commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r6187 - in trunk/gnue-common: po src/apps src/datasources src/datasource


From: johannes
Subject: r6187 - in trunk/gnue-common: po src/apps src/datasources src/datasources/drivers/DBSIG2 src/datasources/drivers/appserver/appserver src/datasources/drivers/interbase/interbase src/datasources/drivers/ldap src/datasources/drivers/mysql/Schema/Creation src/datasources/drivers/mysql/mysql src/datasources/drivers/odbc/wodbc src/datasources/drivers/postgresql/Base src/datasources/drivers/sapdb/sapdb src/datasources/drivers/special/configfile src/datasources/drivers/sqlrelay/sqlrelay src/datasources/drivers/sybase/sybase src/definitions src/formatting src/logic src/rpc src/rpc/drivers/_helpers src/rpc/drivers/proxy src/rpc/drivers/pyro src/rpc/drivers/soap src/rpc/drivers/soap/soappy src/rpc/drivers/sockets src/rpc/drivers/xmlrpc src/rpc/drivers/xmlrpc/pw_xmlrpc src/rpc/drivers/xmlrpc/py_xmlrpc src/schema src/schema/importer src/schema/scripter
Date: Thu, 12 Aug 2004 08:04:28 -0500 (CDT)

Author: johannes
Date: 2004-08-12 08:04:23 -0500 (Thu, 12 Aug 2004)
New Revision: 6187

Modified:
   trunk/gnue-common/po/de.po
   trunk/gnue-common/po/es_ES.po
   trunk/gnue-common/po/es_MX.po
   trunk/gnue-common/po/fr.po
   trunk/gnue-common/po/hu.po
   trunk/gnue-common/po/lt.po
   trunk/gnue-common/po/ro.po
   trunk/gnue-common/po/ru.po
   trunk/gnue-common/src/apps/GBaseApp.py
   trunk/gnue-common/src/apps/GConfig.py
   trunk/gnue-common/src/apps/GServerApp.py
   trunk/gnue-common/src/apps/RuntimeSettings.py
   trunk/gnue-common/src/datasources/GConditions.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
   trunk/gnue-common/src/datasources/drivers/ldap/Driver.py
   trunk/gnue-common/src/datasources/drivers/mysql/Schema/Creation/Creation.py
   trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py
   trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
   trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py
   trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/special/configfile/Connection.py
   trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py
   trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py
   trunk/gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py
   trunk/gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py
   trunk/gnue-common/src/definitions/GParser.py
   trunk/gnue-common/src/formatting/BaseMask.py
   trunk/gnue-common/src/formatting/DateMask.py
   trunk/gnue-common/src/logic/GTrigger.py
   trunk/gnue-common/src/rpc/RpcDoc.py
   trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py
   trunk/gnue-common/src/rpc/drivers/_helpers/ObjectEnabler.py
   trunk/gnue-common/src/rpc/drivers/_helpers/RpcDoc.py
   trunk/gnue-common/src/rpc/drivers/proxy/CommDriver.py
   trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py
   trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py
   trunk/gnue-common/src/rpc/drivers/soap/CommDriver.py
   trunk/gnue-common/src/rpc/drivers/soap/soappy/Driver.py
   trunk/gnue-common/src/rpc/drivers/sockets/CommDriver.py
   trunk/gnue-common/src/rpc/drivers/xmlrpc/RpcDoc.py
   trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py
   trunk/gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py
   trunk/gnue-common/src/schema/GSData.py
   trunk/gnue-common/src/schema/Objects.py
   trunk/gnue-common/src/schema/importer/Importer.py
   trunk/gnue-common/src/schema/scripter/Scripter.py
Log:
*) All messages with arguments are using u_() now
*) All messages with multiple arguments are using named arguments
*) All multiline-messages are correctly formed now
*) Updated translations


Modified: trunk/gnue-common/po/de.po
===================================================================
--- trunk/gnue-common/po/de.po  2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/de.po  2004-08-12 13:04:23 UTC (rev 6187)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUe-Common 0.5\n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
-"PO-Revision-Date: $Date: $\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
+"PO-Revision-Date: $LastChangedDate$\n"
 "Last-Translator: Johannes Vetter <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -18,7 +18,7 @@
 
 #: apps/GBaseApp.py:94
 msgid "level"
-msgstr ""
+msgstr "Ebene"
 
 #: apps/GBaseApp.py:95
 msgid ""
@@ -121,8 +121,10 @@
 "NOTE: SUPPLYING A PASSWORD VIA THE COMMAND LINE MAY BE CONSIDERED A SECURITY "
 "RISK AND IS NOT RECOMMENDED.)"
 msgstr ""
-"Passwort f�r die Anmeldung an der Datenbank. Hinweis: Dieses Passwort wird\n"
-"f�r alle Datenbanken verwendet. Falls nicht angegeben erfolgt eine Abfrage."
+"Passwort f�r die Anmeldung an der Datenbank. Hinweis: Dieses Passwort wird "
+"f�r alle Datenbanken verwendet. Falls nicht angegeben erfolgt eine Abfrage.\n"
+"HINWEIS: Die Angabe eines Passwortes via Kommandozeile wird als "
+"Sicherheitsrisiko betrachtet und wird deshalb nicht empfohlen."
 
 #: apps/GBaseApp.py:161
 msgid ""
@@ -148,116 +150,118 @@
 
 #: apps/GBaseApp.py:179
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr ""
 "Diese Anwendung ben�tigt Python 2.1 oder h�her. Sie verwenden Python %s"
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 msgid "This application requires Python 2.1 or greater."
 msgstr "Diese Anwendung ben�tigt Python 2.1 oder h�her."
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
-msgstr "Die Option 'debug-level' ('-d') erwartet ein numerisches Argument."
+msgstr "Die Option 'debug-level' erwartet ein numerisches Argument."
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
-msgstr "Die gnue.conf Datei ist unvollst�ndig:"
-
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
-msgstr "Fehler beim Lesen von gnue.conf: %s"
-
-# ../src/GBaseApp.py:238 :244
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr "Die Verbindungsdefinitionsdatei kann nicht geladen werden.\n"
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:275
 msgid ""
-"\n"
-"   The connections file is in an invalid format. "
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr ""
-"\n"
-"   Die Verbindungsdefinitionsdatei hat ein ung�ltiges Format."
+"Die gnue.conf Datei ist unvollst�ndig:\n"
+"   %s"
 
-#: apps/GBaseApp.py:331
+#: apps/GBaseApp.py:280
 msgid ""
-"\n"
-"   The connections file specified either does "
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr ""
+"Fehler beim Lesen von gnue.conf: %(exType)s\n"
+"   %(message)s"
 
-#: apps/GBaseApp.py:332
+# ../src/GBaseApp.py:238 :244
+#: apps/GBaseApp.py:328
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   not exist or is not readable by your account.\n"
+"The connections file is in an invalid format.\n"
+"%s"
 msgstr ""
+"Die Verbindungsdefinitionsdatei kann nicht geladen werden.\n"
+"\n"
+"Die Datei hat ein ung�ltiges Dateiformat.\n"
+"%s"
 
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
+"Die Verbindungsdefinitionsdatei kann nicht geladen werden.\n"
 "\n"
-"   Ort: \"%s\""
+"Die angegebene Datei existiert nicht oder kann mit dem aktuellen "
+"Benutzerkonto nicht gelesen werden.\n"
+"Datei: \"%s\""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 "\n"
-"%s\n"
-"Version %s (de)\n"
+"%(name)s\n"
+"Version %(version)s (de)\n"
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr "GNUe Common Version %s (de)\n"
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr "Aufruf:  "
 
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 msgid "Available command line options:"
 msgstr "Verf�gbare Kommandozeilenoptionen:"
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr ""
 "Die folgenden Optionen sind vorallem f�r GNUe Entwickler von Bedeutung."
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr ""
 "Um eine allgemeine Hilfestellung zu erhalten, f�hren Sie diese Anwendung "
 "mit\n"
 "der Option '--help' aus."
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr "Entwickler-relevante Kommandozeilenoptionen:"
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr ""
 "Die folgenden Verbindungs- und Datenbank-spezifischen Optionen sind "
 "verf�gbar."
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr "Datenbank-/Verbindungsspezifische Kommandozeilenoptionen:"
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr "Die folgenden Datenbanktreiber sind auf Ihrem System installiert:"
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr "Fehler: %s"
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -276,18 +280,18 @@
 msgstr "Die Datei enth�lt keine Abschnitte."
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
-msgstr "Die Datei kann nicht eingelesen werden. %s :: %s"
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
+msgstr "Die Datei kann nicht eingelesen werden. %(exType)s :: %(exValue)s"
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr "Die Datei kann nicht eingelesen werden."
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
-msgstr "Die Option '%s' im Abschnitt '%s' hat einen falschen Typ"
+#: apps/GConfig.py:210
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
+msgstr "Die Option '%(field)s' im Abschnitt '%(section)s' ist vom falschen Typ"
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
@@ -297,21 +301,16 @@
 "scheint fehlerhaft zu sein."
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
-msgstr "Den Server nicht in den Hintergrund schicken. F�r ein POSIX-System"
-
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
 msgstr ""
-"vermeidet diese Option, dass der Serverprozess sich aufsplittet und die "
-"Verkn�pfung"
+"Der Server wird nicht als Hintergrundprozess ausgef�hrt. Bei POSIX Systemen "
+"wird der Server-Prozess nicht vom kontrollierenden Terminal getrennt."
 
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr " zum aufrufenden Terminal l��t."
-
 # ../src/RuntimeSettings.py:92 :95
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -372,28 +371,21 @@
 msgid "No valid condition tree"
 msgstr "Kein g�ltiger Bedingungs-Baum"
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr ""
-"Bedingungselement '%s' erwartet mindestens %s Argumente, hat aber nur %s"
+"Bedingungselement '%(element)s' erwartet h�chstens %(expected)s Argumente, "
+"hat aber %(found)s"
 
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
-msgstr "Bedingungselement '%s' erwartet h�chstens %s Argumente, hat aber %s"
-
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
 "conversion."
@@ -440,22 +432,24 @@
 "Datei: %s"
 
 # ../src/GConnections.py:134 :169
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
-"In der Verbindungsdefinitionsdatei ist keine Definition f�r '%s' enthalten.\n"
+"In der Verbindungsdefinitionsdatei ist keine Definition f�r '%(connection)s' "
+"enthalten.\n"
 "\n"
-"Datei: %s"
+"Datei: %(file)s"
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
-msgstr "Datenbanktreiber '%s' unterst�tzt den Quelltyp '%s' nicht"
+#: datasources/GConnections.py:304
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
+msgstr ""
+"Datenbanktreiber '%(connection)s' unterst�tzt den Quelltyp '%(conType)s' "
+"nicht"
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
@@ -465,76 +459,77 @@
 "\n"
 "Grund: %s"
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr "Der Benutzer hat die Login Anfrage abgebrochen."
 
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr "Der Datenbanktreiber unterst�tzt die Trigger-Funktion 'call' nicht."
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr "Datenquelle %s ist SQL-basiert, hat aber keine <sql> Definition."
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr "Datenquelle %s ist nicht SQL-basiert, hat aber eine <sql> Definition."
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr ""
-"Detailquelle '%s' verweist auf eine nicht existierende Masterquelle '%s'"
+"Detailquelle '%(source)s' verweist auf eine nicht existierende Masterquelle "
+"'%(master)s'"
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr "Typ des Datenobjektes"
 
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 msgid "Connection Name"
 msgstr "Verbindungsname"
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 msgid "Table Name"
 msgstr "Tabellenname"
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr "Anzahl der Zeilen im Cache"
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr "Abfrage beim Start ausf�hren"
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 msgid "M/D Master DataSource"
 msgstr "Name der Master-Datenquelle"
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr "Feld der Master-Datenquelle"
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr "Feld der Detail-Datenquelle"
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr "Explizite Felder"
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 msgid "Primary Key Field(s)"
 msgstr "Felder des Prim�rschl�ssels"
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr "Die URL '%s' entspricht keiner g�ltigen Applikations-Server-Quelle"
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 msgid "Resource type '%s' is not supported"
 msgstr "Der Resourcen-Typ '%s' wird nicht unterst�tzt."
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr "Die Resource '%(name)s' vom Typ '%(type)s' wurde nicht gefunden"
 
@@ -638,12 +633,25 @@
 msgid "Object of unknown type (%s) passed to DBSIG2 based dbdriver."
 msgstr "DBSIG2-basierender DB-Treiber erhielt unbekannten Objekt-Typ (%s)."
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr ""
+"Bedingungselement '%(element)s' erwartet mindestens %(expedted)s Argumente, "
+"hat aber nur %(found)s"
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr "Bedingung '%s' wird von diesem Datenbanktreiber nicht unterst�tzt."
 
@@ -678,9 +686,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr "Ansichten"
 
@@ -716,9 +724,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr "Tabellen"
 
@@ -771,7 +779,7 @@
 
 #: datasources/drivers/db2/Schema/Discovery/Introspection.py:45
 msgid "Summary Tables"
-msgstr ""
+msgstr "Zusammenfassungstabellen"
 
 #: datasources/drivers/db2/db2/Info.py:28
 msgid "IBM DB2 Data Driver"
@@ -805,14 +813,14 @@
 msgstr "Der Zeichensatz '%s' wird vom InterBase-DB-Treiber nicht unterst�tzt."
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
-msgstr "Der Interbase-Zeichensatz wird auf %s (%s) gesetzt"
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
+msgstr "Der Interbase-Zeichensatz wird auf %(new)s (%(old)s) gesetzt"
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr "kinterbasdb Firebird/Interbase Treiber"
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 msgid "Objects"
 msgstr "Objekte"
@@ -825,40 +833,44 @@
 #: datasources/drivers/mysql/mysql/Driver.py:46
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 "\n"
 "MySQLdb konnte nicht geladen werden. F�r MySQL Unterst�tzung installieren "
-"Sie bitte\n"
+"Sie bitte 'mysql-python 0.9.0' von\n"
+"http://sourceforge.net/projects/mysql-python\n";
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr "mysql-python 0.9.0 oder h�her von"
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr "Fehler: %s"
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr "MySSQLdb"
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 "Treiber nicht installiert: win32all ODBC Treiber\n"
 "\n"
-"[%s"
+"[%s]"
 
 #: datasources/drivers/odbc/wodbc/Info.py:28
 msgid "PythonWin ODBC Driver"
 msgstr "PythonWin ODBC Treiber"
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+"Treiber nicht installiert: win32all ODBC Treiber\n"
+"\n"
+"[%s"
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 msgid "This feature is currently not supported by this driver"
 msgstr "Diese Funktion wird zur Zeit von diesem Treiber nicht unterst�tzt"
@@ -899,7 +911,7 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr "DCOracle2 Treiber f�r Oracle 7.3/8i/9i+ (OCI8)"
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
@@ -907,14 +919,14 @@
 "Der PostgreSQL-Treiber lieferte den folgenden Fehler:\n"
 "\t%s"
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
-msgstr "Der Zeichensatz '%s' wird von der Datenbank nicht unterst�tzt"
+#: datasources/drivers/postgresql/Base/Connection.py:100
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
+msgstr ""
+"Der Zeichensatz '%s' wird vom postgresql-DB-Treiber nicht unterst�tzt.Der "
+"Standardzeichensatz wird verwendet."
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr "Der voreingestellte Zeichensatz wird verwendet."
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 msgid "popy"
 msgstr "popy"
@@ -1043,51 +1055,55 @@
 msgstr "Fehler beim Laden von '%s': leere Definitionsdatei"
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
-"Fehler beim Laden von '%s': dies ist keine g�ltige '%s' Definition (erwartet "
-"war: %s, vorhanden ist: '%s')"
+"Fehler beim Laden von '%(filetype)s': dies ist keine g�ltige '%(filetype)s' "
+"Definition (erwartet war: %(expected)s, erhalten wurde: %(got)s)"
 
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr "Der ben�tigte Tag <%s> ist in der Datei nicht enthalten"
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
-msgstr ""
-"Fehler beim Bearbeiten des <%s> Tags [Ich kenne den Zweck eines <%s> Tags "
-"nicht]"
+#: definitions/GParser.py:257
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
+msgstr "Unbekannter Tag <%(tag)>"
 
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr "Das Attribut enth�lt einen unerwarteten Namensraum"
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
-msgstr "Fehler beim Bearbeiten des <%s> Tags [Ich kenne kein <%s> Attribut]"
+#: definitions/GParser.py:280
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
+msgstr "Ung�ltiges Attribut '%(attribute)s' f�r den Tag <%(tag)s>"
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
-"Fehler beim Bearbeiten des <%s> Tags [Das Attribut '%s' sollte eindeutig "
-"sein; doppelter Wert: '%s']"
+"Das Attribut '%(attribute)s' des Tags <%(tag)s> kommt doppelt vor: '%"
+"(duplicate)s'"
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
-msgstr ""
-"Fehler beim Bearbeiten des <%s> Tags [Das ben�tigte Attribut '%s' ist nicht "
-"vorhanden]"
+#: definitions/GParser.py:317
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
+msgstr "Das ben�tigte Attribut '%(attribute)s' des Tags <%(tag)s> fehlt"
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr ""
-"Fehler beim Bearbeotem des <%s:%s> Tags: Wurzel Element muss im Standard "
-"Namespace liegen."
+"Fehler beim Bearbeiten des <%(namespace)s:%(name)s>-Tags: Das Wurzelelement "
+"muss im Standard Namespace liegen."
 
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
@@ -1095,84 +1111,29 @@
 "WARNUNG: Das Markup enth�lt Namespaces, jedoch beinhaltet das  vorliegende "
 "Werkzeug keine Unterst�tzung von Namespaces."
 
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
-msgstr "Das importierbare Objekt %s kann in %s nicht gefunden werden"
+#: definitions/GParser.py:466
+msgid "Unable to find an importable object named %(name)s in %(library)s"
+msgstr ""
+"Das importierbare Objekt %(name)s kann in der Bibliothek %(library)s nicht "
+"gefunden werden"
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
-msgstr "Das angeforderte Format '%s' ist f�r %s-Felder nicht definiert"
-
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
-msgstr "Unerwartetes Zeichen '%s' im Format '%s'"
-
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr "Starting cursor: %s; shift: %s"
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr "Ending cursor: %s; shift: %s"
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr "*** moveCursorRelative(%s)"
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr "relative=%s"
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr "direction=%s"
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr "cursor #1: %s"
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr "cursor #2: %s"
-
-# ../src/FormatMasks/BaseMask.py:256 :326
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr "pos=%s"
-
-# ../src/FormatMasks/BaseMask.py:257 :263 :272
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr "section=%s"
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr "cursor #2b: %s"
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr "cursor #3: %s"
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr "cursor #4: %s"
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr "Neue Cursor-Position: %s"
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr ""
+"Das angeforderte Format '%(mask)s' ist f�r %(type)s-Felder nicht definiert"
 
+#: formatting/BaseMask.py:159
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
+msgstr "Unerwartetes Zeichen '%(char)s' in der Maske '%(type)s'"
+
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
-msgstr ""
+msgstr "inputMaskPos=%s"
 
 #: formatting/DateMask.py:140
 msgid "inputMaskLen=%s"
-msgstr ""
+msgstr "inputMaskLen=%s"
 
 #: formatting/GTypecast.py:165
 msgid "Whole numbers must be positive or 0"
@@ -1204,149 +1165,111 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr "Die Klasse '%(class)s' hat keine Implementierung f�r '%(method)s'"
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr "GNUe RPC Dokumentations Generator"
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr "Fehler: Das Modul %s existiert nicht oder kann nicht gelanden werden"
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
-msgstr "Fehlende Verkn�pfungsinformationen. Bitte tragen Sie die"
+#: rpc/drivers/pyro/ServerAdapter.py:190
+msgid "Missing Binding information. Please add binding information for %s"
+msgstr ""
+"Fehlende Verkn�pfungsinformationen. Bitte geben Sie die "
+"Verkn�pfungsinformationen f�r %s an"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr "Informationen f�r %s nach."
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
-msgstr "GNURPC kann Dienst '%s' nicht an Dienst '%s' binden."
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
+msgstr ""
+"GNURPC kann den Dienst '%(name)s' nicht an den Dienst '%(destination)s' "
+"binden."
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
-msgstr "GNURPC: kann Dienst '%s' nicht an Dienst '%s' binden."
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
+msgstr ""
+"GNURPC kann die Methode/das Attribut '%(name)s' nicht an den Dienst '%"
+"(service)s' binden"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
-msgstr "GNURPC kann die Methode/das Attribut '%s' nicht an Dienst '%s' binden"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr "Aufl�sen:"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
-msgstr "Die Server-XMLRPC-Methode '%s' konnte nicht"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
-msgstr "an eine reale Methode gebunden werden."
-
-#: rpc/drivers/_helpers/DirectoryServer.py:308
+#: rpc/drivers/_helpers/DirectoryServer.py:309
 #: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
-msgstr "Der Server hat kein XML-RPC"
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+msgid "Server XML-RPC method '%s' is not bound to real method"
+msgstr ""
+"Die Server-XMLRPC-Methode '%s' konnte keiner realen Methode zugeordnet werden"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
-msgstr "Prozedur %s"
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+msgid "Server does not have XML-RPC procedure %s"
+msgstr "Der Server hat kein XML-RPC Prozedur %s"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
-msgstr "Interner Server XML-RPC Fehler: Methoden-Typ"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr ""
+"Interner Server XML-RPC Fehler: Art der Methode (set/get) kann f�r '%s' "
+"nicht ermittelt werden"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr "Server XML-RPC "
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
+msgstr "Server XML-RPC-Prozedur %(method)s nimmt nur %(attr)s als Attribut an"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
-msgstr "Prozedur %s nimmt nur %s als Attribut an"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr "Keine Hilfe f�r %s verf�gbar"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:388 :400
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr "Ung�ltiger Methodenname"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:389 :401
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr "Angefragte Methode existiert nicht."
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
-msgid "Wrong format of object handler "
-msgstr "Falsches Format des Objekt-Handlers "
+msgid "Wrong format of object handler in method call %s"
+msgstr "Falsches Format des Objekt-Handlers im Prozeduraufruf '%s'"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
+#: rpc/drivers/pyro/ServerAdapter.py:348
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
 msgstr ""
+"Interner XMLRPC-Server Fehler: Die Methode %s ist zwar im Verzeichnis "
+"enthalten, aber das Objekt enth�lt keine solche(s) Prozedur/Attribut. Bitte "
+"Pr�fen Sie Ihre .grpc-Datei nach falschen R�ckgabe-Typen."
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr "Interner XMLRPC Server Fehler: Methode %s kann"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr "im Verzeichnis gefunden werden,"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr "aber das Objekt enth�lt diese(s) Methode/Attribut nicht."
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
-#: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
-msgstr "Bitte pr�fen Sie die .grpc-Datei nach falschen R�ckgabetypen."
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr "Kein Objekt-Handle zur�ckgegeben"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr "Ung�ltiges Objekt-Handle"
 
@@ -1359,83 +1282,72 @@
 #: rpc/drivers/pyro/ClientAdapter.py:51
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 "\n"
-"pyro konnte nicht geladen werden. Um PYRO nutzen zu k�nnen \n"
+"Pyro kann nicht geladen werden. Um die Pyro-Schnittstelle zu benutzen,\n"
+"installieren Sie xmlrpc von:\n"
+"    http://sourceforge.net/projects/pyroDas Debian-Paket ist 'python-pyro."
+"deb'"
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr "installieren sie xmlrpc bitte von:\n"
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr "Das passende DEBIAN Paket is 'python-pyro.deb'"
-
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
-msgstr "py-xmlrpc unterst�tzt nur 'http' als Transportprotokoll. "
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
+msgstr ""
+"py-xmlrp unterst�tzt lediglich 'http' als Transportprotokoll. Sollten Sie "
+"'https' ben�tigen, verwenden Sie 'pw_xmlrpc'."
 
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr "Falls Sie https ben�tigen, versuchen Sie es mit dem "
-
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr "'pw_xmlrpc'-Adapter."
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
-msgstr "Um XML-RPC nutzen zu k�nnen, mu� entwerde eine 'url' oder\n"
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
+msgstr ""
+"Um XML-RPC nutzen zu k�nnen, mu� entweder eine 'url' oder\n"
+"Ein Host- und ein Port-Eintrag angegeben werden."
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr "ein 'host' und ein 'port' Option angegeben sein."
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr "Die XML-RPC-Schnittstelle an %s kann nicht initialisiert werden"
 
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
-msgstr "Die XML-RPC-Schnittstelle an %s kann nicht initialisiert werden"
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
+msgstr ""
+"Die XML-RPC-Schnittstelle an %s kann nicht initialisiert werden: Verbindung "
+"abgelehnt"
 
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr "Verbindung verweigert"
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 "\n"
-"pyro konnte nicht geladen werden. Um PYRO nutzen zu k�nnen \n"
+"Pyro kann nicht geladen werden. Um die Pyro-Schnittstelle zu benutzen,\n"
+"installieren Sie pyro von:\n"
+"    http://pyro.sf.net/";
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
-msgid "please install pyro from:\n"
-msgstr "installieren sie PYRO bitte  von:\n"
-
-#: rpc/drivers/pyro/ServerAdapter.py:329
+#: rpc/drivers/pyro/ServerAdapter.py:334
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
-msgstr ""
+msgid "Wrong format of object handle in method call %s"
+msgstr "Der Objekt-Handle im Prozeduraufruf %s besitzt ein falsches Format"
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr ""
-
 #: rpc/drivers/soap/CommDriver.py:45
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
+"\n"
+"'soaplib' konnte nicht geladen werden. Um die SOPA-Schnittstelle verwenden "
+"zu k�nnen, installieren Sie 'soaplib' bitte von:\n"
+"    http://www.pythonware.com/products/soap/\n";
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr ""
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1444,6 +1356,11 @@
 "    http://sourceforge.net/projects/pywebsvcs\n";
 "the appropriate DEBIAN package is python-soappy"
 msgstr ""
+"\n"
+"SOAP.py konnte nicht geladen werden. Um die SOAP-Schnittstelle verwenden zu "
+"k�nnen, installieren Sie SOPA.py bitte von:\n"
+"    http://sourceforge.net/projects/pywebsvcs\n";
+"Das ben�tigte Debian Paket ist 'python-soappy'"
 
 #: rpc/drivers/soap/soappy/Driver.py:86
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:114
@@ -1454,38 +1371,39 @@
 #: rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py:115
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr ""
 "Ein Interner Server Fehler ist aufgetreten:\n"
-" Server %s\n"
-" Quelle %s."
+" Server %(server)s\n"
+" Quelle %(source)s."
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr ""
+"Ihre Konfiguration referenziert eine Datei-basierende Socket-Verbindung.\n"
+"Ihr Betriebssystem unterst�tzt diese Art der Socket-Verbindung nicht."
 
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
-msgstr ""
-
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
-msgstr ""
+msgstr "Der von %s angeforderte Socket konnte nicht initialisert werden"
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr ""
-
 #: rpc/drivers/sockets/CommDriver.py:114
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
 msgstr ""
+"Um den Sockets-Comm-Treiber verwenden zu k�nnen, muss entweder eine Socket-"
+"Datei oder ein Host und eine Port-Nummer angegeben werden. Bitte lesen Sie "
+"in der Dokumentation nach."
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
+#: rpc/drivers/sockets/CommDriver.py:120
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
 msgstr ""
+"Der von %(host)s:%(port)s angeforderte Socket konnte nicht initialisert "
+"werden"
 
 # ../src/commdrivers/pw_xmlrpc/RpcDoc.py:66 :77 :99
 # ../src/commdrivers/xmlrpc/RpcDoc.py:66 :77 :88 :99
@@ -1545,42 +1463,51 @@
 "    http://sourceforge.net/projects/py-xmlrpc\n";
 "the appropriate DEBIAN package is python-xmlrpc.deb"
 msgstr ""
+"\n"
+"xmlrpc konnte nicht geladen werden. Um die XML-RPC-Schnittstelle verwenden "
+"zu k�nnen, installieren Sie xmlrpc bitte von:\n"
+"    http://sourceforge.net/projects/py-xmlrpc\n";
+"Das Debian-Paket ist 'python-xmlrpc.deb'"
 
 #: rpc/drivers/xmlrpc/py_xmlrpc/ClientAdapter.py:75
 msgid ""
 "py-xmlrpc only supports http as a transport.  If you need https, please have "
 "a look at the 'pw_xmlrpc' adapter."
 msgstr ""
+"py-xmlrpc unterst�tzt nur das 'http'-Transportprotokoll. Sollten Sie 'https' "
+"ben�tigen, verwenden Sie den 'pw_xmlrpc'-Adapter."
 
 #: schema/GSData.py:72
-msgid "%sInvalid datatype '%s'."
-msgstr "%sUng�ltiger Datentyp '%s'"
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
+msgstr "%(fieldname)sUng�ltiger Datentyp '%(datatype)s'."
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
-msgstr "%sDer Wert '%s' liegt ausserhalb des g�ltigen Bereiches (%s)"
+#: schema/GSData.py:110
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
+msgstr ""
+"%(fieldname)sDer Wert '%(value)s' liegt ausserhalb des g�ltigen Bereiches (%"
+"(range)s)"
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
-msgstr "%sWert '%s' %s"
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
+msgstr "%(fieldname)sDer Wert '%(value)s' %(format)s"
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
-msgstr "ist kein numerischer Wert (%d.%d)"
+#: schema/GSData.py:147
+msgid "is not a number (%(length)d.%(scale)d)"
+msgstr "ist kein numerischer Wert (%(length)d.%(scale)d)"
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr "ist kein boolscher Wert"
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
-msgstr "ist kein Datumsangabe (YYYY-MM-DD)"
+msgstr "ist keine Datumsangabe (YYYY-MM-DD)"
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr "ist keine Zeitangabe (HH:MM:SS.ss)"
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr "ist keine Datums- und Zeitangabe (YYYY-MM-DD HH:MM:SS.ss)"
 
@@ -1601,56 +1528,57 @@
 msgstr "Die Beziehung '%s' hat eine ungleiche Anzahl Felder."
 
 #: schema/Objects.py:170
-msgid "Constraint '%s' has more fields than the table '%s'"
-msgstr "Die Beziehung '%s' hat mehr Felder als die Tabelle '%s'"
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
+msgstr "Die Beziehung '%(name)s' hat mehr Felder als die Tabelle '%(table)s'"
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
-msgstr "Die Tabelle '%s' hat kein Feld '%s'."
+#: schema/Objects.py:185
+msgid "Table '%(table)s' has no field '%(field)s'."
+msgstr "Die Tabelle '%(table)s' hat kein Feld '%(field)s'."
 
-#: schema/Objects.py:212
-msgid "Constraint '%s': typemismatch in reference field '%s'."
-msgstr "Beziehung '%s': Datentyp des Referenzfeldes '%s' stimmt nicht."
+#: schema/Objects.py:215
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
+msgstr ""
+"Beziehung '%(name)s': Der Datentyp des Referenzfeldes '%(field)s' ist falsch."
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr "Fehler im GSD-Objektbaum: Objekt im XML Code nicht gefunden."
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
-msgstr "Zeile %d der Tabelle %s hat keine Key-Felder."
+msgid "Row %(row)d of table %(table)s has no key fields."
+msgstr "Die Zeile %(row)d der Tabelle %(table)s hat keine Key-Felder."
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr "Daten werden an die Verbindung <connectinoname> gesendet."
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr "GNUe Schema Importer liest Daten aus einer GNUe Schema "
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr "Definitionsdatei und importiert diese in eine gegebene Verbindung."
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 msgid "No input file specified."
 msgstr "Keine Eingabe-Datei angegeben."
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 msgid "Unable to open input file %s."
 msgstr "Die Eingabe-Datei '%s' kann nicht ge�ffnet werden."
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr "Einlesen von Daten in die Tabelle '%s'"
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
-msgstr " %d neue Zeile(n), %d Zeile(n) aktualisiert"
+#: schema/importer/Importer.py:175
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
+msgstr " %(inserted)d neue Zeile(n), %(updated)d Zeile(n) aktualisiert"
 
 #: schema/scripter/Scripter.py:48
 msgid "Data row of table '%s' has no key fields"
-msgstr "Zeile %d der Tabelle %s hat keine Key-Felder."
+msgstr "Datenzeile der Tabelle '%s' hat keine Key-Felder."
 
 #: schema/scripter/Scripter.py:61
 msgid ""


Property changes on: trunk/gnue-common/po/de.po
___________________________________________________________________
Name: svn:keywords
   - +Date
   + Date

Modified: trunk/gnue-common/po/es_ES.po
===================================================================
--- trunk/gnue-common/po/es_ES.po       2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/es_ES.po       2004-08-12 13:04:23 UTC (rev 6187)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUe-Common 0.5.5\n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
 "PO-Revision-Date: 2004-06-09\n"
 "Last-Translator: J. Esteban <address@hidden>\n"
 "Language-Team: es_ES\n"
@@ -145,117 +145,107 @@
 "GNUE_CONNECTIONS. Si no est� definida, se usa \"%s\"."
 
 #: apps/GBaseApp.py:179
+#, fuzzy
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr "Esta aplicacion requiere Python 2.1 o superior. Est� usando Python %s"
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 msgid "This application requires Python 2.1 or greater."
 msgstr "Esta aplicacion requiere Python 2.1 o superior."
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
 msgstr "La opcion debug_level (\"-d\") requiere un parametro num�rico."
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
+#: apps/GBaseApp.py:275
+#, fuzzy
+msgid ""
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr "El archivo gnue.conf esta incompleto: "
 
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
+#: apps/GBaseApp.py:280
+#, fuzzy
+msgid ""
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr "%s al leer gnue.conf: "
 
 # ../src/GBaseApp.py:238 :244
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr "Incapaz de cargar el archivo de definiciones de conexi�n\n"
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:328
+#, fuzzy
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   The connections file is in an invalid format. "
-msgstr ""
-"\n"
-"   El archivo de conexiones no tiene formato v�lido. "
+"The connections file is in an invalid format.\n"
+"%s"
+msgstr "Incapaz de cargar el archivo de definiciones de conexi�n\n"
 
