Shell: fix handling of commandlines

With HANDLES_COMMANDLINE, the commandline is handled in the primary
instance. That means two things:
- We cannot let GOption handle --help, since it calls exit() after
  printing out the help
- The static booleans need to be reset to FALSE for each handled
  commandline

This commit adds a new string, 'Show help options'. It also includes
existing translations for this string that were taken from GLib.

1 files changed, 21 insertions, 11 deletions

diff --git a/po/kn.po b/po/kn.po
index 7e858dc31..abbb4fd15 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-control-center.master.kn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=gnome-control-center&keywords=I18N+L10N&component=general\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"control-center&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2011-03-29 14:22+0000\n"
 "PO-Revision-Date: 2011-04-01 00:33+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
@@ -115,7 +115,8 @@ msgid "Change set"
 msgstr "ಬದಲಾವಣೆ ಸೆಟ್"
 
 #: ../libgnome-control-center/gconf-property-editor.c:148
-msgid "GConf change set containing data to be forwarded to the gconf client on apply"
+msgid ""
+"GConf change set containing data to be forwarded to the gconf client on apply"
 msgstr ""
 "ಅನ್ವಯಿಸಿದಾಗ gconf ಕ್ಲೈಂಟಿಗೆ ರವಾನಿಸಬೇಕಿರುವ ದತ್ತಾಂಶವನ್ನು ಹೊಂದಿರುವ GConf ಬದಲಾವಣೆ ಸೆಟ್"
 
@@ -124,7 +125,8 @@ msgid "Conversion to widget callback"
 msgstr "ವಿಜೆಟ್‌ ಕಾಲ್‌ಬ್ಯಾಕ್‌ಗೆ ಪರಿವರ್ತನೆ"
 
 #: ../libgnome-control-center/gconf-property-editor.c:154
-msgid "Callback to be issued when data are to be converted from GConf to the widget"
+msgid ""
+"Callback to be issued when data are to be converted from GConf to the widget"
 msgstr "ವಿಜೆಟ್‌ಗೆ GConf ನಿಂದ ದತ್ತಾಂಶವನ್ನು ಮಾರ್ಪಡಿಸಬೇಕಾದಾಗ ಒದಗಿಸಬೇಕಿರುವ ಕಾಲ್‌ಬ್ಯಾಕ್"
 
 #: ../libgnome-control-center/gconf-property-editor.c:159
@@ -132,7 +134,8 @@ msgid "Conversion from widget callback"
 msgstr "ವಿಜೆಟ್‌ ಕಾಲ್‌ಬ್ಯಾಕ್‌ನಿಂದ ಪರಿವರ್ತನೆ"
 
 #: ../libgnome-control-center/gconf-property-editor.c:160
-msgid "Callback to be issued when data are to be converted to GConf from the widget"
+msgid ""
+"Callback to be issued when data are to be converted to GConf from the widget"
 msgstr "ವಿಜೆಟ್‌ನಿಂದ GConf ಗೆ ದತ್ತಾಂಶವನ್ನು ಮಾರ್ಪಡಿಸಬೇಕಾದಾಗ ಒದಗಿಸಬೇಕಿರುವ ಕಾಲ್‌ಬ್ಯಾಕ್"
 
 #: ../libgnome-control-center/gconf-property-editor.c:165
@@ -934,7 +937,8 @@ msgstr ""
 
 #: ../panels/keyboard/keyboard-shortcuts.c:1327
 #, c-format
-msgid "If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
+msgid ""
+"If you reassign the shortcut to \"%s\", the \"%s\" shortcut will be disabled."
 msgstr "ಶಾರ್ಟ್-ಕಟ್‌ ಅನ್ನು \"%s\" ಗೆ ನಿಯೋಜಿಸಿದಲ್ಲಿ, \"%s\" ಶಾರ್ಟ್-ಕಟ್‌ ಅಶಕ್ತಗೊಳ್ಳುತ್ತದೆ."
 
 #: ../panels/keyboard/keyboard-shortcuts.c:1333
@@ -1804,7 +1808,8 @@ msgstr ""
 
 #. TRANSLATORS: this is when the use leaves the PAC textbox blank
 #: ../panels/network/cc-network-panel.c:193
-msgid "Web Proxy Autodiscovery is used when a Configuration URL is not provided."
+msgid ""
+"Web Proxy Autodiscovery is used when a Configuration URL is not provided."
 msgstr ""
 
 #. TRANSLATORS: WPAD is bad: if you enable it on an untrusted
@@ -3135,7 +3140,8 @@ msgid "Administrator"
 msgstr "ವ್ಯವಸ್ಥಾಪಕ"
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:107
-msgid "You are not allowed to access the device. Contact your system administrator."
+msgid ""
+"You are not allowed to access the device. Contact your system administrator."
 msgstr "ನೀವು ಈ ಸಾಧನವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳುವಂತಿಲ್ಲ. ನಿಮ್ಮ ಗಣಕ ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
 #: ../panels/user-accounts/um-fingerprint-dialog.c:109
@@ -3504,8 +3510,8 @@ msgid ""
 "<a href=\"http://wolfram.org/writing/howto/password.html\">How to choose a "
 "strong password</a>"
 msgstr ""
-"<a href=\"http://wolfram.org/writing/howto/password.html\">ಸದೃಢವಾದ ಗುಪ್ತಪದವನ್ನು ಹೇಗೆ "
-"ಆರಿಸಿಬೇಕು</a>"
+"<a href=\"http://wolfram.org/writing/howto/password.html\">ಸದೃಢವಾದ "
+"ಗುಪ್ತಪದವನ್ನು ಹೇಗೆ ಆರಿಸಿಬೇಕು</a>"
 
 #: ../panels/user-accounts/data/password-dialog.ui.h:2
 msgid ""
@@ -3595,7 +3601,8 @@ msgid "Changing photo for:"
 msgstr "ಇವರ ಚಿತ್ರವನ್ನು ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ:"
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:5
-msgid "Choose a picture that will be shown at the login screen for this account."
+msgid ""
+"Choose a picture that will be shown at the login screen for this account."
 msgstr ""
 
 #: ../panels/user-accounts/data/photo-dialog.ui.h:6
@@ -3729,6 +3736,9 @@ msgstr "ನಿಯಂತ್ರಣ ಕೇಂದ್ರ"
 msgid "_All Settings"
 msgstr "ಎಲ್ಲಾ ಸಿದ್ಧತೆಗಳು (_A)"
 
+msgid "Show help options"
+msgstr "ಸಹಾಯ ಆಯ್ಕೆಯನ್ನು ತೋರಿಸು"
+
 #~ msgid "Image/label border"
 #~ msgstr "ಚಿತ್ರ/ಲೇಬಲ್ ಅಂಚು"