diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2008-11-15 22:53:02 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2008-11-15 22:53:02 +0100 |
| commit | a1746ab2158da2324aefb7ce81e7b5edc9c41e79 (patch) | |
| tree | d74e132e17c57ea12b7c0731c17c624775d3a938 /po/en@quot.po | |
| parent | c230443c6596039f426542f5a286120891a745c5 (diff) | |
| parent | e59d06c7f3ede4911c8ab08c101f6b0322a0ea58 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/event.c
Diffstat (limited to 'po/en@quot.po')
| -rw-r--r-- | po/en@quot.po | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/po/en@quot.po b/po/en@quot.po index 41f9861b..4a8ed324 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.999.0\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-05-24 16:33+0200\n" -"PO-Revision-Date: 2008-05-24 16:33+0200\n" +"POT-Creation-Date: 2008-11-15 22:28+0100\n" +"PO-Revision-Date: 2008-11-15 22:28+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -61,7 +61,7 @@ msgid "Failed to convert the path \"%s\" from utf8" msgstr "Failed to convert the path “%s” from utf8" #: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3458 +#: openbox/client.c:3465 msgid "Cancel" msgstr "Cancel" @@ -95,19 +95,19 @@ msgstr "Log Out" msgid "Are you sure you want to log out?" msgstr "Are you sure you want to log out?" -#: openbox/client.c:2005 +#: openbox/client.c:2012 msgid "Unnamed Window" msgstr "Unnamed Window" -#: openbox/client.c:2019 openbox/client.c:2051 +#: openbox/client.c:2026 openbox/client.c:2058 msgid "Killing..." msgstr "Killing..." -#: openbox/client.c:2021 openbox/client.c:2053 +#: openbox/client.c:2028 openbox/client.c:2060 msgid "Not Responding" msgstr "Not Responding" -#: openbox/client.c:3447 +#: openbox/client.c:3454 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " @@ -116,11 +116,11 @@ msgstr "" "The window “%s” does not seem to be responding. Do you want to force it to " "exit by sending the %s signal?" -#: openbox/client.c:3449 +#: openbox/client.c:3456 msgid "End Process" msgstr "End Process" -#: openbox/client.c:3453 +#: openbox/client.c:3460 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " @@ -129,7 +129,7 @@ msgstr "" "The window “%s” does not seem to be responding. Do you want to disconnect " "it from the X server?" -#: openbox/client.c:3455 +#: openbox/client.c:3462 msgid "Disconnect" msgstr "Disconnect" @@ -436,9 +436,15 @@ msgstr "The WM on screen %d is not exiting" #: openbox/screen.c:412 #, c-format msgid "" +"Openbox is configured for %d desktop, but the current session has %d. " +"Overriding the Openbox configuration." +msgid_plural "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." -msgstr "" +msgstr[0] "" +"Openbox is configured for %d desktop, but the current session has %d. " +"Overriding the Openbox configuration." +msgstr[1] "" "Openbox is configured for %d desktops, but the current session has %d. " "Overriding the Openbox configuration." @@ -457,12 +463,12 @@ msgstr "Unable to make directory “%s”: %s" msgid "Unable to save the session to \"%s\": %s" msgstr "Unable to save the session to “%s”: %s" -#: openbox/session.c:598 +#: openbox/session.c:605 #, c-format msgid "Error while saving the session to \"%s\": %s" msgstr "Error while saving the session to “%s”: %s" -#: openbox/session.c:835 +#: openbox/session.c:842 msgid "Not connected to a session manager" msgstr "Not connected to a session manager" |