From 69ad8b5035ac9a4043201622eade4264bcc5b2f3 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Fri, 18 Nov 2005 03:59:30 +0000 Subject: [PATCH] fixed xml2po.py for duplicate entries --- po/Makefile | 6 +- po/de.po | 428 ++++++++++++++++++++++++++++++----------------------------- po/xml2po.py | 20 ++- 3 files changed, 234 insertions(+), 220 deletions(-) diff --git a/po/Makefile b/po/Makefile index 5f39fb9..84bf78e 100644 --- a/po/Makefile +++ b/po/Makefile @@ -16,6 +16,8 @@ default: enigma2.pot $(LANGPO) merge $(LANGMO) cp en.mo en/LC_MESSAGES/enigma2.mo merge: + msgmerge -N -U enigma2.pot menu.pot + msgmerge -N -U enigma2.pot setup.pot msgmerge -N -U de.po enigma2.pot enigma2.pot: @@ -33,8 +35,8 @@ enigma2.pot: ../lib/python/Components/Language.py \ ../lib/python/Components/EventInfo.py \ ../lib/python/Components/Network.py - ./xml2po.py ../data/menu.xml >> enigma2.pot - ./xml2po.py ../data/setup.xml >> enigma2.pot + ./xml2po.py ../data/menu.xml >> menu.pot + ./xml2po.py ../data/setup.xml >> setup.pot %.mo: %.po diff --git a/po/de.po b/po/de.po index 7f61a0a..4f87879 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tuxbox-enigma 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-18 04:47+0100\n" +"POT-Creation-Date: 2005-11-18 04:59+0100\n" "PO-Revision-Date: 2005-11-17 20:53+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -16,287 +16,293 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/python/Screens/EventView.py:58 -#, python-format -msgid "%d min" +#: ../data/setup.xml +msgid "Invert" msgstr "" -#: ../lib/python/Screens/About.py:25 -#, python-format -msgid "%s (%s, %d MB free)" -msgstr "%s (%s, %d MB frei)" - -#: ../lib/python/Screens/TimerEdit.py:25 -msgid "Add" +#: ../data/setup.xml +msgid "Hide error windows" msgstr "" -#: ../lib/python/Screens/HarddiskSetup.py:30 -msgid "Bus: " -msgstr "Personennahverkehr: " +#: ../data/setup.xml +msgid "Delay" +msgstr "" -#: ../lib/python/Screens/HarddiskSetup.py:29 -msgid "Capacity: " -msgstr "Kapazitaet: " +#: ../data/setup.xml +msgid "WSS" +msgstr "" -#: ../lib/python/Components/SetupDevices.py:21 -msgid "Classic" -msgstr "klassisch" +#: ../data/setup.xml +msgid "use power delta" +msgstr "" -#: ../lib/python/Screens/Satconfig.py:30 ../lib/python/Screens/Satconfig.py:48 -#: ../lib/python/Screens/Satconfig.py:57 -msgid "Configmode" -msgstr "Konfigurationsmodus" +#: ../data/setup.xml +msgid "Latitude" +msgstr "Breitengrad" -#: ../lib/python/Components/SetupDevices.py:21 -msgid "Default" -msgstr "Standard" +#: ../data/setup.xml +msgid "Setup Lock" +msgstr "" -#: ../lib/python/Screens/TimerEdit.py:24 -#, fuzzy -msgid "Delete" -msgstr "Standard" - -#: ../lib/python/Screens/About.py:22 -msgid "Detected HDD:" -msgstr "Erkannte Festplatten:" - -#: ../lib/python/Screens/About.py:14 -msgid "Detected NIMs:" -msgstr "Erkannte Tuner:" - -#: ../lib/python/Components/SetupDevices.py:38 -#: ../lib/python/Components/SetupDevices.py:39 -#: ../lib/python/Components/SetupDevices.py:43 -#: ../lib/python/Components/SetupDevices.py:44 -#: ../lib/python/Components/SetupDevices.py:45 -#: ../lib/python/Components/SetupDevices.py:46 -#: ../lib/python/Components/SetupDevices.py:47 -msgid "Disable" -msgstr "Aus" - -#: ../lib/python/Screens/Satconfig.py:33 ../lib/python/Screens/Satconfig.py:46 -msgid "Diseqcmode" -msgstr "Diseqc-Modus" - -#: ../lib/python/Components/SetupDevices.py:38 -#: ../lib/python/Components/SetupDevices.py:39 -#: ../lib/python/Components/SetupDevices.py:43 -#: ../lib/python/Components/SetupDevices.py:44 -#: ../lib/python/Components/SetupDevices.py:45 -#: ../lib/python/Components/SetupDevices.py:46 -#: ../lib/python/Components/SetupDevices.py:47 -msgid "Enable" -msgstr "Ein" - -#: ../lib/python/Components/SetupDevices.py:24 -#: ../lib/python/Components/Language.py:9 -msgid "English" -msgstr "Englisch" - -#: ../lib/python/Screens/ScanSetup.py:76 -msgid "Frequency" -msgstr "Frequenz" - -#: ../lib/python/Screens/NetworkSetup.py:44 -msgid "Gateway" +#: ../data/setup.xml +msgid "Soundcarrier" msgstr "" -#: ../lib/python/Components/SetupDevices.py:24 -#: ../lib/python/Components/Language.py:10 -msgid "German" -msgstr "Deutsch" +#: ../data/setup.xml +msgid "Color Format" +msgstr "" -#: ../lib/python/Screens/NetworkSetup.py:42 -msgid "IP Address" -msgstr "IP Adresse" +#: ../data/setup.xml +msgid "Channel" +msgstr "" -#: ../lib/python/Screens/HarddiskSetup.py:31 -msgid "Initialize" -msgstr "Initialisiere" +#: ../data/setup.xml +msgid "Repeat" +msgstr "" -#: ../lib/python/Screens/HarddiskSetup.py:18 -msgid "Initializing Harddisk..." -msgstr "Initialisiere Festplatte..." +#: ../data/setup.xml +msgid "Language" +msgstr "" -#: ../lib/python/Screens/ScanSetup.py:77 -msgid "Inversion" +#: ../data/setup.xml +msgid "Keyboard Map" msgstr "" -#: ../lib/python/Screens/Satconfig.py:24 -msgid "Latitude" -msgstr "Breitengrad" +#: ../data/setup.xml +msgid "TV System" +msgstr "" -#: ../lib/python/Screens/Satconfig.py:23 -msgid "Longitude" -msgstr "Laengengrad" +#: ../data/setup.xml +msgid "Show Satposition" +msgstr "" -#: ../lib/python/Screens/HarddiskSetup.py:28 -msgid "Model: " -msgstr "Modell: " +#: ../data/setup.xml +msgid "Aspect Ratio" +msgstr "" -#: ../lib/python/Screens/NetworkSetup.py:45 -msgid "Nameserver" +#: ../data/setup.xml +msgid "DiSEqC" msgstr "" -#: ../lib/python/Screens/NetworkSetup.py:43 +#: ../data/setup.xml msgid "Netmask" msgstr "Netzmaske" -#: ../lib/python/Screens/Satconfig.py:15 -msgid "Port A" +#: ../data/setup.xml +msgid "Contrast" +msgstr "" + +#: ../data/setup.xml +msgid "Alpha" +msgstr "" + +#: ../data/setup.xml +msgid "Parental Lock" +msgstr "" + +#: ../data/setup.xml +msgid "AC3 default" msgstr "" -#: ../lib/python/Screens/Satconfig.py:18 -msgid "Port B" +#: ../data/setup.xml +msgid "Sound" msgstr "" -#: ../lib/python/Screens/Satconfig.py:20 -msgid "Port C" +#: ../data/setup.xml +msgid "Fast zapping" msgstr "" -#: ../lib/python/Screens/Satconfig.py:21 -msgid "Port D" +#: ../data/setup.xml +msgid "Modulator" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:75 ../lib/python/Screens/Satconfig.py:13 -msgid "Satellite" -msgstr "Satellit" +#: ../data/setup.xml +msgid "Brightness" +msgstr "" + +#: ../data/setup.xml +msgid "Standby" +msgstr "" -#: ../lib/python/Screens/InfoBar.py:72 -msgid "Stop playing this movie?" +#: ../data/setup.xml +msgid "Finetune" msgstr "" -#: ../lib/python/Screens/ScanSetup.py:78 -msgid "Symbolrate" +#: ../data/setup.xml +msgid "Activate network settings" msgstr "" -#: ../lib/python/Screens/NetworkSetup.py:40 -#: ../lib/python/Screens/NetworkSetup.py:52 +#: ../data/setup.xml +msgid "Longitude" +msgstr "Laengengrad" + +#: ../data/setup.xml +msgid "Configmode" +msgstr "Konfigurationsmodus" + +#: ../data/setup.xml msgid "Use DHCP" msgstr "Adresse automatisch beziehen (DHCP)" -#: ../lib/python/Components/Network.py:134 -msgid "no" -msgstr "nein" +#: ../data/setup.xml +msgid "Keymap" +msgstr "" -#: ../lib/python/Screens/HarddiskSetup.py:57 -msgid "no HDD found" -msgstr "keine Festplatte gefunden" +#: ../data/setup.xml +msgid "Testmode" +msgstr "" -#: ../lib/python/Screens/About.py:27 -msgid "none" +#: ../data/setup.xml +msgid "Tuner-Slot" msgstr "" -#: ../lib/python/Screens/EventView.py:43 -msgid "unknown service" -msgstr "unbekannter Dienst" +#: ../data/setup.xml +msgid "Nameserver" +msgstr "" -#: ../lib/python/Screens/Ci.py:32 -msgid "waiting for CI..." -msgstr "warte auf das CI..." +#: ../data/setup.xml +msgid "VCR Switch" +msgstr "" -#: ../lib/python/Components/EventInfo.py:43 -#, fuzzy -msgid "waiting for event data..." -msgstr "warte auf Programmdaten..." +#: ../data/setup.xml +msgid "IP Address" +msgstr "IP Adresse" -#: ../lib/python/Components/Network.py:15 -#: ../lib/python/Components/Network.py:134 -msgid "yes" -msgstr "ja" +#: ../data/setup.xml +msgid "Skip confirmations" +msgstr "" -#: ../data/menu.xml -msgid "Mainmenu" -msgstr "Hauptmenue" +#: ../data/setup.xml +msgid "Timezone" +msgstr "Zeitzone" -#: ../data/menu.xml -msgid "Timer" -msgstr "Zeitgesteuerte Aufnamen" +#: ../data/setup.xml +msgid "Record Splitsize" +msgstr "" -#: ../data/menu.xml -msgid "Information" +#: ../data/setup.xml +msgid "Gateway" msgstr "" -#: ../data/menu.xml -msgid "Service" +#: ../data/setup.xml +msgid "Auto show inforbar" msgstr "" -#: ../data/menu.xml -msgid "About..." -msgstr "Ueber..." +#~ msgid "%s (%s, %d MB free)" +#~ msgstr "%s (%s, %d MB frei)" -#: ../data/menu.xml -msgid "Games / Plugins" -msgstr "Spiele / Erweiterungen" +#~ msgid "Bus: " +#~ msgstr "Personennahverkehr: " -#: ../data/menu.xml -msgid "Setup" -msgstr "Einstellungen" +#~ msgid "Capacity: " +#~ msgstr "Kapazitaet: " -#: ../data/menu.xml -msgid "Service Searching" -msgstr "Kanalsuche" +#~ msgid "Classic" +#~ msgstr "klassisch" -#: ../data/menu.xml -msgid "Satelliteconfig" -msgstr "Satelliteneinstellungen" +#~ msgid "Default" +#~ msgstr "Standard" -#: ../data/menu.xml -msgid "Automatic Scan" -msgstr "Automatische Suche" +#, fuzzy +#~ msgid "Delete" +#~ msgstr "Standard" -#: ../data/menu.xml -msgid "Manual Scan" -msgstr "Manuelle Suche" +#~ msgid "Detected HDD:" +#~ msgstr "Erkannte Festplatten:" -#: ../data/menu.xml -msgid "System" -msgstr "" +#~ msgid "Detected NIMs:" +#~ msgstr "Erkannte Tuner:" -#: ../data/menu.xml -msgid "Timezone" -msgstr "Zeitzone" +#~ msgid "Disable" +#~ msgstr "Aus" -#: ../data/menu.xml -msgid "Video Audio" -msgstr "" +#~ msgid "Diseqcmode" +#~ msgstr "Diseqc-Modus" -#: ../data/menu.xml -msgid "UHF Modulator" -msgstr "" +#~ msgid "Enable" +#~ msgstr "Ein" -#: ../data/menu.xml -msgid "Harddisk" -msgstr "Festplatte" +#~ msgid "English" +#~ msgstr "Englisch" -#: ../data/menu.xml -msgid "OSD" -msgstr "" +#~ msgid "Frequency" +#~ msgstr "Frequenz" -#: ../data/menu.xml -msgid "LCD" -msgstr "" +#~ msgid "German" +#~ msgstr "Deutsch" -#: ../data/menu.xml -msgid "Network" -msgstr "Netzwerk" +#~ msgid "Initialize" +#~ msgstr "Initialisiere" -#: ../data/menu.xml -msgid "Common Interface" -msgstr "" +#~ msgid "Initializing Harddisk..." +#~ msgstr "Initialisiere Festplatte..." + +#~ msgid "Model: " +#~ msgstr "Modell: " + +#~ msgid "Satellite" +#~ msgstr "Satellit" + +#~ msgid "no" +#~ msgstr "nein" + +#~ msgid "no HDD found" +#~ msgstr "keine Festplatte gefunden" + +#~ msgid "unknown service" +#~ msgstr "unbekannter Dienst" + +#~ msgid "waiting for CI..." +#~ msgstr "warte auf das CI..." + +#, fuzzy +#~ msgid "waiting for event data..." +#~ msgstr "warte auf Programmdaten..." + +#~ msgid "yes" +#~ msgstr "ja" + +#~ msgid "Mainmenu" +#~ msgstr "Hauptmenue" + +#~ msgid "Timer" +#~ msgstr "Zeitgesteuerte Aufnamen" + +#~ msgid "About..." +#~ msgstr "Ueber..." + +#~ msgid "Games / Plugins" +#~ msgstr "Spiele / Erweiterungen" + +#~ msgid "Setup" +#~ msgstr "Einstellungen" + +#~ msgid "Service Searching" +#~ msgstr "Kanalsuche" + +#~ msgid "Satelliteconfig" +#~ msgstr "Satelliteneinstellungen" + +#~ msgid "Automatic Scan" +#~ msgstr "Automatische Suche" + +#~ msgid "Manual Scan" +#~ msgstr "Manuelle Suche" + +#~ msgid "Harddisk" +#~ msgstr "Festplatte" + +#~ msgid "Network" +#~ msgstr "Netzwerk" -#: ../data/menu.xml -msgid "Expert" -msgstr "Experten" +#~ msgid "Expert" +#~ msgstr "Experten" -#: ../data/menu.xml -msgid "Standby / Restart" -msgstr "Standby / Neustart" +#~ msgid "Standby / Restart" +#~ msgstr "Standby / Neustart" -#: ../data/menu.xml -msgid "Restart" -msgstr "Neustart" +#~ msgid "Restart" +#~ msgstr "Neustart" -#: ../data/menu.xml -msgid "Deep Standby" -msgstr "Tiefschlaf" +#~ msgid "Deep Standby" +#~ msgstr "Tiefschlaf" diff --git a/po/xml2po.py b/po/xml2po.py index ec19acf..3fef7f8 100755 --- a/po/xml2po.py +++ b/po/xml2po.py @@ -4,20 +4,26 @@ from xml.sax import make_parser from xml.sax.handler import ContentHandler class parseXML(ContentHandler): - def __init__(self): + def __init__(self, attrlist): self.isPointsElement, self.isReboundsElement = 0, 0 + self.attrlist = attrlist def startElement(self, name, attrs): if (attrs.has_key('text')): - print - print '#: ' + sys.argv[1] - print 'msgid "' + str(attrs.get('text', "")) + '"' - print 'msgstr ""' + attrlist[attrs.get('text', "")] = "foo" sys.argv[1] parser = make_parser() - -contentHandler = parseXML() + +attrlist = {} +contentHandler = parseXML(attrlist) parser.setContentHandler(contentHandler) parser.parse(sys.argv[1]) + +for k, v in attrlist.items(): + print + print '#: ' + sys.argv[1] + print 'msgid "' + str(k) + '"' + print 'msgstr ""' + -- 2.7.4