-#: apps/GBaseApp.py:331
-msgid ""
-"\n"
-"   The connections file specified either does "
-msgstr ""
-"\n"
-"  El archivo de conexiones o  "
-
-#: apps/GBaseApp.py:332
-msgid ""
-"\n"
-"   not exist or is not readable by your account.\n"
-msgstr ""
-"\n"
-"   no existe, o no es legible.\n"
-
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
-"\n"
-"   Ubicaci�n: \"%s\""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
+#, fuzzy
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 "\n"
 "%s\n"
 "Versi�n %s\n"
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr "GNUe Common, versi�n %s\n"
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr "Uso: "
 
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 msgid "Available command line options:"
 msgstr "Opciones de linea de comando disponibles:"
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr ""
 "Las siguientes opciones son de inter�s preferentemente para  desarrolladores "
 "de GNUe"
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr "Para obtener ayuda gen�rica, ejecute con la opci�n --help."
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr "Opciones de l�nea de comando espec�ficas para desarrolladores:"
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr ""
 "Existen las siguientes opciones relacionadas con conexiones a base de datos:"
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr "Opciones de conexi�n a base de datos:"
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr "En su sistema se encuentran instalados los siguientes controladores:"
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -274,18 +264,20 @@
 msgstr "El archivo define fuentes de datos."
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
+#, fuzzy
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
 msgstr "El archivo no puede ser interpretado. %s :: %s"
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr "El archivo no puede ser interpretado."
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
+#: apps/GConfig.py:210
+#, fuzzy
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
 msgstr "El valor de la opci�n %s es de un tipo err�neo en [%s]"
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
@@ -294,19 +286,14 @@
 "con su instalacion"
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
-msgstr "No coloca el servidor en background. En un sistema POSIX, "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
+msgstr ""
 
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
-msgstr "esta opci�n evita que el proceso bifurque y se desvincule "
-
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr "del terminal controlador."
-
 # ../src/RuntimeSettings.py:92 :95
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -360,27 +347,20 @@
 msgid "No valid condition tree"
 msgstr "Fecha no v�lida"
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
-msgstr "Condici�n \"%s\" necesita al menos %s argumentos; se encontraron %s"
-
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr "Condici�n \"%s\" espera no mas de %s argumentos; se encontraron %s"
 
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 #, fuzzy
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
@@ -426,22 +406,23 @@
 "Archivo: %s"
 
 # ../src/GConnections.py:134 :169
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
+#, fuzzy
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
 "El archivo de conexiones no define \"%s\".\n"
 "\n"
 "Archivo: %s"
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
+#: datasources/GConnections.py:304
+#, fuzzy
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
 msgstr "DB Driver '%s' no soporta fuentes de tipo  '%s'"
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
@@ -451,75 +432,76 @@
 "\n"
 "Error: %s"
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr "El usuario cancel� el proceso de login."
 
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr "Backend no soporta la funcion 'call' de trigger"
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr "La fuente de datos %s es sql, pero no hay una definici�n <sql>"
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr "La fuente de datos %s no es sql, pero hay una definici�n <sql>"
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+#, fuzzy
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr "El maestro '%s' de '%s' no existe."
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr "Tipo de objeto de datos"
 
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 msgid "Connection Name"
 msgstr "Nombre de la conexi�n"
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 msgid "Table Name"
 msgstr "Nombre de la tabla"
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr "Tama�o de cach�"
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr "Interrogar al inicio"
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 msgid "M/D Master DataSource"
 msgstr "M/D Fuente de datos maestra"
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr "M/D Campo maestro"
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr "M/D Campo de detalle"
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr "Campos expl�citos"
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 msgid "Primary Key Field(s)"
 msgstr "Campos que componen la clave principal"
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr ""
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 msgid "Resource type '%s' is not supported"
 msgstr ""
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 #, fuzzy
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr "La fila %d de la tabla %s no tiene campo clave."
@@ -626,12 +608,24 @@
 msgid "Object of unknown type (%s) passed to DBSIG2 based dbdriver."
 msgstr "Se pas� un objeto de tipo desconocido (%s) al conector DBSIG2."
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr "Condici�n \"%s\" necesita al menos %s argumentos; se encontraron %s"
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr "Cl�usula de condicion \"%s\" no soportada por este manejador."
 
@@ -666,9 +660,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr "Vistas"
 
@@ -704,9 +698,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr "Tablas"
 
@@ -795,14 +789,14 @@
 msgstr "Clausula de condici�n \"%s\" no es soportada por este manejador."
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr "Controlador Firebird/Interbase kinterbasdb"
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 msgid "Objects"
 msgstr "Objetos"
@@ -813,32 +807,26 @@
 msgstr "CUIDADO: el tipo de '%s.%s' se ha cambiado a 'timestamp'"
 
 #: datasources/drivers/mysql/mysql/Driver.py:46
+#, fuzzy
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 "\n"
 "No es posible cargar MySQLdb. Para usar MySQL, por favor instale\n"
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr "'mysql-python version 0.9.0 o mejor de"
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr "Error: %s"
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr ""
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+#, fuzzy
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 "Controlador no instalado: controlador win32all ODBC \n"
 "\n"
@@ -848,6 +836,17 @@
 msgid "PythonWin ODBC Driver"
 msgstr "Controlador ODBC PythonWin"
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+"Controlador no instalado: controlador win32all ODBC \n"
+"\n"
+"[%s"
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 #, fuzzy
 msgid "This feature is currently not supported by this driver"
@@ -889,7 +888,7 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr "Controlador DCOracle2 para Oracle 7.3/8i/9i+ (OCI8)"
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
@@ -897,14 +896,13 @@
 "El conector PostgreSQL devolvi� el este error:\n"
 "\t%s"
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
-msgstr "El conector postgresql no soporta codificaci�n '%s'."
+#: datasources/drivers/postgresql/Base/Connection.py:100
+#, fuzzy
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
+msgstr "Clausula de condici�n \"%s\" no es soportada por este manejador."
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr "Usando codificaci�n de caracteres por defecto."
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 msgid "popy"
 msgstr "Copiar"
@@ -1033,47 +1031,61 @@
 msgstr "Error al cargar %s: archivo de definicion vacio"
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+#, fuzzy
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
 "Error la cargar %s: no hay definiciones validas de %s (se esperaba: %s, "
 "obtuve: %s)"
 
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr "El fichero no contiene la etiqueta obligatoria <%s>"
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
+#: definitions/GParser.py:257
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
 msgstr "Error procesando la etiqueta <%s> [No s� qu� hace la etiqueta <%s>]"
 
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr "Espacio de nombres inesperado en atributo"
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
+#: definitions/GParser.py:280
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
 msgstr "Error procesando la etiqueta <%s> [No reconozco el atributo \"%s\""
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
+#, fuzzy
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
 "Error procesando la etiqueta <%s> [El atributo \"%s\" deber�a de ser �nico; "
 "el valor duplicado es \"%s\"]"
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
+#: definitions/GParser.py:317
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
 msgstr "Error procesando la etiqueta <%s> [falta atributo obligatorio \"%s\"]"
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
+#, fuzzy
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr ""
 "Error en <%s:%s>: elemento ra�z ha de pertenecer al espacio de nombres por "
 "defecto"
 
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
@@ -1081,77 +1093,22 @@
 "Aviso: �El texto incluye 'namespaces', pero la herramienta actual no los "
 "soporta!"
 
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
+#: definitions/GParser.py:466
+#, fuzzy
+msgid "Unable to find an importable object named %(name)s in %(library)s"
 msgstr "No se encuentra objeto importable llamado %s en %s"
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
+#, fuzzy
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr "No se ha definido m�scara de formato '%s' para campos %s"
 
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
+#: formatting/BaseMask.py:159
+#, fuzzy
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
 msgstr "Caracter inespearado '%s' en m�scara %s."
 
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr "Comienzo: %s, desplazamiento: %s"
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr "Fin: %s, desplazamiento: %s"
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr "*** movimientoRelativoCursor(%s)"
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr "relativo=%s"
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr "direcci�n=%s"
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr ""
-
-# ../src/FormatMasks/BaseMask.py:256 :326
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr "posici�n=%s"
-
-# ../src/FormatMasks/BaseMask.py:257 :263 :272
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr "seccion=%s"
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr "Nueva posicion de cursor: %s"
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
-msgstr "despues de processEdit, index=%s;cursor=%s"
-
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
 msgstr "PosPlantilla=%s"
@@ -1191,149 +1148,107 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr ""
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr "GNUe RPC Generador de Documentos"
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr "Error: el modulo %s no existe o no se puede cargar"
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
+#: rpc/drivers/pyro/ServerAdapter.py:190
+#, fuzzy
+msgid "Missing Binding information. Please add binding information for %s"
 msgstr "Falta informaci�n de enlace. Por favor, a�ada la "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr "informacion de enlace para %s"
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+#, fuzzy
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
 msgstr "GNURPC: no se pudo enlazar el servicio '%s' al servicio '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
-msgstr "GNURPC: no se pudo asociar servicio '%s' a '%s'"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+#, fuzzy
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
 msgstr "GNURPC no puede asociar el metodo/atributo '%s' al servicio '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr "Despachando: "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
+#: rpc/drivers/_helpers/DirectoryServer.py:309
+#: rpc/drivers/pyro/ServerAdapter.py:380
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+#, fuzzy
+msgid "Server XML-RPC method '%s' is not bound to real method"
 msgstr "El metodo del servidor XML-RPC '%s' no est� "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
-msgstr "asociado a un m�todo real"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:308
-#: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+#, fuzzy
+msgid "Server does not have XML-RPC procedure %s"
 msgstr "El servidor no tiene (XML-RPC)"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
-msgstr "procedimiento %s"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
-msgstr "Error Interno del Servidor XML-RPC: tipo de metodo"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+#, fuzzy
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr "no se encuentra (atributo get/set, metodo %s)"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr "Servidor XML-RPC "
-
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+#, fuzzy
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
 msgstr "El procedimiento %s acepta solamente %s como atributo"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr "No hay ayuda disponible para %s"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:388 :400
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr "Nombre de M�todo invalido"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:389 :401
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr "El m�todo solicitado no existe"
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
-msgid "Wrong format of object handler "
+#, fuzzy
+msgid "Wrong format of object handler in method call %s"
 msgstr "Formato err�neo del controlador de objeto "
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
-msgstr "al llamar %s"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr "Error interno del servidor XMLRPC: el metodo %s se puede "
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr "localizar en el directorio (creado a partir de un archivo .grpc),"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr "pero el objeto no contiene este metodo/atributo."
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
 #: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
-msgstr "Por favor compruebe en su archivo .grpc tipos de retorno equivocados."
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
+msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr "No se devolvi� objeto controlador"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr "Controlador no v�lido"
 
@@ -1343,87 +1258,76 @@
 "el adaptador cliente de Proxy debe ser llamado con el objeto del servidor"
 
 #: rpc/drivers/pyro/ClientAdapter.py:51
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 "\n"
-"Incapaz de cargar pyro. Para usar la interface PYRO, \n"
+"No se puede cargar xmlrpc. Instalelo desde: \n"
+"    http://sourceforge.net/projects/py-xmlrpc\n";
+"el paquete DEBIAN apropiado es python-xmlrpc.deb"
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr "por favor instale xmlrpc de:\n"
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr "el paquete DEBIAN apropiado es python-pyro.deb"
-
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
-msgstr "py-xmlrpc solo soporta transporte HTTP"
+#, fuzzy
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
+msgstr ""
+"py-xmlrpc solo soporta transporte HTTP. Si necesita HTTPS, considere el "
+"controlador 'pw_xmlrpc'."
 
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr "Si necesita HTTPS, echele un vistazo al"
-
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr "controlador 'pw_xmlprc'"
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
+#, fuzzy
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
 msgstr "Para utilizar XML-RPC, debe especificar un 'url' o \n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr "una combinaci�n de 'host' y 'puerto'."
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr "Incapaz de arrancar la interfaz XML-RPC en %s"
 
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
+#, fuzzy
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
 msgstr "Incapaz de arrancar la interfaz XML-RPC en %s: "
 
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr "Conexion rechazada"
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
+#, fuzzy
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 "\n"
-"Incapaz de cargar pyro. Para usar la interfaz PYRO, \n"
+"Incapaz de cargar xmlrpclib. Para utilizar la interfaz XML-RPC, \n"
+"instale xmlrpc from:\n"
+"    http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
-msgid "please install pyro from:\n"
-msgstr "por favor instale Pyro de:\n"
-
-#: rpc/drivers/pyro/ServerAdapter.py:329
+#: rpc/drivers/pyro/ServerAdapter.py:334
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
+#, fuzzy
+msgid "Wrong format of object handle in method call %s"
 msgstr "Formato erroneo del objeto controlador "
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr "el m�todo XML-RPC %s del servidor no "
-
 #: rpc/drivers/soap/CommDriver.py:45
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
 "\n"
-"Incapaz de cargar soaplib. Para utilizar la interfaz SOAP, \n"
+"Incapaz de cargar xmlrpclib. Para utilizar la interfaz XML-RPC, \n"
+"instale xmlrpc from:\n"
+"    http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr "instale soaplib de:\n"
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1444,40 +1348,36 @@
 
 #: rpc/drivers/soap/soappy/Driver.py:157
 #: rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py:115
+#, fuzzy
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr ""
 "Error interno. Servidor %s, \n"
 "fuente de datos %s"
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
-msgstr "Su configuracion define una conexi�n de fichero socket.\n"
-
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
+#, fuzzy
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr "Pero, su sistema operativo no soporta ficheros socket."
 
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
 msgstr "Incapaz de arrancar el socket solicitado localizado en %s"
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr "Para utilizar sockets, debe especificar un archivo tipo socket"
-
 #: rpc/drivers/sockets/CommDriver.py:114
+#, fuzzy
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
-msgstr ""
-"\n"
-" o un host y numero de puerto. Vea la documentaci�n."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
+msgstr "Para utilizar sockets, debe especificar un archivo tipo socket"
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
+#: rpc/drivers/sockets/CommDriver.py:120
+#, fuzzy
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
 msgstr "Incapaz de abrir el socket requerido en %s:%s"
 
 # ../src/commdrivers/pw_xmlrpc/RpcDoc.py:66 :77 :99
@@ -1553,34 +1453,38 @@
 "controlador 'pw_xmlrpc'."
 
 #: schema/GSData.py:72
-msgid "%sInvalid datatype '%s'."
+#, fuzzy
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
 msgstr "'%s': entrada no v�lida."
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
+#: schema/GSData.py:110
+#, fuzzy
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
 msgstr "El valor de %s, '%s', est� fuera de rango."
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
-msgstr "Valor de %s, '%s', %s"
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
+msgstr ""
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
+#: schema/GSData.py:147
+#, fuzzy
+msgid "is not a number (%(length)d.%(scale)d)"
 msgstr "no es num�rico (%d.%d)"
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr "no es l�gico (TRUE o FALSE)"
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
 msgstr "no es una fecha (DD-MM-YYYY)"
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+#, fuzzy
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr "no es una hora (HH:MM:SS.SS"
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr "no es fecha-hora (DD-MM-YYYY HH:MM:SS.ss)"
 
@@ -1602,52 +1506,55 @@
 
 #: schema/Objects.py:170
 #, fuzzy
-msgid "Constraint '%s' has more fields than the table '%s'"
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
 msgstr "Requerimiento '%s' no indica campo de referencia."
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
+#: schema/Objects.py:185
+#, fuzzy
+msgid "Table '%(table)s' has no field '%(field)s'."
 msgstr "La tabla '%s' no tiene campo '%s'"
 
-#: schema/Objects.py:212
+#: schema/Objects.py:215
 #, fuzzy
-msgid "Constraint '%s': typemismatch in reference field '%s'."
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
 msgstr "Requerimiento '%s' no indica campo de referencia."
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr "Error GSD: �no estoy yo en el �rbol XML!"
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
+#, fuzzy
+msgid "Row %(row)d of table %(table)s has no key fields."
 msgstr "La fila %d de la tabla %s no tiene campo clave."
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr "Utilice conexi�n <nombredeconexi�n> para importar datos."
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr "El importador de GNUe Schema lee datos de un GNUe Schema"
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr "y la importa sobre una conexi�n."
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 msgid "No input file specified."
 msgstr "No se ha especificado fichero de entrada."
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 msgid "Unable to open input file %s."
 msgstr "Incapaz de abrir archivo %s."
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr "Importando sobre %s"
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
+#: schema/importer/Importer.py:175
+#, fuzzy
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
 msgstr "  Insertadas %d fila(s), actualizada(s) %d"
 
 #: schema/scripter/Scripter.py:48
@@ -1741,7 +1648,220 @@
 msgid "Not a valid date"
 msgstr "Fecha no v�lida"
 
+#, fuzzy
+#~ msgid "Server XML-RPC method %s is not bound to real method"
+#~ msgstr "el m�todo XML-RPC %s del servidor no "
+
+#, fuzzy
 #~ msgid ""
+#~ "GNURPC can't bind method/attribut '%(name)s' to service '%(service)s'"
+#~ msgstr "GNURPC no puede asociar el metodo/atributo '%s' al servicio '%s'"
+
+#~ msgid "Wrong format of object handle "
+#~ msgstr "Formato erroneo del objeto controlador "
+
+#~ msgid "in method call %s"
+#~ msgstr "al llamar %s"
+
+#~ msgid "Internal XMLRPC server error: method %s can be "
+#~ msgstr "Error interno del servidor XMLRPC: el metodo %s se puede "
+
+#~ msgid "found in the directory (build out of a .grpc file),"
+#~ msgstr "localizar en el directorio (creado a partir de un archivo .grpc),"
+
+#~ msgid " but the object doesn't contain this method/attribut."
+#~ msgstr "pero el objeto no contiene este metodo/atributo."
+
+#~ msgid " Please check you .grpc file for wrong return types."
+#~ msgstr ""
+#~ "Por favor compruebe en su archivo .grpc tipos de retorno equivocados."
+
+#~ msgid "Server XML-RPC method %s  is not "
+#~ msgstr "el m�todo XML-RPC %s del servidor no "
+
+#~ msgid "bound to real method"
+#~ msgstr "asociado a un m�todo real"
+
+#~ msgid "Server does not have XML-RPC "
+#~ msgstr "El servidor no tiene (XML-RPC)"
+
+#~ msgid "procedure %s"
+#~ msgstr "procedimiento %s"
+
+#~ msgid "Server XML-RPC "
+#~ msgstr "Servidor XML-RPC "
+
+#~ msgid "procedure %s accepts just %s as attributs"
+#~ msgstr "El procedimiento %s acepta solamente %s como atributo"
+
+#~ msgid "Internal Server XML-RPC error: method type"
+#~ msgstr "Error Interno del Servidor XML-RPC: tipo de metodo"
+
+#~ msgid "(get/set attribute) couldn't be detected (method %s)"
+#~ msgstr "no se encuentra (atributo get/set, metodo %s)"
+
+#~ msgid ""
+#~ "Internal server error occured:\n"
+#~ " server %s \n"
+#~ " on source %s."
+#~ msgstr ""
+#~ "Error interno. Servidor %s, \n"
+#~ "fuente de datos %s"
+
+#, fuzzy
+#~ msgid "Missing Binding information. Please add binding information for %s "
+#~ msgstr "Falta informaci�n de enlace. Por favor, a�ada la "
+
+#, fuzzy
+#~ msgid "GNURPC cannot bind service '%(name)s' to service'%(destination)s'"
+#~ msgstr "GNURPC: no se pudo enlazar el servicio '%s' al servicio '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file is in an invalid format. "
+#~ msgstr ""
+#~ "\n"
+#~ "   El archivo de conexiones no tiene formato v�lido. "
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file specified either does "
+#~ msgstr ""
+#~ "\n"
+#~ "  El archivo de conexiones o  "
+
+#~ msgid ""
+#~ "\n"
+#~ "   not exist or is not readable by your account.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "   no existe, o no es legible.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "   Location: \"%s\""
+#~ msgstr ""
+#~ "\n"
+#~ "   Ubicaci�n: \"%s\""
+
+#~ msgid "Do not send the server into the background. For a POSIX system, "
+#~ msgstr "No coloca el servidor en background. En un sistema POSIX, "
+
+#~ msgid "this option keeps the server process from forking and detaching "
+#~ msgstr "esta opci�n evita que el proceso bifurque y se desvincule "
+
+#~ msgid "from its controlling terminal."
+#~ msgstr "del terminal controlador."
+
+#~ msgid "mysql-python 0.9.0 or later from"
+#~ msgstr "'mysql-python version 0.9.0 o mejor de"
+
+#~ msgid "Error:  %s"
+#~ msgstr "Error: %s"
+
+#~ msgid "Encoding '%s' is not supported by postgresql dbdriver."
+#~ msgstr "El conector postgresql no soporta codificaci�n '%s'."
+
+#~ msgid "Using default encoding."
+#~ msgstr "Usando codificaci�n de caracteres por defecto."
+
+#~ msgid "Starting cursor: %s; shift: %s"
+#~ msgstr "Comienzo: %s, desplazamiento: %s"
+
+#~ msgid "Ending cursor: %s; shift: %s"
+#~ msgstr "Fin: %s, desplazamiento: %s"
+
+#~ msgid "*** moveCursorRelative(%s)"
+#~ msgstr "*** movimientoRelativoCursor(%s)"
+
+#~ msgid "relative=%s"
+#~ msgstr "relativo=%s"
+
+#~ msgid "direction=%s"
+#~ msgstr "direcci�n=%s"
+
+# ../src/FormatMasks/BaseMask.py:256 :326
+#~ msgid "pos=%s"
+#~ msgstr "posici�n=%s"
+
+# ../src/FormatMasks/BaseMask.py:257 :263 :272
+#~ msgid "section=%s"
+#~ msgstr "seccion=%s"
+
+#~ msgid "New cursor position: %s"
+#~ msgstr "Nueva posicion de cursor: %s"
+
+#~ msgid "after processEdit, index=%s;cursor=%s"
+#~ msgstr "despues de processEdit, index=%s;cursor=%s"
+
+#~ msgid "information for %s "
+#~ msgstr "informacion de enlace para %s"
+
+#~ msgid "GNURPC: cannot bind service '%s' to %s"
+#~ msgstr "GNURPC: no se pudo asociar servicio '%s' a '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Incapaz de cargar pyro. Para usar la interface PYRO, \n"
+
+#~ msgid "please install xmlrpc from:\n"
+#~ msgstr "por favor instale xmlrpc de:\n"
+
+#~ msgid "the appropriate DEBIAN package is python-pyro.deb"
+#~ msgstr "el paquete DEBIAN apropiado es python-pyro.deb"
+
+#~ msgid "py-xmlrpc just support http as a transport. "
+#~ msgstr "py-xmlrpc solo soporta transporte HTTP"
+
+#~ msgid "If you need https please have a look at the "
+#~ msgstr "Si necesita HTTPS, echele un vistazo al"
+
+#~ msgid "'pw_xmlrpc' adapter."
+#~ msgstr "controlador 'pw_xmlprc'"
+
+#~ msgid "a 'host' and 'port' setting."
+#~ msgstr "una combinaci�n de 'host' y 'puerto'."
+
+#~ msgid "Connection refused"
+#~ msgstr "Conexion rechazada"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load Pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Incapaz de cargar pyro. Para usar la interfaz PYRO, \n"
+
+#~ msgid "please install pyro from:\n"
+#~ msgstr "por favor instale Pyro de:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load soaplib.  To use the SOAP interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Incapaz de cargar soaplib. Para utilizar la interfaz SOAP, \n"
+
+#~ msgid "please install soaplib from:\n"
+#~ msgstr "instale soaplib de:\n"
+
+#~ msgid "Your configuration references a file-based sockets connection.\n"
+#~ msgstr "Su configuracion define una conexi�n de fichero socket.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "file or a host and port number.  Please see documentation."
+#~ msgstr ""
+#~ "\n"
+#~ " o un host y numero de puerto. Vea la documentaci�n."
+
+#~ msgid "%sValue '%s' %s"
+#~ msgstr "Valor de %s, '%s', %s"
+
+#~ msgid ""
 #~ "Driver not installed: SQLitedbapi for SQLite 7.x \n"
 #~ "[%s]"
 #~ msgstr ""

Modified: trunk/gnue-common/po/es_MX.po
===================================================================
--- trunk/gnue-common/po/es_MX.po       2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/es_MX.po       2004-08-12 13:04:23 UTC (rev 6187)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
 "PO-Revision-Date: 2002-07-05 13:48+0200\n"
 "Last-Translator: Enrique Sanchez <address@hidden>\n"
 "Language-Team: Espa~ol/Mexico\n"
@@ -134,82 +134,71 @@
 #: apps/GBaseApp.py:179
 #, fuzzy
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr "Esta aplicacion requiere Python 2.0 o mejor. Esta utilizando Python %s"
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 #, fuzzy
 msgid "This application requires Python 2.1 or greater."
 msgstr "Esta aplicacion requiere Python 2.0 o mejor."
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
 msgstr "La opcion debug_level (\"-d\") requiere un parametro numerico."
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
+#: apps/GBaseApp.py:275
+#, fuzzy
+msgid ""
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr "El archivo gnue.conf esta incompleto: "
 
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
+#: apps/GBaseApp.py:280
+#, fuzzy
+msgid ""
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr "%s al leer gnue.conf: "
 
 # ../src/GBaseApp.py:238 :244
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr "Incapaz de cargar el archivo de definiciones de conexion\n"
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:328
+#, fuzzy
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   The connections file is in an invalid format. "
-msgstr ""
-"\n"
-"   El archivo de conexiones esta en un formato invalido. "
+"The connections file is in an invalid format.\n"
+"%s"
+msgstr "Incapaz de cargar el archivo de definiciones de conexion\n"
 
-#: apps/GBaseApp.py:331
-msgid ""
-"\n"
-"   The connections file specified either does "
-msgstr ""
-"\n"
-"  El archivo de conexiones o  "
-
-#: apps/GBaseApp.py:332
-msgid ""
-"\n"
-"   not exist or is not readable by your account.\n"
-msgstr ""
-"\n"
-"   no existe, o no es por su usuario.\n"
-
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
-"\n"
-"   Ubicacion: \"%s\""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
+#, fuzzy
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 "\n"
 "%s\n"
 "Version %s\n"
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr "GNUe Common Version %s\n"
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr ""
 
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 #, fuzzy
 msgid "Available command line options:"
 msgstr ""
@@ -220,35 +209,35 @@
 "Opciones de linea de comandos disponibles:\n"
 "%s"
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr ""
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr ""
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr ""
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr ""
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr ""
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr ""
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -267,18 +256,19 @@
 msgstr "El archivo no tiene definiciones fuente."
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
+#, fuzzy
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
 msgstr "El archivo no puede ser analizado. %s :: %s"
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr "El archivo no puede ser analizado."
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
+#: apps/GConfig.py:210
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
 msgstr ""
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
@@ -287,19 +277,14 @@
 "con su instalacion"
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
-msgstr "No envie el servidor a background. En un sistema POSIX, "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
+msgstr ""
 
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
-msgstr "esta opcion evita que el proceso bifurque y se desprenda "
-
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr "de su terminal controladora."
-
 # ../src/RuntimeSettings.py:92 :95
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -352,29 +337,21 @@
 msgid "No valid condition tree"
 msgstr "Fecha invalida"
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr ""
-"Elemento condicional \"%s\" espera al menos %s argumentos; se encontraron %s"
-
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
-msgstr ""
 "Elemento condicional \"%s\" espera no mas de %s argumentos; se encontraron %s"
 
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 #, fuzzy
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
@@ -420,23 +397,24 @@
 "Archivo: %s"
 
 # ../src/GConnections.py:134 :169
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
+#, fuzzy
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
 "El archivo de coneiones no contiene una definiciones \n"
 " para  \"%s\".\n"
 "\n"
 "Archivo: %s"
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
+#: datasources/GConnections.py:304
+#, fuzzy
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
 msgstr "DB Driver '%s' no soporta fuentes del tipo  '%s'"
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
@@ -446,79 +424,79 @@
 "\n"
 "Error: %s"
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr "El usuario cancelo el proceso de login."
 
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr "Backend no soporta el funcion trigger 'call' "
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr ""
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr ""
 
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 #, fuzzy
 msgid "Connection Name"
 msgstr "Conexion: "
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 #, fuzzy
 msgid "Table Name"
 msgstr "Nombre"
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr ""
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr ""
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 #, fuzzy
 msgid "M/D Master DataSource"
 msgstr "Crear Fuente de Datos"
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr ""
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr ""
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr ""
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 msgid "Primary Key Field(s)"
 msgstr ""
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr ""
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 #, fuzzy
 msgid "Resource type '%s' is not supported"
 msgstr "El adaptador GComm '%s' no soporta clientes"
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr ""
 
@@ -617,12 +595,25 @@
 msgid "Object of unknown type (%s) passed to DBSIG2 based dbdriver."
 msgstr ""
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr ""
+"Elemento condicional \"%s\" espera al menos %s argumentos; se encontraron %s"
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr "Clausula de condicion \"%s\" no es soportada por este manejador."
 
@@ -657,9 +648,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr ""
 
@@ -695,9 +686,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr ""
 
@@ -788,14 +779,14 @@
 msgstr "Clausula de condicion \"%s\" no es soportada por este manejador."
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr ""
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 #, fuzzy
 msgid "Objects"
@@ -806,32 +797,26 @@
 msgstr ""
 
 #: datasources/drivers/mysql/mysql/Driver.py:46
+#, fuzzy
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 "\n"
 "No es posible cargar MySQLdb. Para soportar MySQL, por favor instale\n"
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr "'mysql-python version 0.9.0 o mejor de"
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr "Error: %s"
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr ""
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+#, fuzzy
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 "Manejador no instalado: manejador win32all ODBC \n"
 "\n"
@@ -841,6 +826,17 @@
 msgid "PythonWin ODBC Driver"
 msgstr ""
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+"Manejador no instalado: manejador win32all ODBC \n"
+"\n"
+"[%s"
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 #, fuzzy
 msgid "This feature is currently not supported by this driver"
@@ -882,21 +878,19 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
+#: datasources/drivers/postgresql/Base/Connection.py:100
 #, fuzzy
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
 msgstr "Clausula de condicion \"%s\" no es soportada por este manejador."
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr ""
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 #, fuzzy
 msgid "popy"
@@ -1020,48 +1014,61 @@
 msgstr "Error al cargar %s: archivo de definicion vacio"
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+#, fuzzy
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
 "Error la cargar %s: no hay definiciones validas de %s (se esperaba: %s, "
 "obtuve: %s)"
 
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr ""
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
+#: definitions/GParser.py:257
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
 msgstr "Error procesando la etiqueta <%s> [No se que hace la etiqueta <%s>]"
 
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr ""
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
+#: definitions/GParser.py:280
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
 msgstr "Error procesando la etiqueta <%s> [No reconozco el atributo \"%s\""
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
+#, fuzzy
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
 "Error procesando la etiqueta <%s> [El atributo \"%s\" deberia de ser unico; "
 "el valor duplicado es \"%s\"]"
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
+#: definitions/GParser.py:317
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
 msgstr ""
 "Error procesando la etiqueta <%s> [el atributo requerido \"%s\" no esta "
 "presente]"
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
 #, fuzzy
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr "Error procesando la etiqueta <%s> [No reconozco el atributo \"%s\""
 
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
@@ -1069,77 +1076,21 @@
 "Aviso: La codificacion incluye 'namespaces', pero la herramienta actual no "
 "incluye soporte para 'namespaces'!"
 
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
+#: definitions/GParser.py:466
+msgid "Unable to find an importable object named %(name)s in %(library)s"
 msgstr ""
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
+#, fuzzy
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr "El formato de enmascaramiento '%s' no esta definido para los campos %s"
 
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
+#: formatting/BaseMask.py:159
+#, fuzzy
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
 msgstr "Caracter inespearado '%s' en  %s."
 
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr ""
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr ""
-
-# ../src/FormatMasks/BaseMask.py:256 :326
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr ""
-
-# ../src/FormatMasks/BaseMask.py:257 :263 :272
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr "seccion=%s"
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr "Nueva posicion de cursor: %s"
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
-msgstr "despues de processEdit, index=%s;cursor=%s"
-
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
 msgstr ""
@@ -1180,150 +1131,107 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr ""
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr "GNUe RPC Generador de Documentos"
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr "Error: el modulo %s no existe o no puede ser cargado"
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
+#: rpc/drivers/pyro/ServerAdapter.py:190
+#, fuzzy
+msgid "Missing Binding information. Please add binding information for %s"
 msgstr "Informacion de enlace faltante. Por favor agregue la "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr "informacion de enlace para %s"
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+#, fuzzy
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
 msgstr "GNURPC: no puede asociar el servicio '%s' al servicio '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
-msgstr "GNURPC: no puede asociar el servicio '%s' a '%s'"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+#, fuzzy
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
 msgstr "GNURPC no puede asociar el metodo/atributo '%s' al servicio '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr "Despachando:"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
+#: rpc/drivers/_helpers/DirectoryServer.py:309
+#: rpc/drivers/pyro/ServerAdapter.py:380
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+#, fuzzy
+msgid "Server XML-RPC method '%s' is not bound to real method"
 msgstr "El metodo del servidor XML-RPC '%s' no esta "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
-msgstr "asociado a un metodo real"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:308
-#: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+#, fuzzy
+msgid "Server does not have XML-RPC procedure %s"
 msgstr "El servidor no tiene XML-RPC"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
-msgstr "procedimiento %s"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
-msgstr "Error Interno del Servidor XML-RPC: tipo de metodo"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+#, fuzzy
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr "(get/set attribute) no pudo ser detectado (metodo %s)"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr "Servidor XML-RPC "
-
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+#, fuzzy
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
 msgstr "El procedimiento %s acepta solamente %s como atributo"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr "No hay ayuda disponible para %s"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:388 :400
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr "Nombre de Metodo invalido"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:389 :401
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr "El metodo solicitado no existe"
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
 #, fuzzy
-msgid "Wrong format of object handler "
+msgid "Wrong format of object handler in method call %s"
 msgstr "Formato erroneo del manejador de objeto "
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
-msgstr "al llamar %s"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr "Error interno del servidor XMLRPC: el metodo %s puede ser "
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr "localizado en el directorio (creado a partir de un archivo .grpc),"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr "pero el objeto no contiene este metodo/atributo."
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
 #: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
-msgstr "Por favor cheque su archivo .grpc por tipos de retorno equivocados."
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
+msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr "Manejador de objeto no regresado"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr "Manejador de objeto invalido"
 
@@ -1336,88 +1244,64 @@
 #, fuzzy
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 "\n"
-"Incapaz de cargar pyro. Para usar la interface PYRO, \n"
+"Incapaz de cargar xmlrpclib. Para utilizar la interface XML-RPC, \n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr "por favor instale xmlrpc de:\n"
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-#, fuzzy
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr "el paquete DEBIAN apropiado es python-xmlrpc.deb"
-
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
 msgstr ""
 
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr ""
-
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr ""
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
+#, fuzzy
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
 msgstr "Para utilizar XML-RPC, debe especificar un 'url' o \n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr "una especificacion de 'host' y 'puerto'."
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr "Incapaz de inicializar la interface XML-RPC en %s"
 
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
+#, fuzzy
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
 msgstr "Incapaz de inicializar la interface XML-RPC en %s: "
 
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr "Conexion rechazada"
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
 #, fuzzy
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 "\n"
-"Incapaz de cargar pyro. Para usar la interface PYRO, \n"
+"Incapaz de cargar xmlrpclib. Para utilizar la interface XML-RPC, \n"
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
+#: rpc/drivers/pyro/ServerAdapter.py:334
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
 #, fuzzy
-msgid "please install pyro from:\n"
-msgstr "por favor instale Pyro de:\n"
-
-#: rpc/drivers/pyro/ServerAdapter.py:329
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
+msgid "Wrong format of object handle in method call %s"
 msgstr "Formato erroneo del manejador de objeto "
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr ""
-
 #: rpc/drivers/soap/CommDriver.py:45
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
 "\n"
-"Incapaz de cargar soaplib. Para utilizar la interface SOAP, \n"
+"Incapaz de cargar xmlrpclib. Para utilizar la interface XML-RPC, \n"
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr "instale soaplib de:\n"
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1437,36 +1321,31 @@
 #, fuzzy
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr "Ocurrio un error interno en el servidor:\n"
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
-msgstr "Su configuracion referencia una conexion basada en sockets.\n"
-
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
+#, fuzzy
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr "Pero, su sistema operativo no soporta sockets basados en archivos."
 
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
 msgstr "Incapaz de inicializar el socket solicitado localizado en %s"
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr "Para utilizar sockets, debe especificar un archivo tipo socket"
-
 #: rpc/drivers/sockets/CommDriver.py:114
+#, fuzzy
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
-msgstr ""
-"\n"
-" o un host y numero de puerto. Por favor vea la documentacion."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
+msgstr "Para utilizar sockets, debe especificar un archivo tipo socket"
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
+#: rpc/drivers/sockets/CommDriver.py:120
+#, fuzzy
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
 msgstr "Incapaz de inicializar el socket requerido en %s:%s"
 
 # ../src/commdrivers/pw_xmlrpc/RpcDoc.py:66 :77 :99
@@ -1540,34 +1419,34 @@
 
 #: schema/GSData.py:72
 #, fuzzy
