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/sk.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/sk.po')
| -rw-r--r-- | po/sk.po | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Openbox-3.4.3\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-01-17 22:13+0100\n" +"POT-Creation-Date: 2008-01-25 03:51+0100\n" "PO-Revision-Date: 2007-12-7 13:43Central Europe Daylight Time\n" "Last-Translator: Jozef Riha <jose1711@gmail.com\n" "Language-Team: Slovak <sk@sk.org>\n" @@ -25,7 +25,7 @@ msgstr "Vyžiadaná neplatná akcia '%s'. Takáto akcia neexistuje." msgid "Failed to convert the path '%s' from utf8" msgstr "Nepodarilo sa skonvertovať cestu '%s' z 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 "Nepodarilo sa spustiť '%s': %s" @@ -251,9 +251,8 @@ msgid " --restart Restart Openbox\n" msgstr " --restart Restartuje Openbox\n" #: openbox/openbox.c:495 -#, fuzzy msgid " --exit Exit Openbox\n" -msgstr " --restart Restartuje Openbox\n" +msgstr "" #: openbox/openbox.c:496 msgid "" @@ -289,7 +288,7 @@ msgstr "" "\n" "Prosim hlaste chyby na %s\n" -#: openbox/openbox.c:604 +#: openbox/openbox.c:602 #, c-format msgid "Invalid command line argument '%s'\n" msgstr "Neplatny parameter prikazoveho riadku '%s'\n" @@ -309,7 +308,14 @@ msgstr "Nepodarilo sa získať výber okenného manažéra na obrazovke %d" msgid "The WM on screen %d is not exiting" msgstr "Okenný manažér na obrazovke %d sa neukončuje" -#: 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/screen.c:1168 #, c-format msgid "desktop %i" msgstr "plocha %i" @@ -329,7 +335,7 @@ msgstr "Nepodarilo sa uložiť sedenie '%s': %s" msgid "Error while saving the session to '%s': %s" msgstr "Chyba pri ukladaní sedenia do '%s': %s" -#: openbox/startupnotify.c:237 +#: openbox/startupnotify.c:241 #, c-format msgid "Running %s\n" msgstr "Spúšťam %s\n" |