From 8b65a79f985ae4788e6403c7768b354ab57d39bd Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sun, 18 Oct 2020 14:14:15 +0000
Subject: [PATCH] --- Merging r47124 into '.': U   
 packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of
 r47124 into '.':  U   . --- Merging r47125 into '.': U   
 packages/rtl-objpas/src/inc/stdconvs.pp --- Recording mergeinfo for merge of
 r47125 into '.':  G   . --- Merging r47126 into '.': U   
 packages/dbus/src/dbuscomp.pp --- Recording mergeinfo for merge of r47126
 into '.':  G   .

# revisions: 47124,47125,47126
r47124 | marco | 2020-10-18 13:26:59 +0200 (Sun, 18 Oct 2020) | 2 lines
Changed paths:
   M /trunk/packages/fcl-passrc/src/pasresolver.pp

 * fix spell error detected by debian lintian
r47125 | marco | 2020-10-18 13:35:47 +0200 (Sun, 18 Oct 2020) | 2 lines
Changed paths:
   M /trunk/packages/rtl-objpas/src/inc/stdconvs.pp

 * debian lintian spellfix
r47126 | marco | 2020-10-18 13:43:52 +0200 (Sun, 18 Oct 2020) | 1 line
Changed paths:
   M /trunk/packages/dbus/src/dbuscomp.pp

 * debian lintian detected spellfix

git-svn-id: branches/fixes_3_2@47127 -
---
 packages/dbus/src/dbuscomp.pp           | 2 +-
 packages/fcl-passrc/src/pasresolver.pp  | 2 +-
 packages/rtl-objpas/src/inc/stdconvs.pp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/dbus/src/dbuscomp.pp b/packages/dbus/src/dbuscomp.pp
index 4d9c93ebeb..0642016a5e 100644
--- a/packages/dbus/src/dbuscomp.pp
+++ b/packages/dbus/src/dbuscomp.pp
@@ -513,7 +513,7 @@ resourcestring
    SErrCouldNotSetReplySerial = 'Could not set reply serial';
    SErrInitIter = 'Could not initialize iterator';
    SErrAppendFailed = 'Append of argument to message failed';
-   SErrNoMoreArguments = 'No more arguments availaible';
+   SErrNoMoreArguments = 'No more arguments available';
    SErrInvalidArgumentType = 'Invalid argument type. Expected %s, got %s.';
    SErrInvalidArrayElementType = 'Invalid array element type. Expected %s got %s';
    SErrInvalidVariantType = 'Invalid VARIANT type';
diff --git a/packages/fcl-passrc/src/pasresolver.pp b/packages/fcl-passrc/src/pasresolver.pp
index d1b41b0bef..20b2208b5e 100644
--- a/packages/fcl-passrc/src/pasresolver.pp
+++ b/packages/fcl-passrc/src/pasresolver.pp
@@ -11807,7 +11807,7 @@ var
 begin
   GenTemplates:=El.GenericTemplateTypes;
   if (GenTemplates=nil) or (GenTemplates.Count=0) then
-    RaiseNotYetImplemented(20190726184902,El,'emty generic template list');
+    RaiseNotYetImplemented(20190726184902,El,'empty generic template list');
 
   // template names must differ from generic type name
   for i:=0 to GenTemplates.Count-1 do
diff --git a/packages/rtl-objpas/src/inc/stdconvs.pp b/packages/rtl-objpas/src/inc/stdconvs.pp
index 83bc410df4..3eced99e13 100644
--- a/packages/rtl-objpas/src/inc/stdconvs.pp
+++ b/packages/rtl-objpas/src/inc/stdconvs.pp
@@ -332,7 +332,7 @@ ResourceString  // Note, designations for FFU's are guesses.
   txttuYears               = 'Years (years)';
   txttuDecades             = 'Decades (decades)';
   txttuCenturies           = 'Centuries (centuries)';
-  txttuMillennia           = 'Millennia (millenia)';
+  txttuMillennia           = 'Millennia (millennia)';
   txttuDateTime            = 'DateTime (??)';
   txttuJulianDate          = 'JulianDate (??)';
   txttuModifiedJulianDate  = 'Modified JulianData (??)';