-msgid "%sInvalid datatype '%s'."
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
 msgstr "Entrada invalida: '%s'"
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
+#: schema/GSData.py:110
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
 msgstr ""
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
 msgstr ""
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
+#: schema/GSData.py:147
+msgid "is not a number (%(length)d.%(scale)d)"
 msgstr ""
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr ""
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
 msgstr ""
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr ""
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr ""
 
@@ -1589,43 +1468,43 @@
 msgstr ""
 
 #: schema/Objects.py:170
-msgid "Constraint '%s' has more fields than the table '%s'"
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
 msgstr ""
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
+#: schema/Objects.py:185
+msgid "Table '%(table)s' has no field '%(field)s'."
 msgstr ""
 
-#: schema/Objects.py:212
-msgid "Constraint '%s': typemismatch in reference field '%s'."
+#: schema/Objects.py:215
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
 msgstr ""
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr ""
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
+msgid "Row %(row)d of table %(table)s has no key fields."
 msgstr ""
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr ""
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr ""
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr ""
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 #, fuzzy
 msgid "No input file specified."
 msgstr "No se ha especificado ninguna Definicion de Forma."
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 #, fuzzy
 msgid "Unable to open input file %s."
 msgstr ""
@@ -1633,12 +1512,12 @@
 "\n"
 "    %s"
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr ""
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
+#: schema/importer/Importer.py:175
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
 msgstr ""
 
 #: schema/scripter/Scripter.py:48
@@ -1727,7 +1606,186 @@
 msgstr "Fecha invalida"
 
 #, fuzzy
+#~ msgid "Server XML-RPC method %s is not bound to real method"
+#~ msgstr "El metodo del servidor XML-RPC '%s' no esta "
+
+#, fuzzy
 #~ msgid ""
+#~ "GNURPC can't bind method/attribut '%(name)s' to service '%(service)s'"
+#~ msgstr "GNURPC no puede asociar el metodo/atributo '%s' al servicio '%s'"
+
+#~ msgid "Wrong format of object handle "
+#~ msgstr "Formato erroneo del manejador de objeto "
+
+#~ msgid "in method call %s"
+#~ msgstr "al llamar %s"
+
+#~ msgid "Internal XMLRPC server error: method %s can be "
+#~ msgstr "Error interno del servidor XMLRPC: el metodo %s puede ser "
+
+#~ msgid "found in the directory (build out of a .grpc file),"
+#~ msgstr "localizado en el directorio (creado a partir de un archivo .grpc),"
+
+#~ msgid " but the object doesn't contain this method/attribut."
+#~ msgstr "pero el objeto no contiene este metodo/atributo."
+
+#~ msgid " Please check you .grpc file for wrong return types."
+#~ msgstr "Por favor cheque su archivo .grpc por tipos de retorno equivocados."
+
+#~ msgid "bound to real method"
+#~ msgstr "asociado a un metodo real"
+
+#~ msgid "Server does not have XML-RPC "
+#~ msgstr "El servidor no tiene XML-RPC"
+
+#~ msgid "procedure %s"
+#~ msgstr "procedimiento %s"
+
+#~ msgid "Server XML-RPC "
+#~ msgstr "Servidor XML-RPC "
+
+#~ msgid "procedure %s accepts just %s as attributs"
+#~ msgstr "El procedimiento %s acepta solamente %s como atributo"
+
+#~ msgid "Internal Server XML-RPC error: method type"
+#~ msgstr "Error Interno del Servidor XML-RPC: tipo de metodo"
+
+#~ msgid "(get/set attribute) couldn't be detected (method %s)"
+#~ msgstr "(get/set attribute) no pudo ser detectado (metodo %s)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Internal server error occured:\n"
+#~ " server %s \n"
+#~ " on source %s."
+#~ msgstr "Ocurrio un error interno en el servidor:\n"
+
+#, fuzzy
+#~ msgid "Missing Binding information. Please add binding information for %s "
+#~ msgstr "Informacion de enlace faltante. Por favor agregue la "
+
+#, fuzzy
+#~ msgid "GNURPC cannot bind service '%(name)s' to service'%(destination)s'"
+#~ msgstr "GNURPC: no puede asociar el servicio '%s' al servicio '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file is in an invalid format. "
+#~ msgstr ""
+#~ "\n"
+#~ "   El archivo de conexiones esta en un formato invalido. "
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file specified either does "
+#~ msgstr ""
+#~ "\n"
+#~ "  El archivo de conexiones o  "
+
+#~ msgid ""
+#~ "\n"
+#~ "   not exist or is not readable by your account.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "   no existe, o no es por su usuario.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "   Location: \"%s\""
+#~ msgstr ""
+#~ "\n"
+#~ "   Ubicacion: \"%s\""
+
+#~ msgid "Do not send the server into the background. For a POSIX system, "
+#~ msgstr "No envie el servidor a background. En un sistema POSIX, "
+
+#~ msgid "this option keeps the server process from forking and detaching "
+#~ msgstr "esta opcion evita que el proceso bifurque y se desprenda "
+
+#~ msgid "from its controlling terminal."
+#~ msgstr "de su terminal controladora."
+
+#~ msgid "mysql-python 0.9.0 or later from"
+#~ msgstr "'mysql-python version 0.9.0 o mejor de"
+
+#~ msgid "Error:  %s"
+#~ msgstr "Error: %s"
+
+#, fuzzy
+#~ msgid "Encoding '%s' is not supported by postgresql dbdriver."
+#~ msgstr "Clausula de condicion \"%s\" no es soportada por este manejador."
+
+# ../src/FormatMasks/BaseMask.py:257 :263 :272
+#~ msgid "section=%s"
+#~ msgstr "seccion=%s"
+
+#~ msgid "New cursor position: %s"
+#~ msgstr "Nueva posicion de cursor: %s"
+
+#~ msgid "after processEdit, index=%s;cursor=%s"
+#~ msgstr "despues de processEdit, index=%s;cursor=%s"
+
+#~ msgid "information for %s "
+#~ msgstr "informacion de enlace para %s"
+
+#~ msgid "GNURPC: cannot bind service '%s' to %s"
+#~ msgstr "GNURPC: no puede asociar el servicio '%s' a '%s'"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Incapaz de cargar pyro. Para usar la interface PYRO, \n"
+
+#~ msgid "please install xmlrpc from:\n"
+#~ msgstr "por favor instale xmlrpc de:\n"
+
+#, fuzzy
+#~ msgid "the appropriate DEBIAN package is python-pyro.deb"
+#~ msgstr "el paquete DEBIAN apropiado es python-xmlrpc.deb"
+
+#~ msgid "a 'host' and 'port' setting."
+#~ msgstr "una especificacion de 'host' y 'puerto'."
+
+#~ msgid "Connection refused"
+#~ msgstr "Conexion rechazada"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load Pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Incapaz de cargar pyro. Para usar la interface PYRO, \n"
+
+#, fuzzy
+#~ msgid "please install pyro from:\n"
+#~ msgstr "por favor instale Pyro de:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load soaplib.  To use the SOAP interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Incapaz de cargar soaplib. Para utilizar la interface SOAP, \n"
+
+#~ msgid "please install soaplib from:\n"
+#~ msgstr "instale soaplib de:\n"
+
+#~ msgid "Your configuration references a file-based sockets connection.\n"
+#~ msgstr "Su configuracion referencia una conexion basada en sockets.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "file or a host and port number.  Please see documentation."
+#~ msgstr ""
+#~ "\n"
+#~ " o un host y numero de puerto. Por favor vea la documentacion."
+
+#, fuzzy
+#~ msgid ""
 #~ "Driver not installed: SQLitedbapi for SQLite 7.x \n"
 #~ "[%s]"
 #~ msgstr ""

Modified: trunk/gnue-common/po/fr.po
===================================================================
--- trunk/gnue-common/po/fr.po  2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/fr.po  2004-08-12 13:04:23 UTC (rev 6187)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
 "PO-Revision-Date: 2004-04-14 19:00+0200\n"
 "Last-Translator: Laurent Savaete <address@hidden>\n"
 "Language-Team: Francais <address@hidden>\n"
@@ -153,116 +153,106 @@
 "aucun des deux n'est initialis�, \"%s\" est utilis� par d�faut."
 
 #: apps/GBaseApp.py:179
+#, fuzzy
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr ""
 "Cette application n�cessite Python 2.1 ou plus. Vous utilisez Python %s."
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 msgid "This application requires Python 2.1 or greater."
 msgstr "Cette application n�cessite Python 2.1 ou plus."
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
 msgstr "L'option debug_level (\"-d\") requiert une valeur num�rique."
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
+#: apps/GBaseApp.py:275
+#, fuzzy
+msgid ""
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr "Le fichier gnue.conf est incomplet: "
 
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
+#: apps/GBaseApp.py:280
+#, fuzzy
+msgid ""
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr "%s pendant la lecture de gnue.conf: "
 
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr "Impossible de charger le fichier de d�finition de connections.\n"
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:328
+#, fuzzy
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   The connections file is in an invalid format. "
-msgstr ""
-"\n"
-"Le fichier de connections n'a pas un format valide. "
+"The connections file is in an invalid format.\n"
+"%s"
+msgstr "Impossible de charger le fichier de d�finition de connections.\n"
 
-#: apps/GBaseApp.py:331
-msgid ""
-"\n"
-"   The connections file specified either does "
-msgstr ""
-"\n"
-"Le fichier de connections sp�cifi� n'existe pas"
-
-#: apps/GBaseApp.py:332
-msgid ""
-"\n"
-"   not exist or is not readable by your account.\n"
-msgstr ""
-"\n"
-"ou n'est pas lisible par votre compte.\n"
-
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
-"\n"
-"   Localisation: \"%s\""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
+#, fuzzy
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 "\n"
 "%s\n"
 "Version %s\n"
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr "GNUe Common Version %s\n"
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr "Utilisation:  "
 
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 msgid "Available command line options:"
 msgstr "Options de ligne de commande disponibles:"
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr "Les options suivantes sont surtout utiles pour les d�veloppeurs GNUe."
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr ""
 "Pour afficher l'aide g�n�rale, ex�cuter cette commande avec l'option --help."
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr "Options de ligne de commande sp�cial d�veloppeur:"
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr "Les options de connexion/base de donn�es suivantes sont disponibles."
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr "Options de ligne de commande de base de donn�es/connexion:"
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr ""
 "Les pilotes de base de donn�es suivants sont install�s sur votre syst�me:"
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr "Erreur: %s"
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -281,18 +271,20 @@
 msgstr "Le fichier n'a pas de d�finition source."
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
+#, fuzzy
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
 msgstr "Le fichier ne peut �tre analys�. %s :: %s"
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr "Le fichier ne peut �tre analys�."
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
+#: apps/GConfig.py:210
+#, fuzzy
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
 msgstr "Mauvais type pour l'option de configuration %s dans [%s]"
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
@@ -301,18 +293,13 @@
 "avec votre installation."
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
-msgstr "Ne pas envoyer le serveur en t�che de fond. Sur un syst�me POSIX, "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
+msgstr ""
 
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
-msgstr "cette option emp�che le processus serveur de forker et de se d�tacher "
-
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr "de son terminal parent."
-
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -366,31 +353,22 @@
 msgid "No valid condition tree"
 msgstr "Date invalide"
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr ""
-"L'�l�ment de condition \"%s\" attend au moins %s arguments, mais n'en a re�u "
-"que %s."
-
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
-msgstr ""
 "L'�l�ment de condition \\\"%s\\\" attend au plus %s arguments, mais en a "
 "re�u %s."
 
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 #, fuzzy
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
@@ -437,24 +415,25 @@
 "\n"
 "Fichier: %s"
 
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
+#, fuzzy
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
 "Le fichier de connexions ne contient aucune d�finition \n"
 "    pour \"%s\".\n"
 "\n"
 "Fichier: %s"
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
+#: datasources/GConnections.py:304
+#, fuzzy
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
 msgstr ""
 "Le pilote de base de donn�es '%s' ne supporte pas le type de source '%s'."
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
@@ -464,78 +443,79 @@
 "\n"
 "Erreur: %s"
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr "Demande de connexion annul�e par l'utilisateur."
 
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr "Le backend ne supporte pas la fonction trigger 'call'."
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+#, fuzzy
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr "La source de d�tail '%s' fait r�f�rence � un ma�tre non-existant '%s'."
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr ""
 
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 #, fuzzy
 msgid "Connection Name"
 msgstr "Connexion refus�e"
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 #, fuzzy
 msgid "Table Name"
 msgstr "Table"
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr ""
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr ""
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 msgid "M/D Master DataSource"
 msgstr ""
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr ""
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr ""
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr ""
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 #, fuzzy
 msgid "Primary Key Field(s)"
 msgstr "Cl� primaire: %s"
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr ""
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 msgid "Resource type '%s' is not supported"
 msgstr ""
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 #, fuzzy
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr "La ligne %d de la table %s n'a pas de champ cl�."
@@ -643,12 +623,26 @@
 msgid "Object of unknown type (%s) passed to DBSIG2 based dbdriver."
 msgstr "Objet de type inconnu (%s) pass� au pilote de base de donn�es DBSIG2."
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr ""
+"L'�l�ment de condition \"%s\" attend au moins %s arguments, mais n'en a re�u "
+"que %s."
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr ""
 "La clause de condition \"%s\" n'est pas support�e par ce pilote de base de "
@@ -685,9 +679,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr "Vues"
 
@@ -723,9 +717,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr "Tables"
 
@@ -816,14 +810,14 @@
 "Interbase."
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr "Pilote Firebird/Interbase kinterbasdb"
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 msgid "Objects"
 msgstr "Objets"
@@ -834,32 +828,26 @@
 msgstr "ATTENTION: changement du type de colonne de '%s.%s' en 'timestamp'."
 
 #: datasources/drivers/mysql/mysql/Driver.py:46
+#, fuzzy
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 "\n"
 "Impossible de charger la base MySQL. Pour le support MySQL, installez \n"
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr "mysql-python 0.9.0 ou plus r�cent depuis"
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr "Erreur:  %s"
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr "Base de donn�es MySQL"
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+#, fuzzy
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 "Pilote non install�: win32all ODBC\n"
 "\n"
@@ -869,6 +857,17 @@
 msgid "PythonWin ODBC Driver"
 msgstr "Pilote ODBC PythonWin"
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+"Pilote non install�: win32all ODBC\n"
+"\n"
+"%s"
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 #, fuzzy
 msgid "This feature is currently not supported by this driver"
@@ -912,7 +911,7 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr "Pilote de donn�es DCOracle2 pour Oracle 7.3/8i/9i+ (OCI8)"
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
@@ -920,14 +919,15 @@
 "Le pilote PostgreSQL a renvoy� l'erreur suivante:\n"
 "   %s"
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
-msgstr "L'encodage '%s' n'est pas support� par le pilote PostgreSQL."
+#: datasources/drivers/postgresql/Base/Connection.py:100
+#, fuzzy
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
+msgstr ""
+"L'encodage '%s' n'est pas support� par le pilote de base de donn�es "
+"Interbase."
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr "Utilisation de l'encodage par d�faut."
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 msgid "popy"
 msgstr "popy"
@@ -1058,124 +1058,85 @@
 msgstr "Erreur lors du chargement %s: fichier de d�finition vide"
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+#, fuzzy
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
 "Erreur lors du chargement %s: d�finition %s non valide (attendu: %s, re�u: %"
 "s)"
 
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr "Le fichier ne contient pas le tag requis <%s>"
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
+#: definitions/GParser.py:257
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
 msgstr "Erreur lors du traitement du tag <%s> [ je ne sais pas ce qu'il fait]"
 
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr "Nom d'espace (namespace) inattendu sur l'attribut"
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
+#: definitions/GParser.py:280
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
 msgstr ""
 "Erreur lors du traitement du tag <%s> [je ne reconnais pas l'attribut \"%s\"]"
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
+#, fuzzy
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
 "Erreur lors du traitement du tag <%s> [L'attribut \"%s\" devrait �tre "
 "unique; la valeur \"%s\" est dupliqu�e]"
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
+#: definitions/GParser.py:317
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
 msgstr ""
 "Erreur lors du traitement du tag <%s> [L'attribut \"%s\" requis n'est pas "
 "pr�sent]"
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
+#, fuzzy
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr ""
 "Erreur lors du traitement du tag <%s:%s>: l'�l�ment racine doit �tre dans le "
 "namespace par d�faut."
 
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
 msgstr ""
 
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
+#: definitions/GParser.py:466
+#, fuzzy
+msgid "Unable to find an importable object named %(name)s in %(library)s"
 msgstr "Impossible de trouver un objet importable nomm� %s dans %s."
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
+#, fuzzy
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr "Le masque de format requis \"%s\" n'est pas d�fini pour les champs %s."
 
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
+#: formatting/BaseMask.py:159
+#, fuzzy
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
 msgstr "Caract�re \"%s\" inattendu dans le masque %s."
 
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr "Curseur de d�part: %s; d�calage: %s."
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr "Curseur de fin: %s; d�calage: %s."
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr ""
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr "relatif=%s"
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr "direction=%s"
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr "curseur #1: %s"
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr "curseur #2: %s"
-
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr "pos=%s"
-
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr "section=%s"
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr "curseur #2b: %s"
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr "curseur #3: %s"
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr "curseur #4: %s"
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr "Nouvelle position curseur: %s"
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
-msgstr "apr�s processEdit, index=%s;curseur=%s"
-
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
 msgstr "inputMaskPos=%s"
@@ -1214,148 +1175,105 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr ""
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr "G�n�rateur de Documentation GNUe RPC"
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr "Erreur: le module %s n'existe pas ou ne peut �tre charg�"
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
+#: rpc/drivers/pyro/ServerAdapter.py:190
+#, fuzzy
+msgid "Missing Binding information. Please add binding information for %s"
 msgstr "Information de liaison manquante. Ajoutez l'information "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr "de liaison pour %s "
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+#, fuzzy
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
 msgstr "GNURPC ne peut lier le service '%s' au service '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
-msgstr "GNURPC ne peut lier le service '%s' au service '%s'"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+#, fuzzy
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
 msgstr "GNURPC ne peut lier la m�thode/attribut '%s' au service '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr "R�partition: "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
+#: rpc/drivers/_helpers/DirectoryServer.py:309
+#: rpc/drivers/pyro/ServerAdapter.py:380
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+#, fuzzy
+msgid "Server XML-RPC method '%s' is not bound to real method"
 msgstr "La m�thode '%s' XML-RPC du serveur n'est pas "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
-msgstr "li�e � la m�thode r�elle"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:308
-#: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+#, fuzzy
+msgid "Server does not have XML-RPC procedure %s"
 msgstr "Le serveur n'a pas la proc�dure"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
-msgstr "XML-RPC %s"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
-msgstr "Erreur interne du serveur XML-RPC: le type de la m�thode"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+#, fuzzy
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr "(lire/�crire l'attribut) n'a pas pu �tre d�t�ct�e (m�thode %s)"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr "La proc�dure %s "
-
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+#, fuzzy
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
 msgstr "du serveur XML-RPC n'accepte que %s comme attributs"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr "Pas d'aide disponible pour %s"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr "Nom de m�thode invalide"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr "La m�thode demand�e n'existe pas"
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
-msgid "Wrong format of object handler "
+#, fuzzy
+msgid "Wrong format of object handler in method call %s"
 msgstr "Mauvais format de gestionnaire d'objet"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
-msgstr "dans l'appel � la m�thode %s"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr "Erreur interne du serveur XMLRPC: la m�thode %s peut �tre "
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr "trouv�e dans le r�pertoir (construite � partir d'un fichier .grpc),"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr "mais l'objet ne contient pas cette m�thode/attribut."
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
 #: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
 msgstr ""
-"V�rifiez que votre fichier .grpc ne contient pas d'erreur de type de retour."
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr "Handle sur l'objet non renvoy�"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr "Handle objet invalide"
 
@@ -1364,87 +1282,77 @@
 msgstr "L'adaptateur client proxy devrait �tre appel� avec l'objet serveur."
 
 #: rpc/drivers/pyro/ClientAdapter.py:51
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 "\n"
-"Impossible de charger pyro. Pour utiliser l'interface pyro, \n"
+"Impossible de charger xmlrpc. Pour utiliser l'interface XML-RPC,\n"
+"installez xmlrpc depuis:\n"
+"   http://sourceforge.net/projects/py-xmlrpc\n";
+"Le package DEBIAN est python-xmlrpc.deb"
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr "installez xmlrpc depuis:\n"
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr "le package DEBIAN est python-pyro.deb"
-
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
-msgstr "py-xmlrpc ne supporte que http comme transport. "
+#, fuzzy
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
+msgstr ""
+"py-xmlrpc ne supporte que http comme transport. Si vous avez besoin de "
+"https, jetez un oeil � l'adaptateur 'pw_xmlrpc'"
 
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr "Si vous avez besoin de https, utilisez plut�t"
-
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr "l'adaptateur 'pw_xmlrpc'."
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
+#, fuzzy
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
 msgstr "Pour utiliser XML-RPC, vous devez soit sp�cifier un url ou\n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr "un 'hote' et un 'port'."
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr "Impossible d'initialiser l'interface XML-RPC � %s"
 
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
+#, fuzzy
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
 msgstr "Impossible d'initialiser l'interface XML-RPC � %s: "
 
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr "Connexion refus�e"
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
+#, fuzzy
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 "\n"
-"Impossible de charger Pyro. Pour utiliser l'interface Pyro, \n"
+"Impossible de charger xmlrpclib. Pour utiliser l'interface XML-RPC, \n"
+"installez xmlrpc depuis:\n"
+"   http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
-msgid "please install pyro from:\n"
-msgstr "installez pyro depuis:\n"
-
-#: rpc/drivers/pyro/ServerAdapter.py:329
+#: rpc/drivers/pyro/ServerAdapter.py:334
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
+#, fuzzy
+msgid "Wrong format of object handle in method call %s"
 msgstr "Mauvais format de handle objet"
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr ""
-
 #: rpc/drivers/soap/CommDriver.py:45
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
 "\n"
-"Impossible de charger soaplib. Pour utiliser l'interface SOAP, \n"
+"Impossible de charger xmlrpclib. Pour utiliser l'interface XML-RPC, \n"
+"installez xmlrpc depuis:\n"
+"   http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr "installez soaplib depuis:\n"
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1466,46 +1374,39 @@
 
 #: rpc/drivers/soap/soappy/Driver.py:157
 #: rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py:115
+#, fuzzy
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr ""
 "Erreur interne au serveur:\n"
 " serveur %s\n"
 " sur la source %s."
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
+#, fuzzy
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr ""
-"Votre configuration fait r�f�rence � une connexion sur un socket file-"
-"based.\n"
-
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
-msgstr ""
 "Cependant, votre syst�me d'exploitation ne supporte pas ce type de socket."
 
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
 msgstr "Impossible d'initialiser le socket demand�, situ� � %s"
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr ""
-"Pour utiliser le pilote de socket commdriver, vous devez sp�cifier soit"
-
 #: rpc/drivers/sockets/CommDriver.py:114
+#, fuzzy
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
 msgstr ""
-"\n"
-"un fichier de socket, soit un h�te et un num�ro de port. Consultez la "
-"documentation."
+"Pour utiliser le pilote de socket commdriver, vous devez sp�cifier soit"
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
+#: rpc/drivers/sockets/CommDriver.py:120
+#, fuzzy
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
 msgstr "Impossible d'initialiser le socket demand�, situ� � %s:%s"
 
 #: rpc/drivers/xmlrpc/RpcDoc.py:69 rpc/drivers/xmlrpc/RpcDoc.py:80
@@ -1576,34 +1477,38 @@
 "https, jetez un oeil � l'adaptateur 'pw_xmlrpc'"
 
 #: schema/GSData.py:72
-msgid "%sInvalid datatype '%s'."
+#, fuzzy
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
 msgstr "%s Type de donn�es invalide '%s'."
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
+#: schema/GSData.py:110
+#, fuzzy
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
 msgstr "%s Valeur '%s' hors de la plage (%s)"
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
-msgstr "%s Valeur '%s' %s"
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
+msgstr ""
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
+#: schema/GSData.py:147
+#, fuzzy
+msgid "is not a number (%(length)d.%(scale)d)"
 msgstr "n'est pas un nombre (%d.%d)"
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr "n'est pas un bool�en (TRUE ou FALSE)"
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
 msgstr "n'est pas une date (AAAA-MM-JJ)"
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+#, fuzzy
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr "n'est pas une heure (HH:MM:SS.ss)"
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr "n'est pas une horodate (AAAA-MM-JJ HH:MM:SS.ss)"
 
@@ -1625,52 +1530,55 @@
 
 #: schema/Objects.py:170
 #, fuzzy
-msgid "Constraint '%s' has more fields than the table '%s'"
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
 msgstr "La contrainte '%s' n'a pas de champs de r�f�rence."
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
+#: schema/Objects.py:185
+#, fuzzy
+msgid "Table '%(table)s' has no field '%(field)s'."
 msgstr "La table '%s' n'a pas de champ '%s'."
 
-#: schema/Objects.py:212
+#: schema/Objects.py:215
 #, fuzzy
-msgid "Constraint '%s': typemismatch in reference field '%s'."
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
 msgstr "La contrainte '%s' n'a pas de champs de r�f�rence."
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr "Erreur GSD: je ne me trouve pas dans l'arbre XML ?!"
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
+#, fuzzy
+msgid "Row %(row)d of table %(table)s has no key fields."
 msgstr "La ligne %d de la table %s n'a pas de champ cl�."
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr "Utiliser la connexion <nom_de_connexion> pour importer les donn�es."
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr "L'importateur de sch�ma GNUe lit les donn�es depuis une d�finition "
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr "de sch�ma GNUe et les importe vers une connexion."
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 msgid "No input file specified."
 msgstr "Pas de fichier d'entr�e sp�cifi�."
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 msgid "Unable to open input file %s."
 msgstr "Impossible d'ouvrir le fichier d'entr�e %s."
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr "Import vers %s"
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
+#: schema/importer/Importer.py:175
+#, fuzzy
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
 msgstr "  %d lignes ins�r�es, %d lignes mises � jour."
 
 #: schema/scripter/Scripter.py:48
@@ -1766,7 +1674,233 @@
 msgid "Not a valid date"
 msgstr "Date invalide"
 
+#, fuzzy
+#~ msgid "Server XML-RPC method %s is not bound to real method"
+#~ msgstr "La m�thode '%s' XML-RPC du serveur n'est pas "
+
+#, fuzzy
 #~ msgid ""
+#~ "GNURPC can't bind method/attribut '%(name)s' to service '%(service)s'"
+#~ msgstr "GNURPC ne peut lier la m�thode/attribut '%s' au service '%s'"
+
+#~ msgid "Wrong format of object handle "
+#~ msgstr "Mauvais format de handle objet"
+
+#~ msgid "in method call %s"
+#~ msgstr "dans l'appel � la m�thode %s"
+
+#~ msgid "Internal XMLRPC server error: method %s can be "
+#~ msgstr "Erreur interne du serveur XMLRPC: la m�thode %s peut �tre "
+
+#~ msgid "found in the directory (build out of a .grpc file),"
+#~ msgstr "trouv�e dans le r�pertoir (construite � partir d'un fichier .grpc),"
+
+#~ msgid " but the object doesn't contain this method/attribut."
+#~ msgstr "mais l'objet ne contient pas cette m�thode/attribut."
+
+#~ msgid " Please check you .grpc file for wrong return types."
+#~ msgstr ""
+#~ "V�rifiez que votre fichier .grpc ne contient pas d'erreur de type de "
+#~ "retour."
+
+#~ msgid "bound to real method"
+#~ msgstr "li�e � la m�thode r�elle"
+
+#~ msgid "Server does not have XML-RPC "
+#~ msgstr "Le serveur n'a pas la proc�dure"
+
+#~ msgid "procedure %s"
+#~ msgstr "XML-RPC %s"
+
+#~ msgid "Server XML-RPC "
+#~ msgstr "La proc�dure %s "
+
+#~ msgid "procedure %s accepts just %s as attributs"
+#~ msgstr "du serveur XML-RPC n'accepte que %s comme attributs"
+
+#~ msgid "Internal Server XML-RPC error: method type"
+#~ msgstr "Erreur interne du serveur XML-RPC: le type de la m�thode"
+
+#~ msgid "(get/set attribute) couldn't be detected (method %s)"
+#~ msgstr "(lire/�crire l'attribut) n'a pas pu �tre d�t�ct�e (m�thode %s)"
+
+#~ msgid ""
+#~ "Internal server error occured:\n"
+#~ " server %s \n"
+#~ " on source %s."
+#~ msgstr ""
+#~ "Erreur interne au serveur:\n"
+#~ " serveur %s\n"
+#~ " sur la source %s."
+
+#, fuzzy
+#~ msgid "Missing Binding information. Please add binding information for %s "
+#~ msgstr "Information de liaison manquante. Ajoutez l'information "
+
+#, fuzzy
+#~ msgid "GNURPC cannot bind service '%(name)s' to service'%(destination)s'"
+#~ msgstr "GNURPC ne peut lier le service '%s' au service '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file is in an invalid format. "
+#~ msgstr ""
+#~ "\n"
+#~ "Le fichier de connections n'a pas un format valide. "
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file specified either does "
+#~ msgstr ""
+#~ "\n"
+#~ "Le fichier de connections sp�cifi� n'existe pas"
+
+#~ msgid ""
+#~ "\n"
+#~ "   not exist or is not readable by your account.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ou n'est pas lisible par votre compte.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "   Location: \"%s\""
+#~ msgstr ""
+#~ "\n"
+#~ "   Localisation: \"%s\""
+
+#~ msgid "Do not send the server into the background. For a POSIX system, "
+#~ msgstr "Ne pas envoyer le serveur en t�che de fond. Sur un syst�me POSIX, "
+
+#~ msgid "this option keeps the server process from forking and detaching "
+#~ msgstr ""
+#~ "cette option emp�che le processus serveur de forker et de se d�tacher "
+
+#~ msgid "from its controlling terminal."
+#~ msgstr "de son terminal parent."
+
+#~ msgid "mysql-python 0.9.0 or later from"
+#~ msgstr "mysql-python 0.9.0 ou plus r�cent depuis"
+
+#~ msgid "Error:  %s"
+#~ msgstr "Erreur:  %s"
+
+#~ msgid "Encoding '%s' is not supported by postgresql dbdriver."
+#~ msgstr "L'encodage '%s' n'est pas support� par le pilote PostgreSQL."
+
+#~ msgid "Using default encoding."
+#~ msgstr "Utilisation de l'encodage par d�faut."
+
+#~ msgid "Starting cursor: %s; shift: %s"
+#~ msgstr "Curseur de d�part: %s; d�calage: %s."
+
+#~ msgid "Ending cursor: %s; shift: %s"
+#~ msgstr "Curseur de fin: %s; d�calage: %s."
+
+#~ msgid "relative=%s"
+#~ msgstr "relatif=%s"
+
+#~ msgid "direction=%s"
+#~ msgstr "direction=%s"
+
+#~ msgid "cursor #1: %s"
+#~ msgstr "curseur #1: %s"
+
+#~ msgid "cursor #2: %s"
+#~ msgstr "curseur #2: %s"
+
+#~ msgid "pos=%s"
+#~ msgstr "pos=%s"
+
+#~ msgid "section=%s"
+#~ msgstr "section=%s"
+
+#~ msgid "cursor #2b: %s"
+#~ msgstr "curseur #2b: %s"
+
+#~ msgid "cursor #3: %s"
+#~ msgstr "curseur #3: %s"
+
+#~ msgid "cursor #4: %s"
+#~ msgstr "curseur #4: %s"
+
+#~ msgid "New cursor position: %s"
+#~ msgstr "Nouvelle position curseur: %s"
+
+#~ msgid "after processEdit, index=%s;cursor=%s"
+#~ msgstr "apr�s processEdit, index=%s;curseur=%s"
+
+#~ msgid "information for %s "
+#~ msgstr "de liaison pour %s "
+
+#~ msgid "GNURPC: cannot bind service '%s' to %s"
+#~ msgstr "GNURPC ne peut lier le service '%s' au service '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Impossible de charger pyro. Pour utiliser l'interface pyro, \n"
+
+#~ msgid "please install xmlrpc from:\n"
+#~ msgstr "installez xmlrpc depuis:\n"
+
+#~ msgid "the appropriate DEBIAN package is python-pyro.deb"
+#~ msgstr "le package DEBIAN est python-pyro.deb"
+
+#~ msgid "py-xmlrpc just support http as a transport. "
+#~ msgstr "py-xmlrpc ne supporte que http comme transport. "
+
+#~ msgid "If you need https please have a look at the "
+#~ msgstr "Si vous avez besoin de https, utilisez plut�t"
+
+#~ msgid "'pw_xmlrpc' adapter."
+#~ msgstr "l'adaptateur 'pw_xmlrpc'."
+
+#~ msgid "a 'host' and 'port' setting."
+#~ msgstr "un 'hote' et un 'port'."
+
+#~ msgid "Connection refused"
+#~ msgstr "Connexion refus�e"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load Pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Impossible de charger Pyro. Pour utiliser l'interface Pyro, \n"
+
+#~ msgid "please install pyro from:\n"
+#~ msgstr "installez pyro depuis:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load soaplib.  To use the SOAP interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Impossible de charger soaplib. Pour utiliser l'interface SOAP, \n"
+
+#~ msgid "please install soaplib from:\n"
+#~ msgstr "installez soaplib depuis:\n"
+
+#~ msgid "Your configuration references a file-based sockets connection.\n"
+#~ msgstr ""
+#~ "Votre configuration fait r�f�rence � une connexion sur un socket file-"
+#~ "based.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "file or a host and port number.  Please see documentation."
+#~ msgstr ""
+#~ "\n"
+#~ "un fichier de socket, soit un h�te et un num�ro de port. Consultez la "
+#~ "documentation."
+
+#~ msgid "%sValue '%s' %s"
+#~ msgstr "%s Valeur '%s' %s"
+
+#~ msgid ""
 #~ "Driver not installed: SQLitedbapi for SQLite 7.x \n"
 #~ "[%s]"
 #~ msgstr ""

Modified: trunk/gnue-common/po/hu.po
===================================================================
--- trunk/gnue-common/po/hu.po  2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/hu.po  2004-08-12 13:04:23 UTC (rev 6187)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
 "PO-Revision-Date: 2004-08-05 22:19+0200\n"
 "Last-Translator: Kmetyk� G�bor <address@hidden>\n"
 "Language-Team: \n"
@@ -154,117 +154,107 @@
 "ker�l felhaszn�l�sra alap�rtelmez�s szerint."
 
 #: apps/GBaseApp.py:179
+#, fuzzy
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr ""
 "Ehhez az alkalmaz�shoz a Python 2.1 vagy nagyobb sz�ks�ges. Most a Python %s "
 "fut"
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 msgid "This application requires Python 2.1 or greater."
 msgstr "Ehhez az alkalmaz�shoz a Python 2.1 vagy nagyobb sz�ks�ges."
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
 msgstr "A debug_level opci� (\"-d\") egy sz�m�rt�ket v�r."
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
+#: apps/GBaseApp.py:275
+#, fuzzy
+msgid ""
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr "A gnue.conf f�jl nem teljes:"
 
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
+#: apps/GBaseApp.py:280
+#, fuzzy
+msgid ""
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr "%s a gnue.conf olvas�sakor:"
 
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr "Nem lehet bet�lteni a kapcsolat defin�ci�s f�jlt.\n"
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:328
+#, fuzzy
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   The connections file is in an invalid format. "
-msgstr ""
-"\n"
-"   A kapcsolat f�jl �rv�nytelen form�tum�. "
+"The connections file is in an invalid format.\n"
+"%s"
+msgstr "Nem lehet bet�lteni a kapcsolat defin�ci�s f�jlt.\n"
 
