From 2570d8f25fcbfbae344b33cd63774a37c952d6eb Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 29 Jan 2008 14:04:31 +0100 Subject: Mark translations without the new desktop number mismatch message as 3.4.5. Update swedish translation with them. [ I mistakenly originally made this commit on 3.4-working (commit 7f514044f7fb8f5c2948d9b3da837a9b46717ee5) so the changes got lost on a subsequent merge from backport when we usually overwrite po/. ] --- po/en@boldquot.po | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'po/en@boldquot.po') 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 ‘%s’ requested. No such action exists." msgid "Failed to convert the path '%s' from utf8" msgstr "Failed to convert the path ‘%s’ 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 ‘%s’\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" -- cgit v1.2.3