[Thuban-commits] r2782 - in trunk/thuban: . Thuban/UI po
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 26 00:54:39 CET 2007
Author: bernhard
Date: 2007-11-26 00:54:38 +0100 (Mon, 26 Nov 2007)
New Revision: 2782
Modified:
trunk/thuban/ChangeLog
trunk/thuban/Thuban/UI/altpathdialog.py
trunk/thuban/po/de.po
trunk/thuban/po/es.po
trunk/thuban/po/fr.po
trunk/thuban/po/hu.po
trunk/thuban/po/it.po
trunk/thuban/po/pt_BR.po
trunk/thuban/po/ru.po
Log:
* Thuban/UI/altpathdialog.py: transformed result from GetPaths to
internal encoding. Made sure the translation is actually used as
the _() function will only match on a fixed string.
* po/*: updated all po files (minor for altpathdialog.py).
* po/de.po: improved translation for altpathdialog.py.
Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/ChangeLog 2007-11-25 23:54:38 UTC (rev 2782)
@@ -1,3 +1,11 @@
+2007-11-26 Bernhard Reiter <bernhard at intevation.de>
+
+ * Thuban/UI/altpathdialog.py: transformed result from GetPaths to
+ internal encoding. Made sure the translation is actually used as
+ the _() function will only match on a fixed string.
+ * po/*: updated all po files (minor for altpathdialog.py).
+ * po/de.po: improved translation for altpathdialog.py.
+
2007-11-25 Bernhard Reiter <bernhard at intevation.de>
* po/*: Updated all po files.
Modified: trunk/thuban/Thuban/UI/altpathdialog.py
===================================================================
--- trunk/thuban/Thuban/UI/altpathdialog.py 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/Thuban/UI/altpathdialog.py 2007-11-25 23:54:38 UTC (rev 2782)
@@ -13,6 +13,7 @@
"""
from Thuban import _
+from Thuban.UI import internal_from_wxstring
import wx
@@ -21,8 +22,8 @@
class AltPathFileDialog(wx.FileDialog):
def __init__(self, filename):
- msg = _("Select an alternative data file for %s" % \
- os.path.basename(filename))
+ msg = _("Select an alternative data file for %s") % \
+ os.path.basename(filename)
wx.FileDialog.__init__(self, None,
msg,
@@ -36,7 +37,7 @@
val = self.ShowModal()
self.Destroy()
if val == wx.ID_OK:
- return self.GetPaths()[0]
+ return internal_from_wxstring(self.GetPaths()[0])
else:
return None
@@ -44,7 +45,7 @@
def __init__(self, filename):
self.filename = filename
- msg = _("Found the following as an alternative for %s.\n%s\n\n Please confirm with Yes or select alternative with No." % (os.path.basename(filename), filename))
+ msg = _("Found the following as an alternative for '%s':\n%s\n\nPlease confirm with Yes or select alternative with No.") % (os.path.basename(filename), filename)
wx.MessageDialog.__init__(self, None, msg, _("Alternative Path"),
wx.YES_NO|wx.YES_DEFAULT|wx.ICON_INFORMATION)
Modified: trunk/thuban/po/de.po
===================================================================
--- trunk/thuban/po/de.po 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/po/de.po 2007-11-25 23:54:38 UTC (rev 2782)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-25 23:20+0000\n"
+"POT-Creation-Date: 2007-11-25 23:51+0000\n"
"PO-Revision-Date: 2003-12-23 12:31+0100\n"
"Last-Translator: Bernhard Herzog <bh at intevation.de>\n"
"Language-Team: german <bjoern at intevation.de>\n"
@@ -386,34 +386,34 @@
msgid "Close"
msgstr "Schließen"
-#: ../Thuban/UI/altpathdialog.py:24
+#: ../Thuban/UI/altpathdialog.py:25
#, python-format
msgid "Select an alternative data file for %s"
msgstr "Wählen Sie eine andere Datei für %s"
-#: ../Thuban/UI/altpathdialog.py:31 ../Thuban/UI/mainwindow.py:564
+#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:564
msgid "Shapefiles (*.shp)"
msgstr "Shapefiles (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:565
+#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:565
#: ../Thuban/UI/mainwindow.py:853
msgid "All Files (*.*)"
msgstr "Alle Dateien (*.*)"
-#: ../Thuban/UI/altpathdialog.py:47
+#: ../Thuban/UI/altpathdialog.py:48
#, python-format
msgid ""
-"Found the following as an alternative for %s.\n"
+"Found the following as an alternative for '%s':\n"
"%s\n"
"\n"
-" Please confirm with Yes or select alternative with No."
+"Please confirm with Yes or select alternative with No."
msgstr ""
-"Habe die folgende Alternative für %s gefunden.\n"
+"Habe die folgende Alternative für %s gefunden:\n"
"%s\n"
"\n"
-"Bitte bestätigen Sie mit Ja oder wählen Sie eine andere mit Nein"
+"Bitte bestätigen Sie mit Ja oder wählen Sie eine andere mit Nein."
-#: ../Thuban/UI/altpathdialog.py:49
+#: ../Thuban/UI/altpathdialog.py:50
msgid "Alternative Path"
msgstr "Alternativer Dateiname"
Modified: trunk/thuban/po/es.po
===================================================================
--- trunk/thuban/po/es.po 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/po/es.po 2007-11-25 23:54:38 UTC (rev 2782)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.0Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-25 23:20+0000\n"
+"POT-Creation-Date: 2007-11-25 23:51+0000\n"
"PO-Revision-Date: 2003-12-16 14:12-0500\n"
"Last-Translator: Daniel Calvelo Aros (dcalvelo at minag.gob.pe)\n"
"Language-Team: Thuban <thuban at intevation.de>\n"
@@ -384,30 +384,30 @@
msgid "Close"
msgstr "Cerrar"
-#: ../Thuban/UI/altpathdialog.py:24
+#: ../Thuban/UI/altpathdialog.py:25
#, fuzzy, python-format
msgid "Select an alternative data file for %s"
msgstr "Seleccione uno o más archivos de datos"
-#: ../Thuban/UI/altpathdialog.py:31 ../Thuban/UI/mainwindow.py:564
+#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:564
msgid "Shapefiles (*.shp)"
msgstr "Shapefiles (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:565
+#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:565
#: ../Thuban/UI/mainwindow.py:853
msgid "All Files (*.*)"
msgstr "Todos (*.*)"
-#: ../Thuban/UI/altpathdialog.py:47
+#: ../Thuban/UI/altpathdialog.py:48
#, python-format
msgid ""
-"Found the following as an alternative for %s.\n"
+"Found the following as an alternative for '%s':\n"
"%s\n"
"\n"
-" Please confirm with Yes or select alternative with No."
+"Please confirm with Yes or select alternative with No."
msgstr ""
-#: ../Thuban/UI/altpathdialog.py:49
+#: ../Thuban/UI/altpathdialog.py:50
msgid "Alternative Path"
msgstr ""
Modified: trunk/thuban/po/fr.po
===================================================================
--- trunk/thuban/po/fr.po 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/po/fr.po 2007-11-25 23:54:38 UTC (rev 2782)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-25 23:20+0000\n"
+"POT-Creation-Date: 2007-11-25 23:51+0000\n"
"PO-Revision-Date: 2003-12-16 15:12-0500\n"
"Last-Translator: Daniel Calvelo Aros <dcalvelo at minag.gob.pe>\n"
"Language-Team: Thuban developers <thuban at intevation.de>\n"
@@ -382,30 +382,30 @@
msgid "Close"
msgstr "Fermer"
-#: ../Thuban/UI/altpathdialog.py:24
+#: ../Thuban/UI/altpathdialog.py:25
#, fuzzy, python-format
msgid "Select an alternative data file for %s"
msgstr "Choisir un ou plusieurs fichiers de données"
-#: ../Thuban/UI/altpathdialog.py:31 ../Thuban/UI/mainwindow.py:564
+#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:564
msgid "Shapefiles (*.shp)"
msgstr "Shapefiles (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:565
+#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:565
#: ../Thuban/UI/mainwindow.py:853
msgid "All Files (*.*)"
msgstr "Tous (*.*)"
-#: ../Thuban/UI/altpathdialog.py:47
+#: ../Thuban/UI/altpathdialog.py:48
#, python-format
msgid ""
-"Found the following as an alternative for %s.\n"
+"Found the following as an alternative for '%s':\n"
"%s\n"
"\n"
-" Please confirm with Yes or select alternative with No."
+"Please confirm with Yes or select alternative with No."
msgstr ""
-#: ../Thuban/UI/altpathdialog.py:49
+#: ../Thuban/UI/altpathdialog.py:50
msgid "Alternative Path"
msgstr ""
Modified: trunk/thuban/po/hu.po
===================================================================
--- trunk/thuban/po/hu.po 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/po/hu.po 2007-11-25 23:54:38 UTC (rev 2782)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-25 23:20+0000\n"
+"POT-Creation-Date: 2007-11-25 23:51+0000\n"
"PO-Revision-Date: 2004-11-09 11:31+0100\n"
"Last-Translator: Solymosi Norbert <Solymosi.Norbert at aotk.szie.hu>\n"
"Language-Team: hungarian <Solymosi.Norbert at aotk.szie.hu>\n"
@@ -383,30 +383,30 @@
msgid "Close"
msgstr "Bezár"
-#: ../Thuban/UI/altpathdialog.py:24
+#: ../Thuban/UI/altpathdialog.py:25
#, fuzzy, python-format
msgid "Select an alternative data file for %s"
msgstr "Válasszon ki egy vagy több adatfájlt"
-#: ../Thuban/UI/altpathdialog.py:31 ../Thuban/UI/mainwindow.py:564
+#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:564
msgid "Shapefiles (*.shp)"
msgstr "Shape-fájlok (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:565
+#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:565
#: ../Thuban/UI/mainwindow.py:853
msgid "All Files (*.*)"
msgstr "Minden fájlt (*.*)"
-#: ../Thuban/UI/altpathdialog.py:47
+#: ../Thuban/UI/altpathdialog.py:48
#, python-format
msgid ""
-"Found the following as an alternative for %s.\n"
+"Found the following as an alternative for '%s':\n"
"%s\n"
"\n"
-" Please confirm with Yes or select alternative with No."
+"Please confirm with Yes or select alternative with No."
msgstr ""
-#: ../Thuban/UI/altpathdialog.py:49
+#: ../Thuban/UI/altpathdialog.py:50
msgid "Alternative Path"
msgstr ""
Modified: trunk/thuban/po/it.po
===================================================================
--- trunk/thuban/po/it.po 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/po/it.po 2007-11-25 23:54:38 UTC (rev 2782)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-25 23:20+0000\n"
+"POT-Creation-Date: 2007-11-25 23:51+0000\n"
"PO-Revision-Date: 2003-12-22 23:09+0100\n"
"Last-Translator: Maurizio Napolitano <napo at itc.it>\n"
"Language-Team: <thuban at intevation.de>\n"
@@ -384,30 +384,30 @@
msgid "Close"
msgstr "Chiudi"
-#: ../Thuban/UI/altpathdialog.py:24
+#: ../Thuban/UI/altpathdialog.py:25
#, fuzzy, python-format
msgid "Select an alternative data file for %s"
msgstr "Selezione uno o più file di dati"
-#: ../Thuban/UI/altpathdialog.py:31 ../Thuban/UI/mainwindow.py:564
+#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:564
msgid "Shapefiles (*.shp)"
msgstr "File shape (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:565
+#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:565
#: ../Thuban/UI/mainwindow.py:853
msgid "All Files (*.*)"
msgstr "Tutti i file (*.*)"
-#: ../Thuban/UI/altpathdialog.py:47
+#: ../Thuban/UI/altpathdialog.py:48
#, python-format
msgid ""
-"Found the following as an alternative for %s.\n"
+"Found the following as an alternative for '%s':\n"
"%s\n"
"\n"
-" Please confirm with Yes or select alternative with No."
+"Please confirm with Yes or select alternative with No."
msgstr ""
-#: ../Thuban/UI/altpathdialog.py:49
+#: ../Thuban/UI/altpathdialog.py:50
msgid "Alternative Path"
msgstr ""
Modified: trunk/thuban/po/pt_BR.po
===================================================================
--- trunk/thuban/po/pt_BR.po 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/po/pt_BR.po 2007-11-25 23:54:38 UTC (rev 2782)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Thuban 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-25 23:20+0000\n"
+"POT-Creation-Date: 2007-11-25 23:51+0000\n"
"PO-Revision-Date: 2004-01-15 16:07+0300\n"
"Last-Translator: Eduardo Patto Kanegae <eduardo at consultoria.eti.br>\n"
"Language-Team: Thuban <thuban at intevation.de>\n"
@@ -384,30 +384,30 @@
msgid "Close"
msgstr "Fechar"
-#: ../Thuban/UI/altpathdialog.py:24
+#: ../Thuban/UI/altpathdialog.py:25
#, fuzzy, python-format
msgid "Select an alternative data file for %s"
msgstr "Selecione um ou mais arquivos"
-#: ../Thuban/UI/altpathdialog.py:31 ../Thuban/UI/mainwindow.py:564
+#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:564
msgid "Shapefiles (*.shp)"
msgstr "Shapefiles (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:565
+#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:565
#: ../Thuban/UI/mainwindow.py:853
msgid "All Files (*.*)"
msgstr "Todos arquivos (*.*)"
-#: ../Thuban/UI/altpathdialog.py:47
+#: ../Thuban/UI/altpathdialog.py:48
#, python-format
msgid ""
-"Found the following as an alternative for %s.\n"
+"Found the following as an alternative for '%s':\n"
"%s\n"
"\n"
-" Please confirm with Yes or select alternative with No."
+"Please confirm with Yes or select alternative with No."
msgstr ""
-#: ../Thuban/UI/altpathdialog.py:49
+#: ../Thuban/UI/altpathdialog.py:50
msgid "Alternative Path"
msgstr ""
Modified: trunk/thuban/po/ru.po
===================================================================
--- trunk/thuban/po/ru.po 2007-11-25 23:27:14 UTC (rev 2781)
+++ trunk/thuban/po/ru.po 2007-11-25 23:54:38 UTC (rev 2782)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: Thuban 0.9.0 CVS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-25 23:20+0000\n"
+"POT-Creation-Date: 2007-11-25 23:51+0000\n"
"PO-Revision-Date: 2003-12-26 12:00+0400\n"
"Last-Translator: Alex Shevlakov <alex at motivation.ru>\n"
"Language-Team: RU\n"
@@ -379,30 +379,30 @@
msgid "Close"
msgstr "úÁËÒÙÔØ"
-#: ../Thuban/UI/altpathdialog.py:24
+#: ../Thuban/UI/altpathdialog.py:25
#, fuzzy, python-format
msgid "Select an alternative data file for %s"
msgstr "÷ÙÂÒÁÔØ ÏÄÉÎ ÉÌÉ ÎÅÓËÏÌØËÏ ÆÁÊÌÏ× Ó ÄÁÎÎÙÍÉ"
-#: ../Thuban/UI/altpathdialog.py:31 ../Thuban/UI/mainwindow.py:564
+#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:564
msgid "Shapefiles (*.shp)"
msgstr "Shapefiles (*.shp)"
-#: ../Thuban/UI/altpathdialog.py:32 ../Thuban/UI/mainwindow.py:565
+#: ../Thuban/UI/altpathdialog.py:33 ../Thuban/UI/mainwindow.py:565
#: ../Thuban/UI/mainwindow.py:853
msgid "All Files (*.*)"
msgstr "÷ÓÅ ÆÁÊÌÙ (*.*)"
-#: ../Thuban/UI/altpathdialog.py:47
+#: ../Thuban/UI/altpathdialog.py:48
#, python-format
msgid ""
-"Found the following as an alternative for %s.\n"
+"Found the following as an alternative for '%s':\n"
"%s\n"
"\n"
-" Please confirm with Yes or select alternative with No."
+"Please confirm with Yes or select alternative with No."
msgstr ""
-#: ../Thuban/UI/altpathdialog.py:49
+#: ../Thuban/UI/altpathdialog.py:50
msgid "Alternative Path"
msgstr ""
More information about the Thuban-commits
mailing list