-#: apps/GBaseApp.py:331
-msgid ""
-"\n"
-"   The connections file specified either does "
-msgstr ""
-"\n"
-"   A megadott kapcsolat f�jl vagy nem"
-
-#: apps/GBaseApp.py:332
-msgid ""
-"\n"
-"   not exist or is not readable by your account.\n"
-msgstr ""
-"\n"
-"   l�tezik, vagy nem olvashat� az aktu�lis felhaszn�l�i jogosults�ggal.\n"
-
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
-"\n"
-"   Hely: \"%s\""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
+#, fuzzy
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 "\n"
 "%s\n"
 "Verzi� %s\n"
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr "GNUe Common Verzi� %s\n"
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr "Haszn�lat:"
 
 # c:\python22\lib\site-packages\gnue/common/apps/GBaseApp.py:353
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 msgid "Available command line options:"
 msgstr "Lehets�ges parancssori kapcsol�k:"
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr "A k�vetkez� lehet�s�gek f�leg a GNUe fejleszt�k sz�m�ra �rdekesek."
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr ""
 "Az �ltal�nos seg�ts�ghez a --help opci�val futassa ugyanezt a parancsot."
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr "Fejleszt�i parancssori lehet�s�gek:"
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr "Az al�bbi kapcsolat/adatb�zis-f�gg� lehet�s�gek haszn�lhat�k."
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr "Adatb�zis/kapcsolat parancssori lehet�s�gek:"
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr "Ezen a rendszeren az al�bbi adatb�zis meghajt�k tal�lhat�k:"
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr "Hiba: %s"
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -283,18 +273,20 @@
 msgstr "A f�jlban nincs forr�s defin�ci�."
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
+#, fuzzy
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
 msgstr "A f�jl nem olvashat�. %s :: %s"
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr "A f�jl nem olvashat�."
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
+#: apps/GConfig.py:210
+#, fuzzy
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
 msgstr "A %s konfigur�ci�s opci� rossz t�pus� a [%s]-ban"
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
@@ -303,19 +295,13 @@
 "az install�lt verzi�val."
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
-msgstr "Ne tegye h�tt�rfolyamatt� a szervert. POSIX rendszereken"
-
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
 msgstr ""
-"ez az opci� megakad�lyozza, hogy a szerver folyamat fork-oljon �s elszakadjon"
 
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr "a vez�rl� termin�lj�t�l."
-
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -375,27 +361,20 @@
 msgid "No valid condition tree"
 msgstr "Nincs �rv�nyes felt�tel fa"
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
-msgstr "A \"%s\" felt�tel legal�bb %s argumentumot v�r; %s-t kapott"
-
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr "A \"%s\" felt�tel legfeljebb %s argumentumot v�r; %s-t kapott"
 
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
 "conversion."
@@ -440,23 +419,24 @@
 "\n"
 "F�jl: %s"
 
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
+#, fuzzy
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
 "A kapcsolat f�jl nem tartalmaz defin�ci�t \n"
 "       a \"%s\" sz�m�ra.\n"
 "\n"
 "F�jl: %s"
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
+#: datasources/GConnections.py:304
+#, fuzzy
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
 msgstr "A '%s' adatb�zis meghajt� nem t��mogatja a '%s' forr�s t�pust."
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
@@ -466,77 +446,78 @@
 "\n"
 "Hiba: %s"
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr "A felhaszn�l� megszak�totta a bel�p�st."
 
 # c:\python22\lib\site-packages\gnue/common/datasources/GDataSource.py:151
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr "A backend nem t�mogatja a trigger 'call' f�ggv�nyt"
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr "A %s adatforr�s SQL alap�, de nincs <sql> defin�ci�ja."
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr "A %s adatforr�s nem SQL alap�, de van hozz� <sql> defin�ci�-"
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+#, fuzzy
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr "A '%s' detail forr�s a nem l�tez� '%s' master-re hivatkozik"
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr "Adatobjektum T�pus"
 
 # 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:197
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 msgid "Connection Name"
 msgstr "Kapcsolatn�v"
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 msgid "Table Name"
 msgstr "T�blan�v"
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr "Gyors�t�t�r m�rete"
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr "Lek�rdez�s v�grehajt�sa indul�skor"
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 msgid "M/D Master DataSource"
 msgstr "M/D Master adatforr�s"
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr "M/D Master mez�"
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr "M/D Detail mez�"
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr "Explicit mez�k"
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 msgid "Primary Key Field(s)"
 msgstr "Els�dleges kulcsmez�(k)"
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr "A '%s' URL nem hat�roz meg �rv�nyes AppServer er�forr�st"
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 msgid "Resource type '%s' is not supported"
 msgstr "A '%s' er�forr�s-�tpus nem t�mogatott"
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr "A '%(type)s' t�pus� '%(name)s' er�forr�s nem tal�lhat�"
 
@@ -646,12 +627,24 @@
 "Ismeretlen t�pus� (%s) objektum ker�lt �tad�sra a DBSIG2-alap� adatb�zis "
 "meghajt�hoz."
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr "A \"%s\" felt�tel legal�bb %s argumentumot v�r; %s-t kapott"
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr "A \"%s\" felt�tel klauz�t ez az adatb�zis meghajt� nem t�mogatja."
 
@@ -686,9 +679,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr "N�zetek"
 
@@ -724,9 +717,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr "T�bl�k"
 
@@ -818,14 +811,15 @@
 "k�dol�s haszn�lata."
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
+#, fuzzy
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
 msgstr "Az InterBase client_encoding �rt�k�nek be�ll�t�sa erre: %s (%s)"
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr "kinterbasdb Firebird/Interbase meghajt�"
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 msgid "Objects"
 msgstr "Objektumok"
@@ -836,32 +830,26 @@
 "FIGYELEM: a '%(table)s.%(column)s' oszlop t�pus�t 'timestamp'-re m�dos�tjuk"
 
 #: datasources/drivers/mysql/mysql/Driver.py:46
+#, fuzzy
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 "\n"
 "Nem lehetett bet�lteni a MySQLdb-t.  MySQL t�mogat�shoz telep�tse \n"
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr "a mysql-python 0.9.0 vagy k�s�bbi verzi�j�t"
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr "Hiba:  %s"
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr "MySQLdb"
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+#, fuzzy
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 "Nincs telep�tve a meghajt�: win32all ODBC driver\n"
 "\n"
@@ -871,6 +859,17 @@
 msgid "PythonWin ODBC Driver"
 msgstr "PythonWin ODBC adatb�zis meghajt�"
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+"Nincs telep�tve a meghajt�: win32all ODBC driver\n"
+"\n"
+"[%s"
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 msgid "This feature is currently not supported by this driver"
 msgstr "Ezt a tulajdons�got jelenleg nem t�mogatja ez a meghajt�"
@@ -911,7 +910,7 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr "DCOracle2 adatb�zis meghajt� Oracle 7.3/8i/9i+ (OCI8)"
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
@@ -919,14 +918,15 @@
 "A PostgreSQL meghajt� az al�bbi hib�t k�ldte:\n"
 "\t%s"
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
-msgstr "A(z) '%s' k�dol�st a postgresql dbdriver nem t�mogatja."
+#: datasources/drivers/postgresql/Base/Connection.py:100
+#, fuzzy
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
+msgstr ""
+"A(z) '%s' k�dol�st az interbase dbdriver nem t�mogatja. Alap�rtelmezett "
+"k�dol�s haszn�lata."
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr "Alap�rtelmezett k�dol�s haszn�lata."
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 msgid "popy"
 msgstr "popy"
@@ -1059,50 +1059,64 @@
 msgstr "Hiba a bet�lt�skor: %s. �res defin�ci�s f�jl."
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+#, fuzzy
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
 "Hiba a %s bet�lt�se sor�n: nem �rv�nyes %s defin�ci� (v�rt: %s, kapott: %s)"
 
 # c:\python22\lib\site-packages\gnue/common/definitions/GParser.py:234
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr "A f�jlb�l hi�nyzik egy elv�rt cimke <%s>"
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
+#: definitions/GParser.py:257
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
 msgstr ""
 "Hiba a <%s> c�mke feldolgoz�sa sor�n [nem tudni, a <%s> c�mke mit csin�l]"
 
 # c:\python22\lib\site-packages\gnue/common/definitions/GParser.py:267
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr "V�ratlan namespace a tulajdons�gn�l"
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
+#: definitions/GParser.py:280
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
 msgstr "Hiba a <%s> c�mke feldolgoz�sakor [nem ismerem a \"%s\" tulajdons�got]"
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
+#, fuzzy
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
 "Hiba a <%s> c�mke feldolgoz�sakor [a \"%s\" tulajdons�gnak egyedinek kell "
 "lennie; a duplik�lt �rt�k: \"%s\"]"
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
+#: definitions/GParser.py:317
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
 msgstr ""
 "Hiba a <%s> c�mke feldolgoz�sakor [a k�telez� \"%s\" tulajdons�g hi�nyzik]"
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
+#, fuzzy
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr ""
 "Hiba a <%s:%s> c�mke feldolgoz�sakor: a root elemnek az alap�rtelmezett "
 "namespace-ben kell lennie"
 
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
@@ -1111,75 +1125,22 @@
 "tartalmaz namespace t�mogat�st!"
 
 # c:\python22\lib\site-packages\gnue/common/definitions/GParser.py:449
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
+#: definitions/GParser.py:466
+#, fuzzy
+msgid "Unable to find an importable object named %(name)s in %(library)s"
 msgstr "Nam tal�lhat� a %s import�lhat� objektum ezen bel�l: %s"
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
+#, fuzzy
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr "A k�v�nt \"%s\" form�tum maszk nem defini�lt a %s mez�kre"
 
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
+#: formatting/BaseMask.py:159
+#, fuzzy
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
 msgstr "V�ratlan karakter \"%s\" a %s maszkban."
 
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr "Kezd� kurzor: %s; shift: %s"
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr "Z�r� kurzor: %s; shift: %s"
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr "*** moveCursorRelative(%s)"
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr "relative=%s"
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr "direction=%s"
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr "kurzor #1: %s"
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr "kurzor #2: %s"
-
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr "pos=%s"
-
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr "section=%s"
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr "kurzor #2b: %s"
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr "kurzor #3: %s"
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr "kurzor #4: %s"
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr "�j kurzor poz�ci�: %s"
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
-msgstr "processEdit ut�n, index=%s;cursor=%s"
-
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
 msgstr "inputMaskPos=%s"
@@ -1218,151 +1179,109 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr "A '%(class)s' oszt�ly nem val�s�tja meg a '%(method)s' elj�r�st"
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr "GNUe RPC Dokument�ci�s gener�tor"
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr "Hiba: a %s modul nem l�tezik vagy nem t�lthet� be"
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
+#: rpc/drivers/pyro/ServerAdapter.py:190
+#, fuzzy
+msgid "Missing Binding information. Please add binding information for %s"
 msgstr "Hi�nyz� kapcsol�si inform�ci�k. Adja meg a kapcsol�s"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr "Inform�ci� %s sz�m�ra"
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+#, fuzzy
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
 msgstr ""
 "A GNURPC nem tudja a '%s' szolg�ltat�st a '%s' szolg�ltat�shoz kapcsolni."
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
-msgstr "GNURPC: nem lehet a '%s' szolg�ltat�st '%s'-hez kapcsolni."
-
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+#, fuzzy
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
 msgstr ""
 "A GNURPC nem tudja a '%s' elj�r�st/tulajdons�got a '%s' szolg�ltat�shoz "
 "kapcsolni."
 
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr "Elk�ld�s:"
 
 # 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/_directory/DirectoryServer.py:305
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
+#: rpc/drivers/_helpers/DirectoryServer.py:309
+#: rpc/drivers/pyro/ServerAdapter.py:380
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+#, fuzzy
+msgid "Server XML-RPC method '%s' is not bound to real method"
 msgstr "A '%s' szerver XML-RPC elj�r�s nem"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
-msgstr "igazi elj�r�shoz k�tve"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:308
-#: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+#, fuzzy
+msgid "Server does not have XML-RPC procedure %s"
 msgstr "A szerveren nincs XML-RPC"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
-msgstr "%s elj�r�s"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
-msgstr "Bels� szerver XML-RPC hiba: az elj�r�s t�pusa"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+#, fuzzy
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr "(get/set tulajdons�g) nem �llap�that� meg (%s elj�r�s)"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr "A szerver XML-RPC"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+#, fuzzy
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
 msgstr "%s elj�r�s csak a %s-t fogadja el tulajdons�gk�nt"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr "Nincs s�g� az al�bbi t�mak�rh�z: %s"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr "�rv�nytelenElj�r�sN�v"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr "A k�rt elj�r�s nem l�tezik"
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
-msgid "Wrong format of object handler "
+#, fuzzy
+msgid "Wrong format of object handler in method call %s"
 msgstr "Rossz form�tum vagy objektum kezel�"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
-msgstr "a %s elj�r�s h�v�s�ban"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr "Bels� XMLRPC szerver hiba: a %s elj�r�s"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr "megtal�lhat� ugyan a directoryban (egy .grpc f�jll �p�tve),"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr " de az objektum nem tartalmazza ezt az elj�r�st/tulajdons�got."
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
 #: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
-msgstr " Ellen�r�zze a .grpc f�jlt rossz visszat�r�si �rt�keket keresve."
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
+msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr "Nem kaptunk vissza objektum kezel�t"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr "�rv�nytelen objektum le�r�"
 
@@ -1371,93 +1290,81 @@
 msgstr "A proxy kliens adaptert a szerver objektummal kell megh�vni"
 
 #: rpc/drivers/pyro/ClientAdapter.py:51
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 "\n"
-"Nem lehetett bet�lteni a pyro-t.  A Pyto interf�sz haszn�lat�hoz \n"
+"Nem siker�lt bet�lteni az xmlrpc-t.  Az XML-RPC interf�sz haszn�lat�hoz \n"
+"telep�tse az xmlrpc-t innen\n"
+"    http://sourceforge.net/projects/py-xmlrpc\n";
+"a megfelel� DEBIAN csomag neve python-xmlrpc.deb"
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr "telep�tse az xmlrpc-t innen:\n"
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr "a negfelel� DEBIAN csomag neve python-pyro.deb"
-
-# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:123
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
-msgstr "py-xmlrpc csak a HTTP-alap� �tvitelt t�mogatja."
+#, fuzzy
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
+msgstr ""
+"A py-xmlrpc csak a HTTP protokollt t�mogatja trancsport r�tegk�nt. Ha HTTPS-"
+"re van sz�ks�ge, n�zze meg a 'pw_xmlrpc' adaptert."
 
-# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:124
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr "Ha HTTPS-re van sz�ks�g, keresse meg a"
-
-# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:125
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr "'pw_xmlrpc' illeszt�t."
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
+#, fuzzy
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
 msgstr "Az XML-RPC haszn�lat�hoz meg kell adni egy 'URL'-t vagy\n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr "egy 'host' �s egy 'port' �rt�ket."
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr "Nem siker�lt inicializ�lni az XML-RPC illeszt�t: %s"
 
 # 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:196
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
+#, fuzzy
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
 msgstr "Nem siker�lt inicializ�lni az XML-RPC illeszt�t itt: %s:"
 
-# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:197
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr "Csatlakoz�s elutas�tva"
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
+#, fuzzy
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 "\n"
-"Nem lehetett bet�lteni a Pyro-t.  A Pyto interf�sz haszn�lat�hoz \n"
+"Nem siker�lt bet�lteni az xmlrpclib-et.  Az XML-RPC interf�sz "
+"haszn�lat�hoz \n"
+"telep�tse az xmlrpc-t innen:\n"
+"    http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
-msgid "please install pyro from:\n"
-msgstr "telep�tse a pyro-t innen:\n"
-
 # 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/pw_xmlrpc/ServerAdapter.py:229
-#: rpc/drivers/pyro/ServerAdapter.py:329
+#: rpc/drivers/pyro/ServerAdapter.py:334
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
+#, fuzzy
+msgid "Wrong format of object handle in method call %s"
 msgstr "Rossz form�tum� objektum le�r�"
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr "A szerver XML-RPC %s elj�r�s nincs"
-
 #: rpc/drivers/soap/CommDriver.py:45
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
 "\n"
-"A soaplib nem t�lthet� be.  A SOAP  interf�sz haszn�lat�hoz \n"
+"Nem siker�lt bet�lteni az xmlrpclib-et.  Az XML-RPC interf�sz "
+"haszn�lat�hoz \n"
+"telep�tse az xmlrpc-t innen:\n"
+"    http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr "telep�tse a soaplib-et innen:\n"
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1479,42 +1386,38 @@
 
 #: rpc/drivers/soap/soappy/Driver.py:157
 #: rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py:115
+#, fuzzy
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr ""
 "Bels� szerver hiba t�rt�nt:\n"
 " szerver %s \n"
 " forr�s %s."
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
-msgstr "A konfigur�ci� f�jl-alap� Socket kapcsolatra hivatkozik.\n"
-
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
+#, fuzzy
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr "De az oper�ci�s rendszer nem t�mogatja a f�jl-alap� Socketeket."
 
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
 msgstr "Nem lehetett megnyitni a k�rt socket-et a %s-on"
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr ""
-"A sockets kommunik�ci�s meghajt� haszn�lat�hoz meg kell adni a socket file-t"
-
 #: rpc/drivers/sockets/CommDriver.py:114
+#, fuzzy
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
 msgstr ""
-"\n"
-"vagy a host-ot �s a port sz�m�t.  Olvassa el a dokument�ci�t!"
+"A sockets kommunik�ci�s meghajt� haszn�lat�hoz meg kell adni a socket file-t"
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
+#: rpc/drivers/sockets/CommDriver.py:120
+#, fuzzy
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
 msgstr "Nem lehetett megnyitni a k�rt socket-et a %s:%s-on"
 
 #: rpc/drivers/xmlrpc/RpcDoc.py:69 rpc/drivers/xmlrpc/RpcDoc.py:80
@@ -1592,34 +1495,38 @@
 "re van sz�ks�ge, n�zze meg a 'pw_xmlrpc' adaptert."
 
 #: schema/GSData.py:72
-msgid "%sInvalid datatype '%s'."
+#, fuzzy
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
 msgstr "%s �rv�nytelen adatt�pus '%s'"
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
+#: schema/GSData.py:110
+#, fuzzy
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
 msgstr "%s �rt�k '%s' out of Range (%s)"
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
-msgstr "%s �rt�k '%s' %s "
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
+msgstr ""
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
+#: schema/GSData.py:147
+#, fuzzy
+msgid "is not a number (%(length)d.%(scale)d)"
 msgstr "nem sz�m (%d.%d)"
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr "nem logikai v�ltoz� (TRUE vagy FALSE)"
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
 msgstr "nem d�tum (YYYY-MM-DD)"
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+#, fuzzy
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr "nem id��rt�k (HH:MM:SS.ss)"
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr "nem d�tum/id� (YYYY-MM-DD HH:MM:SS.ss)"
 
@@ -1640,51 +1547,56 @@
 msgstr "A '%s' kik�t�snek egyenl�tlen mez�i vannak."
 
 #: schema/Objects.py:170
-msgid "Constraint '%s' has more fields than the table '%s'"
+#, fuzzy
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
 msgstr "A '%s' kik�t�snek t�bb mez�je van, mint a '%s' t�bl�nak"
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
+#: schema/Objects.py:185
+#, fuzzy
+msgid "Table '%(table)s' has no field '%(field)s'."
 msgstr "A '%s' t�bl�ban nincs '%s' mez�."
 
-#: schema/Objects.py:212
-msgid "Constraint '%s': typemismatch in reference field '%s'."
+#: schema/Objects.py:215
+#, fuzzy
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
 msgstr "A '%s' kik�t�snek t�puselt�r�se van a '%s' referencia mez�ben."
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr "GSD hiba: nem tal�lom saj�t magam az XML f�ban?!"
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
+#, fuzzy
+msgid "Row %(row)d of table %(table)s has no key fields."
 msgstr "A %d. sor a %s t�bl�ban nem tartalmaz kulcs mez�ket."
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr "Haszn�lja a <connectionname> kapcsolatot az adatok import�l�s�hoz."
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr "A GNUe Schema Importer beolvassa az adatokat egy GNUE s�ma"
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr "defin�ci�b�l, majd import�lja �ket egy kapcsolaton kereszt�l."
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 msgid "No input file specified."
 msgstr "Nincs megadva bej�v� f�jl."
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 msgid "Unable to open input file %s."
 msgstr "Nem lehet megnyitni a %s bemeneti f�jlt"
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr "Adat import ide: %s"
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
+#: schema/importer/Importer.py:175
+#, fuzzy
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
 msgstr "  import�lt sorok: %d, friss�tett sorok %d"
 
 #: schema/scripter/Scripter.py:48
@@ -1783,3 +1695,239 @@
 #: utils/GDateTime.py:70
 msgid "Not a valid date"
 msgstr "�rv�nytelen d�tum"
+
+#, fuzzy
+#~ msgid "Server XML-RPC method %s is not bound to real method"
+#~ msgstr "A szerver XML-RPC %s elj�r�s nincs"
+
+#, fuzzy
+#~ msgid ""
+#~ "GNURPC can't bind method/attribut '%(name)s' to service '%(service)s'"
+#~ msgstr ""
+#~ "A GNURPC nem tudja a '%s' elj�r�st/tulajdons�got a '%s' szolg�ltat�shoz "
+#~ "kapcsolni."
+
+# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/pw_xmlrpc/ServerAdapter.py:229
+#~ msgid "Wrong format of object handle "
+#~ msgstr "Rossz form�tum� objektum le�r�"
+
+#~ msgid "in method call %s"
+#~ msgstr "a %s elj�r�s h�v�s�ban"
+
+#~ msgid "Internal XMLRPC server error: method %s can be "
+#~ msgstr "Bels� XMLRPC szerver hiba: a %s elj�r�s"
+
+#~ msgid "found in the directory (build out of a .grpc file),"
+#~ msgstr "megtal�lhat� ugyan a directoryban (egy .grpc f�jll �p�tve),"
+
+#~ msgid " but the object doesn't contain this method/attribut."
+#~ msgstr " de az objektum nem tartalmazza ezt az elj�r�st/tulajdons�got."
+
+#~ msgid " Please check you .grpc file for wrong return types."
+#~ msgstr " Ellen�r�zze a .grpc f�jlt rossz visszat�r�si �rt�keket keresve."
+
+#~ msgid "Server XML-RPC method %s  is not "
+#~ msgstr "A szerver XML-RPC %s elj�r�s nincs"
+
+#~ msgid "bound to real method"
+#~ msgstr "igazi elj�r�shoz k�tve"
+
+#~ msgid "Server does not have XML-RPC "
+#~ msgstr "A szerveren nincs XML-RPC"
+
+#~ msgid "procedure %s"
+#~ msgstr "%s elj�r�s"
+
+#~ msgid "Server XML-RPC "
+#~ msgstr "A szerver XML-RPC"
+
+#~ msgid "procedure %s accepts just %s as attributs"
+#~ msgstr "%s elj�r�s csak a %s-t fogadja el tulajdons�gk�nt"
+
+#~ msgid "Internal Server XML-RPC error: method type"
+#~ msgstr "Bels� szerver XML-RPC hiba: az elj�r�s t�pusa"
+
+#~ msgid "(get/set attribute) couldn't be detected (method %s)"
+#~ msgstr "(get/set tulajdons�g) nem �llap�that� meg (%s elj�r�s)"
+
+#~ msgid ""
+#~ "Internal server error occured:\n"
+#~ " server %s \n"
+#~ " on source %s."
+#~ msgstr ""
+#~ "Bels� szerver hiba t�rt�nt:\n"
+#~ " szerver %s \n"
+#~ " forr�s %s."
+
+#, fuzzy
+#~ msgid "Missing Binding information. Please add binding information for %s "
+#~ msgstr "Hi�nyz� kapcsol�si inform�ci�k. Adja meg a kapcsol�s"
+
+#, fuzzy
+#~ msgid "GNURPC cannot bind service '%(name)s' to service'%(destination)s'"
+#~ msgstr ""
+#~ "A GNURPC nem tudja a '%s' szolg�ltat�st a '%s' szolg�ltat�shoz kapcsolni."
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file is in an invalid format. "
+#~ msgstr ""
+#~ "\n"
+#~ "   A kapcsolat f�jl �rv�nytelen form�tum�. "
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file specified either does "
+#~ msgstr ""
+#~ "\n"
+#~ "   A megadott kapcsolat f�jl vagy nem"
+
+#~ msgid ""
+#~ "\n"
+#~ "   not exist or is not readable by your account.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "   l�tezik, vagy nem olvashat� az aktu�lis felhaszn�l�i jogosults�ggal.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "   Location: \"%s\""
+#~ msgstr ""
+#~ "\n"
+#~ "   Hely: \"%s\""
+
+#~ msgid "Do not send the server into the background. For a POSIX system, "
+#~ msgstr "Ne tegye h�tt�rfolyamatt� a szervert. POSIX rendszereken"
+
+#~ msgid "this option keeps the server process from forking and detaching "
+#~ msgstr ""
+#~ "ez az opci� megakad�lyozza, hogy a szerver folyamat fork-oljon �s "
+#~ "elszakadjon"
+
+#~ msgid "from its controlling terminal."
+#~ msgstr "a vez�rl� termin�lj�t�l."
+
+#~ msgid "mysql-python 0.9.0 or later from"
+#~ msgstr "a mysql-python 0.9.0 vagy k�s�bbi verzi�j�t"
+
+#~ msgid "Error:  %s"
+#~ msgstr "Hiba:  %s"
+
+#~ msgid "Encoding '%s' is not supported by postgresql dbdriver."
+#~ msgstr "A(z) '%s' k�dol�st a postgresql dbdriver nem t�mogatja."
+
+#~ msgid "Using default encoding."
+#~ msgstr "Alap�rtelmezett k�dol�s haszn�lata."
+
+#~ msgid "Starting cursor: %s; shift: %s"
+#~ msgstr "Kezd� kurzor: %s; shift: %s"
+
+#~ msgid "Ending cursor: %s; shift: %s"
+#~ msgstr "Z�r� kurzor: %s; shift: %s"
+
+#~ msgid "*** moveCursorRelative(%s)"
+#~ msgstr "*** moveCursorRelative(%s)"
+
+#~ msgid "relative=%s"
+#~ msgstr "relative=%s"
+
+#~ msgid "direction=%s"
+#~ msgstr "direction=%s"
+
+#~ msgid "cursor #1: %s"
+#~ msgstr "kurzor #1: %s"
+
+#~ msgid "cursor #2: %s"
+#~ msgstr "kurzor #2: %s"
+
+#~ msgid "pos=%s"
+#~ msgstr "pos=%s"
+
+#~ msgid "section=%s"
+#~ msgstr "section=%s"
+
+#~ msgid "cursor #2b: %s"
+#~ msgstr "kurzor #2b: %s"
+
+#~ msgid "cursor #3: %s"
+#~ msgstr "kurzor #3: %s"
+
+#~ msgid "cursor #4: %s"
+#~ msgstr "kurzor #4: %s"
+
+#~ msgid "New cursor position: %s"
+#~ msgstr "�j kurzor poz�ci�: %s"
+
+#~ msgid "after processEdit, index=%s;cursor=%s"
+#~ msgstr "processEdit ut�n, index=%s;cursor=%s"
+
+#~ msgid "information for %s "
+#~ msgstr "Inform�ci� %s sz�m�ra"
+
+#~ msgid "GNURPC: cannot bind service '%s' to %s"
+#~ msgstr "GNURPC: nem lehet a '%s' szolg�ltat�st '%s'-hez kapcsolni."
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nem lehetett bet�lteni a pyro-t.  A Pyto interf�sz haszn�lat�hoz \n"
+
+#~ msgid "please install xmlrpc from:\n"
+#~ msgstr "telep�tse az xmlrpc-t innen:\n"
+
+#~ msgid "the appropriate DEBIAN package is python-pyro.deb"
+#~ msgstr "a negfelel� DEBIAN csomag neve python-pyro.deb"
+
+# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:123
+#~ msgid "py-xmlrpc just support http as a transport. "
+#~ msgstr "py-xmlrpc csak a HTTP-alap� �tvitelt t�mogatja."
+
+# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:124
+#~ msgid "If you need https please have a look at the "
+#~ msgstr "Ha HTTPS-re van sz�ks�g, keresse meg a"
+
+# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:125
+#~ msgid "'pw_xmlrpc' adapter."
+#~ msgstr "'pw_xmlrpc' illeszt�t."
+
+#~ msgid "a 'host' and 'port' setting."
+#~ msgstr "egy 'host' �s egy 'port' �rt�ket."
+
+# 
c:\python22\lib\site-packages\gnue/common/rpc/drivers/xmlrpc/ClientAdapter.py:197
+#~ msgid "Connection refused"
+#~ msgstr "Csatlakoz�s elutas�tva"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load Pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nem lehetett bet�lteni a Pyro-t.  A Pyto interf�sz haszn�lat�hoz \n"
+
+#~ msgid "please install pyro from:\n"
+#~ msgstr "telep�tse a pyro-t innen:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load soaplib.  To use the SOAP interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "A soaplib nem t�lthet� be.  A SOAP  interf�sz haszn�lat�hoz \n"
+
+#~ msgid "please install soaplib from:\n"
+#~ msgstr "telep�tse a soaplib-et innen:\n"
+
+#~ msgid "Your configuration references a file-based sockets connection.\n"
+#~ msgstr "A konfigur�ci� f�jl-alap� Socket kapcsolatra hivatkozik.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "file or a host and port number.  Please see documentation."
+#~ msgstr ""
+#~ "\n"
+#~ "vagy a host-ot �s a port sz�m�t.  Olvassa el a dokument�ci�t!"
+
+#~ msgid "%sValue '%s' %s"
+#~ msgstr "%s �rt�k '%s' %s "

Modified: trunk/gnue-common/po/lt.po
===================================================================
--- trunk/gnue-common/po/lt.po  2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/lt.po  2004-08-12 13:04:23 UTC (rev 6187)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
 "PO-Revision-Date: 2002-07-05 13:48+0200\n"
 "Last-Translator: Art�ras Kriukovas <address@hidden>\n"
 "Language-Team: Lithuania\n"
@@ -131,84 +131,73 @@
 #: apps/GBaseApp.py:179
 #, fuzzy
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr ""
 "�iai programai reikalingas Python 2.0 arba auk�tesn�s versijos. J�s� Python "
 "versija yra %s"
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 #, fuzzy
 msgid "This application requires Python 2.1 or greater."
 msgstr "�iai programai reikalingas Python 2.0 arba auk�tesn�s versijos."
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
 msgstr "debug_level opcijai (\"-d\") reiki skaitin�s reik�m�s."
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
+#: apps/GBaseApp.py:275
+#, fuzzy
+msgid ""
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr "gnue.conf failas nebaigtas: "
 
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
+#: apps/GBaseApp.py:280
+#, fuzzy
+msgid ""
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr "%s skaitant gnue.conf: "
 
 # ../src/GBaseApp.py:238 :244
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr "Nepavyko nuskaityti prisijungim� konfig�racijos failo.\n"
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:328
+#, fuzzy
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   The connections file is in an invalid format. "
-msgstr ""
-"\n"
-"   Prisijungim� konfig�racijos failas yra neteisingas suformuotas."
+"The connections file is in an invalid format.\n"
+"%s"
+msgstr "Nepavyko nuskaityti prisijungim� konfig�racijos failo.\n"
 
-#: apps/GBaseApp.py:331
-msgid ""
-"\n"
-"   The connections file specified either does "
-msgstr ""
-"\n"
-"   Nurodytas prisijungim� konfig�racijos failas arba "
-
-#: apps/GBaseApp.py:332
-msgid ""
-"\n"
-"   not exist or is not readable by your account.\n"
-msgstr ""
-"\n"
-"   neegzistuoja, arba nenuskaitomas.\n"
-
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
-"\n"
-"   Vieta: \"%s\""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
+#, fuzzy
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 "\n"
 "%s\n"
 "Versija %s\n"
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr "GNUe Common Versija %s\n"
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr ""
 
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 #, fuzzy
 msgid "Available command line options:"
 msgstr ""
@@ -219,35 +208,35 @@
 "Galimos komandin�s eilut�s opcijos:\n"
 "%s"
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr ""
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr ""
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr ""
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr ""
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr ""
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr ""
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr "Klaida: %s"
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -266,18 +255,19 @@
 msgstr "Failas neturi joki� source apibr��im�."
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
+#, fuzzy
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
 msgstr "Failas negali b�ti apdorotas. %s :: %s"
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr "Failas negali b�ti apdorotas."
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
+#: apps/GConfig.py:210
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
 msgstr ""
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
@@ -286,19 +276,14 @@
 "instaliacija"
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
 msgstr ""
 
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
-msgstr ""
-
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr ""
-
 # ../src/RuntimeSettings.py:92 :95
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -351,27 +336,19 @@
 msgid "No valid condition tree"
 msgstr "Neteisinga data"
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr ""
 
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
-msgstr ""
-
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
 "conversion."
@@ -416,23 +393,24 @@
 "Failas: %s"
 
 # ../src/GConnections.py:134 :169
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
+#, fuzzy
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
 "Prisijungim� konfig�racijos failas neturi konfig�racijos \n"
 "skirtos  \"%s\" prisijungimui.\n"
 "\n"
 "Failas: %s"
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
+#: datasources/GConnections.py:304
+#, fuzzy
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
 msgstr "DB tvarkykl� '%s' nepalaiko tipo '%s'"
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
@@ -442,79 +420,79 @@
 "\n"
 "Klaida: %s"
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr "Vartotojas atsisak� prisijungimo."
 
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr ""
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr ""
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr ""
 
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 #, fuzzy
 msgid "Connection Name"
 msgstr "prisijungimas: "
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 #, fuzzy
 msgid "Table Name"
 msgstr "Pavadinimas"
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr ""
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr ""
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 #, fuzzy
 msgid "M/D Master DataSource"
 msgstr "Sukurti duomen� �altin�"
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr ""
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr ""
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr ""
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 msgid "Primary Key Field(s)"
 msgstr ""
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr ""
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 #, fuzzy
 msgid "Resource type '%s' is not supported"
 msgstr "GComm adapteris '%s' nepalaiko klient�"
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr ""
 
@@ -613,12 +591,23 @@
 msgid "Object of unknown type (%s) passed to DBSIG2 based dbdriver."
 msgstr ""
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr ""
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr ""
 
@@ -653,9 +642,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr ""
 
@@ -691,9 +680,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr ""
 
@@ -783,14 +772,14 @@
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr ""
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 #, fuzzy
 msgid "Objects"
@@ -801,32 +790,26 @@
 msgstr ""
 
 #: datasources/drivers/mysql/mysql/Driver.py:46
+#, fuzzy
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 "\n"
 "Nepavyko paleisti MySQLdb. Jei norite MySQL palaikymo, pra�au suinstaliuoti\n"
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr "'mysql-python 0.9.0 arba v�lesn�s versijos i� "
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr "Klaida: %s"
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr ""
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+#, fuzzy
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 "Draiveris nesuinstaliuotas: visi win32 ODBC draiveriai\n"
 "\n"
@@ -836,6 +819,17 @@
 msgid "PythonWin ODBC Driver"
 msgstr ""
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+"Draiveris nesuinstaliuotas: visi win32 ODBC draiveriai\n"
+"\n"
+"[%s"
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 msgid "This feature is currently not supported by this driver"
 msgstr ""
@@ -876,20 +870,18 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
+#: datasources/drivers/postgresql/Base/Connection.py:100
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr ""
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 #, fuzzy
 msgid "popy"
