diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:36:06 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:51:38 -0500 |
| commit | 20b8fcfa33feeade5946bc7f3046705da5d164fe (patch) | |
| tree | 5199d13a9f18aa90ce51244c3c3eb6685d7673ab /po/en@boldquot.po | |
| parent | dc94a241c30484611688a8bfb5515577f017529e (diff) | |
| parent | d11ac82062d729be5d63c9c40c5c2bb312a8b8f1 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c
Diffstat (limited to 'po/en@boldquot.po')
| -rw-r--r-- | po/en@boldquot.po | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 2f2f3960..c561c282 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: openbox 3.999.0\n" +"Project-Id-Version: openbox 3.4.5\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-01-17 22:13+0100\n" -"PO-Revision-Date: 2008-01-17 22:13+0100\n" +"POT-Creation-Date: 2008-01-25 03:51+0100\n" +"PO-Revision-Date: 2008-01-25 03:51+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "Invalid action ‘[1m%s[0m’ requested. No such action exists." msgid "Failed to convert the path '%s' from utf8" msgstr "Failed to convert the path ‘[1m%s[0m’ from utf8" -#: openbox/actions/execute.c:97 openbox/actions/execute.c:115 +#: openbox/actions/execute.c:97 openbox/actions/execute.c:116 #, c-format msgid "Failed to execute '%s': %s" msgstr "Failed to execute '%s': %s" @@ -310,7 +310,7 @@ msgstr "" "\n" "Please report bugs at %s\n" -#: openbox/openbox.c:604 +#: openbox/openbox.c:602 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Invalid command line argument ‘[1m%s[0m’\n" @@ -330,7 +330,16 @@ msgstr "Could not acquire window manager selection on screen %d" msgid "The WM on screen %d is not exiting" msgstr "The WM on screen %d is not exiting" -#: openbox/screen.c:1162 +#: openbox/screen.c:407 +#, c-format +msgid "" +"Openbox is configured for %d desktops, but the current session has %d. " +"Overriding the Openbox configuration." +msgstr "" +"Openbox is configured for %d desktops, but the current session has %d. " +"Overriding the Openbox configuration." + +#: openbox/screen.c:1168 #, c-format msgid "desktop %i" msgstr "desktop %i" @@ -350,7 +359,7 @@ msgstr "Unable to save the session to '%s': %s" msgid "Error while saving the session to '%s': %s" msgstr "Error while saving the session to '%s': %s" -#: openbox/startupnotify.c:237 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s\n" msgstr "Running %s\n" |