summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornecoro <>2007-08-05 06:14:40 +0000
committernecoro <>2007-08-05 06:14:40 +0000
commit21a3215f2c81c3bf6b9838586c5c19cb5b7f5e21 (patch)
treee08ce263a05ef692af5cbba52a4ef221aa76a65a
parent8ec40e4e4afe07b76016cacb9a121d5d339588da (diff)
downloadportato-21a3215f2c81c3bf6b9838586c5c19cb5b7f5e21.tar.gz
portato-21a3215f2c81c3bf6b9838586c5c19cb5b7f5e21.tar.bz2
portato-21a3215f2c81c3bf6b9838586c5c19cb5b7f5e21.zip
some translation fixes :)
Diffstat (limited to '')
-rw-r--r--i18n/de_DE.po152
-rw-r--r--i18n/messages.pot120
-rw-r--r--plugins/etc_proposals.xml2
-rwxr-xr-xpocompile.sh3
-rwxr-xr-xportato.py6
-rw-r--r--portato/gui/gtk/windows.py6
-rw-r--r--portato/gui/templates/portato.glade426
7 files changed, 357 insertions, 358 deletions
diff --git a/i18n/de_DE.po b/i18n/de_DE.po
index 5ddb79c..f08b767 100644
--- a/i18n/de_DE.po
+++ b/i18n/de_DE.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Portato\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-08-04 22:21-0800\n"
+"PO-Revision-Date: 2007-08-05 00:08-0800\n"
"Last-Translator: René 'Necoro' Neumann <necoro@necoro.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgid "gtk-quit"
msgstr ""
#: portato/gui/templates/portato.glade:81
-#: portato/gui/templates/portato.glade:514
+#: portato/gui/templates/portato.glade:569
msgid "_Emerge"
msgstr "_Emerge"
@@ -41,7 +41,7 @@ msgid "E_merge"
msgstr "E_merge"
#: portato/gui/templates/portato.glade:104
-#: portato/gui/templates/portato.glade:523
+#: portato/gui/templates/portato.glade:578
#: portato/gui/templates/portato.glade:728
msgid "_Unmerge"
msgstr "_Unmerge"
@@ -112,11 +112,27 @@ msgstr "Zeige _Log"
msgid "gtk-find"
msgstr ""
-#: portato/gui/templates/portato.glade:461
+#: portato/gui/templates/portato.glade:472
+msgid "<b>Installed, but not in portage anymore</b>"
+msgstr "<b>Installiert, aber nicht mehr im Portage-Tree vorhanden</b>"
+
+#: portato/gui/templates/portato.glade:551
+msgid "<span foreground='red'><b>MISSING KEYWORD</b></span>"
+msgstr "<span foreground='red'><b>FEHLENDES KEYWORD</b></span>"
+
+#: portato/gui/templates/portato.glade:590
+msgid "Re_vert"
+msgstr "_Wiederherstellen"
+
+#: portato/gui/templates/portato.glade:602
+msgid "E_build"
+msgstr "E_build"
+
+#: portato/gui/templates/portato.glade:628
msgid "Installed"
msgstr "Installiert"
-#: portato/gui/templates/portato.glade:474
+#: portato/gui/templates/portato.glade:641
#: portato/gui/gtk/windows.py:741
#: portato/gui/gtk/windows.py:744
#: portato/gui/gtk/windows.py:747
@@ -127,7 +143,7 @@ msgstr "Installiert"
msgid "Masked"
msgstr "Masked"
-#: portato/gui/templates/portato.glade:488
+#: portato/gui/templates/portato.glade:655
#: portato/gui/gtk/windows.py:754
#: portato/gui/gtk/windows.py:757
#: portato/gui/gtk/windows.py:824
@@ -135,22 +151,6 @@ msgstr "Masked"
msgid "Testing"
msgstr "Testing"
-#: portato/gui/templates/portato.glade:535
-msgid "Re_vert"
-msgstr "_Wiederherstellen"
-
-#: portato/gui/templates/portato.glade:547
-msgid "E_build"
-msgstr "E_build"
-
-#: portato/gui/templates/portato.glade:568
-msgid "<span foreground='red'><b>MISSING KEYWORD</b></span>"
-msgstr "<span foreground='red'><b>FEHLENDES KEYWORD</b></span>"
-
-#: portato/gui/templates/portato.glade:647
-msgid "<b>Installed, but not in portage anymore</b>"
-msgstr "<b>Installiert, aber nicht mehr im Portage-Tree vorhanden</b>"
-
#: portato/gui/templates/portato.glade:682
#: portato/gui/gtk/windows.py:201
msgid "Package"
@@ -175,8 +175,8 @@ msgid "Portato - A Portage GUI"
msgstr "Portato - A Portage GUI"
#: portato/gui/templates/portato.glade:852
-msgid "Search"
-msgstr "Suchen"
+msgid "Search Results"
+msgstr "Ergebnisse"
#: portato/gui/templates/portato.glade:892
#: portato/gui/templates/portato.glade:1502
@@ -208,14 +208,6 @@ msgstr "Browser-Befehl: "
msgid "<b>General Options</b>"
msgstr "<b>Allgemeine Optionen</b>"
-#: portato/gui/templates/portato.glade:1037
-msgid "--deep"
-msgstr "--deep"
-
-#: portato/gui/templates/portato.glade:1048
-msgid "--newuse"
-msgstr "--newuse"
-
#: portato/gui/templates/portato.glade:1064
msgid "<b>Update World Options</b>"
msgstr "<b>Optionen für \"update world\"</b>"
@@ -228,19 +220,31 @@ msgstr "Sync-Befehl: "
msgid "<b>Sync Options</b>"
msgstr "<b>Sync Optionen</b>"
-#: portato/gui/templates/portato.glade:1154
-msgid "<u><i>Masking Keywords</i></u>"
-msgstr "<u><i>Masking Keywords</i></u>"
+#: portato/gui/templates/portato.glade:1164
+msgid "File name to use, if package.use is a directory: "
+msgstr "Zu benutzender Dateiname, wenn package.use ein Verzeichnis ist:"
-#: portato/gui/templates/portato.glade:1169
-msgid "<u><i>Testing Keywords</i></u>"
-msgstr "<u><i>Testing Keywords</i></u>"
+#: portato/gui/templates/portato.glade:1175
+msgid "Add only exact version to package.use"
+msgstr "Füge nur die exakte Paketversion zu package.keywords hinzu"
-#: portato/gui/templates/portato.glade:1184
-msgid "<u><i>Use-Flags</i></u>"
-msgstr "<u><i>Use-Flags</i></u>"
+#: portato/gui/templates/portato.glade:1188
+msgid "Add only exact version to package.keywords"
+msgstr "Füge nur die exakte Paketversion zu package.keywords hinzu"
+
+#: portato/gui/templates/portato.glade:1202
+msgid "File name to use, if package.keywords is a directory: "
+msgstr "Zu benutzender Dateiname, wenn package.keywords ein Verzeichnis ist:"
+
+#: portato/gui/templates/portato.glade:1236
+msgid "File name to use, if package.mask/package.unmask is a directory: "
+msgstr "Zu benutzender Dateiname, wenn package.mask/package.unmask ein Verzeichnis ist:"
-#: portato/gui/templates/portato.glade:1206
+#: portato/gui/templates/portato.glade:1247
+msgid "Add only exact version to package.mask/package.unmask"
+msgstr "Füge nur die exakte Paketversion zu package.mask/package.unmask hinzu"
+
+#: portato/gui/templates/portato.glade:1269
msgid ""
"<u>You may use the following placeholders:</u>\n"
"\n"
@@ -254,29 +258,17 @@ msgstr ""
"<i>$(pkg)</i>: Paketname\n"
"<i>$(cat-1)/$(cat-2)</i>: erster/zweiter Teil der Kategorie"
-#: portato/gui/templates/portato.glade:1230
-msgid "Add only exact version to package.mask/package.unmask"
-msgstr "Füge nur die exakte Paketversion zu package.mask/package.unmask hinzu"
-
-#: portato/gui/templates/portato.glade:1244
-msgid "File name to use, if package.mask/package.unmask is a directory: "
-msgstr "Zu benutzender Dateiname, wenn package.mask/package.unmask ein Verzeichnis ist:"
-
-#: portato/gui/templates/portato.glade:1278
-msgid "File name to use, if package.keywords is a directory: "
-msgstr "Zu benutzender Dateiname, wenn package.keywords ein Verzeichnis ist:"
-
-#: portato/gui/templates/portato.glade:1289
-msgid "Add only exact version to package.keywords"
-msgstr "Füge nur die exakte Paketversion zu package.keywords hinzu"
+#: portato/gui/templates/portato.glade:1295
+msgid "<u><i>Use-Flags</i></u>"
+msgstr "<u><i>Use-Flags</i></u>"
-#: portato/gui/templates/portato.glade:1302
-msgid "Add only exact version to package.use"
-msgstr "Füge nur die exakte Paketversion zu package.keywords hinzu"
+#: portato/gui/templates/portato.glade:1310
+msgid "<u><i>Testing Keywords</i></u>"
+msgstr "<u><i>Testing Keywords</i></u>"
-#: portato/gui/templates/portato.glade:1316
-msgid "File name to use, if package.use is a directory: "
-msgstr "Zu benutzender Dateiname, wenn package.use ein Verzeichnis ist:"
+#: portato/gui/templates/portato.glade:1325
+msgid "<u><i>Masking Keywords</i></u>"
+msgstr "<u><i>Masking Keywords</i></u>"
#: portato/gui/templates/portato.glade:1342
msgid "<b>Use Flag and Keyword Options</b>"
@@ -399,8 +391,8 @@ msgid "This is an expanded use flag and cannot be selected"
msgstr "Dies ist ein \"Expanded Use Flag\" und kann daher nicht ausgewählt werden."
#: portato/gui/gtk/windows.py:616
-msgid "Flags"
-msgstr "Flags"
+msgid "Flag"
+msgstr "Flag"
#: portato/gui/gtk/windows.py:617
msgid "Description"
@@ -432,6 +424,14 @@ msgstr "Pakete"
msgid "Console (%(title)s)"
msgstr "Konsole (%(title)s)"
+#: portato/gui/gtk/windows.py:1218
+msgid "use flags"
+msgstr "Use Flags"
+
+#: portato/gui/gtk/windows.py:1225
+msgid "masking keywords"
+msgstr "Masking Keywords"
+
#: portato/gui/gtk/uncaughtException.py:28
msgid "A programming error has been detected during the execution of this program."
msgstr "Ein Fehler ist aufgetreten."
@@ -507,7 +507,7 @@ msgstr "Paket nicht gefunden!"
#: portato/gui/gtk/dialogs.py:58
#, python-format
msgid "You have changed %s. Portato will write these changes into the appropriate files. Please backup them if you think it is necessairy."
-msgstr "Du hast %s geändert. Portato wird diese Änderungen speichern. Bitte sichere die Dateien, wenn du es als notwendig erachtest."
+msgstr "Du hast die %s geändert. Portato wird diese Änderungen speichern. Bitte sichere die entsprechenden Dateien, wenn du es als notwendig erachtest."
#: portato/gui/gtk/dialogs.py:64
msgid "You cannot remove dependencies. :)"
@@ -562,7 +562,7 @@ msgstr "%s kann nicht importiert werden."
#: portato/plugin.py:325
#, python-format
msgid "Accessing hook '%(hook)s' of plugin '%(plugin)s' (before)."
-msgstr "Zugriff auf den Hook '%(hook)s' vom Plugin '%(plugin)s'. (before)"
+msgstr "Aufruf des Hooks '%(hook)s' vom Plugin '%(plugin)s'. (before)"
#: portato/plugin.py:329
#, python-format
@@ -572,7 +572,7 @@ msgstr "Überschreibe den Hook '%(hook)s' mit Plugin '%(plugin)s'."
#: portato/plugin.py:336
#, python-format
msgid "Accessing hook '%(hook)s' of plugin '%(plugin)s' (after)."
-msgstr "Zugriff auf den Hook '%(hook)s' vom Plugin '%(plugin)s'. (after)"
+msgstr "Aufruf des Hooks '%(hook)s' vom Plugin '%(plugin)s'. (after)"
#: portato/plugin.py:356
#, python-format
@@ -592,7 +592,7 @@ msgstr "Plugin '%s' geladen."
#: portato/plugin.py:391
#, python-format
msgid "Loading plugin '%(plugin)s' failed: Could not import %(import)s"
-msgstr "Laden des Plugins '%(plugin)s\" fehlgeschlagen. Konnte '%(import)s' nicht importieren."
+msgstr "Laden des Plugins '%(plugin)s\" fehlgeschlagen. Import von '%(import)s' nicht möglich."
#: portato/plugin.py:456
#, python-format
@@ -606,7 +606,7 @@ msgstr "Startet \"pychecker\". (Nur Entwickler sollten dies brauchen)."
#: portato.py:41
#, python-format
msgid "the frontend to use - possible values are: %s [default: %%default]"
-msgstr "Das zu benutzende Frontend. Möglichkeiten: %s [Default: %%default"
+msgstr "Das zu benutzende Frontend. Möglichkeiten: %s [Default: %%default]"
#: portato.py:44
msgid "opens the ebuild viewer instead of launching Portato"
@@ -628,14 +628,14 @@ msgstr "'%(frontend)s' sollte installiert sein, aber das Einbinden schlug fehl.
#: portato.py:78
#, python-format
-msgid "Verification failed. XML syntax error: %s."
-msgstr "Verifikation fehlgeschlagen. XML Syntax Fehler: %s."
+msgid "Validation failed. XML syntax error: %s."
+msgstr "Validierung fehlgeschlagen. XML Syntax Fehler: %s."
#: portato.py:81
-msgid "Verification failed. Does not comply with schema."
-msgstr "Verifkation gegen das Schema fehlgeschlagen."
+msgid "Validation failed. Does not comply with schema."
+msgstr "Validierung gegen das Schema fehlgeschlagen."
#: portato.py:84
-msgid "Verification succeeded."
-msgstr "Verifikation erfolgreich."
+msgid "Validation succeeded."
+msgstr "Validierung erfolgreich."
diff --git a/i18n/messages.pot b/i18n/messages.pot
index 5699f0c..ec732ff 100644
--- a/i18n/messages.pot
+++ b/i18n/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-04 22:21-0700\n"
+"POT-Creation-Date: 2007-08-05 00:07-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,7 +34,7 @@ msgid "gtk-quit"
msgstr ""
#: portato/gui/templates/portato.glade:81
-#: portato/gui/templates/portato.glade:514
+#: portato/gui/templates/portato.glade:569
msgid "_Emerge"
msgstr ""
@@ -44,7 +44,7 @@ msgid "E_merge"
msgstr ""
#: portato/gui/templates/portato.glade:104
-#: portato/gui/templates/portato.glade:523
+#: portato/gui/templates/portato.glade:578
#: portato/gui/templates/portato.glade:728
msgid "_Unmerge"
msgstr ""
@@ -115,37 +115,37 @@ msgstr ""
msgid "gtk-find"
msgstr ""
-#: portato/gui/templates/portato.glade:461
-msgid "Installed"
-msgstr ""
-
-#: portato/gui/templates/portato.glade:474 portato/gui/gtk/windows.py:741
-#: portato/gui/gtk/windows.py:744 portato/gui/gtk/windows.py:747
-#: portato/gui/gtk/windows.py:852 portato/gui/gtk/windows.py:855
-#: portato/gui/gtk/windows.py:862 portato/gui/gtk/windows.py:866
-msgid "Masked"
+#: portato/gui/templates/portato.glade:472
+msgid "<b>Installed, but not in portage anymore</b>"
msgstr ""
-#: portato/gui/templates/portato.glade:488 portato/gui/gtk/windows.py:754
-#: portato/gui/gtk/windows.py:757 portato/gui/gtk/windows.py:824
-#: portato/gui/gtk/windows.py:829
-msgid "Testing"
+#: portato/gui/templates/portato.glade:551
+msgid "<span foreground='red'><b>MISSING KEYWORD</b></span>"
msgstr ""
-#: portato/gui/templates/portato.glade:535
+#: portato/gui/templates/portato.glade:590
msgid "Re_vert"
msgstr ""
-#: portato/gui/templates/portato.glade:547
+#: portato/gui/templates/portato.glade:602
msgid "E_build"
msgstr ""
-#: portato/gui/templates/portato.glade:568
-msgid "<span foreground='red'><b>MISSING KEYWORD</b></span>"
+#: portato/gui/templates/portato.glade:628
+msgid "Installed"
msgstr ""
-#: portato/gui/templates/portato.glade:647
-msgid "<b>Installed, but not in portage anymore</b>"
+#: portato/gui/templates/portato.glade:641 portato/gui/gtk/windows.py:741
+#: portato/gui/gtk/windows.py:744 portato/gui/gtk/windows.py:747
+#: portato/gui/gtk/windows.py:852 portato/gui/gtk/windows.py:855
+#: portato/gui/gtk/windows.py:862 portato/gui/gtk/windows.py:866
+msgid "Masked"
+msgstr ""
+
+#: portato/gui/templates/portato.glade:655 portato/gui/gtk/windows.py:754
+#: portato/gui/gtk/windows.py:757 portato/gui/gtk/windows.py:824
+#: portato/gui/gtk/windows.py:829
+msgid "Testing"
msgstr ""
#: portato/gui/templates/portato.glade:682 portato/gui/gtk/windows.py:201
@@ -169,7 +169,7 @@ msgid "Portato - A Portage GUI"
msgstr ""
#: portato/gui/templates/portato.glade:852
-msgid "Search"
+msgid "Search Results"
msgstr ""
#: portato/gui/templates/portato.glade:892
@@ -202,14 +202,6 @@ msgstr ""
msgid "<b>General Options</b>"
msgstr ""
-#: portato/gui/templates/portato.glade:1037
-msgid "--deep"
-msgstr ""
-
-#: portato/gui/templates/portato.glade:1048
-msgid "--newuse"
-msgstr ""
-
#: portato/gui/templates/portato.glade:1064
msgid "<b>Update World Options</b>"
msgstr ""
@@ -222,49 +214,49 @@ msgstr ""
msgid "<b>Sync Options</b>"
msgstr ""
-#: portato/gui/templates/portato.glade:1154
-msgid "<u><i>Masking Keywords</i></u>"
+#: portato/gui/templates/portato.glade:1164
+msgid "File name to use, if package.use is a directory: "
msgstr ""
-#: portato/gui/templates/portato.glade:1169
-msgid "<u><i>Testing Keywords</i></u>"
+#: portato/gui/templates/portato.glade:1175
+msgid "Add only exact version to package.use"
msgstr ""
-#: portato/gui/templates/portato.glade:1184
-msgid "<u><i>Use-Flags</i></u>"
+#: portato/gui/templates/portato.glade:1188
+msgid "Add only exact version to package.keywords"
msgstr ""
-#: portato/gui/templates/portato.glade:1206
-msgid ""
-"<u>You may use the following placeholders:</u>\n"
-"\n"
-"<i>$(cat)</i>: category\n"
-"<i>$(pkg)</i>: package name\n"
-"<i>$(cat-1)/$(cat-2)</i>: first/second part of the category"
+#: portato/gui/templates/portato.glade:1202
+msgid "File name to use, if package.keywords is a directory: "
msgstr ""
-#: portato/gui/templates/portato.glade:1230
-msgid "Add only exact version to package.mask/package.unmask"
+#: portato/gui/templates/portato.glade:1236
+msgid "File name to use, if package.mask/package.unmask is a directory: "
msgstr ""
-#: portato/gui/templates/portato.glade:1244
-msgid "File name to use, if package.mask/package.unmask is a directory: "
+#: portato/gui/templates/portato.glade:1247
+msgid "Add only exact version to package.mask/package.unmask"
msgstr ""
-#: portato/gui/templates/portato.glade:1278
-msgid "File name to use, if package.keywords is a directory: "
+#: portato/gui/templates/portato.glade:1269
+msgid ""
+"<u>You may use the following placeholders:</u>\n"
+"\n"
+"<i>$(cat)</i>: category\n"
+"<i>$(pkg)</i>: package name\n"
+"<i>$(cat-1)/$(cat-2)</i>: first/second part of the category"
msgstr ""
-#: portato/gui/templates/portato.glade:1289
-msgid "Add only exact version to package.keywords"
+#: portato/gui/templates/portato.glade:1295
+msgid "<u><i>Use-Flags</i></u>"
msgstr ""
-#: portato/gui/templates/portato.glade:1302
-msgid "Add only exact version to package.use"
+#: portato/gui/templates/portato.glade:1310
+msgid "<u><i>Testing Keywords</i></u>"
msgstr ""
-#: portato/gui/templates/portato.glade:1316
-msgid "File name to use, if package.use is a directory: "
+#: portato/gui/templates/portato.glade:1325
+msgid "<u><i>Masking Keywords</i></u>"
msgstr ""
#: portato/gui/templates/portato.glade:1342
@@ -384,7 +376,7 @@ msgid "This is an expanded use flag and cannot be selected"
msgstr ""
#: portato/gui/gtk/windows.py:616
-msgid "Flags"
+msgid "Flag"
msgstr ""
#: portato/gui/gtk/windows.py:617
@@ -417,6 +409,14 @@ msgstr ""
msgid "Console (%(title)s)"
msgstr ""
+#: portato/gui/gtk/windows.py:1218
+msgid "use flags"
+msgstr ""
+
+#: portato/gui/gtk/windows.py:1225
+msgid "masking keywords"
+msgstr ""
+
#: portato/gui/gtk/uncaughtException.py:28
msgid ""
"A programming error has been detected during the execution of this program."
@@ -615,13 +615,13 @@ msgstr ""
#: portato.py:78
#, python-format
-msgid "Verification failed. XML syntax error: %s."
+msgid "Validation failed. XML syntax error: %s."
msgstr ""
#: portato.py:81
-msgid "Verification failed. Does not comply with schema."
+msgid "Validation failed. Does not comply with schema."
msgstr ""
#: portato.py:84
-msgid "Verification succeeded."
+msgid "Validation succeeded."
msgstr ""
diff --git a/plugins/etc_proposals.xml b/plugins/etc_proposals.xml
index 410ce4b..2caf341 100644
--- a/plugins/etc_proposals.xml
+++ b/plugins/etc_proposals.xml
@@ -2,7 +2,7 @@
<plugin xmlns="http://portato.sourceforge.net/plugin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portato.sourceforge.net/plugin http://portato.sourceforge.net/plugin.xsd">
<author>René 'Necoro' Neumann</author>
- <name>Etc-proposals plugin</name>
+ <name>Etc-proposals</name>
<import>portato.plugins.etc_proposals</import>
diff --git a/pocompile.sh b/pocompile.sh
index b10460b..e9cf3b1 100755
--- a/pocompile.sh
+++ b/pocompile.sh
@@ -4,8 +4,7 @@
# Copied from porthole :)
cd i18n
for ITEM in *.po; do
- ITEM2=${ITEM/.po/}
- LANG=${ITEM2/_??/}
+ LANG=${ITEM/.po/}
if [ $1 == "-emerge" ]; then
mkdir mo -p
diff --git a/portato.py b/portato.py
index 603e23d..e318411 100755
--- a/portato.py
+++ b/portato.py
@@ -75,13 +75,13 @@ def main ():
try:
etree.XMLSchema(file = XSD_LOCATION).assertValid(etree.parse(options.validate))
except etree.XMLSyntaxError, e:
- print _("Verification failed. XML syntax error: %s.") % e[0]
+ print _("Validation failed. XML syntax error: %s.") % e[0]
sys.exit(3)
except etree.DocumentInvalid:
- print _("Verification failed. Does not comply with schema.")
+ print _("Validation failed. Does not comply with schema.")
sys.exit(3)
else:
- print _("Verification succeeded.")
+ print _("Validation succeeded.")
return
else:
run()
diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py
index cc70122..2cba5b2 100644
--- a/portato/gui/gtk/windows.py
+++ b/portato/gui/gtk/windows.py
@@ -613,7 +613,7 @@ class PackageTable:
tCell.set_property("activatable", True)
tCell.connect("toggled", self.cb_use_flag_toggled, store)
self.useList.append_column(gtk.TreeViewColumn(_("Enabled"), tCell, active = 0))
- self.useList.append_column(gtk.TreeViewColumn(_("Flags"), cell, text = 1))
+ self.useList.append_column(gtk.TreeViewColumn(_("Flag"), cell, text = 1))
self.useList.append_column(gtk.TreeViewColumn(_("Description"), cell, markup = 2))
self.useList.set_search_column(1)
@@ -1215,14 +1215,14 @@ class MainWindow (Window):
self.notebook.set_current_page(self.CONSOLE_PAGE)
if len(flags.newUseFlags) > 0:
- changed_flags_dialog("use flags")
+ changed_flags_dialog(_("use flags"))
flags.write_use_flags()
if len(flags.new_masked)>0 or len(flags.new_unmasked)>0 or len(flags.newTesting)>0:
debug("new masked: %s",flags.new_masked)
debug("new unmasked: %s", flags.new_unmasked)
debug("new testing: %s", flags.newTesting)
- changed_flags_dialog("masking keywords")
+ changed_flags_dialog(_("masking keywords"))
flags.write_masked()
flags.write_testing()
system.reload_settings()
diff --git a/portato/gui/templates/portato.glade b/portato/gui/templates/portato.glade
index b16cec7..31d5805 100644
--- a/portato/gui/templates/portato.glade
+++ b/portato/gui/templates/portato.glade
@@ -450,54 +450,109 @@
<property name="n_rows">5</property>
<property name="n_columns">3</property>
<child>
- <widget class="GtkHBox" id="checkHB">
+ <widget class="GtkHBox" id="pkgLinkBox">
<property name="visible">True</property>
- <property name="spacing">1</property>
- <property name="homogeneous">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkCheckButton" id="installedCheck">
- <property name="visible">True</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes">Installed</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="button_press_event" handler="cb_button_pressed"/>
- </widget>
- <packing>
- <property name="fill">False</property>
- </packing>
+ <placeholder/>
</child>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_EXPAND</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="notInSysLabel">
+ <property name="visible">True</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Installed, but not in portage anymore&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkCheckButton" id="maskedCheck">
+ <widget class="GtkScrolledWindow" id="versionListScroll">
<property name="visible">True</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes">Masked</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="cb_masked_toggled"/>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTreeView" id="versionList">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_clickable">True</property>
+ <property name="show_expanders">False</property>
+ <signal name="cursor_changed" handler="cb_vers_list_changed"/>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="testingCheck">
+ <widget class="GtkScrolledWindow" id="useListScroll">
<property name="visible">True</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes">Testing</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="cb_testing_toggled"/>
+ <property name="can_focus">False</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTreeView" id="useList">
+ <property name="visible">True</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_padding">5</property>
+ <property name="y_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="descLabel">
+ <property name="visible">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ <property name="y_padding">10</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="missingLabel">
+ <property name="visible">True</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">&lt;span foreground='red'&gt;&lt;b&gt;MISSING KEYWORD&lt;/b&gt;&lt;/span&gt;</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options">GTK_FILL</property>
@@ -562,90 +617,51 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="missingLabel">
- <property name="visible">True</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes">&lt;span foreground='red'&gt;&lt;b&gt;MISSING KEYWORD&lt;/b&gt;&lt;/span&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="descLabel">
- <property name="visible">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="y_padding">10</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="checkHB">
<property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">5</property>
+ <property name="spacing">1</property>
+ <property name="homogeneous">True</property>
<child>
- <widget class="GtkScrolledWindow" id="versionListScroll">
+ <widget class="GtkCheckButton" id="installedCheck">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <child>
- <widget class="GtkTreeView" id="versionList">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_clickable">True</property>
- <property name="show_expanders">False</property>
- <signal name="cursor_changed" handler="cb_vers_list_changed"/>
- </widget>
- </child>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Installed</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="button_press_event" handler="cb_button_pressed"/>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="useListScroll">
+ <widget class="GtkCheckButton" id="maskedCheck">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <child>
- <widget class="GtkTreeView" id="useList">
- <property name="visible">True</property>
- </widget>
- </child>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Masked</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="cb_masked_toggled"/>
</widget>
<packing>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_padding">5</property>
- <property name="y_padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="notInSysLabel">
- <property name="visible">True</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Installed, but not in portage anymore&lt;/b&gt;</property>
- <property name="use_markup">True</property>
+ <child>
+ <widget class="GtkCheckButton" id="testingCheck">
+ <property name="visible">True</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes">Testing</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="cb_testing_toggled"/>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="right_attach">3</property>
@@ -654,22 +670,6 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <widget class="GtkHBox" id="pkgLinkBox">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_EXPAND</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
<packing>
<property name="tab_expand">False</property>
@@ -849,7 +849,7 @@
<widget class="GtkWindow" id="SearchWindow">
<property name="width_request">350</property>
<property name="height_request">250</property>
- <property name="title" translatable="yes">Search</property>
+ <property name="title" translatable="yes">Search Results</property>
<property name="default_width">1</property>
<property name="default_height">1</property>
<property name="destroy_with_parent">True</property>
@@ -1034,7 +1034,7 @@
<child>
<widget class="GtkCheckButton" id="deepCheck">
<property name="visible">True</property>
- <property name="label" translatable="yes">--deep</property>
+ <property name="label">--deep</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
@@ -1045,7 +1045,7 @@
<child>
<widget class="GtkCheckButton" id="newUseCheck">
<property name="visible">True</property>
- <property name="label" translatable="yes">--newuse</property>
+ <property name="label">--newuse</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
@@ -1147,189 +1147,189 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="maskLabel">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">&lt;u&gt;&lt;i&gt;Masking Keywords&lt;/i&gt;&lt;/u&gt;</property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="y_padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="testLabel">
+ <widget class="GtkEntry" id="useFileEdit">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">&lt;u&gt;&lt;i&gt;Testing Keywords&lt;/i&gt;&lt;/u&gt;</property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_padding">5</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="useLabel">
+ <widget class="GtkLabel" id="useEditLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">&lt;u&gt;&lt;i&gt;Use-Flags&lt;/i&gt;&lt;/u&gt;</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">File name to use, if package.use is a directory: </property>
<property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_padding">6</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <widget class="GtkEventBox" id="hintEB">
+ <widget class="GtkCheckButton" id="usePerVersionCheck">
<property name="visible">True</property>
- <child>
- <widget class="GtkFrame" id="hintFrame">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_OUT</property>
- <child>
- <widget class="GtkLabel" id="hintLabel">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">&lt;u&gt;You may use the following placeholders:&lt;/u&gt;
-
-&lt;i&gt;$(cat)&lt;/i&gt;: category
-&lt;i&gt;$(pkg)&lt;/i&gt;: package name
-&lt;i&gt;$(cat-1)/$(cat-2)&lt;/i&gt;: first/second part of the category</property>
- <property name="use_markup">True</property>
- </widget>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- </child>
+ <property name="label" translatable="yes">Add only exact version to package.use</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="maskPerVersionCheck">
+ <widget class="GtkCheckButton" id="testPerVersionCheck">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add only exact version to package.mask/package.unmask</property>
+ <property name="label" translatable="yes">Add only exact version to package.keywords</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="maskEditLabel">
+ <widget class="GtkLabel" id="testEditLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">File name to use, if package.mask/package.unmask is a directory: </property>
+ <property name="label" translatable="yes">File name to use, if package.keywords is a directory: </property>
<property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="maskFileEdit">
+ <widget class="GtkEntry" id="testFileEdit">
<property name="visible">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="testFileEdit">
+ <widget class="GtkEntry" id="maskFileEdit">
<property name="visible">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="testEditLabel">
+ <widget class="GtkLabel" id="maskEditLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">File name to use, if package.keywords is a directory: </property>
+ <property name="label" translatable="yes">File name to use, if package.mask/package.unmask is a directory: </property>
<property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="testPerVersionCheck">
+ <widget class="GtkCheckButton" id="maskPerVersionCheck">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add only exact version to package.keywords</property>
+ <property name="label" translatable="yes">Add only exact version to package.mask/package.unmask</property>
<property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="usePerVersionCheck">
+ <widget class="GtkEventBox" id="hintEB">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add only exact version to package.use</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <child>
+ <widget class="GtkFrame" id="hintFrame">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_OUT</property>
+ <child>
+ <widget class="GtkLabel" id="hintLabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">&lt;u&gt;You may use the following placeholders:&lt;/u&gt;
+
+&lt;i&gt;$(cat)&lt;/i&gt;: category
+&lt;i&gt;$(pkg)&lt;/i&gt;: package name
+&lt;i&gt;$(cat-1)/$(cat-2)&lt;/i&gt;: first/second part of the category</property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="useEditLabel">
+ <widget class="GtkLabel" id="useLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">File name to use, if package.use is a directory: </property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">&lt;u&gt;&lt;i&gt;Use-Flags&lt;/i&gt;&lt;/u&gt;</property>
+ <property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_padding">6</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="useFileEdit">
+ <widget class="GtkLabel" id="testLabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">&lt;u&gt;&lt;i&gt;Testing Keywords&lt;/i&gt;&lt;/u&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="maskLabel">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">&lt;u&gt;&lt;i&gt;Masking Keywords&lt;/i&gt;&lt;/u&gt;</property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="y_padding">5</property>
</packing>
</child>
</widget>