Permalink
Browse files

Improved gettext support (incomplete)

  • Loading branch information...
1 parent 8b78fbd commit 454b19d352fcd1cc273136312c2cc448c8688145 @clefebvre clefebvre committed Mar 7, 2012
View
1,485 cinnamon.pot

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,59 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-07 15:23+0000\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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:20
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:136
-msgid "Desktop Settings"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:21
-msgid "Desktop Configuration Tool"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:22
-msgid "Fine-tune desktop settings"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:105
-msgid "Terminal"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:108
-msgid "Panel"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:110
-msgid "Menu text"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:111
-msgid "Auto-hide panel"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:113
-msgid "Hot Corner"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:115
-msgid "Overview icon visible"
-msgstr ""
-
-#: usr/lib/cinnamon-settings/cinnamon-settings.py:116
-msgid "Overview hot corner enabled"
-msgstr ""
@@ -26,7 +26,7 @@ Name=Cinnamon Settings
""")
import gettext
-gettext.install("cinnamon-settings", "/usr/share/cinnamon/locale")
+gettext.install("cinnamon", "/usr/share/cinnamon/locale")
for directory in os.listdir("/usr/share/cinnamon/locale"):
if os.path.isdir(os.path.join("/usr/share/cinnamon/locale", directory)):
View
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-xgettext --language=Python --keyword=_ --output=cinnamon-settings.pot usr/lib/cinnamon-settings/cinnamon-settings.py
@@ -22,7 +22,7 @@
# i18n
-gettext.install("cinnamon-settings", "/usr/share/cinnamon/locale")
+gettext.install("cinnamon", "/usr/share/cinnamon/locale")
# i18n for menu item
menuName = _("Desktop Settings")
@@ -824,10 +824,10 @@ def __init__(self):
proxy = dbus.SystemBus().get_object("org.gnome.SettingsDaemon.DateTimeMechanism", "/")
self.dbus_iface = dbus.Interface(proxy, dbus_interface="org.gnome.SettingsDaemon.DateTimeMechanism")
- # Ensures we're setting the system time only when the user changes it
+ # Ensures we are setting the system time only when the user changes it
self.changedOnTimeout = False
- # Ensures we don't update the values in the date/time fields during the DBus call to set the time
+ # Ensures we do not update the values in the date/time fields during the DBus call to set the time
self._setting_time = False
self._setting_time_lock = thread.allocate()
self._time_to_set = None
@@ -937,7 +937,7 @@ def _do_change_system_time(self):
self._setting_time = True
self._setting_time_lock.release()
- # If there's already another thread updating the time, we let it do the job
+ # If there is already another thread updating the time, we let it do the job
if not do_set:
return
@@ -1151,7 +1151,7 @@ def __init__(self):
label.set_markup("%s" % _("Hot corner position:"))
box.pack_start(label, False, False, 0)
positions = [["topLeft", _("Top left")], ["topRight", _("Top right")], ["bottomLeft", _("Bottom left")], ["bottomRight", _("Bottom right")]]
- combo = GSettingsComboBox(_(""), "org.cinnamon", "overview-corner-position", positions)
+ combo = GSettingsComboBox("", "org.cinnamon", "overview-corner-position", positions)
box.pack_start(combo, False, False, 0)
sidePage.add_widget(box)
@@ -1160,7 +1160,7 @@ def __init__(self):
label.set_markup("%s" % _("Hot corner function:"))
box.pack_start(label, False, False, 0)
cornerfunctions = [["expo", _("Workspace selection (ala Compiz Expo)")], ["scale", _("Window selection (ala Compiz Scale)")]]
- combo = GSettingsComboBox(_(""), "org.cinnamon", "overview-corner-functionality", cornerfunctions)
+ combo = GSettingsComboBox("", "org.cinnamon", "overview-corner-functionality", cornerfunctions)
box.pack_start(combo, False, False, 0)
sidePage.add_widget(box)
@@ -1210,11 +1210,11 @@ def __init__(self):
label.set_markup("%s" % _("Closing windows:"))
box.pack_start(label, False, False, 0)
effects = [["none", _("None")], ["scale", _("Scale")], ["fade", _("Fade")]]
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-close-effect", effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-close-effect", effects)
box.pack_start(combo, False, False, 0)
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-close-transition", transition_effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-close-transition", transition_effects)
box.pack_start(combo, False, False, 0)
- spin = GSettingsSpinButton(_(""), "org.cinnamon", "desktop-effects-close-time", 0, 2000, 50, 200, _("milliseconds"))
+ spin = GSettingsSpinButton("", "org.cinnamon", "desktop-effects-close-time", 0, 2000, 50, 200, _("milliseconds"))
box.pack_start(spin, False, False, 0)
sidePage.add_widget(box)
@@ -1224,11 +1224,11 @@ def __init__(self):
label.set_markup("%s" % _("Mapping windows:"))
box.pack_start(label, False, False, 0)
effects = [["none", _("None")], ["scale", _("Scale")], ["fade", _("Fade")]]
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-map-effect", effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-map-effect", effects)
box.pack_start(combo, False, False, 0)
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-map-transition", transition_effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-map-transition", transition_effects)
box.pack_start(combo, False, False, 0)
- spin = GSettingsSpinButton(_(""), "org.cinnamon", "desktop-effects-map-time", 0, 2000, 50, 200, _("milliseconds"))
+ spin = GSettingsSpinButton("", "org.cinnamon", "desktop-effects-map-time", 0, 2000, 50, 200, _("milliseconds"))
box.pack_start(spin, False, False, 0)
sidePage.add_widget(box)
@@ -1238,11 +1238,11 @@ def __init__(self):
label.set_markup("%s" % _("Minimizing windows:"))
box.pack_start(label, False, False, 0)
effects = [["none", _("None")], ["traditional", _("Traditional")], ["scale", _("Scale")], ["fade", _("Fade")]]
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-minimize-effect", effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-minimize-effect", effects)
box.pack_start(combo, False, False, 0)
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-minimize-transition", transition_effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-minimize-transition", transition_effects)
box.pack_start(combo, False, False, 0)
- spin = GSettingsSpinButton(_(""), "org.cinnamon", "desktop-effects-minimize-time", 0, 2000, 50, 200, _("milliseconds"))
+ spin = GSettingsSpinButton("", "org.cinnamon", "desktop-effects-minimize-time", 0, 2000, 50, 200, _("milliseconds"))
box.pack_start(spin, False, False, 0)
sidePage.add_widget(box)
@@ -1252,11 +1252,11 @@ def __init__(self):
label.set_markup("%s" % _("Maximizing windows:"))
box.pack_start(label, False, False, 0)
effects = [["none", _("None")], ["scale", _("Scale")]]
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-maximize-effect", effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-maximize-effect", effects)
box.pack_start(combo, False, False, 0)
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-maximize-transition", transition_effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-maximize-transition", transition_effects)
box.pack_start(combo, False, False, 0)
- spin = GSettingsSpinButton(_(""), "org.cinnamon", "desktop-effects-maximize-time", 0, 2000, 50, 200, _("milliseconds"))
+ spin = GSettingsSpinButton("", "org.cinnamon", "desktop-effects-maximize-time", 0, 2000, 50, 200, _("milliseconds"))
box.pack_start(spin, False, False, 0)
sidePage.add_widget(box)
@@ -1266,11 +1266,11 @@ def __init__(self):
label.set_markup("%s" % _("Unmaximizing windows:"))
box.pack_start(label, False, False, 0)
effects = [["none", _("None")]]
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-unmaximize-effect", effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-unmaximize-effect", effects)
box.pack_start(combo, False, False, 0)
- combo = GSettingsComboBox(_(""), "org.cinnamon", "desktop-effects-unmaximize-transition", transition_effects)
+ combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-unmaximize-transition", transition_effects)
box.pack_start(combo, False, False, 0)
- spin = GSettingsSpinButton(_(""), "org.cinnamon", "desktop-effects-unmaximize-time", 0, 2000, 50, 200, _("milliseconds"))
+ spin = GSettingsSpinButton("", "org.cinnamon", "desktop-effects-unmaximize-time", 0, 2000, 50, 200, _("milliseconds"))
box.pack_start(spin, False, False, 0)
sidePage.add_widget(box)
@@ -86,8 +86,7 @@ MyApplet.prototype = {
}
};
-const MESSAGE = _("Are you sure you want to delete all items from the trash?\n\
-This operation cannot be undone.");
+const MESSAGE = _("Are you sure you want to delete all items from the trash?") + "\n" + _("This operation cannot be undone.");
function ConfirmEmptyTrashDialog(emptyMethod) {
this._init(emptyMethod);
Oops, something went wrong.

0 comments on commit 454b19d

Please sign in to comment.