@@ -1014,121 +1006,78 @@
 msgstr "Klaida nuskaitant %s: tu��ias apibr��im� failas"
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+#, fuzzy
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
 "Klaida nuskaitant %s: neteisingas %s apibr��imas (tik�jausi %s, gavau %s)"
 
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr ""
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
+#: definitions/GParser.py:257
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
 msgstr "Klaida apdorojant <%s> komand� (ne�inau, k� <%s> komanda daro)"
 
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr ""
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
+#: definitions/GParser.py:280
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
 msgstr "Klaida apdorojant <%s> komand� (neatpa��stu '%s' atributo)"
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
+#, fuzzy
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
 "Klaida apdorojant <%s> komand� ('%s' atrobutas tur�t� b�ti unikalus, "
 "pasikartojanti reik�m� '%s')"
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
+#: definitions/GParser.py:317
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
 msgstr "Klaida apdorojant <%s> komand� (n�ra privalomo atributo '%s')"
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
 #, fuzzy
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr "Klaida apdorojant <%s> komand� (neatpa��stu '%s' atributo)"
 
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
 msgstr ""
 
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
+#: definitions/GParser.py:466
+msgid "Unable to find an importable object named %(name)s in %(library)s"
 msgstr ""
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
+#, fuzzy
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr "Pageidajama formatavimo kauk� '%s' n�ra apibr��ta %s laukams"
 
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
+#: formatting/BaseMask.py:159
+#, fuzzy
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
 msgstr "Netik�tas simbolis '%s' kauk�je %s."
 
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr ""
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr ""
-
-# ../src/FormatMasks/BaseMask.py:256 :326
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr ""
-
-# ../src/FormatMasks/BaseMask.py:257 :263 :272
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
-msgstr ""
-
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
 msgstr ""
@@ -1169,149 +1118,101 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr ""
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr "GNUe RPC dokumentacijos generatorius"
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr "Klaida: modulis %s arba nerastas, arba negali b�ti nuskaitytas"
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
+#: rpc/drivers/pyro/ServerAdapter.py:190
+msgid "Missing Binding information. Please add binding information for %s"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr "informacija %s"
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
-msgstr ""
-
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
+#: rpc/drivers/_helpers/DirectoryServer.py:309
+#: rpc/drivers/pyro/ServerAdapter.py:380
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+msgid "Server XML-RPC method '%s' is not bound to real method"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+msgid "Server does not have XML-RPC procedure %s"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:308
-#: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
-msgstr ""
-
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
-msgstr "proced�ra %s"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
-msgstr "Vidin� XML-RPC serverio klaida: metodo tipas"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+#, fuzzy
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr "(get/set attribute) nerastas (metodas %s)"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr "XML-RPC serveris"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+#, fuzzy
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
 msgstr "%s proced�ra priima tik %s kaip atribut�"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr "Nerasta informacijos apie %s"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:388 :400
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr "Neteisingas metodo vardas"
 
 # ../src/commdrivers/_directory/DirectoryServer.py:389 :401
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr "Pageidaujamas metodas nerastas"
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
-msgid "Wrong format of object handler "
+msgid "Wrong format of object handler in method call %s"
 msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
 #: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
 msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr ""
 
@@ -1323,86 +1224,63 @@
 #, fuzzy
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 "\n"
-"Negaliu paleisti PYRO. Jei norite naudoti PYRO interfeis�, \n"
+"Negaliu paleisti XMLRPCLIB. Jei norite naudoti XML-RPC interfeis�,\n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr "pra�au suinstaliuoti XMLRPC i�:\n"
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-#, fuzzy
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr "atitinkamas DEBIAN paketas yra 'python-xmlrpc.deb'"
-
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
 msgstr ""
 
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr ""
-
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr ""
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
+#, fuzzy
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
 msgstr "Jei norite naudoti XML-RPC j�s turite arba pateikti URL, arba\n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr "kompiuterio vardo ir port'o nustatym�."
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr "Nepavyko inicializuoti XML-RPC interfeiso %s"
 
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
+#, fuzzy
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
 msgstr "Nepavyko inicializuoti XML-RPC interfeiso %s:"
 
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr "Prisijungimo atsakymas: neigiamas."
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
 #, fuzzy
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 "\n"
-"Negaliu paleisti PYRO. Jei norite naudoti PYRO interfeis�, \n"
+"Negaliu paleisti XMLRPCLIB. Jei norite naudoti XML-RPC interfeis�,\n"
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
-#, fuzzy
-msgid "please install pyro from:\n"
-msgstr "pra�au suinstaliuoti PYRO i�:\n"
-
-#: rpc/drivers/pyro/ServerAdapter.py:329
+#: rpc/drivers/pyro/ServerAdapter.py:334
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
+msgid "Wrong format of object handle in method call %s"
 msgstr ""
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr ""
-
 #: rpc/drivers/soap/CommDriver.py:45
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
+"\n"
+"Negaliu paleisti XMLRPCLIB. Jei norite naudoti XML-RPC interfeis�,\n"
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr ""
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1421,35 +1299,30 @@
 #: rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py:115
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr ""
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr ""
 
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
-msgstr ""
-
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
 msgstr ""
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr ""
-
 #: rpc/drivers/sockets/CommDriver.py:114
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
 msgstr ""
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
-msgstr ""
+#: rpc/drivers/sockets/CommDriver.py:120
+#, fuzzy
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
+msgstr "Nepavyko inicializuoti XML-RPC interfeiso %s:"
 
 # ../src/commdrivers/pw_xmlrpc/RpcDoc.py:66 :77 :99
 # ../src/commdrivers/xmlrpc/RpcDoc.py:66 :77 :88 :99
@@ -1522,34 +1395,34 @@
 
 #: schema/GSData.py:72
 #, fuzzy
-msgid "%sInvalid datatype '%s'."
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
 msgstr "Neteisingas �vedimas: '%s'"
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
+#: schema/GSData.py:110
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
 msgstr ""
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
 msgstr ""
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
+#: schema/GSData.py:147
+msgid "is not a number (%(length)d.%(scale)d)"
 msgstr ""
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr ""
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
 msgstr ""
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr ""
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr ""
 
@@ -1571,43 +1444,43 @@
 msgstr ""
 
 #: schema/Objects.py:170
-msgid "Constraint '%s' has more fields than the table '%s'"
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
 msgstr ""
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
+#: schema/Objects.py:185
+msgid "Table '%(table)s' has no field '%(field)s'."
 msgstr ""
 
-#: schema/Objects.py:212
-msgid "Constraint '%s': typemismatch in reference field '%s'."
+#: schema/Objects.py:215
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
 msgstr ""
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr ""
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
+msgid "Row %(row)d of table %(table)s has no key fields."
 msgstr ""
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr ""
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr ""
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr ""
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 #, fuzzy
 msgid "No input file specified."
 msgstr "Nenurodyta jokia forma."
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 #, fuzzy
 msgid "Unable to open input file %s."
 msgstr ""
@@ -1615,12 +1488,12 @@
 "\n"
 "    %s"
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr ""
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
+#: schema/importer/Importer.py:175
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
 msgstr ""
 
 #: schema/scripter/Scripter.py:48
@@ -1708,8 +1581,93 @@
 msgid "Not a valid date"
 msgstr "Neteisinga data"
 
+#~ msgid "procedure %s"
+#~ msgstr "proced�ra %s"
+
+#~ msgid "Server XML-RPC "
+#~ msgstr "XML-RPC serveris"
+
+#~ msgid "procedure %s accepts just %s as attributs"
+#~ msgstr "%s proced�ra priima tik %s kaip atribut�"
+
+#~ msgid "Internal Server XML-RPC error: method type"
+#~ msgstr "Vidin� XML-RPC serverio klaida: metodo tipas"
+
+#~ msgid "(get/set attribute) couldn't be detected (method %s)"
+#~ msgstr "(get/set attribute) nerastas (metodas %s)"
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file is in an invalid format. "
+#~ msgstr ""
+#~ "\n"
+#~ "   Prisijungim� konfig�racijos failas yra neteisingas suformuotas."
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file specified either does "
+#~ msgstr ""
+#~ "\n"
+#~ "   Nurodytas prisijungim� konfig�racijos failas arba "
+
+#~ msgid ""
+#~ "\n"
+#~ "   not exist or is not readable by your account.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "   neegzistuoja, arba nenuskaitomas.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "   Location: \"%s\""
+#~ msgstr ""
+#~ "\n"
+#~ "   Vieta: \"%s\""
+
+#~ msgid "mysql-python 0.9.0 or later from"
+#~ msgstr "'mysql-python 0.9.0 arba v�lesn�s versijos i� "
+
+#~ msgid "Error:  %s"
+#~ msgstr "Klaida: %s"
+
+#~ msgid "information for %s "
+#~ msgstr "informacija %s"
+
 #, fuzzy
 #~ msgid ""
+#~ "\n"
+#~ "Unable to load pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Negaliu paleisti PYRO. Jei norite naudoti PYRO interfeis�, \n"
+
+#~ msgid "please install xmlrpc from:\n"
+#~ msgstr "pra�au suinstaliuoti XMLRPC i�:\n"
+
+#, fuzzy
+#~ msgid "the appropriate DEBIAN package is python-pyro.deb"
+#~ msgstr "atitinkamas DEBIAN paketas yra 'python-xmlrpc.deb'"
+
+#~ msgid "a 'host' and 'port' setting."
+#~ msgstr "kompiuterio vardo ir port'o nustatym�."
+
+#~ msgid "Connection refused"
+#~ msgstr "Prisijungimo atsakymas: neigiamas."
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load Pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Negaliu paleisti PYRO. Jei norite naudoti PYRO interfeis�, \n"
+
+#, fuzzy
+#~ msgid "please install pyro from:\n"
+#~ msgstr "pra�au suinstaliuoti PYRO i�:\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Driver not installed: SQLitedbapi for SQLite 7.x \n"
 #~ "[%s]"
 #~ msgstr ""

Modified: trunk/gnue-common/po/ro.po
===================================================================
--- trunk/gnue-common/po/ro.po  2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/ro.po  2004-08-12 13:04:23 UTC (rev 6187)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnue-common\n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
 "PO-Revision-Date: 2004-04-07 14:53+0200\n"
 "Last-Translator: Florin Boariu <address@hidden>\n"
 "Language-Team: Romanian\n"
@@ -155,116 +155,106 @@
 "presupune \"%s\"."
 
 #: apps/GBaseApp.py:179
+#, fuzzy
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr ""
 "Aceasta aplicatie ruleaza sub Python 2.1 sau mai mult. D-voastra rulati "
 "Python %s"
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 msgid "This application requires Python 2.1 or greater."
 msgstr "Aceasta aplicatie ruleaza sub Python 2.1 sai mai mult."
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
 msgstr "Optiunea debug_level (\"-d\") primeste o valoare numerica."
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
+#: apps/GBaseApp.py:275
+#, fuzzy
+msgid ""
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr "Fisierul gnue.conf e incomplet:"
 
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
+#: apps/GBaseApp.py:280
+#, fuzzy
+msgid ""
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr "%s la citirea fisierului gnue.conf: "
 
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr "Nu pot citi fisierul cu definitiile de conexiuni.\n"
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:328
+#, fuzzy
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   The connections file is in an invalid format. "
-msgstr ""
-"\n"
-"   Fisierul de conexiuni e intr-un format non-valid. "
+"The connections file is in an invalid format.\n"
+"%s"
+msgstr "Nu pot citi fisierul cu definitiile de conexiuni.\n"
 
-#: apps/GBaseApp.py:331
-msgid ""
-"\n"
-"   The connections file specified either does "
-msgstr ""
-"\n"
-"   Fisierul de conexiuni specificat ori nu exista ori nu"
-
-#: apps/GBaseApp.py:332
-msgid ""
-"\n"
-"   not exist or is not readable by your account.\n"
-msgstr ""
-"\n"
-"   poate fi citit de catre contul d-voastra de utilizator.\n"
-
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
-"\n"
-"   Locatia: \"%s\""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
+#, fuzzy
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 "\n"
 "%s\n"
 "Versiunea %s\n"
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr "GNUe Common Versiunea %s\n"
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr "Se ruleaza:  "
 
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 msgid "Available command line options:"
 msgstr "Optiuni pentru linia de comanda:"
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr "Urmatoarele optiuni sunt in special in interesul programatorilor GNUe."
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr "Pentru a primi ajutor general, rulati comanda cu optiunea --help"
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr "Optiuni pentru linia de comanda specifice programatorilor:"
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr "Urmatoarele optiuni pentru conexiuni/baze de date sunt acceptate."
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr "Optiuni pentru linia de comanda pentru baze de date/conexiuni:"
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr ""
 "Urmatoarele driver-e de baze de date sunt instalate in sistemul d-voastra:"
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr "Erori: %s"
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -283,18 +273,20 @@
 msgstr "Fisierul nu contine definitii de sursa."
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
+#, fuzzy
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
 msgstr "Fisierul nu poate fi interpretat. %s :: %s"
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr "Fisierul nu poate fi interpretat."
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
+#: apps/GConfig.py:210
+#, fuzzy
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
 msgstr "Optiunea de configurare %s are tipul gresit in [%s]"
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
@@ -302,18 +294,13 @@
 "Nu pot citi fisierul GNUE_INSTALLED_SITE_CFG... E o problema cu d-voastra"
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
-msgstr "Nu trimite procesul server in fond. Intr-un sistem POSIX, "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
+msgstr ""
 
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
-msgstr "aceasta optiune impiedica procesul server sa creeze un fork si "
-
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr "sa se desparta de terminalul care-l controleaza."
-
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -367,27 +354,20 @@
 msgid "No valid condition tree"
 msgstr "Nu e o data valida"
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
-msgstr "Elementul conditie \"%s\" asteapta cel putin %s argumente; a gasit %s"
-
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr "Elementul conditie \"%s\" asteapta cel mult %s argumente; a gasit %s"
 
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 #, fuzzy
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
@@ -432,23 +412,24 @@
 "\n"
 "Fisier: %s"
 
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
+#, fuzzy
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
 "Fisierul de conexiuni nu contine o definitie \n"
 "       pentru \"%s\".\n"
 "\n"
 "Fisier: %s"
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
+#: datasources/GConnections.py:304
+#, fuzzy
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
 msgstr "Driver-ul DB '%s' nu suporta tipul sursa '%s'"
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
@@ -458,78 +439,79 @@
 "\n"
 "Eroare: %s"
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr "Utilizatorul a retras cererea de login."
 
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr "Baza nu suporta functia-trigger 'call'"
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+#, fuzzy
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr "Sursa de detaliu '%s' are referinta catre maestru neexistent '%s'"
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr ""
 
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 #, fuzzy
 msgid "Connection Name"
 msgstr "Conexiunea refuzata"
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 #, fuzzy
 msgid "Table Name"
 msgstr "Tabela"
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr ""
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr ""
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 msgid "M/D Master DataSource"
 msgstr ""
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr ""
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr ""
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr ""
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 #, fuzzy
 msgid "Primary Key Field(s)"
 msgstr "Cheia primara: %s"
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr ""
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 msgid "Resource type '%s' is not supported"
 msgstr ""
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 #, fuzzy
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr "Rindul %d al tabelei %s nu are campuri cheie."
@@ -637,12 +619,24 @@
 msgstr ""
 "Obiectul de tip necuonscut (%s) a fost predat driver-uili bazat pe DBSIG2"
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+#, fuzzy
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr "Elementul conditie \"%s\" asteapta cel putin %s argumente; a gasit %s"
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr "Expresia conditionala \"%s\" nu e suportat de acest driver db."
 
@@ -677,9 +671,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr "Vizoare"
 
@@ -716,9 +710,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr "Tabele"
 
@@ -808,14 +802,14 @@
 msgstr "Codarea '%s' nu e suportata de driver-ul interbase."
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr "Driver kinterbasdb Firebird/Interbase"
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 msgid "Objects"
 msgstr "Obiecte"
@@ -826,32 +820,26 @@
 msgstr "ATENTIE: schimb tipul coloanei '%s.%s' in 'timestamp'"
 
 #: datasources/drivers/mysql/mysql/Driver.py:46
+#, fuzzy
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 "\n"
 "Nu pot incarca MySQLdb.  Pentru suport MySQL, va rugam instalati \n"
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr "mysql-python 0.9.0 sau mai inalt de la"
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr "Eroare: %s"
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr "MySQLdb"
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+#, fuzzy
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 "Driver-ul nu e instalat: win32all ODBC driver\n"
 "\n"
@@ -861,6 +849,17 @@
 msgid "PythonWin ODBC Driver"
 msgstr "Driver PythonWin ODBC"
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+"Driver-ul nu e instalat: win32all ODBC driver\n"
+"\n"
+"[%s"
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 #, fuzzy
 msgid "This feature is currently not supported by this driver"
@@ -902,7 +901,7 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr "Driver de date DCOracle2 pentru Oracle 7.3/8i/9i+ (OCI8)"
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
@@ -910,14 +909,13 @@
 "Driver-ul PostgreSQL a returnat urmatoarea eroare:\n"
 "\t%s"
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
-msgstr "Codarea '%s' nu e suportata de driver-ul postgresql."
+#: datasources/drivers/postgresql/Base/Connection.py:100
+#, fuzzy
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
+msgstr "Codarea '%s' nu e suportata de driver-ul interbase."
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr "Folosesc codarea standard."
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 msgid "popy"
 msgstr "popy"
@@ -1049,48 +1047,62 @@
 msgstr "Eroare incarcand %s: fisier de definitii gol"
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+#, fuzzy
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
 "Eroare incarcand %s: definitia pentru %s nu e valida (astepam: %s, am "
 "primit: %s)"
 
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr "Fisierului ii lipseste tag-ul necesar <%s>"
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
+#: definitions/GParser.py:257
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
 msgstr "Eroare procesand tag-ul <%s> [nu stiu ce-i un <%s>]"
 
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr "Spatiu de nume neasteptat pentru atribut"
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
+#: definitions/GParser.py:280
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
 msgstr "Eroare procesand tag-ul <%s> [nu recunosc atributul \"%s\"]"
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
+#, fuzzy
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
 "Eroare procesand tag-ul <%s> [atributul \"%s\" ar trebui sa fie unic; "
 "valoarea duplicata este \"%s\"]"
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
+#: definitions/GParser.py:317
+#, fuzzy
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
 msgstr "Eroare procesand tag-ul <%s> [atributul necesar \"%s\" nu e prezent]"
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
+#, fuzzy
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr ""
 "Eroare procesand tag-ul <%s:%s>: elementul radacina trebuie sa se afle in "
 "spatiul de nume standard"
 
 # FIXME: need a romanian expression for 'default' !!
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
@@ -1098,75 +1110,22 @@
 "ATENTIE: Markup-ul contine spatii de nume, dar programul curent n-are suport "
 "inclus pentru nume de spatiu!"
 
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
+#: definitions/GParser.py:466
+#, fuzzy
+msgid "Unable to find an importable object named %(name)s in %(library)s"
 msgstr "Nu pot gasi nici un obiect importabil numit %s in %s"
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
+#, fuzzy
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr "Masca de formatare ceruta \"%s\" nu e definita pentru campuri %s"
 
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
+#: formatting/BaseMask.py:159
+#, fuzzy
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
 msgstr "Caracter neasteptat \"%s\" in masca %s."
 
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr "Pornesc cursorul: %s; shift: %s"
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr "Opresc cursorul: %s; shift: %s"
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr "*** moveCursorRelative(%s)"
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr "relavife=%s"
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
-msgstr ""
-
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
 msgstr ""
@@ -1205,148 +1164,105 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr ""
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr "Generator de Documentatie GNUe RPC"
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr "Eroare: modulul %s nu exista sau nu poate fi incarcat"
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
+#: rpc/drivers/pyro/ServerAdapter.py:190
+#, fuzzy
+msgid "Missing Binding information. Please add binding information for %s"
 msgstr "Imi lipseste informatia despre legatura. Va rog adaugati "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr "informatia de legatura pentru %s "
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+#, fuzzy
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
 msgstr "GNURPC nu poate lega serviciul '%s' la serviciul '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
-msgstr "GNURPC: nu pot lega serviciul '%s' la '%s'"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+#, fuzzy
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
 msgstr "GNURPC nu poate lega metoda/atributul '%s' la serviciul '%s'"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr "Despachetez: "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
+#: rpc/drivers/_helpers/DirectoryServer.py:309
+#: rpc/drivers/pyro/ServerAdapter.py:380
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+#, fuzzy
+msgid "Server XML-RPC method '%s' is not bound to real method"
 msgstr "Metoda de server XML-RPC '%s' nu e "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
-msgstr "legata de o metoda reala"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:308
-#: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+#, fuzzy
+msgid "Server does not have XML-RPC procedure %s"
 msgstr "Server-ul n-are procedura "
 
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
-msgstr "XML-RPC %s"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
-msgstr "Eroare interna a server-ului XML-RPC: tipul de metoda"
-
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+#, fuzzy
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr "(citeste/scrie atributul) n-a fost gasit (metoda %s)"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr "Procedura de server "
-
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+#, fuzzy
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
 msgstr "XML-RPC %s accepta doar %s ca atribut"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr "Nu exista mesaj de ajutor pentru %s"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr "InvalidMethodName"
 
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr "Metoda ceruta nu exista"
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
-msgid "Wrong format of object handler "
+#, fuzzy
+msgid "Wrong format of object handler in method call %s"
 msgstr "Format gresit pentru handler-ul de obiecte "
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
-msgstr "in metoda %s"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr "Eroare interna de server-ul XMPRPC: metoda %s se afla "
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr "in director (creata dintr-un fisier .grpc),"
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr " dar obiectul nu contine aceasta metoda sau acest atribut."
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
 #: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
 msgstr ""
-" Va rugam verificati-va fisierul .grpc pentru tipuri de returnare gresite."
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr "Handle de obiect nereturnat"
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr "Handle de obiect invalid"
 
@@ -1355,87 +1271,77 @@
 msgstr "Adaptor proxy pentru client trebuie pornit cu obiectul de server"
 
 #: rpc/drivers/pyro/ClientAdapter.py:51
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 "\n"
-"Nu pot incarca pyro.  Pentru a utiliza interfata Pyro, \n"
+"Nu pot incarca xmlrpc.  Pentru a utiliza interfata XML-RPC, \n"
+"va rugam instalati xmlrpc de la:\n"
+"    http://sourceforge.net/projects/py-xmlrpc\n";
+"pachetul Debian corespunzator este python-xmlrpc.deb"
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr "va rugam instalati xmlrpc de la:\n"
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr "pachetul Debian corect e python-pyro.deb"
-
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
-msgstr "py-xmlrpc suporta doar http ca transport. "
+#, fuzzy
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
+msgstr ""
+"py-xmlrpc suporta doar http ca mecanism de transport. Daca aveti nevoie de "
+"https, va rugam sa folositi adaptorul 'pw_xmlrpc."
 
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr "Daca aveti nevoie de https, va rugam uitati-va la "
-
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr "adaptorul 'pw_xmlrpc'."
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
+#, fuzzy
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
 msgstr "Pentru a folosi XML-RPC, trebuie sa specificati or un 'url', ori\n"
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr "un 'host' si un 'port'."
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr "Nu pot initializa interfata XML-RPC la %s"
 
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
+#, fuzzy
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
 msgstr "Nu pot initializa interfata XML-RPC la %s: "
 
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr "Conexiunea refuzata"
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
+#, fuzzy
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 "\n"
-"Nu pot incarca Pyro.  Pentru a utiliza interfaza Pyro, \n"
+"Un pot incarca xmlrpclib.  Pentru a folosi interfata XML-RPC, \n"
+"va rugam instalati xmlrpc de la:\n"
+"    http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
-msgid "please install pyro from:\n"
-msgstr "va rugam instalati de la:\n"
-
-#: rpc/drivers/pyro/ServerAdapter.py:329
+#: rpc/drivers/pyro/ServerAdapter.py:334
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
+#, fuzzy
+msgid "Wrong format of object handle in method call %s"
 msgstr "Format gresit de handle de obiect "
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr "Metoda server XML-RPC %s  nu e "
-
 #: rpc/drivers/soap/CommDriver.py:45
+#, fuzzy
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
 "\n"
-"Nu pot incarca soaplib. Pentru a utliliza interfata SOAP, \n"
+"Un pot incarca xmlrpclib.  Pentru a folosi interfata XML-RPC, \n"
+"va rugam instalati xmlrpc de la:\n"
+"    http://www.pythonware.com/products/xmlrpc/";
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr "va rugam instalati soaplib de la:\n"
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1457,45 +1363,38 @@
 
 #: rpc/drivers/soap/soappy/Driver.py:157
 #: rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py:115
+#, fuzzy
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr ""
 "Eroare interna de server:\n"
 " server %s \n"
 " pe sursa %s."
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
+#, fuzzy
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr ""
-"Configuratia d-voastra are referinte catre on conexiune de soclu bazata pe "
-"fisiere.\n"
-
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
-msgstr ""
 "dar sistemul d-voastra de operare nu suporta socluri bazate pe fisiere."
 
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
 msgstr "Nu pot inizializa soclul solicitat, situat la %s"
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr "Pentru a folosi driver-ul de comunicatii pe socluri, trebuie sa"
-
 #: rpc/drivers/sockets/CommDriver.py:114
+#, fuzzy
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
-msgstr ""
-"\n"
-"specificati fie un fisier soclu fie un host si-un numar de port.\n"
-"Va rugam studiati documentatia."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
+msgstr "Pentru a folosi driver-ul de comunicatii pe socluri, trebuie sa"
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
+#: rpc/drivers/sockets/CommDriver.py:120
+#, fuzzy
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
 msgstr "Nu pot initializa soclul solicitat situat la %s:%s"
 
 #: rpc/drivers/xmlrpc/RpcDoc.py:69 rpc/drivers/xmlrpc/RpcDoc.py:80
@@ -1566,34 +1465,38 @@
 "https, va rugam sa folositi adaptorul 'pw_xmlrpc."
 
 #: schema/GSData.py:72
-msgid "%sInvalid datatype '%s'."
+#, fuzzy
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
 msgstr "%sTyp de date non-valid '%s'."
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
+#: schema/GSData.py:110
+#, fuzzy
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
 msgstr "%sValoarea '%s' e in afara limitei (%s)"
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
-msgstr "%sValoarea '%s' %s"
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
+msgstr ""
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
+#: schema/GSData.py:147
+#, fuzzy
+msgid "is not a number (%(length)d.%(scale)d)"
 msgstr "nu e un numar (%d.%d)"
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr "nu e boleana (ADEVARAT sau FALS)"
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
 msgstr "nu e o data (AAAA-LL-ZZ)"
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+#, fuzzy
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr "nu e o ora (HH:MM:SS.ss)"
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr "nu e o data-ora (AAAA-LL-ZZ HH:MM:SS.ss)"
 
@@ -1615,52 +1518,55 @@
 
 #: schema/Objects.py:170
 #, fuzzy
-msgid "Constraint '%s' has more fields than the table '%s'"
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
 msgstr "Constrangere '%s' nu are campuri de referinta."
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
+#: schema/Objects.py:185
+#, fuzzy
+msgid "Table '%(table)s' has no field '%(field)s'."
 msgstr "Tabela '%s' nu are campul '%s'."
 
-#: schema/Objects.py:212
+#: schema/Objects.py:215
 #, fuzzy
-msgid "Constraint '%s': typemismatch in reference field '%s'."
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
 msgstr "Constrangere '%s' nu are campuri de referinta."
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr "Eroare GSD: eu unde-s in arborele XML?!"
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
+#, fuzzy
+msgid "Row %(row)d of table %(table)s has no key fields."
 msgstr "Rindul %d al tabelei %s nu are campuri cheie."
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr "Folositi conexiunea <connectionname> pentru a importa date."
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr "Importatorul GNUe Schema citeste dintr-o Definitie GNUe Schema "
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr "si o importa intr-o conexiune."
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 msgid "No input file specified."
 msgstr "Nu s-a specificat nici un fisier de intrare."
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 msgid "Unable to open input file %s."
 msgstr "Nu pot deschide fisierul de intrare %s."
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr "Import in %s"
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
+#: schema/importer/Importer.py:175
+#, fuzzy
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
 msgstr "  Am adaugat %d linii, am modificat %d linii."
 
 #: schema/scripter/Scripter.py:48
@@ -1755,7 +1661,207 @@
 msgid "Not a valid date"
 msgstr "Nu e o data valida"
 
+#, fuzzy
+#~ msgid "Server XML-RPC method %s is not bound to real method"
+#~ msgstr "Metoda server XML-RPC %s  nu e "
+
+#, fuzzy
 #~ msgid ""
+#~ "GNURPC can't bind method/attribut '%(name)s' to service '%(service)s'"
+#~ msgstr "GNURPC nu poate lega metoda/atributul '%s' la serviciul '%s'"
+
+#~ msgid "Wrong format of object handle "
+#~ msgstr "Format gresit de handle de obiect "
+
+#~ msgid "in method call %s"
+#~ msgstr "in metoda %s"
+
+#~ msgid "Internal XMLRPC server error: method %s can be "
+#~ msgstr "Eroare interna de server-ul XMPRPC: metoda %s se afla "
+
+#~ msgid "found in the directory (build out of a .grpc file),"
+#~ msgstr "in director (creata dintr-un fisier .grpc),"
+
+#~ msgid " but the object doesn't contain this method/attribut."
+#~ msgstr " dar obiectul nu contine aceasta metoda sau acest atribut."
+
+#~ msgid " Please check you .grpc file for wrong return types."
+#~ msgstr ""
+#~ " Va rugam verificati-va fisierul .grpc pentru tipuri de returnare gresite."
+
+#~ msgid "Server XML-RPC method %s  is not "
+#~ msgstr "Metoda server XML-RPC %s  nu e "
+
+#~ msgid "bound to real method"
+#~ msgstr "legata de o metoda reala"
+
+#~ msgid "Server does not have XML-RPC "
+#~ msgstr "Server-ul n-are procedura "
+
+#~ msgid "procedure %s"
+#~ msgstr "XML-RPC %s"
+
+#~ msgid "Server XML-RPC "
+#~ msgstr "Procedura de server "
+
+#~ msgid "procedure %s accepts just %s as attributs"
+#~ msgstr "XML-RPC %s accepta doar %s ca atribut"
+
+#~ msgid "Internal Server XML-RPC error: method type"
+#~ msgstr "Eroare interna a server-ului XML-RPC: tipul de metoda"
+
+#~ msgid "(get/set attribute) couldn't be detected (method %s)"
+#~ msgstr "(citeste/scrie atributul) n-a fost gasit (metoda %s)"
+
+#~ msgid ""
+#~ "Internal server error occured:\n"
+#~ " server %s \n"
+#~ " on source %s."
+#~ msgstr ""
+#~ "Eroare interna de server:\n"
+#~ " server %s \n"
+#~ " pe sursa %s."
+
+#, fuzzy
+#~ msgid "Missing Binding information. Please add binding information for %s "
+#~ msgstr "Imi lipseste informatia despre legatura. Va rog adaugati "
+
+#, fuzzy
+#~ msgid "GNURPC cannot bind service '%(name)s' to service'%(destination)s'"
+#~ msgstr "GNURPC nu poate lega serviciul '%s' la serviciul '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file is in an invalid format. "
+#~ msgstr ""
+#~ "\n"
+#~ "   Fisierul de conexiuni e intr-un format non-valid. "
+
+#~ msgid ""
+#~ "\n"
+#~ "   The connections file specified either does "
+#~ msgstr ""
+#~ "\n"
+#~ "   Fisierul de conexiuni specificat ori nu exista ori nu"
+
+#~ msgid ""
+#~ "\n"
+#~ "   not exist or is not readable by your account.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "   poate fi citit de catre contul d-voastra de utilizator.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "   Location: \"%s\""
+#~ msgstr ""
+#~ "\n"
+#~ "   Locatia: \"%s\""
+
+#~ msgid "Do not send the server into the background. For a POSIX system, "
+#~ msgstr "Nu trimite procesul server in fond. Intr-un sistem POSIX, "
+
+#~ msgid "this option keeps the server process from forking and detaching "
+#~ msgstr "aceasta optiune impiedica procesul server sa creeze un fork si "
+
+#~ msgid "from its controlling terminal."
+#~ msgstr "sa se desparta de terminalul care-l controleaza."
+
+#~ msgid "mysql-python 0.9.0 or later from"
+#~ msgstr "mysql-python 0.9.0 sau mai inalt de la"
+
+#~ msgid "Error:  %s"
+#~ msgstr "Eroare: %s"
+
+#~ msgid "Encoding '%s' is not supported by postgresql dbdriver."
+#~ msgstr "Codarea '%s' nu e suportata de driver-ul postgresql."
+
+#~ msgid "Using default encoding."
+#~ msgstr "Folosesc codarea standard."
+
+#~ msgid "Starting cursor: %s; shift: %s"
+#~ msgstr "Pornesc cursorul: %s; shift: %s"
+
+#~ msgid "Ending cursor: %s; shift: %s"
+#~ msgstr "Opresc cursorul: %s; shift: %s"
+
+#~ msgid "*** moveCursorRelative(%s)"
+#~ msgstr "*** moveCursorRelative(%s)"
+
+#~ msgid "relative=%s"
+#~ msgstr "relavife=%s"
+
+#~ msgid "information for %s "
+#~ msgstr "informatia de legatura pentru %s "
+
+#~ msgid "GNURPC: cannot bind service '%s' to %s"
+#~ msgstr "GNURPC: nu pot lega serviciul '%s' la '%s'"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nu pot incarca pyro.  Pentru a utiliza interfata Pyro, \n"
+
+#~ msgid "please install xmlrpc from:\n"
+#~ msgstr "va rugam instalati xmlrpc de la:\n"
+
+#~ msgid "the appropriate DEBIAN package is python-pyro.deb"
+#~ msgstr "pachetul Debian corect e python-pyro.deb"
+
+#~ msgid "py-xmlrpc just support http as a transport. "
+#~ msgstr "py-xmlrpc suporta doar http ca transport. "
+
+#~ msgid "If you need https please have a look at the "
+#~ msgstr "Daca aveti nevoie de https, va rugam uitati-va la "
+
+#~ msgid "'pw_xmlrpc' adapter."
+#~ msgstr "adaptorul 'pw_xmlrpc'."
+
+#~ msgid "a 'host' and 'port' setting."
+#~ msgstr "un 'host' si un 'port'."
+
+#~ msgid "Connection refused"
+#~ msgstr "Conexiunea refuzata"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load Pyro.  To use the Pyro interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nu pot incarca Pyro.  Pentru a utiliza interfaza Pyro, \n"
+
+#~ msgid "please install pyro from:\n"
+#~ msgstr "va rugam instalati de la:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Unable to load soaplib.  To use the SOAP interface, \n"
+#~ msgstr ""
+#~ "\n"
+#~ "Nu pot incarca soaplib. Pentru a utliliza interfata SOAP, \n"
+
+#~ msgid "please install soaplib from:\n"
+#~ msgstr "va rugam instalati soaplib de la:\n"
+
+#~ msgid "Your configuration references a file-based sockets connection.\n"
+#~ msgstr ""
+#~ "Configuratia d-voastra are referinte catre on conexiune de soclu bazata "
+#~ "pe fisiere.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "file or a host and port number.  Please see documentation."
+#~ msgstr ""
+#~ "\n"
+#~ "specificati fie un fisier soclu fie un host si-un numar de port.\n"
+#~ "Va rugam studiati documentatia."
+
+#~ msgid "%sValue '%s' %s"
+#~ msgstr "%sValoarea '%s' %s"
+
+#~ msgid ""
 #~ "Driver not installed: SQLitedbapi for SQLite 7.x \n"
 #~ "[%s]"
 #~ msgstr ""

Modified: trunk/gnue-common/po/ru.po
===================================================================
--- trunk/gnue-common/po/ru.po  2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/po/ru.po  2004-08-12 13:04:23 UTC (rev 6187)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sat Aug  7 17:21:23 2004\n"
+"POT-Creation-Date: Thu Aug 12 14:49:27 2004\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dmitry Sorokin <address@hidden>\n"
 "Language-Team: Dmitry Sorokin <address@hidden>\n"
@@ -122,102 +122,94 @@
 
 #: apps/GBaseApp.py:179
 msgid ""
-"This application requires Python 2.1 or greater.  You are running Python %s"
+"This application requires Python 2.1 or greater. You are running Python %s"
 msgstr ""
 
-#: apps/GBaseApp.py:182
+#: apps/GBaseApp.py:183
 msgid "This application requires Python 2.1 or greater."
 msgstr ""
 
-#: apps/GBaseApp.py:260
+#: apps/GBaseApp.py:262
 msgid "The debug_level option (\"-d\") expects a numerical value."
 msgstr ""
 
-#: apps/GBaseApp.py:273
-msgid "The gnue.conf file is incomplete: "
-msgstr ""
-
-#: apps/GBaseApp.py:279
-msgid "%s while reading gnue.conf: "
-msgstr ""
-
-# ../src/GBaseApp.py:238 :244
-#: apps/GBaseApp.py:324 apps/GBaseApp.py:330
-msgid "Unable to load the connections definition file.\n"
-msgstr ""
-
-#: apps/GBaseApp.py:325
+#: apps/GBaseApp.py:275
 msgid ""
-"\n"
-"   The connections file is in an invalid format. "
+"The gnue.conf file is incomplete:\n"
+"   %s"
 msgstr ""
 
-#: apps/GBaseApp.py:331
+#: apps/GBaseApp.py:280
 msgid ""
-"\n"
-"   The connections file specified either does "
+"%(exType)s while reading gnue.conf:\n"
+"   %(message)s"
 msgstr ""
 
-#: apps/GBaseApp.py:332
+#: apps/GBaseApp.py:328
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   not exist or is not readable by your account.\n"
+"The connections file is in an invalid format.\n"
+"%s"
 msgstr ""
 
 #: apps/GBaseApp.py:333
 msgid ""
+"Unable to load the connections definition file.\n"
 "\n"
-"   Location: \"%s\""
+"The connections file specified either does not exist or is not readable by "
+"your account.\n"
+"Location: \"%s\""
 msgstr ""
 
-#: apps/GBaseApp.py:344
+#: apps/GBaseApp.py:346
 msgid ""
 "\n"
-"%s\n"
-"Version %s\n"
+"%(name)s\n"
+"Version %(version)s\n"
 msgstr ""
 
-#: apps/GBaseApp.py:345
+#: apps/GBaseApp.py:348
 msgid "GNUe Common Version %s\n"
 msgstr ""
 
-#: apps/GBaseApp.py:414 apps/GBaseApp.py:426
+#: apps/GBaseApp.py:418 apps/GBaseApp.py:430
 msgid "Usage:  "
 msgstr ""
 
-#: apps/GBaseApp.py:429
+#: apps/GBaseApp.py:433
 msgid "Available command line options:"
 msgstr ""
 
-#: apps/GBaseApp.py:439 apps/GBaseApp.py:463
+#: apps/GBaseApp.py:443 apps/GBaseApp.py:467
 msgid "The following options are mainly of interest to GNUe developers."
 msgstr ""
 
-#: apps/GBaseApp.py:440 apps/GBaseApp.py:450 apps/GBaseApp.py:464
+#: apps/GBaseApp.py:444 apps/GBaseApp.py:454 apps/GBaseApp.py:468
 msgid "To view general help, run this command with the --help option."
 msgstr ""
 
-#: apps/GBaseApp.py:442 apps/GBaseApp.py:466
+#: apps/GBaseApp.py:446 apps/GBaseApp.py:470
 msgid "Developer-specific command line options:"
 msgstr ""
 
-#: apps/GBaseApp.py:449
+#: apps/GBaseApp.py:453
 msgid "The following connection/database-related options are available."
 msgstr ""
 
-#: apps/GBaseApp.py:452
+#: apps/GBaseApp.py:456
 msgid "Database/connection command line options:"
 msgstr ""
 
-#: apps/GBaseApp.py:455
+#: apps/GBaseApp.py:459
 msgid "The following database drivers are installed on your system:"
 msgstr ""
 
-#: apps/GBaseApp.py:502
+#: apps/GBaseApp.py:506 datasources/drivers/mysql/mysql/Driver.py:49
 msgid "Error: %s"
 msgstr ""
 
-#: apps/GBaseApp.py:505
+#: apps/GBaseApp.py:509
 msgid ""
 "\n"
 "For help, type:\n"
@@ -233,37 +225,32 @@
 msgstr ""
 
 #: apps/GConfig.py:112
-msgid "The file cannot be parsed. %s :: %s"
+msgid "The file cannot be parsed. %(exType)s :: %(exValue)s"
 msgstr ""
 
-#: apps/GConfig.py:113
+#: apps/GConfig.py:115
 msgid "The file cannot be parsed."
 msgstr ""
 
-#: apps/GConfig.py:208
-msgid "Config option %s is of wrong type in [%s]"
+#: apps/GConfig.py:210
+msgid "Config option %(field)s is of wrong type in [%(section)s]"
 msgstr ""
 
-#: apps/GConfig.py:260
+#: apps/GConfig.py:264
 msgid ""
 "Unable to read the GNUE_INSTALLED_SITE_CFG file... There is a problem with "
 "your installation"
 msgstr ""
 
 #: apps/GServerApp.py:58
-msgid "Do not send the server into the background. For a POSIX system, "
+msgid ""
+"Do not send the server into the background. For a POSIX system, this option "
+"keeps the server process from forking and detaching from its controlling "
+"terminal."
 msgstr ""
 
-#: apps/GServerApp.py:59
-msgid "this option keeps the server process from forking and detaching "
-msgstr ""
-
-#: apps/GServerApp.py:60
-msgid "from its controlling terminal."
-msgstr ""
-
 # ../src/RuntimeSettings.py:92 :95
-#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:106
+#: apps/RuntimeSettings.py:101 apps/RuntimeSettings.py:107
 msgid ""
 "\n"
 "Warning: Unable to save session data to %s\n"
@@ -313,27 +300,19 @@
 msgid "No valid condition tree"
 msgstr ""
 
-#: datasources/GConditions.py:1264
-#: datasources/drivers/DBSIG2/DataObject.py:267
-#: datasources/drivers/ldap/Driver.py:551
-#: datasources/drivers/odbc/wodbc/Connection.py:412
-#: datasources/drivers/odbc/wodbc/DataObject.py:409
-#: datasources/drivers/odbc/wodbc/RecordSet.py:409
-#: datasources/drivers/odbc/wodbc/ResultSet.py:409
-msgid "Condition element \"%s\" expects at least %s arguments; found %s"
+#: datasources/GConditions.py:1264 datasources/GConditions.py:1272
+#: datasources/drivers/DBSIG2/DataObject.py:276
+#: datasources/drivers/ldap/Driver.py:559
+#: datasources/drivers/odbc/wodbc/Connection.py:419
+#: datasources/drivers/odbc/wodbc/DataObject.py:417
+#: datasources/drivers/odbc/wodbc/RecordSet.py:417
+#: datasources/drivers/odbc/wodbc/ResultSet.py:416
+msgid ""
+"Condition element \"%(element)s\" expects at most %(expected)s arguments; "
+"found %(found)s"
 msgstr ""
 
-#: datasources/GConditions.py:1269
-#: datasources/drivers/DBSIG2/DataObject.py:271
-#: datasources/drivers/ldap/Driver.py:556
-#: datasources/drivers/odbc/wodbc/Connection.py:416
-#: datasources/drivers/odbc/wodbc/DataObject.py:413
-#: datasources/drivers/odbc/wodbc/RecordSet.py:413
-#: datasources/drivers/odbc/wodbc/ResultSet.py:413
-msgid "Condition element \"%s\" expects at most %s arguments; found %s"
-msgstr ""
-
-#: datasources/GConditions.py:1278
+#: datasources/GConditions.py:1284
 msgid ""
 "Condition clause \"%s\" is not supported by the condition to prefix table "
 "conversion."
@@ -368,95 +347,93 @@
 "File: %s"
 msgstr ""
 
-# ../src/GConnections.py:134 :169
-#: datasources/GConnections.py:161 datasources/GConnections.py:196
+#: datasources/GConnections.py:162 datasources/GConnections.py:199
 msgid ""
-"The connections file does not contain a definition \n"
-"       for \"%s\".\n"
+"The connections file does not contain a definition for \"%(connection)s\".\n"
 "\n"
-"File: %s"
+"File: %(file)s"
 msgstr ""
 
-#: datasources/GConnections.py:299
-msgid "DB Driver '%s' does not support source type '%s'"
+#: datasources/GConnections.py:304
+msgid "DB Driver '%(connection)s' does not support source type '%(conType)s'"
 msgstr ""
 
-#: datasources/GConnections.py:453
+#: datasources/GConnections.py:461
 msgid ""
 "Unable to log in after 4 attempts.\n"
 "\n"
 "Error: %s"
 msgstr ""
 
-#: datasources/GConnections.py:459
+#: datasources/GConnections.py:468
 msgid "User canceled the login request."
 msgstr ""
 
-#: datasources/GDataSource.py:160
+#: datasources/GDataSource.py:171
 msgid "Backend doesn't support the trigger 'call' function"
 msgstr ""
 
-#: datasources/GDataSource.py:245
+#: datasources/GDataSource.py:256
 msgid "Datasource %s is sql-based, but has no <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:248
+#: datasources/GDataSource.py:260
 msgid "Datasource %s is not sql-based, but has a <sql> definition."
 msgstr ""
 
-#: datasources/GDataSource.py:363
-msgid "Detail source '%s' references non-existant master '%s'"
+#: datasources/GDataSource.py:376
+msgid "Detail source '%(source)s' references non-existant master '%(master)s'"
 msgstr ""
 
-#: datasources/GDataSource.py:474
+#: datasources/GDataSource.py:489
 msgid "Data Object Type"
 msgstr ""
 
-#: datasources/GDataSource.py:478
+#: datasources/GDataSource.py:493
 msgid "Connection Name"
 msgstr ""
 
-#: datasources/GDataSource.py:484
+#: datasources/GDataSource.py:499
 msgid "Table Name"
 msgstr ""
 
-#: datasources/GDataSource.py:487
+#: datasources/GDataSource.py:502
 msgid "Cache Size"
 msgstr ""
 
-#: datasources/GDataSource.py:491
+#: datasources/GDataSource.py:506
 msgid "Query on Startup"
 msgstr ""
 
-#: datasources/GDataSource.py:500
+#: datasources/GDataSource.py:515
 msgid "M/D Master DataSource"
 msgstr ""
 
-#: datasources/GDataSource.py:506
+#: datasources/GDataSource.py:521
 msgid "M/D Master Field"
 msgstr ""
 
-#: datasources/GDataSource.py:514
+#: datasources/GDataSource.py:529
 msgid "M/D Detail Field"
 msgstr ""
 
-#: datasources/GDataSource.py:523
+#: datasources/GDataSource.py:538
 msgid "Explicit Fields"
 msgstr ""
 
-#: datasources/GDataSource.py:527
+#: datasources/GDataSource.py:542
 msgid "Primary Key Field(s)"
 msgstr ""
 
-#: datasources/GDataSource.py:654
+#: datasources/GDataSource.py:669
 msgid "The URL '%s' is not a valid application server resource locator"
 msgstr ""
 
-#: datasources/GDataSource.py:660
+#: datasources/GDataSource.py:675
 msgid "Resource type '%s' is not supported"
 msgstr ""
 
-#: datasources/GDataSource.py:665
+#: datasources/GDataSource.py:680
 msgid "Resource '%(name)s' of type '%(type)s' not found"
 msgstr ""
 
@@ -553,12 +530,23 @@
 msgid "Object of unknown type (%s) passed to DBSIG2 based dbdriver."
 msgstr ""
 
-#: datasources/drivers/DBSIG2/DataObject.py:281
-#: datasources/drivers/ldap/Driver.py:567
-#: datasources/drivers/odbc/wodbc/Connection.py:425
-#: datasources/drivers/odbc/wodbc/DataObject.py:422
-#: datasources/drivers/odbc/wodbc/RecordSet.py:422
-#: datasources/drivers/odbc/wodbc/ResultSet.py:422
+#: datasources/drivers/DBSIG2/DataObject.py:268
+#: datasources/drivers/ldap/Driver.py:551
+#: datasources/drivers/odbc/wodbc/Connection.py:412
+#: datasources/drivers/odbc/wodbc/DataObject.py:409
+#: datasources/drivers/odbc/wodbc/RecordSet.py:409
+#: datasources/drivers/odbc/wodbc/ResultSet.py:409
+msgid ""
+"Condition element \"%(element)s\" expects at least %(expected)s arguments; "
+"found %(found)s"
+msgstr ""
+
+#: datasources/drivers/DBSIG2/DataObject.py:289
+#: datasources/drivers/ldap/Driver.py:573
+#: datasources/drivers/odbc/wodbc/Connection.py:431
+#: datasources/drivers/odbc/wodbc/DataObject.py:430
+#: datasources/drivers/odbc/wodbc/RecordSet.py:429
+#: datasources/drivers/odbc/wodbc/ResultSet.py:428
 msgid "Condition clause \"%s\" is not supported by this db driver."
 msgstr ""
 
@@ -593,9 +581,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:105
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:105
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:42
-#: datasources/drivers/sybase/sybase/DataObject.py:104
-#: datasources/drivers/sybase/sybase/RecordSet.py:104
-#: datasources/drivers/sybase/sybase/ResultSet.py:104
+#: datasources/drivers/sybase/sybase/DataObject.py:105
+#: datasources/drivers/sybase/sybase/RecordSet.py:105
+#: datasources/drivers/sybase/sybase/ResultSet.py:105
 msgid "Views"
 msgstr ""
 
@@ -631,9 +619,9 @@
 #: datasources/drivers/sqlrelay/sqlrelay/RecordSet.py:106
 #: datasources/drivers/sqlrelay/sqlrelay/ResultSet.py:106
 #: datasources/drivers/sybase/Schema/Discovery/Introspection.py:43
-#: datasources/drivers/sybase/sybase/DataObject.py:105
-#: datasources/drivers/sybase/sybase/RecordSet.py:105
-#: datasources/drivers/sybase/sybase/ResultSet.py:105
+#: datasources/drivers/sybase/sybase/DataObject.py:106
+#: datasources/drivers/sybase/sybase/RecordSet.py:106
+#: datasources/drivers/sybase/sybase/ResultSet.py:106
 msgid "Tables"
 msgstr ""
 
@@ -720,14 +708,14 @@
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Connection.py:99
-msgid "Setting interbase client_encoding to %s (%s)"
+msgid "Setting interbase client_encoding to %(new)s (%(old)s)"
 msgstr ""
 
 #: datasources/drivers/interbase/interbase/Info.py:28
 msgid "kinterbasdb Firebird/Interbase Driver"
 msgstr ""
 
-#: datasources/drivers/ldap/Driver.py:679
+#: datasources/drivers/ldap/Driver.py:685
 #: datasources/drivers/special/configfile/DataObject.py:119
 #, fuzzy
 msgid "Objects"
@@ -740,34 +728,34 @@
 #: datasources/drivers/mysql/mysql/Driver.py:46
 msgid ""
 "\n"
-"Could not load MySQLdb.  For MySQL support, please install \n"
+"Could not load MySQLdb. For MySQL support, please install mysql-python 0.9.0 "
+"or later from\n"
+"http://sourceforge.net/projects/mysql-python\n";
 msgstr ""
 
-#: datasources/drivers/mysql/mysql/Driver.py:47
-msgid "mysql-python 0.9.0 or later from"
-msgstr ""
-
-#: datasources/drivers/mysql/mysql/Driver.py:49
-msgid "Error:  %s"
-msgstr ""
-
 #: datasources/drivers/mysql/mysql/Info.py:28
 msgid "MySQLdb"
 msgstr ""
 
 #: datasources/drivers/odbc/wodbc/DataObject.py:46
-#: datasources/drivers/odbc/wodbc/RecordSet.py:46
-#: datasources/drivers/odbc/wodbc/ResultSet.py:46
 msgid ""
 "Driver not installed: win32all ODBC driver\n"
 "\n"
-"[%s"
+"[%s]"
 msgstr ""
 
 #: datasources/drivers/odbc/wodbc/Info.py:28
 msgid "PythonWin ODBC Driver"
 msgstr ""
 
+#: datasources/drivers/odbc/wodbc/RecordSet.py:46
+#: datasources/drivers/odbc/wodbc/ResultSet.py:46
+msgid ""
+"Driver not installed: win32all ODBC driver\n"
+"\n"
+"[%s"
+msgstr ""
+
 #: datasources/drivers/oracle/Schema/Creation/Creation.py:47
 msgid "This feature is currently not supported by this driver"
 msgstr ""
@@ -808,20 +796,18 @@
 msgid "DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)"
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:93
+#: datasources/drivers/postgresql/Base/Connection.py:94
 msgid ""
 "The PostgreSQL driver returned the following error:\n"
 "\t%s"
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:98
-msgid "Encoding '%s' is not supported by postgresql dbdriver."
+#: datasources/drivers/postgresql/Base/Connection.py:100
+msgid ""
+"Encoding '%s' is not supported by postgresql dbdriver. Using default "
+"encoding."
 msgstr ""
 
-#: datasources/drivers/postgresql/Base/Connection.py:99
-msgid "Using default encoding."
-msgstr ""
-
 #: datasources/drivers/postgresql/popy/Info.py:28
 #, fuzzy
 msgid "popy"
@@ -941,117 +927,67 @@
 msgstr ""
 
 #: definitions/GParser.py:116
-msgid "Error loading %s: not a valid %s definition (expected: %s, got: %s)"
+msgid ""
+"Error loading %(filetype)s: not a valid %(filetype)s definition (expected: %"
+"(expected)s, got: %(got)s)"
 msgstr ""
 
-#: definitions/GParser.py:230
+#: definitions/GParser.py:233
 msgid "File is missing required tag <%s>"
 msgstr ""
 
-#: definitions/GParser.py:253
-msgid "Error processing <%s> tag [I do not know what a <%s> tag does]"
+#: definitions/GParser.py:257
+msgid ""
+"Error processing <%(tag)s> tag [I do not know what a <%(tag)s> tag does]"
 msgstr ""
 
-#: definitions/GParser.py:264
+#: definitions/GParser.py:267
 msgid "Unexpected namespace on attribute"
 msgstr ""
 
-#: definitions/GParser.py:277
-msgid "Error processing <%s> tag [I do not recognize the \"%s\" attribute"
+#: definitions/GParser.py:280
+msgid ""
+"Error processing <%(tag)s> tag [I do not recognize the \"%(attribute)s\" "
+"attribute"
 msgstr ""
 
-#: definitions/GParser.py:296
+#: definitions/GParser.py:300
 msgid ""
-"Error processing <%s> tag [\"%s\" attribute should be unique; duplicate "
-"value is \"%s\"]"
+"Error processing <%(tag)s> tag [\"%(attribute)s\" attribute should be "
+"unique; duplicate value is \"%(duplicate)s\"]"
 msgstr ""
 
-#: definitions/GParser.py:309
-msgid "Error processing <%s> tag [required attribute \"%s\" not present]"
+#: definitions/GParser.py:317
+msgid ""
+"Error processing <%(tag)s> tag [required attribute \"%(attribute)s\" not "
+"present]"
 msgstr ""
 
-#: definitions/GParser.py:343
+#: definitions/GParser.py:353
 msgid ""
-"Error processing <%s:%s> tag: root element needs to be in default namespace"
+"Error processing <%(namespace)s:%(name)s> tag: root element needs to be in "
+"default namespace"
 msgstr ""
 
-#: definitions/GParser.py:355
+#: definitions/GParser.py:367
 msgid ""
 "WARNING: Markup includes namespaces, but the current tool does not include "
 "namespace support!"
 msgstr ""
 
-#: definitions/GParser.py:453
-msgid "Unable to find an importable object named %s in %s"
+#: definitions/GParser.py:466
+msgid "Unable to find an importable object named %(name)s in %(library)s"
 msgstr ""
 
 #: formatting/BaseMask.py:142
-msgid "The requested format mask \"%s\" is not defined for %s fields"
+msgid ""
+"The requested format mask \"%(mask)s\" is not defined for %(type)s fields"
 msgstr ""
 
-#: formatting/BaseMask.py:157
-msgid "Unexpected character \"%s\" in %s mask."
+#: formatting/BaseMask.py:159
+msgid "Unexpected character \"%(char)s\" in %(type)s mask."
 msgstr ""
 
-#: formatting/BaseMask.py:186
-msgid "Starting cursor: %s; shift: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:198
-msgid "Ending cursor: %s; shift: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:258
-msgid "*** moveCursorRelative(%s)"
-msgstr ""
-
-#: formatting/BaseMask.py:263
-msgid "relative=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:264
-msgid "direction=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:268
-msgid "cursor #1: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:277
-msgid "cursor #2: %s"
-msgstr ""
-
-# ../src/FormatMasks/BaseMask.py:256 :326
-#: formatting/BaseMask.py:289 formatting/BaseMask.py:359
-msgid "pos=%s"
-msgstr ""
-
-# ../src/FormatMasks/BaseMask.py:257 :263 :272
-#: formatting/BaseMask.py:290 formatting/BaseMask.py:296
-#: formatting/BaseMask.py:305
-msgid "section=%s"
-msgstr ""
-
-#: formatting/BaseMask.py:293
-msgid "cursor #2b: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:300
-msgid "cursor #3: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:308
-msgid "cursor #4: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:312
-msgid "New cursor position: %s"
-msgstr ""
-
-#: formatting/BaseMask.py:400
-msgid "after processEdit, index=%s;cursor=%s"
-msgstr ""
-
 #: formatting/DateMask.py:139
 msgid "inputMaskPos=%s"
 msgstr ""
@@ -1090,149 +1026,99 @@
 msgid "The class '%(class)s' has no implementation for '%(method)s'"
 msgstr ""
 
-#: rpc/RpcDoc.py:46 rpc/drivers/_helpers/RpcDoc.py:47
+#: rpc/RpcDoc.py:43 rpc/drivers/_helpers/RpcDoc.py:43
 msgid "GNUe RPC Documentation Generator"
 msgstr ""
 
-#: rpc/RpcDoc.py:48 rpc/drivers/_helpers/RpcDoc.py:49
+#: rpc/RpcDoc.py:45 rpc/drivers/_helpers/RpcDoc.py:45
 msgid "Error: the module %s does not exist or cannot be loaded"
 msgstr ""
 
 #: rpc/drivers/_helpers/DirectoryServer.py:123
-#: rpc/drivers/pyro/ServerAdapter.py:191
-msgid "Missing Binding information. Please add binding "
+#: rpc/drivers/pyro/ServerAdapter.py:190
+msgid "Missing Binding information. Please add binding information for %s"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:124
-#: rpc/drivers/pyro/ServerAdapter.py:192
-msgid "information for %s "
-msgstr ""
-
 #: rpc/drivers/_helpers/DirectoryServer.py:140
-#: rpc/drivers/pyro/ServerAdapter.py:208
-msgid "GNURPC can't bind service '%s' to service '%s'"
+#: rpc/drivers/_helpers/DirectoryServer.py:148
+#: rpc/drivers/pyro/ServerAdapter.py:207 rpc/drivers/pyro/ServerAdapter.py:215
+msgid "GNURPC cannot bind service '%(name)s' to service '%(destination)s'"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:146
-#: rpc/drivers/pyro/ServerAdapter.py:214
-msgid "GNURPC: cannot bind service '%s' to %s"
+#: rpc/drivers/_helpers/DirectoryServer.py:173
+#: rpc/drivers/pyro/ServerAdapter.py:250
+msgid "GNURPC cannot bind method/attribut '%(name)s' to service '%(service)s'"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:169
-#: rpc/drivers/pyro/ServerAdapter.py:247
-msgid "GNURPC can't bind method/attribut '%s' to service '%s'"
-msgstr ""
-
-#: rpc/drivers/_helpers/DirectoryServer.py:268
-#: rpc/drivers/_helpers/ObjectEnabler.py:129
-#: rpc/drivers/pyro/ServerAdapter.py:309
+#: rpc/drivers/_helpers/DirectoryServer.py:274
+#: rpc/drivers/_helpers/ObjectEnabler.py:127
+#: rpc/drivers/pyro/ServerAdapter.py:314
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:194
 msgid "Dispatching: "
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:303
-msgid "Server XML-RPC method '%s' is not "
-msgstr ""
-
-#: rpc/drivers/_helpers/DirectoryServer.py:304
-#: rpc/drivers/pyro/ServerAdapter.py:377
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:262
-msgid "bound to real method"
-msgstr ""
-
-#: rpc/drivers/_helpers/DirectoryServer.py:308
+#: rpc/drivers/_helpers/DirectoryServer.py:309
 #: rpc/drivers/pyro/ServerAdapter.py:380
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:265
-msgid "Server does not have XML-RPC "
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:260
+msgid "Server XML-RPC method '%s' is not bound to real method"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:309
-#: rpc/drivers/pyro/ServerAdapter.py:381
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:266
-msgid "procedure %s"
+#: rpc/drivers/_helpers/DirectoryServer.py:314
+#: rpc/drivers/pyro/ServerAdapter.py:384
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:264
+msgid "Server does not have XML-RPC procedure %s"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:350
-#: rpc/drivers/pyro/ServerAdapter.py:437
+#: rpc/drivers/_helpers/DirectoryServer.py:355
+#: rpc/drivers/pyro/ServerAdapter.py:442
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:329
-msgid "Internal Server XML-RPC error: method type"
+msgid ""
+"Internal Server XML-RPC error: method type (get/set attribute) couldn't be "
+"detected (method %s)"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:351
-#: rpc/drivers/pyro/ServerAdapter.py:438
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:330
-msgid "(get/set attribute) couldn't be detected (method %s)"
+#: rpc/drivers/_helpers/DirectoryServer.py:369
+#: rpc/drivers/pyro/ServerAdapter.py:391
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:271
+msgid "Server XML-RPC procedure %(method)s accepts just %(attr)s as attributs"
 msgstr ""
 
-#: rpc/drivers/_helpers/DirectoryServer.py:365
-#: rpc/drivers/pyro/ServerAdapter.py:388
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:273
-msgid "Server XML-RPC "
-msgstr ""
-
-#: rpc/drivers/_helpers/DirectoryServer.py:366
-#: rpc/drivers/pyro/ServerAdapter.py:389
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:274
-msgid "procedure %s accepts just %s as attributs"
-msgstr ""
-
-#: rpc/drivers/_helpers/DirectoryServer.py:383
+#: rpc/drivers/_helpers/DirectoryServer.py:389
 msgid "No help available for %s"
 msgstr ""
 
 # ../src/commdrivers/_directory/DirectoryServer.py:388 :400
-#: rpc/drivers/_helpers/DirectoryServer.py:386
-#: rpc/drivers/_helpers/DirectoryServer.py:398
+#: rpc/drivers/_helpers/DirectoryServer.py:392
+#: rpc/drivers/_helpers/DirectoryServer.py:404
 msgid "InvalidMethodName"
 msgstr ""
 
 # ../src/commdrivers/_directory/DirectoryServer.py:389 :401
-#: rpc/drivers/_helpers/DirectoryServer.py:387
-#: rpc/drivers/_helpers/DirectoryServer.py:399
+#: rpc/drivers/_helpers/DirectoryServer.py:393
+#: rpc/drivers/_helpers/DirectoryServer.py:405
 msgid "Requested method does not exist"
 msgstr ""
 
 #: rpc/drivers/_helpers/ObjectEnabler.py:73
-msgid "Wrong format of object handler "
+msgid "Wrong format of object handler in method call %s"
 msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:74
-#: rpc/drivers/pyro/ServerAdapter.py:330
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:215
-msgid "in method call %s"
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:90
-#: rpc/drivers/pyro/ServerAdapter.py:344
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:229
-msgid "Internal XMLRPC server error: method %s can be "
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:92
-#: rpc/drivers/pyro/ServerAdapter.py:346
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:231
-msgid "found in the directory (build out of a .grpc file),"
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:93
-#: rpc/drivers/pyro/ServerAdapter.py:347
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:232
-msgid " but the object doesn't contain this method/attribut."
-msgstr ""
-
-#: rpc/drivers/_helpers/ObjectEnabler.py:94
+#: rpc/drivers/_helpers/ObjectEnabler.py:89
 #: rpc/drivers/pyro/ServerAdapter.py:348
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:233
-msgid " Please check you .grpc file for wrong return types."
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:228
+msgid ""
+"Internal XMLRPC server error: method %s can be found in the directory (build "
+"out of a .grpc file), but the object doesn't contain this method/attribut. "
+"Please check you .grpc file for wrong return types."
 msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:220
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:555
+#: rpc/drivers/_helpers/ObjectEnabler.py:218
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:554
 msgid "Object handle not returned"
 msgstr ""
 
-#: rpc/drivers/_helpers/ObjectEnabler.py:229
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:564
+#: rpc/drivers/_helpers/ObjectEnabler.py:227
+#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:563
 msgid "Invalid object handle"
 msgstr ""
 
@@ -1243,79 +1129,53 @@
 #: rpc/drivers/pyro/ClientAdapter.py:51
 msgid ""
 "\n"
-"Unable to load pyro.  To use the Pyro interface, \n"
+"Unable to load pyro. To use the Pyro interface, \n"
+"please install xmlrpc from:\n"
+"    http://sourceforge.net/projects/pyro the appropriate DEBIAN package is "
+"python-pyro.deb"
 msgstr ""
 
-#: rpc/drivers/pyro/ClientAdapter.py:52
-msgid "please install xmlrpc from:\n"
-msgstr ""
-
-#: rpc/drivers/pyro/ClientAdapter.py:54
-msgid "the appropriate DEBIAN package is python-pyro.deb"
-msgstr ""
-
 #: rpc/drivers/pyro/ClientAdapter.py:99
-msgid "py-xmlrpc just support http as a transport. "
+msgid ""
+"py-xmlrpc just support http as a transport. If you need https please have a "
+"look at the 'pw_xmlrpc' adapter."
 msgstr ""
 
-#: rpc/drivers/pyro/ClientAdapter.py:100
-msgid "If you need https please have a look at the "
-msgstr ""
-
-#: rpc/drivers/pyro/ClientAdapter.py:101
-msgid "'pw_xmlrpc' adapter."
-msgstr ""
-
 #: rpc/drivers/pyro/ClientAdapter.py:155
-msgid "To use XML-RPC, you must either specify a 'url' or\n"
+msgid ""
+"To use XML-RPC, you must either specify a 'url' or\n"
+"a 'host' and 'port' setting."
 msgstr ""
 
-#: rpc/drivers/pyro/ClientAdapter.py:156
-msgid "a 'host' and 'port' setting."
-msgstr ""
-
 #: rpc/drivers/pyro/ClientAdapter.py:159
 msgid "Unable to initialize the XML-RPC interface at %s"
 msgstr ""
 
 #: rpc/drivers/pyro/ClientAdapter.py:188
-msgid "Unable to initialize the XML-RPC interface at %s: "
+msgid "Unable to initialize the XML-RPC interface at %s: Connection refused"
 msgstr ""
 
-#: rpc/drivers/pyro/ClientAdapter.py:189
-msgid "Connection refused"
-msgstr ""
-
 #: rpc/drivers/pyro/ServerAdapter.py:50
 msgid ""
 "\n"
 "Unable to load Pyro.  To use the Pyro interface, \n"
+"please install pyro from:\n"
+"    http://pyro.sf.net/";
 msgstr ""
 
-#: rpc/drivers/pyro/ServerAdapter.py:51
-msgid "please install pyro from:\n"
-msgstr ""
-
-#: rpc/drivers/pyro/ServerAdapter.py:329
+#: rpc/drivers/pyro/ServerAdapter.py:334
 #: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:214
-msgid "Wrong format of object handle "
+msgid "Wrong format of object handle in method call %s"
 msgstr ""
 
-#: rpc/drivers/pyro/ServerAdapter.py:376
-#: rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py:261
-msgid "Server XML-RPC method %s  is not "
-msgstr ""
-
 #: rpc/drivers/soap/CommDriver.py:45
 msgid ""
 "\n"
-"Unable to load soaplib.  To use the SOAP interface, \n"
+"Unable to load soaplib. To use the SOAP interface, please install soaplib "
+"from:\n"
+"    http://www.pythonware.com/products/soap/\n";
 msgstr ""
 
-#: rpc/drivers/soap/CommDriver.py:46
-msgid "please install soaplib from:\n"
-msgstr ""
-
 #: rpc/drivers/soap/soappy/Driver.py:49
 msgid ""
 "\n"
@@ -1334,34 +1194,28 @@
 #: rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py:115
 msgid ""
 "Internal server error occured:\n"
-" server %s \n"
-" on source %s."
+" server %(server)s \n"
+" on source %(source)s."
 msgstr ""
 
 #: rpc/drivers/sockets/CommDriver.py:84
-msgid "Your configuration references a file-based sockets connection.\n"
+msgid ""
+"Your configuration references a file-based sockets connection.\n"
+"However, your operating system does not support file-based sockets."
 msgstr ""
 
-#: rpc/drivers/sockets/CommDriver.py:85
-msgid "However, your operating system does not support file-based sockets."
-msgstr ""
-
-#: rpc/drivers/sockets/CommDriver.py:96
+#: rpc/drivers/sockets/CommDriver.py:97
 msgid "Unable to initialize the requested socket located at %s"
 msgstr ""
 
-#: rpc/drivers/sockets/CommDriver.py:113
-msgid "To use the sockets commdriver, you must specify either a sockets"
-msgstr ""
-
 #: rpc/drivers/sockets/CommDriver.py:114
 msgid ""
-"\n"
-"file or a host and port number.  Please see documentation."
+"To use the sockets commdriver, you must specify either a sockets\n"
+"file or a host and port number. Please see documentation."
 msgstr ""
 
-#: rpc/drivers/sockets/CommDriver.py:118
-msgid "Unable to initialize the requested socket located at %s:%s"
+#: rpc/drivers/sockets/CommDriver.py:120
+msgid "Unable to initialize the requested socket located at %(host)s:%(port)s"
 msgstr ""
 
 # ../src/commdrivers/pw_xmlrpc/RpcDoc.py:66 :77 :99
@@ -1423,34 +1277,34 @@
 msgstr ""
 
 #: schema/GSData.py:72
-msgid "%sInvalid datatype '%s'."
+msgid "%(fieldname)sInvalid datatype '%(datatype)s'."
 msgstr ""
 
-#: schema/GSData.py:108
-msgid "%sValue '%s' out of Range (%s)"
+#: schema/GSData.py:110
+msgid "%(fieldname)sValue '%(value)s' out of Range (%(range)s)"
 msgstr ""
 
-#: schema/GSData.py:126
-msgid "%sValue '%s' %s"
+#: schema/GSData.py:131
+msgid "%(fieldname)sValue '%(value)s' %(format)s"
 msgstr ""
 
-#: schema/GSData.py:139
-msgid "is not a number (%d.%d)"
+#: schema/GSData.py:147
+msgid "is not a number (%(length)d.%(scale)d)"
 msgstr ""
 
-#: schema/GSData.py:152
+#: schema/GSData.py:162
 msgid "is not a boolean (TRUE or FALSE)"
 msgstr ""
 
-#: schema/GSData.py:165
+#: schema/GSData.py:175
 msgid "is not a date (YYYY-MM-DD)"
 msgstr ""
 
-#: schema/GSData.py:178
-msgid "is not a time (HH:MM:SS.ss"
+#: schema/GSData.py:188
+msgid "is not a time (HH:MM:SS.ss)"
 msgstr ""
 
-#: schema/GSData.py:191
+#: schema/GSData.py:201
 msgid "is not a datetime (YYYY-MM-DD HH:MM:SS.ss)"
 msgstr ""
 
@@ -1471,51 +1325,51 @@
 msgstr ""
 
 #: schema/Objects.py:170
-msgid "Constraint '%s' has more fields than the table '%s'"
+msgid "Constraint '%(name)s' has more fields than the table '%(table)s'"
 msgstr ""
 
-#: schema/Objects.py:183
-msgid "Table '%s' has no field '%s'."
+#: schema/Objects.py:185
+msgid "Table '%(table)s' has no field '%(field)s'."
 msgstr ""
 
-#: schema/Objects.py:212
-msgid "Constraint '%s': typemismatch in reference field '%s'."
+#: schema/Objects.py:215
+msgid "Constraint '%(name)s': typemismatch in reference field '%(field)s'."
 msgstr ""
 
-#: schema/Objects.py:322
+#: schema/Objects.py:327
 msgid "GSD-Error: can't find myself in the XML tree?!"
 msgstr ""
 
 #: schema/importer/Importer.py:36
-msgid "Row %d of table %s has no key fields."
+msgid "Row %(row)d of table %(table)s has no key fields."
 msgstr ""
 
-#: schema/importer/Importer.py:52
+#: schema/importer/Importer.py:54
 msgid "Use the connection <connectionname> for importing data."
 msgstr ""
 
-#: schema/importer/Importer.py:55
+#: schema/importer/Importer.py:57
 msgid "GNUe Schema Importer reads data from a GNUe Schema "
 msgstr ""
 
-#: schema/importer/Importer.py:56
+#: schema/importer/Importer.py:58
 msgid "Definition and imports it into a connection."
 msgstr ""
 
-#: schema/importer/Importer.py:75 schema/scripter/Scripter.py:166
+#: schema/importer/Importer.py:77 schema/scripter/Scripter.py:166
 msgid "No input file specified."
 msgstr ""
 
-#: schema/importer/Importer.py:81 schema/scripter/Scripter.py:175
+#: schema/importer/Importer.py:83 schema/scripter/Scripter.py:175
 msgid "Unable to open input file %s."
 msgstr ""
 
-#: schema/importer/Importer.py:130
+#: schema/importer/Importer.py:132
 msgid "Importing into %s"
 msgstr ""
 
-#: schema/importer/Importer.py:173
-msgid "  Inserted %d row(s), updated %d row(s)"
+#: schema/importer/Importer.py:175
+msgid "  Inserted %(inserted)d row(s), updated %(updated)d row(s)"
 msgstr ""
 
 #: schema/scripter/Scripter.py:48

Modified: trunk/gnue-common/src/apps/GBaseApp.py
===================================================================
--- trunk/gnue-common/src/apps/GBaseApp.py      2004-08-10 19:09:01 UTC (rev 
6186)
+++ trunk/gnue-common/src/apps/GBaseApp.py      2004-08-12 13:04:23 UTC (rev 
6187)
@@ -176,10 +176,12 @@
     # Python version check
     try:
       if sys.hexversion < 0x02010000:
-        self.handleStartupError (_('This application requires Python 2.1 or 
greater.  You are running Python %s') % sys.version[:5])
+        self.handleStartupError (u_("This application requires Python 2.1 or "
+                    "greater. You are running Python %s") % sys.version [:5])
     except AttributeError:
       # Really, really old version of Python...
-      self.handleStartupError (_('This application requires Python 2.1 or 
greater.'))
+      self.handleStartupError (_("This application requires Python 2.1 or "
+                                 "greater."))
 
 
     #
@@ -270,14 +272,15 @@
       try:
         self.configurationManager = GConfig.GConfig(application, defaults, 
configFilename=self.CONFIGFILE)
       except ConfigParser.NoSectionError, msg:
-        self.handleStartupError(_('The gnue.conf file is incomplete: ')\
-                                + '\n   %s'         % msg)
+        self.handleStartupError (u_("The gnue.conf file is incomplete:\n"
+                                    "   %s") % msg)
       except Exception, msg:
-        etype=string.splitfields(str(sys.exc_type),'.')
-        etype.reverse()
-        self.handleStartupError( \
-          _('%s while reading gnue.conf: ') % etype[0] \
-          + '\n   %s'         % msg)
+        etype = string.splitfields (str (sys.exc_type), '.')
+        etype.reverse ()
+        self.handleStartupError (u_("%(exType)s while reading gnue.conf:\n"
+                                    "   %(message)s") \
+                                 % {'exType' : etype [0],
+                                    'message': msg})
 
     # Add custom import to python's namespace
     try:
@@ -318,20 +321,19 @@
       GDebug.printMesg(1, 'Connection Definition: "%s"' % 
self.connections_file)
 
       try:
-        self.connections = GConnections.GConnections(self.connections_file, 
loginOptions=lhOptions)
+        self.connections = GConnections.GConnections (self.connections_file,
+                                                      loginOptions = lhOptions)
       except GConnections.InvalidFormatError, msg:
         self.handleStartupError(
-            _('Unable to load the connections definition file.\n') \
-            + _('\n   The connections file is in an invalid format. ') \
-            + '\n   %s' \
-               % msg)
+            u_("Unable to load the connections definition file.\n\n"
+               "The connections file is in an invalid format.\n%s") % msg)
+
       except IOError:
-        self.handleStartupError(
-             _('Unable to load the connections definition file.\n') \
-             + _('\n   The connections file specified either does ') \
-             + _('\n   not exist or is not readable by your account.\n') \
-             + _('\n   Location: "%s"')
-                % self.connections_file)
+        self.handleStartupError (
+             u_("Unable to load the connections definition file.\n\n"
+                "The connections file specified either does "
+                "not exist or is not readable by your account.\n"
+                "Location: \"%s\"") % self.connections_file)
 
   def addCommandOption(self, *args, **parms):
     self.COMMAND_OPTIONS.append(CommandOption(*args, **parms))
@@ -341,9 +343,11 @@
   #
   def printVersion(self):
     from gnue.common import VERSION as commonVersion
-    print _("\n%s\nVersion %s\n") % (self.NAME, self.VERSION)
-    print _("GNUe Common Version %s\n") % commonVersion
+    print o(u_("\n%(name)s\nVersion %(version)s\n") \
+             % {'name': self.NAME, 'version': self.VERSION})
+    print o(u_("GNUe Common Version %s\n") % commonVersion)
 
+
   #
   #  "Help" helpers
   #
@@ -499,10 +503,10 @@
     # if msg is multiline, then surround with dashes to set it apart
     if string.find("%s" % msg, "\n") + 1:
       print '-' * 60
-    print _("Error: %s") % msg
+    print o(u_("Error: %s") % msg)
     if string.find("%s" % msg, "\n") + 1:
       print '-' * 60
-    print _("\nFor help, type:\n   %s --help\n") % (self.COMMAND)
+    print o(u_("\nFor help, type:\n   %s --help\n") % self.COMMAND)
     sys.exit()
 
 

Modified: trunk/gnue-common/src/apps/GConfig.py
===================================================================
--- trunk/gnue-common/src/apps/GConfig.py       2004-08-10 19:09:01 UTC (rev 
6186)
+++ trunk/gnue-common/src/apps/GConfig.py       2004-08-12 13:04:23 UTC (rev 
6187)
@@ -109,7 +109,9 @@
       except MissingSectionHeaderError:
         raise InvalidFormatError, _('The file has no source definitions.')
       except:
-        print _('The file cannot be parsed. %s :: %s') % (sys.exc_type, 
sys.exc_value)
+        print u_("The file cannot be parsed. %(exType)s :: %(exValue)s") \
+            % {'exType': sys.exc_type,
+               'exValue': sys.exc_value}
         raise InvalidFormatError, _('The file cannot be parsed.')
 
       #
@@ -205,7 +207,9 @@
     except KeyError:
       return val
     except ValueError:
-      raise ValueError, _("Config option %s is of wrong type in [%s]") % 
(field, section)
+      raise ValueError, u_("Config option %(field)s is of wrong type in "
+                           "[%(section)s]") \
+                        % {'field': field, 'section': section}
 
 
 class GConfigAlias:

Modified: trunk/gnue-common/src/apps/GServerApp.py
===================================================================
--- trunk/gnue-common/src/apps/GServerApp.py    2004-08-10 19:09:01 UTC (rev 
6186)
+++ trunk/gnue-common/src/apps/GServerApp.py    2004-08-12 13:04:23 UTC (rev 
6187)
@@ -55,9 +55,9 @@
 
     self.COMMAND_OPTIONS.append (
       [ 'foreground','Z','no-detach',0,0, None,
-        _('Do not send the server into the background. For a POSIX system, ')+
-        _('this option keeps the server process from forking and detaching ')+
-        _('from its controlling terminal.')],
+        _("Do not send the server into the background. For a POSIX system, "
+          "this option keeps the server process from forking and detaching "
+          "from its controlling terminal.")],
     )
     GBaseApp.__init__(self, connections, application, defaults)
 

Modified: trunk/gnue-common/src/apps/RuntimeSettings.py
===================================================================
--- trunk/gnue-common/src/apps/RuntimeSettings.py       2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/apps/RuntimeSettings.py       2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -98,12 +98,13 @@
 
         config.write(fh)
       except:
-        print _("\nWarning: Unable to save session data to %s\n") % location
+        print o(u_("\nWarning: Unable to save session data to %s\n") %
+                   location)
         if _DEBUG_LEVEL:
           raise
       fh.close()
     except:
-      print _("\nWarning: Unable to save session data to %s\n") % location
+      print o(u_("\nWarning: Unable to save session data to %s\n") % location)
       if _DEBUG_LEVEL:
         raise
 

Modified: trunk/gnue-common/src/datasources/GConditions.py
===================================================================
--- trunk/gnue-common/src/datasources/GConditions.py    2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/datasources/GConditions.py    2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -1261,14 +1261,19 @@
       #  check for integrity of condition
       #
       if len(conditionTree._children) < conditionElements[otype][0]:
-        tmsg = u_("Condition element \"%s\" expects at least %s arguments; "
-                  "found %s") % \
-             (otype, conditionElements[otype][0], len(conditionTree._children))
+        tmsg = u_('Condition element "%(element)s" expects at most '
+                  '%(expected)s arguments; found %(found)s') \
+               % {'element' : otype,
+                  'expected': conditionElements[otype][0],
+                  'found'   : len (conditionTree._children)}
         raise ConditionError, tmsg
 
       if len(conditionTree._children) > conditionElements[otype][1]:
-        tmsg = u_('Condition element "%s" expects at most %s arguments; found 
%s') % \
-                (otype, conditionElements[otype][1], 
len(conditionTree._children))
+        tmsg = u_('Condition element "%(element)s" expects at most '
+                  '%(expected)s arguments; found %(found)s') \
+               % {'element' : otype,
+                  'expected': conditionElements[otype][1],
+                  'found'   : len (conditionTree._children)}
         raise ConditionError, tmsg
 
 

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2004-08-12 13:04:23 UTC (rev 6187)
@@ -263,13 +263,21 @@
            otype in ('eq','ne') and \
            result[1] == 'NULL':
            otype = "__is%s" % otype
-        if len(result) < self.conditionElements[otype][0]:
-          tmsg = u_('Condition element "%s" expects at least %s arguments; 
found %s') % \
-                (otype, self.conditionElements[otype][0], len(result))
+
+        if len(result) < self.conditionElements [otype][0]:
+          tmsg = u_('Condition element "%(element)s" expects at least '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][0],
+                    'found'   : len (result)}
           raise GConditions.ConditionError, tmsg
-        if len(result) > self.conditionElements[otype][1]:
-          tmsg = u_('Condition element "%s" expects at most %s arguments; 
found %s') % \
-                (otype, self.conditionElements[otype][0], len(result))
+
+        if len(result) > self.conditionElements [otype][1]:
+          tmsg = u_('Condition element "%(element)s" expects at most '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][1],
+                    'found'   : len (result)}
           raise GConditions.ConditionError, tmsg
 
         if self.conditionElements[otype][3] == None:

Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/RecordSet.py  
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/RecordSet.py  
2004-08-12 13:04:23 UTC (rev 6187)
@@ -100,7 +100,7 @@
   def callFunc (self, methodname, parameters):
 
     if self.isEmpty ():
-      raise gException, u_("Function call for empty record")
+      raise gException, _("Function call for empty record")
 
     # Before calling the function, post all pending changes to the server
     self.post ()

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py 
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py 
2004-08-12 13:04:23 UTC (rev 6187)
@@ -96,8 +96,8 @@
       ib_encoding = ''
 
     if ib_encoding:
-      GDebug.printMesg (1, u_("Setting interbase client_encoding to %s (%s)") \
-                           % (ib_encoding, self._encoding))
+      gDebug (1, u_("Setting interbase client_encoding to %(new)s (%(old)s)") \
+                 % {'new': ib_encoding, 'old': self._encoding})
 
     try:
       self.native = SIG2api.connect ( \

Modified: trunk/gnue-common/src/datasources/drivers/ldap/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/ldap/Driver.py    2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/ldap/Driver.py    2004-08-12 
13:04:23 UTC (rev 6187)
@@ -548,13 +548,19 @@
           # check for too less parameters 
           if len(conditionTree._children) < self.conditionElements[otype][0]:
             raise GConditions.ConditionError, \
-                  _('Condition element "%s" expects at least %s arguments; 
found %s') % \
-                  (otype, self.conditionElements[otype][0], 
len(conditionTree._children))
+                  u_('Condition element "%(element)s" expects at least '
+                     '%(expected)s arguments; found %(found)s') \
+                  % {'element' : otype,
+                     'expected': self.conditionElements[otype][0],
+                     'found'   : len (conditionTree._children)}
           # check for too much parameters 
           if len(conditionTree._children) > self.conditionElements[otype][1]:
             raise GConditions.ConditionError, \
-                  _('Condition element "%s" expects at most %s arguments; 
found %s') % \
-                  (otype, self.conditionElements[otype][1], 
len(conditionTree._children))
+                  u_('Condition element "%(element)s" expects at most '
+                     '%(expected)s arguments; found %(found)s') \
+                  % {'element' : otype,
+                     'expected': self.conditionElements[otype][1],
+                     'found'   : len (conditionTree._children)}
           # check
           if len(conditionTree._children) > self.conditionElements[otype][0]:
             return self.conditionElements[otype][2] % \
@@ -564,7 +570,7 @@
                  tuple(conditionTree._children)
         else:
           raise GConditions.ConditionNotSupported, \
-                _('Condition clause "%s" is not supported by this db driver.') 
% otype
+                u_('Condition clause "%s" is not supported by this db 
driver.') % otype
 
   def computeSearchDN(self, tablename):
     #

Modified: 
trunk/gnue-common/src/datasources/drivers/mysql/Schema/Creation/Creation.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/Schema/Creation/Creation.py 
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/mysql/Schema/Creation/Creation.py 
2004-08-12 13:04:23 UTC (rev 6187)
@@ -58,8 +58,8 @@
         code [1].pop ()
         code [1].append (self._composeField (tableName, fieldDef, forAlter))
         
-        print _("WARNING: changing column type of '%(table)s.%(column)s' "
-                "to 'timestamp'") \
+        print u_("WARNING: changing column type of '%(table)s.%(column)s' "
+                 "to 'timestamp'") \
               % {'table': tableName,
                  'column': fieldDef ['name']}
 

Modified: trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py     
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py     
2004-08-12 13:04:23 UTC (rev 6187)
@@ -33,21 +33,21 @@
 import sys
 import types
 from gnue.common.datasources import GDataObjects, GConditions
-from gnue.common.apps import GDebug
 from gnue.common.datasources.drivers.DBSIG2.Driver \
    import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
           DBSIG_DataObject_SQL, DBSIG_DataObject_Object
 
 try:
   import MySQLdb
+
 except ImportError, mesg:
-  GDebug.printMesg(1,mesg)
-  print "-"*79
-  print _("\nCould not load MySQLdb.  For MySQL support, please install \n") \
-      + _("mysql-python 0.9.0 or later from") \
-      + "http://sourceforge.net/projects/mysql-python\n";
-  print _("Error:  %s") % mesg
-  print "-"*79
+  gDebug (1, mesg)
+  print "-" * 79
+  print o(_("\nCould not load MySQLdb. For MySQL support, please install "
+            "mysql-python 0.9.0 or later from\n"
+            "http://sourceforge.net/projects/mysql-python\n";))
+  print o(u_("Error: %s") % mesg)
+  print "-" * 79
   sys.exit()
 
 
@@ -118,7 +118,7 @@
     self._resultSetClass = MySQL_ResultSet
     
   def connect(self, connectData={}):
-    GDebug.printMesg(1,"Mysql database driver initializing")
+    gDebug (1,"Mysql database driver initializing")
    
     # 1. just allow string type username/password 2. None -> ''
     user   = str(connectData['_username'] or '')
@@ -252,7 +252,7 @@
           if prec != None:
             attrs['precision'] = int(prec)
       except ValueError:
-        GDebug.printMesg(1,'WARNING: mysql native type error: %s' % nativetype)
+        gDebug (1,'WARNING: mysql native type error: %s' % nativetype)
 
       if rs[4] not in ('NULL', '0000-00-00 00:00:00','', None):
         attrs['defaulttype'] = 'constant'

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py  
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/Connection.py  
2004-08-12 13:04:23 UTC (rev 6187)
@@ -409,12 +409,18 @@
         for i in range(0, len(element._children)):
           element._children[i] = self.__conditionToSQL(element._children[i])
         if len(element._children) < self.conditionElements[otype][0]:
-          tmsg = _('Condition element "%s" expects at least %s arguments; 
found %s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+          tmsg = u_('Condition element "%(element)s" expects at least '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][0],
+                    'found'   : len (element._children)}
           raise GConditions.ConditionError, tmsg
         if len(element._children) > self.conditionElements[otype][1]:
-          tmsg = _('Condition element "%s" expects at most %s arguments; found 
%s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+          tmsg = u_('Condition element "%(element)s" expects at most '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][1],
+                    'found'   : len (element._children)}
           raise GConditions.ConditionError, tmsg
         if self.conditionElements[otype][3] == None:
           return self.conditionElements[otype][2] % tuple(element._children)
@@ -422,7 +428,7 @@
           return self.conditionElements[otype][2] % \
             (string.join(element._children, self.conditionElements[otype][3]))
       else:
-        tmsg = _('Condition clause "%s" is not supported by this db driver.') 
% otype
+        tmsg = u_('Condition clause "%s" is not supported by this db driver.') 
% otype
         raise GConditions.ConditionNotSupported, tmsg
 
   # Code necessary to force the connection into transaction mode...

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py  
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/DataObject.py  
2004-08-12 13:04:23 UTC (rev 6187)
@@ -43,7 +43,7 @@
 try:
   import dbi, odbc
 except ImportError, message:
-  tmsg = _("Driver not installed: win32all ODBC driver\n\n[%s") % message
+  tmsg = u_("Driver not installed: win32all ODBC driver\n\n[%s]") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 
@@ -405,21 +405,29 @@
       elif self.conditionElements.has_key(otype):
         for i in range(0, len(element._children)): 
           element._children[i] = self.__conditionToSQL(element._children[i])
-        if len(element._children) < self.conditionElements[otype][0]: 
-          tmsg = _('Condition element "%s" expects at least %s arguments; 
found %s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+        if len(element._children) < self.conditionElements[otype][0]:
+          tmsg = u_('Condition element "%(element)s" expects at least '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][0],
+                    'found'   : len (element._children)}
           raise GConditions.ConditionError, tmsg
-        if len(element._children) > self.conditionElements[otype][1]: 
-          tmsg = _('Condition element "%s" expects at most %s arguments; found 
%s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+
+        if len(element._children) > self.conditionElements[otype][1]:
+          tmsg = u_('Condition element "%(element)s" expects at most '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][1],
+                    'found'   : len (element._children)}
           raise GConditions.ConditionError, tmsg
+
         if self.conditionElements[otype][3] == None: 
           return self.conditionElements[otype][2] % tuple(element._children)
         else: 
           return self.conditionElements[otype][2] % \
             (string.join(element._children, self.conditionElements[otype][3]))
       else: 
-        tmsg = _('Condition clause "%s" is not supported by this db driver.') 
% otype
+        tmsg = u_('Condition clause "%s" is not supported by this db driver.') 
% otype
         raise GConditions.ConditionNotSupported, tmsg
 
   # Code necessary to force the connection into transaction mode... 

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py   
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/RecordSet.py   
2004-08-12 13:04:23 UTC (rev 6187)
@@ -43,7 +43,7 @@
 try:
   import dbi, odbc
 except ImportError, message:
-  tmsg = _("Driver not installed: win32all ODBC driver\n\n[%s") % message
+  tmsg = u_("Driver not installed: win32all ODBC driver\n\n[%s") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 
@@ -406,12 +406,19 @@
         for i in range(0, len(element._children)): 
           element._children[i] = self.__conditionToSQL(element._children[i])
         if len(element._children) < self.conditionElements[otype][0]: 
-          tmsg = _('Condition element "%s" expects at least %s arguments; 
found %s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+          tmsg = u_('Condition element "%(element)s" expects at least '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][0],
+                    'found'   : len(element._children)}
           raise GConditions.ConditionError, tmsg
+
         if len(element._children) > self.conditionElements[otype][1]: 
-          tmsg = _('Condition element "%s" expects at most %s arguments; found 
%s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+          tmsg = u_('Condition element "%(element)s" expects at most '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][1],
+                    'found'   : len (element._children)}
           raise GConditions.ConditionError, tmsg
         if self.conditionElements[otype][3] == None: 
           return self.conditionElements[otype][2] % tuple(element._children)
@@ -419,7 +426,7 @@
           return self.conditionElements[otype][2] % \
             (string.join(element._children, self.conditionElements[otype][3]))
       else: 
-        tmsg = _('Condition clause "%s" is not supported by this db driver.') 
% otype
+        tmsg = u_('Condition clause "%s" is not supported by this db driver.') 
% otype
         raise GConditions.ConditionNotSupported, tmsg
 
   # Code necessary to force the connection into transaction mode... 

Modified: trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py   
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/odbc/wodbc/ResultSet.py   
2004-08-12 13:04:23 UTC (rev 6187)
@@ -43,7 +43,7 @@
 try:
   import dbi, odbc
 except ImportError, message:
-  tmsg = _("Driver not installed: win32all ODBC driver\n\n[%s") % message
+  tmsg = u_("Driver not installed: win32all ODBC driver\n\n[%s") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 
@@ -405,13 +405,19 @@
       elif self.conditionElements.has_key(otype):
         for i in range(0, len(element._children)): 
           element._children[i] = self.__conditionToSQL(element._children[i])
-        if len(element._children) < self.conditionElements[otype][0]: 
-          tmsg = _('Condition element "%s" expects at least %s arguments; 
found %s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+        if len(element._children) < self.conditionElements[otype][0]:
+          tmsg = u_('Condition element "%(element)s" expects at least '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements[otype][0],
+                    'found'   : len (element._children)}
           raise GConditions.ConditionError, tmsg
-        if len(element._children) > self.conditionElements[otype][1]: 
-          tmsg = _('Condition element "%s" expects at most %s arguments; found 
%s') % \
-                (otype, self.conditionElements[otype][0], 
len(element._children))
+        if len(element._children) > self.conditionElements[otype][1]:
+          tmsg = u_('Condition element "%(element)s" expects at most '
+                    '%(expected)s arguments; found %(found)s') \
+                 % {'element' : otype,
+                    'expected': self.conditionElements [otype][1],
+                    'found'   : len (element._children)}
           raise GConditions.ConditionError, tmsg
         if self.conditionElements[otype][3] == None: 
           return self.conditionElements[otype][2] % tuple(element._children)
@@ -419,7 +425,7 @@
           return self.conditionElements[otype][2] % \
             (string.join(element._children, self.conditionElements[otype][3]))
       else: 
-        tmsg = _('Condition clause "%s" is not supported by this db driver.') 
% otype
+        tmsg = u_('Condition clause "%s" is not supported by this db driver.') 
% otype
         raise GConditions.ConditionNotSupported, tmsg
 
   # Code necessary to force the connection into transaction mode... 

Modified: 
trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py     
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py     
2004-08-12 13:04:23 UTC (rev 6187)
@@ -90,13 +90,15 @@
               connectData['_password'],
               port)))
       GDebug.printMesg(1,"Exception %s " % value)
-      raise Exceptions.LoginError, _("The PostgreSQL driver returned the 
following error:\n\t%s") % value
+      raise Exceptions.LoginError, \
+          u_("The PostgreSQL driver returned the following error:\n\t%s") \
+          % value
 
     try:
       self._pg_encoding = pg_encTable[self._encoding]
     except KeyError:
-      GDebug.printMesg(1,_("Encoding '%s' is not supported by postgresql 
dbdriver.") % \
-                       self._encoding + _('Using default encoding.'))
+      gDebug (1, u_("Encoding '%s' is not supported by postgresql dbdriver. "
+                    "Using default encoding.") % self._encoding)
       self._pg_encoding = ''
 
     if self._pg_encoding not in ("",'DEFAULT'):

Modified: trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py 
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py 
2004-08-12 13:04:23 UTC (rev 6187)
@@ -66,7 +66,7 @@
 try:
   import sapdbapi as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: sapdbapi for SAP-DB 7.x \n[%s]") % message
+  tmsg = u_("Driver not installed: sapdbapi for SAP-DB 7.x \n[%s]") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 class SAP_RecordSet(DBSIG2.RecordSet):

Modified: trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py  
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/RecordSet.py  
2004-08-12 13:04:23 UTC (rev 6187)
@@ -67,7 +67,7 @@
 try:
   import sapdbapi as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: sapdbapi for SAP-DB 7.x \n[%s]") % message
+  tmsg = u_("Driver not installed: sapdbapi for SAP-DB 7.x \n[%s]") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 class SAP_RecordSet(DBSIG2.RecordSet):

Modified: 
trunk/gnue-common/src/datasources/drivers/special/configfile/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/special/configfile/Connection.py  
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/special/configfile/Connection.py  
2004-08-12 13:04:23 UTC (rev 6187)
@@ -94,7 +94,7 @@
       file.close()
 
     except:
-      tmsg = _("Error opening config file %s") % self._filename
+      tmsg = u_("Error opening config file %s") % self._filename
       raise GDataObjects.ConnectionError, tmsg
 
   # no authentification required

Modified: 
trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py   
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/DataObject.py   
2004-08-12 13:04:23 UTC (rev 6187)
@@ -49,7 +49,7 @@
 try:
   from SQLRelay import PySQLRDB as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: SQLRelay Python API\n[%s]") % message
+  tmsg = u_("Driver not installed: SQLRelay Python API\n[%s]") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 

Modified: 
trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py    
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/RecordSet.py    
2004-08-12 13:04:23 UTC (rev 6187)
@@ -49,7 +49,7 @@
 try:
   from SQLRelay import PySQLRDB as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: SQLRelay Python API\n[%s]") % message
+  tmsg = u_("Driver not installed: SQLRelay Python API\n[%s]") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 

Modified: 
trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py    
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sqlrelay/sqlrelay/ResultSet.py    
2004-08-12 13:04:23 UTC (rev 6187)
@@ -49,7 +49,7 @@
 try:
   from SQLRelay import PySQLRDB as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: SQLRelay Python API\n[%s]") % message
+  tmsg = u_("Driver not installed: SQLRelay Python API\n[%s]") % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 

Modified: trunk/gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py       
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sybase/sybase/DataObject.py       
2004-08-12 13:04:23 UTC (rev 6187)
@@ -49,7 +49,8 @@
 try:
   import Sybase as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: Sybase.py for Sybase ASE 11.0/11.9 [%s]") % 
message
+  tmsg = u_("Driver not installed: Sybase.py for Sybase ASE 11.0/11.9 [%s]") \
+         % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 

Modified: trunk/gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py        
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sybase/sybase/RecordSet.py        
2004-08-12 13:04:23 UTC (rev 6187)
@@ -49,7 +49,8 @@
 try:
   import Sybase as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: Sybase.py for Sybase ASE 11.0/11.9 [%s]") % 
message
+  tmsg = u_("Driver not installed: Sybase.py for Sybase ASE 11.0/11.9 [%s]") \
+            % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 

Modified: trunk/gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py        
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/datasources/drivers/sybase/sybase/ResultSet.py        
2004-08-12 13:04:23 UTC (rev 6187)
@@ -49,7 +49,8 @@
 try:
   import Sybase as SIG2api
 except ImportError, message:
-  tmsg = _("Driver not installed: Sybase.py for Sybase ASE 11.0/11.9 [%s]") % 
message
+  tmsg = u_("Driver not installed: Sybase.py for Sybase ASE 11.0/11.9 [%s]") \
+         % message
   raise GConnections.AdapterNotInstalled, tmsg
 
 

Modified: trunk/gnue-common/src/definitions/GParser.py
===================================================================
--- trunk/gnue-common/src/definitions/GParser.py        2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/definitions/GParser.py        2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -110,11 +110,14 @@
   object = dh.getRoot()
 
   if not object:
-    tmsg = _("Error loading %s: empty definition file") % (xmlFileType)
+    tmsg = u_("Error loading %s: empty definition file") % (xmlFileType)
     raise MarkupError, tmsg
   elif object._type != rootType:
-    tmsg = _("Error loading %s: not a valid %s definition (expected: %s, got: 
%s)") % \
-        (xmlFileType, xmlFileType, rootType, object._type) 
+    tmsg = u_("Error loading %(filetype)s: not a valid %(filetype)s definition 
"
+              "(expected: %(expected)s, got: %(got)s)") \
+           % {'filetype': xmlFileType,
+              'expected': rootType,
+              'got'     : object._type}
     raise MarkupError, tmsg
 
   dh.finalValidation()
@@ -227,7 +230,7 @@
 
     for element in self._requiredTags:
       if self._tagCounts[element] < 1:
-        tmsg = _("File is missing required tag <%s>") % (element)
+        tmsg = u_("File is missing required tag <%s>") % (element)
         raise MarkupError, tmsg
 
 
@@ -249,10 +252,10 @@
 
       try:
         baseAttrs = self.xmlElements[name].get('Attributes',{})
+
       except KeyError:
-        tmsg = _("Error processing <%s> tag [I do not know what a <%s> tag 
does]") \
-                % (name, name)
-        raise MarkupError, tmsg
+        raise MarkupError, u_("Error processing <%(tag)s> tag [I do not know "
+                              "what a <%(tag)s> tag does]") % {'tag': name}
 
       xmlns = {}
 
@@ -270,13 +273,14 @@
         else:
 
           # Typecasting, anyone?  If attribute should be int, make it an int
-          try:            
-            attrs[attr] = 
baseAttrs[attr].get('Typecast',GTypecast.text)(saxattrs[qattr])
+          try:
+            attrs [attr] = baseAttrs [attr].get ('Typecast', 
GTypecast.text)(saxattrs[qattr])
             loadedxmlattrs[attr] = attrs[attr]
           except KeyError:
-            tmsg = _('Error processing <%s> tag [I do not recognize the "%s" 
attribute')\
-                % (name, attr)
-            raise MarkupError, tmsg
+            raise MarkupError, u_('Error processing <%(tag)s> tag [I do not '
+                                  'recognize the "%(attribute)s" attribute') \
+                               % {'tag': name,
+                                  'attribute': attr}
 
           # this error shouldn't occure anymore
           #except UnicodeError:
@@ -293,8 +297,12 @@
           # If this attribute must be unique, check for duplicates
           if baseAttrs[attr].get('Unique',0): # default 
(baseAttrs[attr],'Unique',0):
             if self.uniqueIDs.has_key('%s' % (saxattrs[qattr])):
-              tmsg = _('Error processing <%s> tag ["%s" attribute should be 
unique; duplicate value is "%s"]')\
-                % (name, attr, saxattrs[qattr]) 
+              tmsg = u_('Error processing <%(tag)s> tag ["%(attribute)s" '
+                        'attribute should be unique; duplicate value is '
+                        '"%(duplicate)s"]') \
+                     % {'tag'      : name,
+                        'attribute': attr,
+                        'duplicate': saxattrs [qattr]}
               raise MarkupError, tmsg
 
       for attr in baseAttrs.keys():
@@ -306,8 +314,10 @@
 
           # Check for missing required attributes
           elif baseAttrs[attr].get('Required', 0): #default(baseAttrs[attr], 
'Required', 0):
-            tmsg = _('Error processing <%s> tag [required attribute "%s" not 
present]')\
-                % (name, attr)
+            tmsg = u_('Error processing <%(tag)s> tag [required attribute '
+                      '"%(attribute)s" not present]') \
+                   % {'tag'      : name,
+                      'attribute': attr}
             raise MarkupError, tmsg
 
       attrs['_xmlnamespaces'] = xmlns
@@ -340,10 +350,12 @@
       try:
         object = self.xmlMasqueradeNamespaceElements(self.xmlStack[0])
       except IndexError:
-        tmsg = _("Error processing <%s:%s> tag: root element needs to be in 
default namespace") %\
-               (ns,name)
+        tmsg = u_("Error processing <%(namespace)s:%(name)s> tag: root "
+                  "element needs to be in default namespace") \
+               % {'namespace': ns,
+                  'name'     : name}
         raise MarkupError, tmsg
-           
+
       object._xmltag = name
       object._xmlnamespace = ns
       object._listedAttributes = loadedxmlattrs.keys()
@@ -352,7 +364,8 @@
       #
       # namespace qualifier and we are not masquerading
       #
-      print _("WARNING: Markup includes namespaces, but the current tool does 
not include namespace support!")
+      print _("WARNING: Markup includes namespaces, but the current tool does "
+              "not include namespace support!")
       sys.exit()
 
 
@@ -450,9 +463,10 @@
            GDebug.printMesg (5, ">>> Moving %s" % key)
        rv._buildObject()
      else:
-         tmsg =  _("Unable to find an importable object named %s in %s") \
-            % (self.name, self.library)
-         raise MarkupError, tmsg
+         raise MarkupError, u_("Unable to find an importable object named "
+                               "%(name)s in %(library)s") \
+                            % {'name'   : self.name,
+                               'library': self.library}
 
   #
   # __findImportItem

Modified: trunk/gnue-common/src/formatting/BaseMask.py
===================================================================
--- trunk/gnue-common/src/formatting/BaseMask.py        2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/formatting/BaseMask.py        2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -138,9 +138,11 @@
             mask = gConfig('%smask_%s' % (self.basetype, edstr, mask[1:]))
           except KeyError:
             pass
-      if not len(mask): 
-        tmsg =  _('The requested format mask "%s" is not defined for %s 
fields') \
-                    % (mask[1:], self.basetype)  
+      if not len(mask):
+        tmsg =  u_('The requested format mask "%(mask)s" is not defined for '
+                   '%(type)s fields') \
+                % {'mask': mask [1:],
+                   'type': self.basetype}
         raise PredefinedMaskNotFound, tmsg
 
     # Process each character in mask at a time
@@ -154,8 +156,9 @@
       elif self.maskMappings.has_key(ch):
         maskHandler.append(self.maskMappings[ch])
       else:
-        tmsg = _('Unexpected character "%s" in %s mask.') \
-            % (ch, self.basetype)  
+        tmsg = u_('Unexpected character "%(char)s" in %(type)s mask.') \
+               % {'char': ch,
+                  'type': self.basetype}
         raise InvalidCharInMask, tmsg
 
     return maskHandler
@@ -183,7 +186,7 @@
     for size in self.inputDisplayLen:
       shift -= size
 
-    print _("Starting cursor: %s; shift: %s") % (cursor, shift)
+    print "Starting cursor: %s; shift: %s" % (cursor, shift)
 
 
     value = self.processEdit(value, text, pos, replaces)
@@ -195,7 +198,7 @@
     self.cursor = cursor + shift
     self.moveCursorRelative(0)
 
-    print _("Ending cursor: %s; shift: %s") % (self.cursor, shift)
+    print "Ending cursor: %s; shift: %s" % (self.cursor, shift)
 
     return (value, formatted, self.cursor)
 
@@ -255,17 +258,17 @@
   #
   def moveCursorRelative(self, relative):
 
-    print _("*** moveCursorRelative(%s)")%relative
+    print "*** moveCursorRelative(%s)" % relative
 
     # Direction = -1 (left) or 1 (right).
     direction = relative == 0 or int(relative/abs(relative))
 
-    print _("relative=%s") % relative
-    print _("direction=%s") % direction
+    print "relative=%s" % relative
+    print "direction=%s" % direction
 
     self.cursor = self.cursor + relative
 
-    print _("cursor #1: %s") % self.cursor
+    print "cursor #1: %s" % self.cursor
 
     if self.cursor <= 0:
       self.cursor = 0
@@ -274,7 +277,7 @@
       self.cursor = len(self.display)
       self.direction = -1
 
-    print _("cursor #2: %s") % self.cursor
+    print "cursor #2: %s" % self.cursor
 
     pos = 0
     section = 0
@@ -286,30 +289,30 @@
       section += 1
 
 
-    print _("pos=%s") % pos
-    print _("section=%s") % pos
+    print "pos=%s" % pos
+    print "section=%s" % pos
 
     if pos + self.inputFormattedLen[section] == self.cursor:
-      print _("cursor #2b: %s") % self.cursor
+      print "cursor #2b: %s" % self.cursor
       section += direction
 
-    print _("section=%s") % section
+    print "section=%s" % section
 
     if section == self.inputCount:
 #      self.cursor = pos + self.inputDisplayLen[-1]
-      print _("cursor #3: %s") % self.cursor
+      print "cursor #3: %s" % self.cursor
       section -= 1
 
 
 
-    print _("section=%s") % section
+    print "section=%s" % section
     if isinstance(self.inputHandlers[section], Literal):
       self.moveCursorRelative(direction)
-      print _("cursor #4: %s") % self.cursor
+      print "cursor #4: %s" % self.cursor
 
     self.index = self.cursorToIndex(self.cursor)
 
-    print _("New cursor position: %s") % self.cursor
+    print "New cursor position: %s" % self.cursor
 
     return self.cursor
 
@@ -356,7 +359,7 @@
 
     GDebug.printMesg(15,"inputMaskPos=%s" % self.inputMaskPos)
 
-    print _("pos=%s")%pos
+    print "pos=%s"%pos
 
     section = 0
     while section < self.inputCount and \
@@ -397,7 +400,7 @@
 
     self.index = pos + len(value)
     self.cursor = self.indexToCursor(self.index)
-    print _("after processEdit, index=%s;cursor=%s") % (self.index, 
self.cursor)
+    print "after processEdit, index=%s;cursor=%s" % (self.index, self.cursor)
 
     GDebug.printMesg(15,"<< %s" % nv)
     return nv

Modified: trunk/gnue-common/src/formatting/DateMask.py
===================================================================
--- trunk/gnue-common/src/formatting/DateMask.py        2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/formatting/DateMask.py        2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -136,8 +136,8 @@
     self.lastInputPos = 0
     lastElement = self.inputCount - 1
 
-    print _("inputMaskPos=%s") % self.inputMaskLen
-    print _("inputMaskLen=%s") % self.inputMaskLen
+    print o(u_("inputMaskPos=%s") % self.inputMaskLen)
+    print o(u_("inputMaskLen=%s") % self.inputMaskLen)
 
 
     for i in range(self.inputCount):

Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py     2004-08-10 19:09:01 UTC (rev 
6186)
+++ trunk/gnue-common/src/logic/GTrigger.py     2004-08-12 13:04:23 UTC (rev 
6187)
@@ -273,7 +273,7 @@
         self._trigger[key] = []
       self._trigger[key].append(function)
     else:
-      GDebug.printMesg(0, "%s %s" % (_("Invalid trigger "),key))
+      gDebug (0, "%s %s" % (_("Invalid trigger "), key))
 
   def processTrigger(self, key, ignoreAbort=True):
     """
@@ -305,7 +305,7 @@
       else:
         GDebug.printMesg(10, "No triggers to fire")
     else:
-      GDebug.printMesg(0, "%s: %s %s" % (self._type,_("Invalid trigger "),key))
+      gDebug (0, "%s: %s %s" % (self._type, _("Invalid trigger "), key))
       #print self._type,": ",_("Invalid trigger "),key
 
 def getXMLelements(updates={}):

Modified: trunk/gnue-common/src/rpc/RpcDoc.py
===================================================================
--- trunk/gnue-common/src/rpc/RpcDoc.py 2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/RpcDoc.py 2004-08-12 13:04:23 UTC (rev 6187)
@@ -35,9 +35,6 @@
 import sys, string
 from gnue.common.utils.FileUtils import dyn_import
 
-import __builtin__
-__builtin__.__dict__['_']=lambda string:string
-
 def run (interface, command, *arguments):
   try:
     commdriver = dyn_import("gnue.common.rpc.drivers.%s.RpcDoc" % (interface))
@@ -45,8 +42,8 @@
   except ImportError, err:
     print _("GNUe RPC Documentation Generator")
     print ""
-    print _("Error: the module %s does not exist or cannot be loaded") % \
-          (interface)
+    print o(u_("Error: the module %s does not exist or cannot be loaded") % \
+          (interface))
     print ""
 
   return ""

Modified: trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py       
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/_helpers/DirectoryServer.py       
2004-08-12 13:04:23 UTC (rev 6187)
@@ -120,8 +120,8 @@
         # they are bound dynamicly
         if object._type != 'RpObject':
           
-          print _("Missing Binding information. Please add binding "),\
-                _("information for %s ") % object.binding      
+          print o(u_("Missing Binding information. Please add binding "
+                     "information for %s") % object.binding)
 
         
     # care for bindings in all Services
@@ -135,16 +135,20 @@
                                          object.name)
 
             GDebug.printMesg(8,'* %s is bound to \n * %s' % \
-                             (object._path,object._realbinding))         
+                             (object._path,object._realbinding))
           except:
-            tmsg = _("GNURPC can't bind service '%s' to service '%s'") %\
-                  (object.name,parent.name)  
+            tmsg = u_("GNURPC cannot bind service '%(name)s' to service "
+                      "'%(destination)s'") \
+                   % {'name'       : object.name,
+                      'destination': parent.name}
             raise AttributeError, tmsg
         elif parent._type == 'RpGnuRpc':
           pass
         else:
-          tmsg = _("GNURPC: cannot bind service '%s' to %s") %\
-                (object.name,parent._type) 
+          tmsg = u_("GNURPC cannot bind service '%(name)s' to service "
+                    "'%(destination)s'") \
+                 % {'name'       : object.name,
+                    'destination': parent._type}
           raise AttributeError, tmsg
           
 
@@ -166,8 +170,10 @@
             GDebug.printMesg(8,'* %s is bound to \n * %s' % \
                              (object._path,bindto))
           except:
-            tmsg = _("GNURPC can't bind method/attribut '%s' to service '%s'") 
%\
-                      (object.name,parent.name)  
+            tmsg = u_("GNURPC cannot bind method/attribut '%(name)s' to "
+                      "service '%(service)s'") \
+                   % {'name'   : object.name,
+                      'service': parent.name}
             raise AttributeError, tmsg
             pass
         else:
@@ -265,7 +271,7 @@
   #
   def call(self, method, params):
     if self._loglevel>0:
-      print _("Dispatching: "), method, params 
+      print _("Dispatching: "), method, params
 
     for i in self._dispatchers:
       (result,rtype,method,params) = i(method,params)
@@ -300,13 +306,12 @@
       signature=direntry['signature']
 
       if (server_method==None) and (server_attribute==None):
-        tmsg = _("Server XML-RPC method '%s' is not ") % method +\
-               _("bound to real method") 
+        tmsg = u_("Server XML-RPC method '%s' is not bound to real method") \
+               % method
         raise AttributeError, tmsg
       
     except KeyError:
-      tmsg = _("Server does not have XML-RPC ") +\
-             _("procedure %s") % method 
+      tmsg = u_("Server does not have XML-RPC procedure %s") % method
       raise AttributeError, tmsg
     
     self.checkParamsAgainstSignature(signature,params)
@@ -347,9 +352,8 @@
       # getAttribut method
       return server_attribute
     else:
-      tmsg = _("Internal Server XML-RPC error: method type") +\
-             _("(get/set attribute) couldn't be detected (method %s)") \
-             % method  
+      tmsg = u_("Internal Server XML-RPC error: method type (get/set "
+                "attribute) couldn't be detected (method %s)") % method
       raise AttributeError, tmsg
 
 
@@ -362,8 +366,10 @@
       # TODO:  Compare submitted attributs with signature
       pass
     except KeyError:
-        tmsg = _("Server XML-RPC ") +\
-               _("procedure %s accepts just %s as attributs") % (method,attr) 
+        tmsg = u_("Server XML-RPC procedure %(method)s accepts just %(attr)s "
+                  "as attributs") \
+               % {'method': method,
+                  'attr'  : attr}
         raise AttributeError, tmsg
     
 
@@ -380,7 +386,7 @@
       try:
         return self.directory[method]['help']
       except KeyError:
-        return _("No help available for %s") % method
+        return u_("No help available for %s") % method
     else:
       # TODO: Is this right? If the requested method is not available?
       self.raiseException(_('InvalidMethodName'),

Modified: trunk/gnue-common/src/rpc/drivers/_helpers/ObjectEnabler.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/_helpers/ObjectEnabler.py 2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/_helpers/ObjectEnabler.py 2004-08-12 
13:04:23 UTC (rev 6187)
@@ -70,8 +70,7 @@
       objhandle=method[1:i]
       method=method[i+2:]
     except ValueError:
-      tmsg = _("Wrong format of object handler ")+\
-             _("in method call %s") % method 
+      tmsg = u_("Wrong format of object handler in method call %s") % method
       raise AttributeError, tmsg
     
     # TODO check in service dir, if obj is supported or not
@@ -87,12 +86,11 @@
           server_attribute=getattr(o,method[4:])
         except AttributeError:
           
-          msg=_("Internal XMLRPC server error: method %s can be ")% \
-               method +\
-               _("found in the directory (build out of a .grpc file),")+\
-               _(" but the object doesn't contain this method/attribut.")+\
-               _(" Please check you .grpc file for wrong return types.")
-          
+          msg= u_("Internal XMLRPC server error: method %s can be "
+                  "found in the directory (build out of a .grpc file), "
+                  "but the object doesn't contain this method/attribut. "
+                  "Please check you .grpc file for wrong return types.") \
+               % method
           raise AttributeError, msg
 
  
@@ -126,7 +124,7 @@
   #
   def call(self, method, params):
     if self._loglevel>0:
-      print _("Dispatching: "), method, params 
+      print _("Dispatching: "), method, params
     
 
     ## Check if the Method is part of a service or a pointer to a
@@ -217,7 +215,7 @@
         del args['obj_handle']
 
       except KeyError:
-        tmsg = _('Object handle not returned') 
+        tmsg = _('Object handle not returned')
         raise StandardError, tmsg   # TODO
 
     try:
@@ -226,6 +224,6 @@
     except KeyError:
 
       # Attempt to use an invalid objecthandle
-      tmsg = _('Invalid object handle') 
+      tmsg = _('Invalid object handle')
       raise StandardError, tmsg # TODO
 

Modified: trunk/gnue-common/src/rpc/drivers/_helpers/RpcDoc.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/_helpers/RpcDoc.py        2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/_helpers/RpcDoc.py        2004-08-12 
13:04:23 UTC (rev 6187)
@@ -35,10 +35,6 @@
 import sys, string
 from gnue.common.utils.FileUtils import dyn_import
 
-# HACK: fix I18n by defining _()
-import __builtin__
-__builtin__.__dict__['_'] = lambda string:string
-
 def run (interface, command, *arguments):
   try:
     commdriver = dyn_import("gnue.common.rpc.drivers.%s.RpcDoc" % (interface))
@@ -46,8 +42,8 @@
   except ImportError, err:
     print _("GNUe RPC Documentation Generator")
     print ""
-    print _("Error: the module %s does not exist or cannot be loaded") % \
-          (interface)
+    print o(u_("Error: the module %s does not exist or cannot be loaded") \
+            % interface)
     print ""
 
   return ""

Modified: trunk/gnue-common/src/rpc/drivers/proxy/CommDriver.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/proxy/CommDriver.py       2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/proxy/CommDriver.py       2004-08-12 
13:04:23 UTC (rev 6187)
@@ -57,7 +57,7 @@
     try:
       self._serverproxy = params['_proxy']
     except KeyError:
-      tmsg = _('Proxy client adapter should be called with the server object') 
+      tmsg = _('Proxy client adapter should be called with the server object')
       raise GComm.AdapterInitializationError, tmsg
 
   def request(self, service, params={}):

Modified: trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py     2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/pyro/ClientAdapter.py     2004-08-12 
13:04:23 UTC (rev 6187)
@@ -48,10 +48,10 @@
   import Pyro.naming, Pyro.core, Pyro.protocol
   
 except ImportError:
-  tmsg = _("\nUnable to load pyro.  To use the Pyro interface, \n") \
-         + _("please install xmlrpc from:\n") \
-         + "    http://sourceforge.net/projects/pyro " \
-         + _("the appropriate DEBIAN package is python-pyro.deb")
+  tmsg = _("\nUnable to load pyro. To use the Pyro interface, \n"
+           "please install xmlrpc from:\n"
+           "    http://sourceforge.net/projects/pyro "
+           "the appropriate DEBIAN package is python-pyro.deb")
   raise GComm.AdapterInitializationError, tmsg
 
 
@@ -96,9 +96,9 @@
           transport = 'http'
 
         if (transport!='http'):
-           tmsg = _("py-xmlrpc just support http as a transport. ") +\
-                  _("If you need https please have a look at the ") +\
-                  _("'pw_xmlrpc' adapter.")
+           tmsg = _("py-xmlrpc just support http as a transport. "
+                    "If you need https please have a look at the "
+                    "'pw_xmlrpc' adapter.")
            raise GComm.AdapterConfigurationError,  tmsg
         #
         #   path parameter
@@ -152,11 +152,11 @@
       print 'Naming Service found 
at',self.ns.URI.address,'('+(Pyro.protocol.getHostname(self.ns.URI.address) \
                                                                or '??')+') 
port',self.ns.URI.port
     except KeyError:
-      tmsg = _("To use XML-RPC, you must either specify a 'url' or\n") +\
-             _("a 'host' and 'port' setting.")
+      tmsg = _("To use XML-RPC, you must either specify a 'url' or\n"
+               "a 'host' and 'port' setting.")
       raise GComm.AdapterConfigurationError,  tmsg
     except:
-      tmsg = _("Unable to initialize the XML-RPC interface at %s") % url
+      tmsg = u_("Unable to initialize the XML-RPC interface at %s") % url
       raise GComm.AdapterInitializationError, tmsg
 
 
@@ -184,9 +184,10 @@
     # doesn't work correct, so is being disabled
     if exc[1]==(111, 'Connection refused'):
       # cannot raise a new error, so I try to change it
-      exc=(GComm.AdapterInitializationError,
-           _("Unable to initialize the XML-RPC interface at %s: ")\
-           % src.getDesc() +  _("Connection refused"), None )
+      exc = (GComm.AdapterInitializationError,
+             u_("Unable to initialize the XML-RPC interface at %s: "
+                "Connection refused") % src.getDesc(), None)
+
     print "Connection to ",src.getDesc()," failed."
     print exc
     # sys.exit(0)

Modified: trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py     2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py     2004-08-12 
13:04:23 UTC (rev 6187)
@@ -47,9 +47,8 @@
   from Pyro.errors import PyroError,NamingError
 
 except ImportError:
-  tmsg = _("\nUnable to load Pyro.  To use the Pyro interface, \n") \
-      + _("please install pyro from:\n") \
-      + "    http://pyro.sf.net/";
+  tmsg = _("\nUnable to load Pyro.  To use the Pyro interface, \n"
+           "please install pyro from:\n    http://pyro.sf.net/";)
   raise GComm.AdapterInitializationError, tmsg
 
 
@@ -188,8 +187,8 @@
         # they are bound dynamicly
         if object._type != 'RpObject':
           
-          print _("Missing Binding information. Please add binding "),\
-                _("information for %s ") % object.binding      
+          print u_("Missing Binding information. Please add binding "
+                   "information for %s") % object.binding
 
         
     # care for bindings in all Services
@@ -203,16 +202,20 @@
                                          object.name)
 
             GDebug.printMesg(8,'* %s is bound to \n * %s' % \
-                             (object._path,object._realbinding))         
+                             (object._path,object._realbinding))
           except:
-            tmsg = _("GNURPC can't bind service '%s' to service '%s'") %\
-                  (object.name,parent.name)  
+            tmsg = u_("GNURPC cannot bind service '%(name)s' to service "
+                      "'%(destination)s'") \
+                   % {'name'       : object.name,
+                      'destination': parent.name}
             raise AttributeError, tmsg
         elif parent._type == 'RpGnuRpc':
           pass
         else:
-          tmsg = _("GNURPC: cannot bind service '%s' to %s") %\
-                (object.name,parent._type) 
+          tmsg = u_("GNURPC cannot bind service '%(name)s' to service "
+                    "'%(destination)s'") \
+                 % {'name'       : object.name,
+                    'destination': parent._type}
           raise AttributeError, tmsg
 
       # create binding for service
@@ -244,8 +247,10 @@
             GDebug.printMesg(8,'* %s is bound to \n * %s' % \
                              (object._path,bindto))
           except:
-            tmsg = _("GNURPC can't bind method/attribut '%s' to service '%s'") 
%\
-                      (object.name,parent.name)  
+            tmsg = u_("GNURPC cannot bind method/attribut '%(name)s' to "
+                      "service '%(service)s'") \
+                   % {'name'   : object.name,
+                      'service': parent.name}
             raise AttributeError, tmsg
             pass
         else:
@@ -306,7 +311,7 @@
   #
   def call(self, method, params):
     if self._loglevel>0:
-      print _("Dispatching: "), method, params 
+      print _("Dispatching: "), method, params
     
 
     ## Check if the Method is part of a service or a pointer to a
@@ -326,8 +331,7 @@
         objhandle=method[1:i]
         method=method[i+2:]
       except ValueError:
-        tmsg = _("Wrong format of object handle ")+\
-              _("in method call %s") % method
+        tmsg = u_("Wrong format of object handle in method call %s") % method
         raise AttributeError, tmsg
       # TODO check in service dir, if obj is supported or not
       o=ObjectLibrarian.retrieveObject(objhandle)
@@ -340,12 +344,12 @@
           server_attribute=getattr(o,method[4:])
         except AttributeError:
           
-          if method!="_close":                      
-            msg=_("Internal XMLRPC server error: method %s can be ")% \
-                 method +\
-                 _("found in the directory (build out of a .grpc file),")+\
-                 _(" but the object doesn't contain this method/attribut.")+\
-                 _(" Please check you .grpc file for wrong return types.")
+          if method ! = "_close":
+            msg = u_("Internal XMLRPC server error: method %s can be "
+                     "found in the directory (build out of a .grpc file), "
+                     "but the object doesn't contain this method/attribut. "
+                     "Please check you .grpc file for wrong return types.") \
+                  % method
             
             raise AttributeError, msg
         
@@ -373,20 +377,21 @@
         signature=direntry['signature']
 
         if (server_method==None) and (server_attribute==None):
-          tmsg = _("Server XML-RPC method %s  is not ")% method +\
-              _("bound to real method") 
+          tmsg = u_("Server XML-RPC method '%s' is not bound to real method") \
+                 % method
           raise AttributeError, tmsg
       except KeyError:
-        tmsg = _("Server does not have XML-RPC ") +\
-              _("procedure %s") % method      
+        tmsg = u_("Server does not have XML-RPC procedure %s") % method
         raise AttributeError, tmsg
     try:
       #
       pass
         # TODO:  Compare submitted attributs with signature
     except KeyError:
-      tmsg = _("Server XML-RPC ") +\
-            _("procedure %s accepts just %s as attributs") % (method,attr)
+      tmsg = u_("Server XML-RPC procedure %(method)s accepts just %(attr)s "
+                "as attributs") \
+             % {'method': method,
+                'attr'  : attr}
       raise AttributeError, tmsg
     
 
@@ -434,9 +439,8 @@
         # getAttribut method
         result=server_attribute
       else:
-        tmsg = _("Internal Server XML-RPC error: method type") +\
-            _("(get/set attribute) couldn't be detected (method %s)") \
-            % method       
+        tmsg = u_("Internal Server XML-RPC error: method type (get/set "
+                  "attribute) couldn't be detected (method %s)") % method
         raise AttributeError, tmsg
     
 

Modified: trunk/gnue-common/src/rpc/drivers/soap/CommDriver.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/soap/CommDriver.py        2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/soap/CommDriver.py        2004-08-12 
13:04:23 UTC (rev 6187)
@@ -42,9 +42,9 @@
 try:
   import soaplib
 except ImportError:
-  print _("\nUnable to load soaplib.  To use the SOAP interface, \n") \
-      + _("please install soaplib from:\n") \
-      + "    http://www.pythonware.com/products/soap/\n";
+  print _("\nUnable to load soaplib. To use the SOAP interface, "
+          "please install soaplib from:\n"
+          "    http://www.pythonware.com/products/soap/\n";)
   sys.exit()
 
 

Modified: trunk/gnue-common/src/rpc/drivers/soap/soappy/Driver.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/soap/soappy/Driver.py     2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/soap/soappy/Driver.py     2004-08-12 
13:04:23 UTC (rev 6187)
@@ -154,8 +154,10 @@
 
 
   def OnErr(self,server,source):
-    print _("Internal server error occured:\n"
-            " server %s \n on source %s.") % (server,source)
+    print u_("Internal server error occured:\n"
+             " server %(server)s \n on source %(source)s.") \
+          % {'server': server,
+             'source': source}
     return xmlrpc.ONERR_KEEP_WORK
     
 

Modified: trunk/gnue-common/src/rpc/drivers/sockets/CommDriver.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/sockets/CommDriver.py     2004-08-10 
19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/sockets/CommDriver.py     2004-08-12 
13:04:23 UTC (rev 6187)
@@ -80,9 +80,10 @@
 
         raise KeyError
 
-      if not hasattr(socket, 'AF_UNIX'): 
-        tmsg =   _("Your configuration references a file-based sockets 
connection.\n") \
-               + _("However, your operating system does not support file-based 
sockets.")
+      if not hasattr(socket, 'AF_UNIX'):
+        tmsg = _("Your configuration references a file-based sockets "
+                 "connection.\nHowever, your operating system does not "
+                 "support file-based sockets.")
         raise GComm.AdapterConfigurationError,  tmsg
 
       self._location = file
@@ -93,8 +94,8 @@
         self.__socket.connect(file) 
 
       except: 
-        tmsg =   _("Unable to initialize the requested socket located at %s") 
% \
-                (file)
+        tmsg = u_("Unable to initialize the requested socket located at %s") \
+               % file
         raise AdapterInitializationError, tmsg
 
  
@@ -110,13 +111,15 @@
         self.__socket.connect((host, port)) 
 
       except KeyError: 
-        tmsg =  _("To use the sockets commdriver, you must specify either a 
sockets") \
-              + _("\nfile or a host and port number.  Please see 
documentation.")
+        tmsg = _("To use the sockets commdriver, you must specify either a "
+                 "sockets\nfile or a host and port number. Please see "
+                 "documentation.")
         raise GComm.AdapterConfigurationError, tmsg
 
       except: 
-        tmsg = _("Unable to initialize the requested socket located at %s:%s") 
% \
-               (host,port)
+        tmsg = u_("Unable to initialize the requested socket located "
+                  "at %(host)s:%(port)s") \
+               % {'host': host, 'port': port}
         raise AdapterInitializationError, tmsg
 
 

Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/RpcDoc.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/RpcDoc.py  2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/RpcDoc.py  2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -116,7 +116,7 @@
     gendocJS(rpcdef, outfile)
     
   else:
-    tmsg = _("Unrecognized XML-RPC doc command: %s") % command 
+    tmsg = u_("Unrecognized XML-RPC doc command: %s") % command
     raise StandardError, tmsg
 
 ##
@@ -409,7 +409,7 @@
 if __name__ == '__main__':
   if len(sys.argv)<2:
     print _("RpcDoc.py has to be called with an command argument. ")
-    print _("call 'RpcDoc.py help' for more information.")    
+    print _("call 'RpcDoc.py help' for more information.")
   else:
     doc(sys.stdout, *sys.argv[1:])
     

Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py 
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/ServerAdapter.py 
2004-08-12 13:04:23 UTC (rev 6187)
@@ -211,8 +211,7 @@
         objhandle=method[1:i]
         method=method[i+2:]
       except ValueError:
-        tmsg = _("Wrong format of object handle ")+\
-              _("in method call %s") % method
+        tmsg = u_("Wrong format of object handle in method call %s") % method
         raise AttributeError, tmsg
       # TODO check in service dir, if obj is supported or not
       o=ObjectLibrarian.retrieveObject(objhandle)
@@ -225,12 +224,12 @@
           server_attribute=getattr(o,method[4:])
         except AttributeError:
           
-          if method!="_close":                      
-            msg=_("Internal XMLRPC server error: method %s can be ")% \
-                 method +\
-                 _("found in the directory (build out of a .grpc file),")+\
-                 _(" but the object doesn't contain this method/attribut.")+\
-                 _(" Please check you .grpc file for wrong return types.")
+          if method!="_close":
+            msg = u_("Internal XMLRPC server error: method %s can be "
+                     "found in the directory (build out of a .grpc file), "
+                     "but the object doesn't contain this method/attribut. "
+                     "Please check you .grpc file for wrong return types.") \
+                 % method
             
             raise AttributeError, msg
         
@@ -258,20 +257,21 @@
         signature=direntry['signature']
 
         if (server_method==None) and (server_attribute==None):
-          tmsg = _("Server XML-RPC method %s  is not ")% method +\
-              _("bound to real method") 
+          tmsg = u_("Server XML-RPC method '%s' is not bound to real method") \
+                 % method
           raise AttributeError, tmsg
       except KeyError:
-        tmsg = _("Server does not have XML-RPC ") +\
-              _("procedure %s") % method      
+        tmsg = u_("Server does not have XML-RPC procedure %s") % method
         raise AttributeError, tmsg
     try:
       #
       pass
         # TODO:  Compare submitted attributs with signature
     except KeyError:
-      tmsg = _("Server XML-RPC ") +\
-            _("procedure %s accepts just %s as attributs") % (method,attr)
+      tmsg = u_("Server XML-RPC procedure %(method)s accepts just %(attr)s "
+                "as attributs") \
+             % {'method': method,
+                'attr'  : attr}
       raise AttributeError, tmsg
     
 
@@ -326,9 +326,8 @@
         # getAttribut method
         result=server_attribute
       else:
-        tmsg = _("Internal Server XML-RPC error: method type") +\
-            _("(get/set attribute) couldn't be detected (method %s)") \
-            % method       
+        tmsg = u_("Internal Server XML-RPC error: method type (get/set "
+                  "attribute) couldn't be detected (method %s)") % method
         raise AttributeError, tmsg
     
 
@@ -552,7 +551,7 @@
         del args['obj_handle']
 
       except KeyError:
-        tmsg = _('Object handle not returned') 
+        tmsg = _('Object handle not returned')
         raise StandardError, tmsg   # TODO
 
     try:
@@ -561,7 +560,7 @@
     except KeyError:
 
       # Attempt to use an invalid objecthandle
-      tmsg = _('Invalid object handle') 
+      tmsg = _('Invalid object handle')
       raise StandardError, tmsg # TODO
 
 

Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py 
2004-08-10 19:09:01 UTC (rev 6186)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/py_xmlrpc/ServerAdapter.py 
2004-08-12 13:04:23 UTC (rev 6187)
@@ -112,8 +112,10 @@
 
   def OnErr (self, server, source):
 
-    print _("Internal server error occured:\n"
-            " server %s \n on source %s.") % (server, source)
+    print u_("Internal server error occured:\n"
+             " server %(server)s \n on source %(source)s.") \
+          % {'server': server,
+             'source': source}
     return xmlrpc.ONERR_KEEP_WORK
     
 

Modified: trunk/gnue-common/src/schema/GSData.py
===================================================================
--- trunk/gnue-common/src/schema/GSData.py      2004-08-10 19:09:01 UTC (rev 
6186)
+++ trunk/gnue-common/src/schema/GSData.py      2004-08-12 13:04:23 UTC (rev 
6187)
@@ -69,7 +69,9 @@
     if hasattr (gsValue, "field"):
       fName = "%s: " % gsValue.field
 
-    msg = _("%sInvalid datatype '%s'.") % (fName, dataType)
+    msg = u_("%(fieldname)sInvalid datatype '%(datatype)s'.") \
+          % {'fieldname': fName,
+             'datatype' : dataType}
     EGSData.__init__ (self, msg)
 
 
@@ -105,7 +107,10 @@
     else:
       rDef = "%d" % length
 
-    msg = _("%sValue '%s' out of Range (%s)") % (fName, fieldValue, rDef)
+    msg = u_("%(fieldname)sValue '%(value)s' out of Range (%(range)s)") \
+          % {'fieldname': fName,
+             'value'    : fieldValue,
+             'range'    : rDef}
 
     EGSData.__init__ (self, msg)
 
@@ -123,7 +128,10 @@
     if hasattr (gsValue, "field"):
       fName = "%s: " % gsValue.field
 
-    msg = _("%sValue '%s' %s") % (fName, fieldValue, fmtString)
+    msg = u_("%(fieldname)sValue '%(value)s' %(format)s") \
+          % {'fieldname': fName,
+             'value'    : fieldValue,
+             'format'   : fmtString}
     EGSData.__init__ (self, msg)
 
 
@@ -136,7 +144,9 @@
   This exception is raised if a string cannot be converted to a number.
   """
   def __init__ (self, gsValue, value, length, precision):
-    fmt = _("is not a number (%d.%d)") % (length, precision)
+    fmt = u_("is not a number (%(length)d.%(scale)d)") \
+          % {'length': length,
+             'scale' : precision}
     EInvalidFormat.__init__ (self, gsValue, value, fmt)
 
 
@@ -175,7 +185,7 @@
   Exception class for invalid formatted times
   """
   def __init__ (self, gsValue, fieldValue):
-    fmt = _("is not a time (HH:MM:SS.ss")
+    fmt = _("is not a time (HH:MM:SS.ss)")
     EInvalidFormat.__init__ (self, gsValue, fieldValue, fmt)
 
 

Modified: trunk/gnue-common/src/schema/Objects.py
===================================================================
--- trunk/gnue-common/src/schema/Objects.py     2004-08-10 19:09:01 UTC (rev 
6186)
+++ trunk/gnue-common/src/schema/Objects.py     2004-08-12 13:04:23 UTC (rev 
6187)
@@ -106,7 +106,7 @@
 
     try:
       if not self.type in ["unique", "foreignkey"]:
-        raise Exception (_("Invalid constraint type '%s'.") % self.type)
+        raise Exception (u_("Invalid constraint type '%s'.") % self.type)
 
       csFields = self.findChildrenOfType ('GSConstraintField')
       self.__checkFields (None, csFields)
@@ -114,12 +114,12 @@
       if self.type == "foreignkey":
         refFields = self.findChildrenOfType ('GSConstraintRef')
         if refFields is None:
-          raise Exception (_("Constraint '%s' has no reference fields.") % \
+          raise Exception (u_("Constraint '%s' has no reference fields.") % \
                              self.name)
         self.__checkFields (refFields [0].table, refFields)
 
         if len (refFields) <> len (csFields):
-          raise Exception (_("Constraint '%s' has unbalanced fields.") % \
+          raise Exception (u_("Constraint '%s' has unbalanced fields.") % \
                             self.name)
 
         self.__typeCheck (csFields, refFields)
@@ -167,8 +167,10 @@
     tbFields = table.findChildrenOfType ('GSField', True, True)
 
     if len (cFields) > len (tbFields):
-      raise gException, u_("Constraint '%s' has more fields than the "
-                           "table '%s'") % (self.name, table.name)
+      raise gException, u_("Constraint '%(name)s' has more fields than the "
+                           "table '%(table)s'") \
+                        % {'name' : self.name,
+                           'table': table.name}
 
     for check in cFields:
       try:
@@ -180,8 +182,9 @@
         pass
 
       else:
-        raise Exception (_("Table '%s' has no field '%s'.") % \
-                           (table.name, check.name))
+        raise Exception, u_("Table '%(table)s' has no field '%(field)s'.") \
+                         % {'table': table.name,
+                            'field': check.name}
 
 
   # ---------------------------------------------------------------------------
@@ -209,8 +212,10 @@
     for ix in range (0, len (csFields)):
       if myFields [csFields [ix].name].type != \
          rfFields [refFields [ix].name].type:
-        raise gException, u_("Constraint '%s': typemismatch in reference "
-                             "field '%s'.") % (self.name, csFields [ix].name)
+        raise gException, u_("Constraint '%(name)s': typemismatch in "
+                             "reference field '%(field)s'.") \
+                          % {'name' : self.name,
+                             'field': csFields [ix].name}
 
 
 class GSConstraintField(GSObject):

Modified: trunk/gnue-common/src/schema/importer/Importer.py
===================================================================
--- trunk/gnue-common/src/schema/importer/Importer.py   2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/schema/importer/Importer.py   2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -33,7 +33,9 @@
 
 class ENoCondition (Exception):
   def __init__ (self, tablename, rowIndex):
-    msg = _("Row %d of table %s has no key fields.") % (rowIndex, tablename)
+    msg = u_("Row %(row)d of table %(table)s has no key fields.") \
+          % {'row'  : rowIndex,
+             'table': tablename}
     Exception.__init__ (self, msg)
 
 
@@ -78,8 +80,8 @@
       self.__input = openResource (self.ARGUMENTS [0])
 
     except IOError:
-      self.handleStartupError (_("Unable to open input file %s.") % \
-                                 self.ARGUMENTS [0])
+      self.handleStartupError (u_("Unable to open input file %s.") % \
+                                  self.ARGUMENTS [0])
 
 
 
@@ -127,7 +129,7 @@
     updCount = 0
     insCount = 0
 
-    print _("Importing into %s") % tablename
+    print o(u_("Importing into %s") % tablename)
 
     for rowIndex in range (0, len (data.rows)):
       row  = data.rows [rowIndex]
@@ -170,7 +172,9 @@
     
     self.connections.commitAll ()
 
-    print _("  Inserted %d row(s), updated %d row(s)") % (insCount, updCount)
+    print o(u_("  Inserted %(inserted)d row(s), updated %(updated)d row(s)") \
+            % {'inserted': insCount,
+               'updated': updCount})
 
 
 

Modified: trunk/gnue-common/src/schema/scripter/Scripter.py
===================================================================
--- trunk/gnue-common/src/schema/scripter/Scripter.py   2004-08-10 19:09:01 UTC 
(rev 6186)
+++ trunk/gnue-common/src/schema/scripter/Scripter.py   2004-08-12 13:04:23 UTC 
(rev 6187)
@@ -172,7 +172,7 @@
         self._files.append (openResource (filename))
 
     except IOError:
-      self.handleStartupError (_("Unable to open input file %s.") % filename)
+      self.handleStartupError (u_("Unable to open input file %s.") % filename)
 
 
     if not self.OPTIONS ['connection']:





reply via email to

[Prev in Thread] Current Thread [Next in Thread]