From 4a15b96585c9f580e8a58b9bb5fc370294b4495b Mon Sep 17 00:00:00 2001 From: Davide Truffa Date: Wed, 25 Feb 2009 23:51:45 +0100 Subject: Update italian translation. --- po/it.po | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/po/it.po b/po/it.po index 263e6ae0..0b67ee8f 100644 --- a/po/it.po +++ b/po/it.po @@ -1,8 +1,8 @@ # Italian translation for Openbox -# Copyright (C) 2007 Davide Truffa +# Copyright (C) 2007-2009 Davide Truffa # Copyright (C) 2008 Andrea Scarpino # This file is distributed under the same license as the openbox package. -# Davide Truffa , 2007. +# Davide Truffa , 2007-2009. # Andrea Scarpino , 2008. # # @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2008-05-15 13:09+0200\n" -"Last-Translator: Andrea Scarpino \n" +"POT-Creation-Date: 2009-02-25 23:51+0100\n" +"PO-Revision-Date: 2009-02-25 11:29+0100\n" +"Last-Translator: Davide Truffa \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,7 +65,7 @@ msgid "" "The SessionLogout action is not available since Openbox was built without " "session management support" msgstr "" -"L'azione SessionLogout non è disponibile se Openbox è compilato senzail " +"L'azione SessionLogout non è disponibile se Openbox è compilato senza il " "supporto del gestore delle sessioni." #: openbox/actions/session.c:65 openbox/actions/session.c:70 @@ -95,7 +95,7 @@ msgid "" "to exit by sending the %s signal?" msgstr "" "La finestra \"%s\" sembra non rispondere. Vuoi terminarne l'esecuzione " -"inviando un segnale %s?" +"inviando il segnale %s?" #: openbox/client.c:3456 msgid "End Process" @@ -107,8 +107,8 @@ msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "" -"La finestra \"%s\" non sembra rispondere. Vuoi terminarne l'esecuzione dal " -"server X?" +"La finestra \"%s\" non sembra rispondere. Vuoi terminarne l'esecuzione " +"tramite il server X?" #: openbox/client.c:3462 msgid "Disconnect" @@ -198,7 +198,7 @@ msgstr "Si/No _Decorazioni" msgid "_Close" msgstr "_Chiudi" -#: openbox/config.c:781 +#: openbox/config.c:782 #, c-format msgid "Invalid button \"%s\" specified in config file" msgstr "Il pulsante \"%s\" specificato nel file di configurazione non è valido" @@ -263,8 +263,7 @@ msgstr "Il server X non ha il supporto per la localizzazione." #: openbox/openbox.c:196 msgid "Cannot set locale modifiers for the X server." msgstr "" -"Impossibile impostare la localizzazione dei tasti modificatori per il server " -"X." +"Impossibile impostare i tasti modificatori localizzati per il server X." #: openbox/openbox.c:263 msgid "Unable to find a valid config file, using some simple defaults" @@ -284,7 +283,7 @@ msgid "" "was in file \"%s\" line %d, with message: %s" msgstr "" "Sono stati trovati uno o più errori nel file di configurazione di Openbox. " -"Vedi stdout per ulteriori informazioni. L'ultimo errore era in \"%s\" alla " +"Vedi stdout per ulteriori informazioni. L'ultimo errore era in \"%s\" alla " "linea %d, con il messaggio: %s" #: openbox/openbox.c:379 @@ -460,7 +459,7 @@ msgstr "Errore durante il salvataggio della sessione in \"%s\": %s" #: openbox/session.c:842 msgid "Not connected to a session manager" -msgstr "Non sei connesso al gestore di sessioni" +msgstr "Non connesso al gestore di sessioni" #: openbox/startupnotify.c:243 #, c-format -- cgit v1.2.3 From 264edb053dcf5cc5b2043bb1b34ac6f116fc4c8c Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 29 Mar 2009 22:34:50 +0200 Subject: Avoid anonymous unions Some compilers, like sun studio and clang don't support them. --- openbox/actions/desktop.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c index 203936d9..07416151 100644 --- a/openbox/actions/desktop.c +++ b/openbox/actions/desktop.c @@ -21,7 +21,7 @@ typedef struct { gboolean wrap; ObDirection dir; } rel; - }; + } u; gboolean send; gboolean follow; } Options; @@ -49,9 +49,9 @@ static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc, o = g_new0(Options, 1); /* don't go anywhere if theres no options given */ o->type = ABSOLUTE; - o->abs.desktop = screen_desktop; + o->u.abs.desktop = screen_desktop; /* wrap by default - it's handy! */ - o->rel.wrap = TRUE; + o->u.rel.wrap = TRUE; if ((n = parse_find_node("to", node))) { gchar *s = parse_string(doc, n); @@ -59,43 +59,43 @@ static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc, o->type = LAST; else if (!g_ascii_strcasecmp(s, "next")) { o->type = RELATIVE; - o->rel.linear = TRUE; - o->rel.dir = OB_DIRECTION_EAST; + o->u.rel.linear = TRUE; + o->u.rel.dir = OB_DIRECTION_EAST; } else if (!g_ascii_strcasecmp(s, "previous")) { o->type = RELATIVE; - o->rel.linear = TRUE; - o->rel.dir = OB_DIRECTION_WEST; + o->u.rel.linear = TRUE; + o->u.rel.dir = OB_DIRECTION_WEST; } else if (!g_ascii_strcasecmp(s, "north") || !g_ascii_strcasecmp(s, "up")) { o->type = RELATIVE; - o->rel.dir = OB_DIRECTION_NORTH; + o->u.rel.dir = OB_DIRECTION_NORTH; } else if (!g_ascii_strcasecmp(s, "south") || !g_ascii_strcasecmp(s, "down")) { o->type = RELATIVE; - o->rel.dir = OB_DIRECTION_SOUTH; + o->u.rel.dir = OB_DIRECTION_SOUTH; } else if (!g_ascii_strcasecmp(s, "west") || !g_ascii_strcasecmp(s, "left")) { o->type = RELATIVE; - o->rel.dir = OB_DIRECTION_WEST; + o->u.rel.dir = OB_DIRECTION_WEST; } else if (!g_ascii_strcasecmp(s, "east") || !g_ascii_strcasecmp(s, "right")) { o->type = RELATIVE; - o->rel.dir = OB_DIRECTION_EAST; + o->u.rel.dir = OB_DIRECTION_EAST; } else { o->type = ABSOLUTE; - o->abs.desktop = atoi(s) - 1; + o->u.abs.desktop = atoi(s) - 1; } g_free(s); } if ((n = parse_find_node("wrap", node))) - o->rel.wrap = parse_bool(doc, n); + o->u.rel.wrap = parse_bool(doc, n); return o; } @@ -127,11 +127,11 @@ static gboolean run_func(ObActionsData *data, gpointer options) d = screen_last_desktop; break; case ABSOLUTE: - d = o->abs.desktop; + d = o->u.abs.desktop; break; case RELATIVE: d = screen_find_desktop(screen_desktop, - o->rel.dir, o->rel.wrap, o->rel.linear); + o->u.rel.dir, o->u.rel.wrap, o->u.rel.linear); break; } -- cgit v1.2.3 From 4ee1ab9f5cf4612a101fc3dc864098d6ea543c3f Mon Sep 17 00:00:00 2001 From: Einars Sprugis Date: Tue, 31 Mar 2009 19:20:23 +0200 Subject: Add latvian translation. --- po/LINGUAS | 1 + po/lv.po | 488 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 489 insertions(+) create mode 100644 po/lv.po diff --git a/po/LINGUAS b/po/LINGUAS index 149afe40..f8f887d7 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -26,6 +26,7 @@ ja ua hu lt +lv tr da diff --git a/po/lv.po b/po/lv.po new file mode 100644 index 00000000..7ef4eeb0 --- /dev/null +++ b/po/lv.po @@ -0,0 +1,488 @@ +# Latvian translations for openbox. +# Copyright (C) 2009 Dana Jansens +# This file is distributed under the same license as the openbox package. +# Einars Sprugis , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: Openbox 3.4.7\n" +"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" +"POT-Creation-Date: 2009-03-31 19:16+0200\n" +"PO-Revision-Date: 2009-03-30 19:14+0300\n" +"Last-Translator: Einars Sprugis \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" + +#: openbox/actions.c:149 +#, c-format +msgid "Invalid action \"%s\" requested. No such action exists." +msgstr "Neatļauta darbība \"%s\". Šāda darbība neeksistē." + +#: openbox/actions/execute.c:128 +msgid "No" +msgstr "Nē" + +#: openbox/actions/execute.c:129 +msgid "Yes" +msgstr "Jā" + +#: openbox/actions/execute.c:133 +msgid "Execute" +msgstr "Izpildīt" + +#: openbox/actions/execute.c:142 +#, c-format +msgid "Failed to convert the path \"%s\" from utf8" +msgstr "Neizdevās pārveidot ceļu \"%s\" no utf8" + +#: openbox/actions/exit.c:52 openbox/actions/session.c:64 +#: openbox/client.c:3465 +msgid "Cancel" +msgstr "Atcelt" + +#: openbox/actions/exit.c:53 +msgid "Exit" +msgstr "Iziet" + +#: openbox/actions/exit.c:56 +msgid "Are you sure you want to exit Openbox?" +msgstr "Vai tiešām vēlaties iziet no Openbox?" + +#: openbox/actions/exit.c:57 +msgid "Exit Openbox" +msgstr "Iziet no Openbox" + +#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the +#. name of the action you write in rc.xml +#: openbox/actions/session.c:43 +msgid "" +"The SessionLogout action is not available since Openbox was built without " +"session management support" +msgstr "" +"SessionLogout darbība nav pieejama, jo Openbox tika kompilēts bez sesijas " +"pārvaldes atbalsta" + +#: openbox/actions/session.c:65 openbox/actions/session.c:70 +msgid "Log Out" +msgstr "Atteikties" + +#: openbox/actions/session.c:69 +msgid "Are you sure you want to log out?" +msgstr "Vai tiešām vēlaties atteikties?" + +#: openbox/client.c:2012 +msgid "Unnamed Window" +msgstr "Logs bez nosaukuma" + +#: openbox/client.c:2026 openbox/client.c:2058 +msgid "Killing..." +msgstr "Nogalina..." + +#: openbox/client.c:2028 openbox/client.c:2060 +msgid "Not Responding" +msgstr "Neatbild" + +#: openbox/client.c:3454 +#, c-format +msgid "" +"The window \"%s\" does not seem to be responding. Do you want to force it " +"to exit by sending the %s signal?" +msgstr "Logs \"%s\" neatbild. Vai vēlieties to piespiest, nosūtot signālu %s?" + +#: openbox/client.c:3456 +msgid "End Process" +msgstr "Nobeigt procesu" + +#: openbox/client.c:3460 +#, c-format +msgid "" +"The window \"%s\" does not seem to be responding. Do you want to disconnect " +"it from the X server?" +msgstr "Logs \"%s\" neatbild. Vai vēlaties to atvienot no X servera?" + +#: openbox/client.c:3462 +msgid "Disconnect" +msgstr "Atvienot" + +#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +msgid "Go there..." +msgstr "Iet uz turieni..." + +#: openbox/client_list_combined_menu.c:94 +msgid "Manage desktops" +msgstr "Pārvaldīt darbvirsmas" + +#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +msgid "_Add new desktop" +msgstr "Pievienot j_aunu darbvirsmu" + +#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +msgid "_Remove last desktop" +msgstr "Aizvākt pēdējo da_rbvirsmu" + +#: openbox/client_list_combined_menu.c:149 +msgid "Windows" +msgstr "Logi" + +#: openbox/client_list_menu.c:203 +msgid "Desktops" +msgstr "Darbvirsmas" + +#: openbox/client_menu.c:258 +msgid "All desktops" +msgstr "Visas darbvirsmas" + +#: openbox/client_menu.c:370 +msgid "_Layer" +msgstr "S_lānis" + +#: openbox/client_menu.c:375 +msgid "Always on _top" +msgstr "Vienmēr augšā" + +#: openbox/client_menu.c:376 +msgid "_Normal" +msgstr "_Normāli" + +#: openbox/client_menu.c:377 +msgid "Always on _bottom" +msgstr "Vienmēr a_pakšā" + +#: openbox/client_menu.c:379 +msgid "_Send to desktop" +msgstr "No_sūtīt uz darbvirsmu" + +#: openbox/client_menu.c:383 +msgid "Client menu" +msgstr "Klientizvēlne" + +#: openbox/client_menu.c:393 +msgid "R_estore" +msgstr "Atja_unot" + +#: openbox/client_menu.c:397 +msgid "_Move" +msgstr "Pārviet_ot" + +#: openbox/client_menu.c:399 +msgid "Resi_ze" +msgstr "Mainīt i_zmēru" + +#: openbox/client_menu.c:401 +msgid "Ico_nify" +msgstr "Mi_nimizēt" + +#: openbox/client_menu.c:405 +msgid "Ma_ximize" +msgstr "Maksimizē_t" + +#: openbox/client_menu.c:409 +msgid "_Roll up/down" +msgstr "Sa_ritināt/Atritināt" + +#: openbox/client_menu.c:411 +msgid "Un/_Decorate" +msgstr "Bez/Ar _dekorācijām" + +#: openbox/client_menu.c:415 +msgid "_Close" +msgstr "Ai_zvērt" + +#: openbox/config.c:782 +#, c-format +msgid "Invalid button \"%s\" specified in config file" +msgstr "Konfigurācijas failā \"%s\" norādīts neatļauts taustiņš" + +#: openbox/keyboard.c:157 +msgid "Conflict with key binding in config file" +msgstr "Konfliktē ar tastatūras saīsnēm konfigurācijas failā" + +#: openbox/menu.c:102 openbox/menu.c:110 +#, c-format +msgid "Unable to find a valid menu file \"%s\"" +msgstr "Nav atrasts atļauts izvēlnes fails \"%s\"" + +#: openbox/menu.c:170 +#, c-format +msgid "Failed to execute command for pipe-menu \"%s\": %s" +msgstr "Nevarēja izpildīt skriptētās izvēlnes komandu \"%s\": %s" + +#: openbox/menu.c:184 +#, c-format +msgid "Invalid output from pipe-menu \"%s\"" +msgstr "Neatļauta izvade no skriptētās izvēlnes \"%s\"" + +#: openbox/menu.c:197 +#, c-format +msgid "Attempted to access menu \"%s\" but it does not exist" +msgstr "Mēģināja piekļūt izvēlnei \"%s\", bet tā neeksistē" + +#: openbox/menu.c:367 openbox/menu.c:368 +msgid "More..." +msgstr "Vairāk..." + +#: openbox/mouse.c:373 +#, c-format +msgid "Invalid button \"%s\" in mouse binding" +msgstr "Neatļauts taustiņš \"%s\" peles saīsnē" + +#: openbox/mouse.c:379 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Neatļauts konteksts \"%s\" peles saīsnē" + +#: openbox/openbox.c:133 +#, c-format +msgid "Unable to change to home directory \"%s\": %s" +msgstr "Nevarēja pāriet uz mājas mapi \"%s\": %s" + +#: openbox/openbox.c:152 +msgid "Failed to open the display from the DISPLAY environment variable." +msgstr "Neizdevās atvēŗt displeju no DISPLAY vides mainīgā." + +#: openbox/openbox.c:183 +msgid "Failed to initialize the obrender library." +msgstr "Neizdevās inicializēt obrender bibliotēku." + +#: openbox/openbox.c:194 +msgid "X server does not support locale." +msgstr "X serveris neatbalsta lokāli." + +#: openbox/openbox.c:196 +msgid "Cannot set locale modifiers for the X server." +msgstr "Nevar uzstādīt lokāles modificētājus X serverim." + +#: openbox/openbox.c:263 +msgid "Unable to find a valid config file, using some simple defaults" +msgstr "" +"Nevarēja atrast atļautu konfigurācijas failu, tiek izmantoti noklusējumi" + +#: openbox/openbox.c:297 +msgid "Unable to load a theme." +msgstr "Nebija iespējams ielādēt tēmu." + +#: openbox/openbox.c:377 +#, c-format +msgid "" +"One or more XML syntax errors were found while parsing the Openbox " +"configuration files. See stdout for more information. The last error seen " +"was in file \"%s\" line %d, with message: %s" +msgstr "" +"Analizējot Openbox konfigurācijas datnes, tika atrastas viena vai vairākas " +"XML sintakses kļūdas. Aplūkojiet standarta izvadi, lai noskaidrotu vairāk. " +"Pēdējā kļūda bija failā \"%s\" - %d rinda, kļūdas ziņojums: %s" + +#: openbox/openbox.c:379 +msgid "Openbox Syntax Error" +msgstr "Openbox sintakses kļūda" + +#: openbox/openbox.c:379 +msgid "Close" +msgstr "Aizvērt" + +#: openbox/openbox.c:448 +#, c-format +msgid "Restart failed to execute new executable \"%s\": %s" +msgstr "" + +#: openbox/openbox.c:518 openbox/openbox.c:520 +msgid "Copyright (c)" +msgstr "Copyright (c)" + +#: openbox/openbox.c:529 +msgid "Syntax: openbox [options]\n" +msgstr "Sintakse: openbox [iespējas]\n" + +#: openbox/openbox.c:530 +msgid "" +"\n" +"Options:\n" +msgstr "" +"\n" +"Iespējas:\n" + +#: openbox/openbox.c:531 +msgid " --help Display this help and exit\n" +msgstr " --help Parāda šo palīdzības tekstu un iziet\n" + +#: openbox/openbox.c:532 +msgid " --version Display the version and exit\n" +msgstr " --version Parāda versiju un iziet\n" + +#: openbox/openbox.c:533 +msgid " --replace Replace the currently running window manager\n" +msgstr " --replace Aizvieto pašreiz palaisto logu pārvaldnieku\n" + +#. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." +#. aligned still, if you have to, make a new line with \n and 22 spaces. It's +#. fine to leave it as FILE though. +#: openbox/openbox.c:537 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr "" +" --config-file FAILS Norāda ceļu uz izmantojamo konfigurācijas failu\n" + +#: openbox/openbox.c:538 +msgid " --sm-disable Disable connection to the session manager\n" +msgstr " --sm-disable Atspējo savienojumu ar sesiju pārvaldnieku\n" + +#: openbox/openbox.c:539 +msgid "" +"\n" +"Passing messages to a running Openbox instance:\n" +msgstr "" +"\n" +"Nodod ziņojumus esošai Openbox instancei:\n" + +#: openbox/openbox.c:540 +msgid " --reconfigure Reload Openbox's configuration\n" +msgstr " --reconfigure Pārlādē Openbox konfigurācijas failus\n" + +#: openbox/openbox.c:541 +msgid " --restart Restart Openbox\n" +msgstr " --restart Pārstartē Openbox\n" + +#: openbox/openbox.c:542 +msgid " --exit Exit Openbox\n" +msgstr " --exit Iziet no Openbox\n" + +#: openbox/openbox.c:543 +msgid "" +"\n" +"Debugging options:\n" +msgstr "" +"\n" +"Atkļūdošanas iespējas:\n" + +#: openbox/openbox.c:544 +msgid " --sync Run in synchronous mode\n" +msgstr " --sync Palaist sinhronajā režīmā\n" + +#: openbox/openbox.c:545 +msgid " --debug Display debugging output\n" +msgstr " --debug Rādīt atkļūdošanas izvadi\n" + +#: openbox/openbox.c:546 +msgid " --debug-focus Display debugging output for focus handling\n" +msgstr " --debug-focus Rādīt atkļūdošanas izvadi fokusēšanas darbībām\n" + +#: openbox/openbox.c:547 +msgid " --debug-xinerama Split the display into fake xinerama screens\n" +msgstr "" +" --debug-xinerama Sadalīt displeju vairākos viltus xinerama ekrānos\n" + +#: openbox/openbox.c:548 +#, c-format +msgid "" +"\n" +"Please report bugs at %s\n" +msgstr "" +"\n" +"Lūdzu, ziņojiet kļūdas %s\n" + +#: openbox/openbox.c:617 +msgid "--config-file requires an argument\n" +msgstr "--config-file vajadzīgs arguments\n" + +#: openbox/openbox.c:660 +#, c-format +msgid "Invalid command line argument \"%s\"\n" +msgstr "Neatļauts komandrindas arguments \"%s\"\n" + +#: openbox/screen.c:102 openbox/screen.c:190 +#, c-format +msgid "A window manager is already running on screen %d" +msgstr "Logu pārvaldnieks jau eksistē uz %d. ekrāna" + +#: openbox/screen.c:124 +#, c-format +msgid "Could not acquire window manager selection on screen %d" +msgstr "Nevarēja iegūt logu pārvaldnieka izvēli uz %d. ekrāna" + +#: openbox/screen.c:145 +#, c-format +msgid "The WM on screen %d is not exiting" +msgstr "Logu pārvaldnieks uz %d. ekrāna nebeidz darbību" + +#. TRANSLATORS: If you need to specify a different order of the +#. arguments, you can use %1$d for the first one and %2$d for the +#. second one. For example, +#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." +#: 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[0] "" +"Openbox ir konfigurēts %d darbvirsmai, bet pašreizējai sesijai tādu ir %d. " +"Šī Openbox konfigurācijas opcija tiks ignorēta." +msgstr[1] "" +"Openbox ir konfigurēts %d darbvirsmām, bet pašreizējai sesijai tādu ir %d. " +"Šī Openbox konfigurācijas opcija tiks ignorēta." +msgstr[2] "" +"Openbox ir konfigurēts %d darbvirsmām, bet pašreizējai sesijai tādu ir %d. " +"Šī Openbox konfigurācijas opcija tiks ignorēta." + +#: openbox/screen.c:1180 +#, c-format +msgid "desktop %i" +msgstr "darbvirsma %i" + +#: openbox/session.c:104 +#, c-format +msgid "Unable to make directory \"%s\": %s" +msgstr "Nav iespējams izveidot mapi \"%s\": %s" + +#: openbox/session.c:466 +#, c-format +msgid "Unable to save the session to \"%s\": %s" +msgstr "Nav iespējams saglabāt sesiju \"%s\": %s" + +#: openbox/session.c:605 +#, c-format +msgid "Error while saving the session to \"%s\": %s" +msgstr "Kļūda saglabājot sesiju \"%s\": %s" + +#: openbox/session.c:842 +msgid "Not connected to a session manager" +msgstr "Nav savienots ar sesiju pārvaldnieku" + +#: openbox/startupnotify.c:243 +#, c-format +msgid "Running %s\n" +msgstr "Palaiž %s\n" + +#: openbox/translate.c:59 +#, c-format +msgid "Invalid modifier key \"%s\" in key/mouse binding" +msgstr "Neatļauts modificētājtaustiņš \"%s\" tastatūras/peles saīsnē" + +#: openbox/translate.c:138 +#, c-format +msgid "Invalid key code \"%s\" in key binding" +msgstr "Neatļauts taustiņa kods \"%s\" tastatūras saīsnē" + +#: openbox/translate.c:145 +#, c-format +msgid "Invalid key name \"%s\" in key binding" +msgstr "Neatļauts taustiņa nosaukums \"%s\" tastatūras saīsnē" + +#: openbox/translate.c:151 +#, c-format +msgid "Requested key \"%s\" does not exist on the display" +msgstr "Pieprasītais taustiņš \"%s\" uz displeja neeksistē" + +#: openbox/xerror.c:40 +#, c-format +msgid "X Error: %s" +msgstr "X kļūda: %s" + +#: openbox/prompt.c:200 +msgid "OK" +msgstr "Labi" -- cgit v1.2.3 From 4705e3d11003296ed9b88c5c95ef1ea5bae19961 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 5 Apr 2009 16:53:38 +0200 Subject: Update and reactivate croatian translation. --- po/LINGUAS | 3 +- po/hr.po | 315 +++++++++++++++++++++++++++++++++---------------------------- 2 files changed, 172 insertions(+), 146 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS index f8f887d7..606a3086 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -29,5 +29,4 @@ lt lv tr da - -#hr +hr diff --git a/po/hr.po b/po/hr.po index 3c943efd..f07db78a 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,133 +1,135 @@ # Croatian messages for openbox. -# Copyright (C) 2006 Mikael Magnusson +# Copyright (C) 2009 Mikael Magnusson # This file is distributed under the same license as the openbox package. -# Daniel Radetic , 2006. # msgid "" msgstr "" -"Project-Id-Version: Openbox 3.3\n" +"Project-Id-Version: Openbox 3.4.7.2\n" "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-03-03 02:10+0100\n" -"PO-Revision-Date: 2006-09-05 16:45+0100\n" -"Last-Translator: Daniel Radetic \n" -"Language-Team: None\n" +"POT-Creation-Date: 2009-03-31 19:16+0200\n" +"PO-Revision-Date: 2009-04-05 16:53+0200\n" +"Last-Translator: boljsa \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/actions.c:150 +#: openbox/actions.c:149 #, c-format msgid "Invalid action \"%s\" requested. No such action exists." -msgstr "" +msgstr "Nevažeća akcija \"%s\" zatražena. Takva akcija ne postoji." #: openbox/actions/execute.c:128 msgid "No" -msgstr "" +msgstr "Ne" #: openbox/actions/execute.c:129 msgid "Yes" -msgstr "" +msgstr "Da" #: openbox/actions/execute.c:133 msgid "Execute" -msgstr "" +msgstr "Izvrši" #: openbox/actions/execute.c:142 #, c-format msgid "Failed to convert the path \"%s\" from utf8" -msgstr "" +msgstr "Neuspio pokušaj pretvorbe putanje \"%s\" iz utf8" -#: openbox/actions/exit.c:52 openbox/actions/session.c:62 -#: openbox/client.c:3460 +#: openbox/actions/exit.c:52 openbox/actions/session.c:64 +#: openbox/client.c:3465 msgid "Cancel" -msgstr "" +msgstr "Odustani" #: openbox/actions/exit.c:53 msgid "Exit" -msgstr "" +msgstr "Izađi" #: openbox/actions/exit.c:56 msgid "Are you sure you want to exit Openbox?" -msgstr "" +msgstr "Jeste li sigurni da želite zatvoriti Openbox?" #: openbox/actions/exit.c:57 msgid "Exit Openbox" -msgstr "" +msgstr "Zatvori Openbox" -#: openbox/actions/session.c:41 +#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the +#. name of the action you write in rc.xml +#: openbox/actions/session.c:43 msgid "" "The SessionLogout action is not available since Openbox was built without " "session management support" msgstr "" +"Akcija SessionLogout nije dostupna otkad je Openbox izgrađen bez podrške " +"upravljanja sesijama" -#: openbox/actions/session.c:63 openbox/actions/session.c:68 +#: openbox/actions/session.c:65 openbox/actions/session.c:70 msgid "Log Out" -msgstr "" +msgstr "Odjava" -#: openbox/actions/session.c:67 +#: openbox/actions/session.c:69 msgid "Are you sure you want to log out?" -msgstr "" +msgstr "Jeste li sigurni da se želite odjaviti?" -#: openbox/client.c:2004 +#: openbox/client.c:2012 msgid "Unnamed Window" -msgstr "" +msgstr "Neimenovan Prozor" -#: openbox/client.c:2018 openbox/client.c:2050 +#: openbox/client.c:2026 openbox/client.c:2058 msgid "Killing..." -msgstr "" +msgstr "Ubijanje..." -#: openbox/client.c:2020 openbox/client.c:2052 +#: openbox/client.c:2028 openbox/client.c:2060 msgid "Not Responding" -msgstr "" +msgstr "Ne Odgovara" -#: openbox/client.c:3449 +#: openbox/client.c:3454 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to force it " "to exit by sending the %s signal?" msgstr "" +"Prozor \"%s\" ne reagira. Želite li forsirati izlaženje šaljući %s signal?" -#: openbox/client.c:3451 +#: openbox/client.c:3456 msgid "End Process" -msgstr "" +msgstr "Završetak Procesa" -#: openbox/client.c:3455 +#: openbox/client.c:3460 #, c-format msgid "" "The window \"%s\" does not seem to be responding. Do you want to disconnect " "it from the X server?" msgstr "" +"Prozor \"%s\" ne reagira. Želite li prekinuti njegovu vezu sa X serverom?" -#: openbox/client.c:3457 +#: openbox/client.c:3462 msgid "Disconnect" -msgstr "" +msgstr "Prekid veze" #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 msgid "Go there..." -msgstr "Odi na..." +msgstr "Idi tamo..." #: openbox/client_list_combined_menu.c:94 -#, fuzzy msgid "Manage desktops" -msgstr "Sve radne površine" +msgstr "Upravljanje radnim površinama" #: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 -#, fuzzy msgid "_Add new desktop" -msgstr "_Pošalji na radnu površinu" +msgstr "_Dodaj novu radnu površinu" #: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 -#, fuzzy msgid "_Remove last desktop" -msgstr "_Pošalji na radnu površinu" +msgstr "_Ukloni zadnju radnu površinu" #: openbox/client_list_combined_menu.c:149 msgid "Windows" -msgstr "" +msgstr "Prozori" #: openbox/client_list_menu.c:203 msgid "Desktops" -msgstr "Radne površine" +msgstr "Radne Površine" #: openbox/client_menu.c:258 msgid "All desktops" @@ -135,7 +137,7 @@ msgstr "Sve radne površine" #: openbox/client_menu.c:370 msgid "_Layer" -msgstr "" +msgstr "_Sloj" #: openbox/client_menu.c:375 msgid "Always on _top" @@ -151,311 +153,336 @@ msgstr "Uvijek na _dnu" #: openbox/client_menu.c:379 msgid "_Send to desktop" -msgstr "_Pošalji na radnu površinu" +msgstr "Pošalji na _radnu površinu" #: openbox/client_menu.c:383 msgid "Client menu" -msgstr "Meni klijenta" +msgstr "Izbornik klijenta" #: openbox/client_menu.c:393 msgid "R_estore" -msgstr "Ponovno uspostav_i" +msgstr "O_bnovi" #: openbox/client_menu.c:397 msgid "_Move" -msgstr "Po_makni" +msgstr "_Pomicanje" #: openbox/client_menu.c:399 msgid "Resi_ze" -msgstr "Prom_jeni veličinu" +msgstr "Prom_jena veličine" #: openbox/client_menu.c:401 msgid "Ico_nify" -msgstr "Iko_nificiraj" +msgstr "Mi_nimizacija" #: openbox/client_menu.c:405 msgid "Ma_ximize" -msgstr "M_aksimiziraj" +msgstr "M_aksimizacija" #: openbox/client_menu.c:409 msgid "_Roll up/down" -msgstr "" +msgstr "_Okretanje gore/dolje" #: openbox/client_menu.c:411 msgid "Un/_Decorate" -msgstr "" +msgstr "Ne/_Dekoriranje" #: openbox/client_menu.c:415 msgid "_Close" msgstr "_Zatvori" -#: openbox/config.c:781 +#: openbox/config.c:782 #, c-format msgid "Invalid button \"%s\" specified in config file" -msgstr "" +msgstr "Nevažeće dugme \"%s\" specificirano u konfiguracijskoj datoteci" #: openbox/keyboard.c:157 msgid "Conflict with key binding in config file" -msgstr "" +msgstr "Konflikt sa povezivanjem tipki u konfiguracijskoj datoteci" -#: openbox/menu.c:103 openbox/menu.c:111 +#: openbox/menu.c:102 openbox/menu.c:110 #, c-format msgid "Unable to find a valid menu file \"%s\"" -msgstr "" +msgstr "Ne mogu pronaći važeću datoteku izbornika \"%s\"" -#: openbox/menu.c:171 +#: openbox/menu.c:170 #, c-format msgid "Failed to execute command for pipe-menu \"%s\": %s" -msgstr "" +msgstr "Neuspio pokušaj izvršavanja naredbe za cijev-izbornik \"%s\": %s" -#: openbox/menu.c:185 +#: openbox/menu.c:184 #, c-format msgid "Invalid output from pipe-menu \"%s\"" -msgstr "" +msgstr "Nevažeći izlaz za cijev-izbornik \"%s\"" -#: openbox/menu.c:198 +#: openbox/menu.c:197 #, c-format msgid "Attempted to access menu \"%s\" but it does not exist" -msgstr "" +msgstr "Pokušavam pristupiti izborniku \"%s\" ali on ne postoji" -#: openbox/menu.c:368 openbox/menu.c:369 +#: openbox/menu.c:367 openbox/menu.c:368 msgid "More..." -msgstr "" +msgstr "Više..." #: openbox/mouse.c:373 #, c-format msgid "Invalid button \"%s\" in mouse binding" -msgstr "" +msgstr "Nevažeće dugme \"%s\" u povezivanju miša" #: openbox/mouse.c:379 #, c-format msgid "Invalid context \"%s\" in mouse binding" -msgstr "" +msgstr "Nevažeći kontekst \"%s\" u povezivanju miša" -#: openbox/openbox.c:134 +#: openbox/openbox.c:133 #, c-format msgid "Unable to change to home directory \"%s\": %s" -msgstr "" +msgstr "Ne mogu doći u home direktorij \"%s\": %s" -#: openbox/openbox.c:154 +#: openbox/openbox.c:152 msgid "Failed to open the display from the DISPLAY environment variable." -msgstr "" +msgstr "Neuspio pokušaj otvaranja zaslona iz DISPLAY varijable okruženja." -#: openbox/openbox.c:185 +#: openbox/openbox.c:183 msgid "Failed to initialize the obrender library." -msgstr "" +msgstr "Neuspio pokušaj inicijalizacije obrender biblioteke." -#: openbox/openbox.c:196 +#: openbox/openbox.c:194 msgid "X server does not support locale." -msgstr "" +msgstr "X server ne podržava lokalno." -#: openbox/openbox.c:198 +#: openbox/openbox.c:196 msgid "Cannot set locale modifiers for the X server." -msgstr "" +msgstr "Ne mogu postaviti lokalne modifikatore za X server." -#: openbox/openbox.c:266 +#: openbox/openbox.c:263 msgid "Unable to find a valid config file, using some simple defaults" msgstr "" +"Ne mogu pronaći važeću konfiguracijsku datoteku, koriteći neke jednostavne " +"standarde" -#: openbox/openbox.c:300 +#: openbox/openbox.c:297 msgid "Unable to load a theme." -msgstr "" +msgstr "Ne mogu pokrenuti temu." -#: openbox/openbox.c:380 +#: openbox/openbox.c:377 #, c-format msgid "" "One or more XML syntax errors were found while parsing the Openbox " "configuration files. See stdout for more information. The last error seen " "was in file \"%s\" line %d, with message: %s" msgstr "" +"Jedna ili više XML pogreški u sintaksi su pronađene prilikom analize Openbox " +"konfiguracijskih datoteka. Pogledajte stdout za više informacija. Zadnja " +"pogreška je u datoteci \"%s\" u liniji %d, sa porukom: %s" -#: openbox/openbox.c:382 +#: openbox/openbox.c:379 msgid "Openbox Syntax Error" -msgstr "" +msgstr "Openbox Pogreška u Sintaksi" -#: openbox/openbox.c:382 -#, fuzzy +#: openbox/openbox.c:379 msgid "Close" -msgstr "_Zatvori" +msgstr "Zatvori" -#: openbox/openbox.c:451 +#: openbox/openbox.c:448 #, c-format msgid "Restart failed to execute new executable \"%s\": %s" -msgstr "" +msgstr "Restart je bio neusješan za izvršenje novog izvršnog \"%s\": %s" -#: openbox/openbox.c:521 openbox/openbox.c:523 +#: openbox/openbox.c:518 openbox/openbox.c:520 msgid "Copyright (c)" -msgstr "" +msgstr "Copyright (c)" -#: openbox/openbox.c:532 +#: openbox/openbox.c:529 msgid "Syntax: openbox [options]\n" -msgstr "" +msgstr "Sintaksa: openbox [opcije]\n" -#: openbox/openbox.c:533 +#: openbox/openbox.c:530 msgid "" "\n" "Options:\n" msgstr "" +"\n" +"Opcije:\n" -#: openbox/openbox.c:534 +#: openbox/openbox.c:531 msgid " --help Display this help and exit\n" -msgstr "" +msgstr " --help Prikazuje ovu pomoć i izlazi\n" -#: openbox/openbox.c:535 +#: openbox/openbox.c:532 msgid " --version Display the version and exit\n" -msgstr "" +msgstr " --version Prikazuje verziju i izlazi\n" -#: openbox/openbox.c:536 +#: openbox/openbox.c:533 msgid " --replace Replace the currently running window manager\n" msgstr "" +" --replace Zamjenjuje trenutno pokrenut upravitelj prozora\n" #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." #. aligned still, if you have to, make a new line with \n and 22 spaces. It's #. fine to leave it as FILE though. -#: openbox/openbox.c:540 +#: openbox/openbox.c:537 msgid " --config-file FILE Specify the path to the config file to use\n" msgstr "" +" --config-file FILE Specificira putanju do konfiguracijske datoteke koja " +"se koristi\n" -#: openbox/openbox.c:541 +#: openbox/openbox.c:538 msgid " --sm-disable Disable connection to the session manager\n" -msgstr "" +msgstr " --sm-disable Onemogućuje vezu sa upraviteljom sesija\n" -#: openbox/openbox.c:542 +#: openbox/openbox.c:539 msgid "" "\n" "Passing messages to a running Openbox instance:\n" msgstr "" +"\n" +"Prosljeđuje poruke pokrenutoj Openbox instanci:\n" -#: openbox/openbox.c:543 +#: openbox/openbox.c:540 msgid " --reconfigure Reload Openbox's configuration\n" -msgstr "" +msgstr " --reconfigure Osvježava Openbox konfiguraciju\n" -#: openbox/openbox.c:544 +#: openbox/openbox.c:541 msgid " --restart Restart Openbox\n" -msgstr "" +msgstr " --restart Restartira Openbox\n" -#: openbox/openbox.c:545 +#: openbox/openbox.c:542 msgid " --exit Exit Openbox\n" -msgstr "" +msgstr " --exit Izlazi iz Openbox-a\n" -#: openbox/openbox.c:546 +#: openbox/openbox.c:543 msgid "" "\n" "Debugging options:\n" msgstr "" +"\n" +"Opcije traženja pogrešaka:\n" -#: openbox/openbox.c:547 +#: openbox/openbox.c:544 msgid " --sync Run in synchronous mode\n" -msgstr "" +msgstr " --sync Pokretanje u sinkronizacijskom modu\n" -#: openbox/openbox.c:548 +#: openbox/openbox.c:545 msgid " --debug Display debugging output\n" -msgstr "" +msgstr " --debug Prikazuje izlaz traženja pogrešaka\n" -#: openbox/openbox.c:549 +#: openbox/openbox.c:546 msgid " --debug-focus Display debugging output for focus handling\n" msgstr "" +" --debug-focus Prikazuje izlaz traženja pogrešaka za rukovanje " +"fokusom\n" -#: openbox/openbox.c:550 +#: openbox/openbox.c:547 msgid " --debug-xinerama Split the display into fake xinerama screens\n" -msgstr "" +msgstr " --debug-xinerama Podijeli zaslon u lažne xinerama zaslone\n" -#: openbox/openbox.c:551 +#: openbox/openbox.c:548 #, c-format msgid "" "\n" "Please report bugs at %s\n" msgstr "" +"\n" +"Molimo prijavite pogrešku na %s\n" -#: openbox/openbox.c:620 +#: openbox/openbox.c:617 msgid "--config-file requires an argument\n" -msgstr "" +msgstr "--config-file zahtjeva argument\n" -#: openbox/openbox.c:663 +#: openbox/openbox.c:660 #, c-format msgid "Invalid command line argument \"%s\"\n" -msgstr "" +msgstr "Nevažeći argument komandne linije \"%s\"\n" #: openbox/screen.c:102 openbox/screen.c:190 #, c-format msgid "A window manager is already running on screen %d" -msgstr "" +msgstr "Upravitelj prozora je već pokrenut na zaslonu %d" #: openbox/screen.c:124 #, c-format msgid "Could not acquire window manager selection on screen %d" -msgstr "" +msgstr "Ne mogu ostvariti odabir upravitelja prozora na zaslonu %d" #: openbox/screen.c:145 #, c-format msgid "The WM on screen %d is not exiting" -msgstr "" +msgstr "Upravitelj prozora na zaslonu %d ne izlazi" #. TRANSLATORS: If you need to specify a different order of the #. arguments, you can use %1$d for the first one and %2$d for the #. second one. For example, #. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." #: openbox/screen.c:412 -#, c-format +#, fuzzy, 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 je konfiguriran za %d radnu površinu, ali trenutna sesija ima %d. " +"Prepisujem preko Openbox konfiguracije." +msgstr[1] "" +"Openbox je konfiguriran za %d radnu površinu, ali trenutna sesija ima %d. " +"Prepisujem preko Openbox konfiguracije." #: openbox/screen.c:1180 #, c-format msgid "desktop %i" -msgstr "" +msgstr "radna površina %i" #: openbox/session.c:104 #, c-format msgid "Unable to make directory \"%s\": %s" -msgstr "Nemogu napraviti direktorij \"%s\": %s" +msgstr "Ne mogu stvoriti direktorij \"%s\": %s" -#: openbox/session.c:452 +#: openbox/session.c:466 #, c-format msgid "Unable to save the session to \"%s\": %s" -msgstr "" +msgstr "Ne mogu spremiti sesiju u \"%s\": %s" -#: openbox/session.c:584 +#: openbox/session.c:605 #, c-format msgid "Error while saving the session to \"%s\": %s" -msgstr "" +msgstr "Pogreška prilokom spremanja sesije u \"%s\": %s" -#: openbox/session.c:821 +#: openbox/session.c:842 msgid "Not connected to a session manager" -msgstr "" +msgstr "Nije povezan sa upraviteljem sesija" #: openbox/startupnotify.c:243 #, c-format msgid "Running %s\n" -msgstr "" +msgstr "Pokrenuto %s\n" #: openbox/translate.c:59 #, c-format msgid "Invalid modifier key \"%s\" in key/mouse binding" -msgstr "" +msgstr "Nevažeći modifikacijski ključ \"%s\" u povezivanju tipke/miš" #: openbox/translate.c:138 #, c-format msgid "Invalid key code \"%s\" in key binding" -msgstr "" +msgstr "Nevažeći kod ključa \"%s\" u povezivanju tipki" #: openbox/translate.c:145 #, c-format msgid "Invalid key name \"%s\" in key binding" -msgstr "" +msgstr "Nevažeće ime tipke \"%s\" u povezivanju tipki" #: openbox/translate.c:151 #, c-format msgid "Requested key \"%s\" does not exist on the display" -msgstr "" +msgstr "Traženi ključ \"%s\" ne postoji na zaslonu" #: openbox/xerror.c:40 #, c-format msgid "X Error: %s" -msgstr "" +msgstr "X Pogreška: %s" #: openbox/prompt.c:200 msgid "OK" -msgstr "" +msgstr "OK" -- cgit v1.2.3 From 08aa5bf04ecc3f902ff974695abe206cddac6bdd Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 15 Apr 2009 18:18:16 +0200 Subject: Make at least the default configs validate More things need to be case insensitive and whatnot. --- data/menu.xsd | 246 ++++++++++++++++++++++++++------ data/rc.xsd | 446 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 469 insertions(+), 223 deletions(-) diff --git a/data/menu.xsd b/data/menu.xsd index e3e1e17b..2ff76b72 100644 --- a/data/menu.xsd +++ b/data/menu.xsd @@ -2,60 +2,214 @@ - + + +]> + + + elementFormDefault="qualified" + attributeFormDefault="unqualified"> - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/rc.xsd b/data/rc.xsd index de227ea1..499b81c9 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -2,10 +2,18 @@ + + + +]> + + elementFormDefault="qualified" + attributeFormDefault="unqualified"> @@ -14,17 +22,20 @@ all these elements are expected in a openbox config file - - - - - - - - - - - + + + + + + + + + + + + + + @@ -196,61 +252,112 @@ - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -300,29 +407,14 @@ - - - - - - - - - - - - - - - - + - + @@ -379,14 +471,14 @@ - + - - - + + + -- cgit v1.2.3 From 82db73cc4344cf4e8a3757fb1ec50be77e3bc9d8 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 3 Jul 2009 21:19:54 +0200 Subject: Fix for #3715, app settings applied too late. This caused problems for placing windows with decor turned off, the placement code thought they had it on. --- openbox/client.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index 03bbfe48..016a660f 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -315,6 +315,11 @@ void client_manage(Window window, ObPrompt *prompt) ob_debug("Window group: 0x%x\n", self->group?self->group->leader:0); ob_debug("Window name: %s class: %s\n", self->name, self->class); + /* per-app settings override stuff from client_get_all, and return the + settings for other uses too. the returned settings is a shallow copy, + that needs to be freed with g_free(). */ + settings = client_get_settings_state(self); + /* now we have all of the window's information so we can set this up. do this before creating the frame, so it can tell that we are still mapping and doesn't go applying things right away */ @@ -335,10 +340,6 @@ void client_manage(Window window, ObPrompt *prompt) time now */ grab_server(FALSE); - /* per-app settings override stuff from client_get_all, and return the - settings for other uses too. the returned settings is a shallow copy, - that needs to be freed with g_free(). */ - settings = client_get_settings_state(self); /* the session should get the last say though */ client_restore_session_state(self); -- cgit v1.2.3 From 75ca8467921f68fdbd6100a1a435a410ef31acb0 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 3 Jul 2009 21:20:30 +0200 Subject: Show window role in the debug message for name/class too. --- openbox/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbox/client.c b/openbox/client.c index 016a660f..789a0347 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -313,7 +313,7 @@ void client_manage(Window window, ObPrompt *prompt) ob_debug("Window type: %d\n", self->type); ob_debug("Window group: 0x%x\n", self->group?self->group->leader:0); - ob_debug("Window name: %s class: %s\n", self->name, self->class); + ob_debug("Window name: %s class: %s role: %s\n", self->name, self->class, self->role); /* per-app settings override stuff from client_get_all, and return the settings for other uses too. the returned settings is a shallow copy, -- cgit v1.2.3 From d48e720c3977d1d64620108589380919b430affe Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 3 Jul 2009 18:58:21 -0400 Subject: client_validate should return FALSE only for UnmapNotifies that will cause the window to become unmanaged --- openbox/client.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index 789a0347..c1af196b 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -3591,18 +3591,38 @@ ObClient *client_search_modal_child(ObClient *self) return NULL; } +static gboolean client_validate_unmap(ObClient *self, int n) +{ + XEvent e; + gboolean ret = TRUE; + + if (XCheckTypedWindowEvent(ob_display, self->window, UnmapNotify, &e)) { + if (n < self->ignore_unmaps) // ignore this one, but look for more + ret = client_validate_unmap(self, n+1); + else + ret = FALSE; // the window is going to become unmanaged + + /* put them back on the event stack so they end up in the same order */ + XPutBackEvent(ob_display, &e); + } + + return ret; +} + gboolean client_validate(ObClient *self) { XEvent e; XSync(ob_display, FALSE); /* get all events on the server */ - if (XCheckTypedWindowEvent(ob_display, self->window, DestroyNotify, &e) || - XCheckTypedWindowEvent(ob_display, self->window, UnmapNotify, &e)) { + if (XCheckTypedWindowEvent(ob_display, self->window, DestroyNotify, &e)) { XPutBackEvent(ob_display, &e); return FALSE; } + if (!client_validate_unmap(self, 0)) + return FALSE; + return TRUE; } -- cgit v1.2.3 From 795e9ebbacf1f70aa1861073f1e600ee25d57879 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 4 Jul 2009 14:16:47 +0200 Subject: Only open the default font once, then ref it. As suggested in #3622, we don't need to open the default font for every place that wasn't specified in the theme. Solved a bit differently than the patch given there. --- render/theme.c | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/render/theme.c b/render/theme.c index d040c171..0882637a 100644 --- a/render/theme.c +++ b/render/theme.c @@ -46,6 +46,22 @@ static int parse_inline_number(const char *p); static RrPixel32* read_c_image(gint width, gint height, const guint8 *data); static void set_default_appearance(RrAppearance *a); +static RrFont *get_font(RrFont *target, RrFont **default_font, const RrInstance *inst) +{ + if (target) { + RrFontRef(target); + return target; + } else { + /* Only load the default font once */ + if (*default_font) { + RrFontRef(*default_font); + } else { + *default_font = RrFontOpenDefault(inst); + } + return *default_font; + } +} + RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, gboolean allow_fallback, RrFont *active_window_font, RrFont *inactive_window_font, @@ -56,6 +72,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, RrJustify winjust, mtitlejust; gchar *str; RrTheme *theme; + RrFont *default_font = NULL; gchar *path; gboolean userdef; @@ -130,17 +147,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_unhilite_fg = RrAppearanceNew(inst, 0); /* load the font stuff */ - if (active_window_font) { - theme->win_font_focused = active_window_font; - RrFontRef(active_window_font); - } else - theme->win_font_focused = RrFontOpenDefault(inst); - - if (inactive_window_font) { - theme->win_font_unfocused = inactive_window_font; - RrFontRef(inactive_window_font); - } else - theme->win_font_unfocused = RrFontOpenDefault(inst); + theme->win_font_focused = get_font(active_window_font, &default_font, inst); + theme->win_font_unfocused = get_font(inactive_window_font, &default_font, inst); winjust = RR_JUSTIFY_LEFT; if (read_string(db, "window.label.text.justify", &str)) { @@ -150,11 +158,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, winjust = RR_JUSTIFY_CENTER; } - if (menu_title_font) { - theme->menu_title_font = menu_title_font; - RrFontRef(menu_title_font); - } else - theme->menu_title_font = RrFontOpenDefault(inst); + theme->menu_title_font = get_font(menu_title_font, &default_font, inst); mtitlejust = RR_JUSTIFY_LEFT; if (read_string(db, "menu.title.text.justify", &str)) { @@ -164,17 +168,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, mtitlejust = RR_JUSTIFY_CENTER; } - if (menu_item_font) { - theme->menu_font = menu_item_font; - RrFontRef(menu_item_font); - } else - theme->menu_font = RrFontOpenDefault(inst); - - if (osd_font) { - theme->osd_font = osd_font; - RrFontRef(osd_font); - } else - theme->osd_font = RrFontOpenDefault(inst); + theme->menu_font = get_font(menu_item_font, &default_font, inst); + + theme->osd_font = get_font(osd_font, &default_font, inst); /* load direct dimensions */ if ((!read_int(db, "menu.overlap.x", &theme->menu_overlap_x) && -- cgit v1.2.3 From 3cd4db67aa430c85af8ac88dc40e9cfa63cc246a Mon Sep 17 00:00:00 2001 From: Nico Golde Date: Sat, 4 Jul 2009 14:26:50 +0200 Subject: Add "prev" and "next" as possible targets for moveto/resizeto actions. One of the Debian users asked if it's possible to send a window to other monitor when using xinerama, especially useful of you have 2 monitors and want to toggle a window to the other one. I wrote a patch that implements next and prev to also make that work for 3 or more workspaces. --- openbox/actions/moveresizeto.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c index cdd772ad..acad73b5 100644 --- a/openbox/actions/moveresizeto.c +++ b/openbox/actions/moveresizeto.c @@ -6,7 +6,9 @@ enum { CURRENT_MONITOR = -1, - ALL_MONITORS = -2 + ALL_MONITORS = -2, + NEXT_MONITOR = -3, + PREV_MONITOR = -4 }; typedef struct { @@ -89,6 +91,10 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) if (g_ascii_strcasecmp(s, "current") != 0) { if (!g_ascii_strcasecmp(s, "all")) o->monitor = ALL_MONITORS; + else if(!g_ascii_strcasecmp(s, "next")) + o->monitor = NEXT_MONITOR; + else if(!g_ascii_strcasecmp(s, "prev")) + o->monitor = PREV_MONITOR; else o->monitor = parse_int(doc, n) - 1; } @@ -121,6 +127,9 @@ static gboolean run_func(ObActionsData *data, gpointer options) cmon = client_monitor(c); if (mon == CURRENT_MONITOR) mon = cmon; else if (mon == ALL_MONITORS) mon = SCREEN_AREA_ALL_MONITORS; + else if (mon == NEXT_MONITOR) mon = (cmon + 1 > screen_num_monitors - 1) ? 0 : (cmon + 1); + else if (mon == PREV_MONITOR) mon = (cmon == 0) ? (screen_num_monitors - 1) : (cmon - 1); + area = screen_area(c->desktop, mon, NULL); carea = screen_area(c->desktop, cmon, NULL); -- cgit v1.2.3 From 18a2bc6da55f1f065bcffdf1c3229d0f2fc7040c Mon Sep 17 00:00:00 2001 From: Reilly Grant Date: Sat, 4 Jul 2009 15:06:55 +0200 Subject: Fix memory corruption when y2sz is 0. data is incremented one too many times when y2sz is zero, leading to memory corruption. [ also changed % 2 to & 1 -- Mikael ] --- render/gradient.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/render/gradient.c b/render/gradient.c index 8b6850f0..60a0a555 100644 --- a/render/gradient.c +++ b/render/gradient.c @@ -507,11 +507,11 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h) */ if (h <= 5) { y1sz = MAX(h/2, 0); - y2sz = (h < 3 ? 0 : h % 2); + y2sz = (h < 3) ? 0 : (h & 1); y3sz = MAX(h/2, 1); } else { - y1sz = h/2 - (1 - (h % 2)); + y1sz = h/2 - (1 - (h & 1)); y2sz = 1; y3sz = h/2; } @@ -534,13 +534,15 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h) } *data = COLOR(y1); data += w; - for (y2 = y2sz-1; y2 > 0; --y2) { + if (y2sz) { + for (y2 = y2sz-1; y2 > 0; --y2) { + *data = COLOR(y2); + data += w; + NEXT(y2); + } *data = COLOR(y2); data += w; - NEXT(y2); } - *data = COLOR(y2); - data += w; for (y3 = y3sz-1; y3 > 0; --y3) { *data = COLOR(y3); data += w; -- cgit v1.2.3 From 384f2dfc48278998631d3f9bac3a337d296b198e Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 4 Jul 2009 15:34:54 +0200 Subject: Give the popup to the timer remove so it does the right one Only the chroot popup uses delayed mapping so this is just a latent bug. --- openbox/popup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbox/popup.c b/openbox/popup.c index 770f33d0..2a0d5960 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -320,7 +320,7 @@ void popup_hide(ObPopup *self) event_end_ignore_all_enters(ignore_start); } else if (self->delay_mapped) { - ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout); + ob_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE); self->delay_mapped = FALSE; } } -- cgit v1.2.3 From 2e1adce628ee3234accc5d88cafb57672800cae0 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 4 Jul 2009 16:58:02 +0200 Subject: Show desktop switch popup on every monitor This should be a satisfactory fix for #3694 I hope. --- openbox/screen.c | 103 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 31 deletions(-) diff --git a/openbox/screen.c b/openbox/screen.c index e908cf10..4913b606 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -77,7 +77,7 @@ static GSList *struts_left = NULL; static GSList *struts_right = NULL; static GSList *struts_bottom = NULL; -static ObPagerPopup *desktop_popup; +static ObPagerPopup **desktop_popup; /*! The number of microseconds that you need to be on a desktop before it will replace the remembered "last desktop" */ @@ -353,15 +353,22 @@ void screen_startup(gboolean reconfig) guint32 d; gboolean namesexist = FALSE; - desktop_popup = pager_popup_new(); - pager_popup_height(desktop_popup, POPUP_HEIGHT); - if (reconfig) { - /* update the pager popup's width */ - pager_popup_text_width_to_strings(desktop_popup, - screen_desktop_names, - screen_num_desktops); + guint i; + desktop_popup = g_new(ObPagerPopup*, screen_num_monitors); + for (i = 0; i < screen_num_monitors; i++) { + desktop_popup[i] = pager_popup_new(); + pager_popup_height(desktop_popup[i], POPUP_HEIGHT); + + /* update the pager popup's width */ + pager_popup_text_width_to_strings(desktop_popup[i], + screen_desktop_names, + screen_num_desktops); + } + return; + } else { + desktop_popup = NULL; } /* get the initial size */ @@ -451,7 +458,12 @@ void screen_startup(gboolean reconfig) void screen_shutdown(gboolean reconfig) { - pager_popup_free(desktop_popup); + guint i; + + for (i = 0; i < screen_num_monitors; i++) { + pager_popup_free(desktop_popup[i]); + } + g_free(desktop_popup); if (reconfig) return; @@ -922,39 +934,52 @@ static guint translate_row_col(guint r, guint c) static gboolean hide_desktop_popup_func(gpointer data) { - pager_popup_hide(desktop_popup); + guint i; + + for (i = 0; i < screen_num_monitors; i++) { + pager_popup_hide(desktop_popup[i]); + } return FALSE; /* don't repeat */ } void screen_show_desktop_popup(guint d) { Rect *a; + guint i; /* 0 means don't show the popup */ if (!config_desktop_popup_time) return; - a = screen_physical_area_active(); - pager_popup_position(desktop_popup, CenterGravity, - a->x + a->width / 2, a->y + a->height / 2); - pager_popup_icon_size_multiplier(desktop_popup, - (screen_desktop_layout.columns / - screen_desktop_layout.rows) / 2, - (screen_desktop_layout.rows/ - screen_desktop_layout.columns) / 2); - pager_popup_max_width(desktop_popup, - MAX(a->width/3, POPUP_WIDTH)); - pager_popup_show(desktop_popup, screen_desktop_names[d], d); - - ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func); - ob_main_loop_timeout_add(ob_main_loop, config_desktop_popup_time * 1000, - hide_desktop_popup_func, NULL, NULL, NULL); - g_free(a); + for (i = 0; i < screen_num_monitors; i++) { + a = screen_physical_area_monitor(i); + pager_popup_position(desktop_popup[i], CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); + pager_popup_icon_size_multiplier(desktop_popup[i], + (screen_desktop_layout.columns / + screen_desktop_layout.rows) / 2, + (screen_desktop_layout.rows/ + screen_desktop_layout.columns) / 2); + pager_popup_max_width(desktop_popup[i], + MAX(a->width/3, POPUP_WIDTH)); + pager_popup_show(desktop_popup[i], screen_desktop_names[d], d); + + ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func); + ob_main_loop_timeout_add(ob_main_loop, config_desktop_popup_time * 1000, + hide_desktop_popup_func, desktop_popup[i], + g_direct_equal, NULL); + g_free(a); + } } void screen_hide_desktop_popup(void) { - ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func); - pager_popup_hide(desktop_popup); + guint i; + + for (i = 0; i < screen_num_monitors; i++) { + ob_main_loop_timeout_remove_data(ob_main_loop, hide_desktop_popup_func, + desktop_popup[i], FALSE); + pager_popup_hide(desktop_popup[i]); + } } guint screen_find_desktop(guint from, ObDirection dir, @@ -1189,9 +1214,11 @@ void screen_update_desktop_names(void) } /* resize the pager for these names */ - pager_popup_text_width_to_strings(desktop_popup, - screen_desktop_names, - screen_num_desktops); + for (i = 0; i < screen_num_monitors; i++) { + pager_popup_text_width_to_strings(desktop_popup[i], + screen_desktop_names, + screen_num_desktops); + } } void screen_show_desktop(gboolean show, ObClient *show_only) @@ -1321,6 +1348,20 @@ void screen_update_areas(void) g_free(monitor_area); extensions_xinerama_screens(&monitor_area, &screen_num_monitors); + if (!desktop_popup) { + desktop_popup = g_new(ObPagerPopup*, screen_num_monitors); + for (i = 0; i < screen_num_monitors; i++) { + desktop_popup[i] = pager_popup_new(); + pager_popup_height(desktop_popup[i], POPUP_HEIGHT); + + if (screen_desktop_names) + /* update the pager popup's width */ + pager_popup_text_width_to_strings(desktop_popup[i], + screen_desktop_names, + screen_num_desktops); + } + } + /* set up the user-specified margins */ config_margins.top_start = RECT_LEFT(monitor_area[screen_num_monitors]); config_margins.top_end = RECT_RIGHT(monitor_area[screen_num_monitors]); -- cgit v1.2.3 From ec9fbf05df3ac807d60ae6af36236ffc6567bbdc Mon Sep 17 00:00:00 2001 From: Geoffrey Antos Date: Sun, 5 Jul 2009 13:14:24 +0200 Subject: Fix interpretation of struts with multiple screens According to the WM Specification, the left, top, right, and bottom fields are to be declared relative to the overall X screen dimensions, not the monitor dimensions. The example given in the spec (v1.3 or 1.4draft2) is: "Another example is a panel on a screen using the Xinerama extension. Assume that the set up uses two monitors, one running at 1280x1024 and the other to the right running at 1024x768, with the top edge of the two physical displays aligned. If the panel wants to fill the entire bottom edge of the smaller display with a panel 50 pixels tall, it should set a bottom strut of 306, with bottom_start_x of 1280, and bottom_end_x of 2303. Note that the strut is relative to the screen edge, and not the edge of the xinerama monitor." In my case, I have a 1680x1050 monitor to the left of a 1920x1200 monitor aligned at the top. I then have a gnome-panel along the bottom edge of the 1680x1050 monitor with a height of 24 pixels. xprop reports the following partial strut: _NET_WM_STRUT_PARTIAL(CARDINAL) = 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, 0, 1679 which is correct according to the spec. Gnome-panel is reserving the 150 pixels along the bottom that aren't visible on the screen plus the 25 it requests for itself. However, maximizing a window on this monitor leaves a gap of exactly 150 pixels between the bottom edge of the maximized window and the top edge of the panel. Also, when the 1680x1050 monitor is the primary monitor (id=1) then the _NET_WORKAREA property on the root window is also off by 150px for the same reason. This patch fixes the two issues I mentioned for exterior monitor edges. It doesn't attempt to account for "interior" monitor edges (i.e. a 'left' strut on monitor A when monitor B is directly to the left of monitor A) because it's not possible to do so with the current strut specification (see http://mail.gnome.org/archives/wm-spec-list/2004-March/msg00004.html for a discussion on this limitation) This could be avoided by having the partial strut atom contain a xinerama screen ID that the strut applies to, but unfortunately the discussion all those years ago never got anywhere. [ quoted from bug #3792 ] --- openbox/screen.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/openbox/screen.c b/openbox/screen.c index 4913b606..1bcda980 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -1459,6 +1459,15 @@ void screen_update_areas(void) b = MAX(b, s->strut->bottom); } + if (l) l += RECT_LEFT (monitor_area[screen_num_monitors]) + - RECT_LEFT (monitor_area[i]); + if (t) t += RECT_TOP (monitor_area[screen_num_monitors]) + - RECT_TOP (monitor_area[i]); + if (r) r -= RECT_RIGHT (monitor_area[screen_num_monitors]) + - RECT_RIGHT (monitor_area[i]); + if (b) b -= RECT_BOTTOM(monitor_area[screen_num_monitors]) + - RECT_BOTTOM(monitor_area[i]); + /* based on these margins, set the work area for the monitor/desktop */ dims[(i * screen_num_desktops + j) * 4 + 0] += l; @@ -1599,28 +1608,32 @@ Rect* screen_area(guint desktop, guint head, Rect *search) if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_LEFT_IN_SEARCH(s->strut, search) && !STRUT_LEFT_IGNORE(s->strut, us, search)) - l = MAX(l, al + s->strut->left); + l = MAX(l, RECT_LEFT(monitor_area[screen_num_monitors]) + + s->strut->left); } for (it = struts_top; it; it = g_slist_next(it)) { ObScreenStrut *s = it->data; if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_TOP_IN_SEARCH(s->strut, search) && !STRUT_TOP_IGNORE(s->strut, us, search)) - t = MAX(t, at + s->strut->top); + t = MAX(t, RECT_TOP(monitor_area[screen_num_monitors]) + + s->strut->top); } for (it = struts_right; it; it = g_slist_next(it)) { ObScreenStrut *s = it->data; if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_RIGHT_IN_SEARCH(s->strut, search) && !STRUT_RIGHT_IGNORE(s->strut, us, search)) - r = MIN(r, ar - s->strut->right); + r = MIN(r, RECT_RIGHT(monitor_area[screen_num_monitors]) + - s->strut->right); } for (it = struts_bottom; it; it = g_slist_next(it)) { ObScreenStrut *s = it->data; if ((s->desktop == d || s->desktop == DESKTOP_ALL) && STRUT_BOTTOM_IN_SEARCH(s->strut, search) && !STRUT_BOTTOM_IGNORE(s->strut, us, search)) - b = MIN(b, ab - s->strut->bottom); + b = MIN(b, RECT_BOTTOM(monitor_area[screen_num_monitors]) + - s->strut->bottom); } /* limit to this monitor */ -- cgit v1.2.3 From 85f39cd27e7ea0eec8bc78f6139092b44fda2dad Mon Sep 17 00:00:00 2001 From: Henning Bekel Date: Sun, 5 Jul 2009 13:38:25 +0200 Subject: Don't draw borders in fullscreen mode when keepBorder is on --- openbox/frame.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openbox/frame.c b/openbox/frame.c index 5e60d11c..e4a64bd3 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -341,7 +341,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved, self->shaded = self->client->shaded; if (self->decorations & OB_FRAME_DECOR_BORDER || - (self->client->undecorated && config_theme_keepborder)) + (self->client->undecorated && config_theme_keepborder + && !self->client->fullscreen)) self->bwidth = ob_rr_theme->fbwidth; else self->bwidth = 0; -- cgit v1.2.3 From 923a11ea3092a5f7b94beadaa5ffaa6af7ce2a87 Mon Sep 17 00:00:00 2001 From: Serhiy Lysovenko Date: Sun, 5 Jul 2009 14:04:44 +0200 Subject: Update ukrainian translation and rename to uk.po --- po/LINGUAS | 2 +- po/ua.po | 482 ----------------------------------------------------------- po/uk.po | 493 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 494 insertions(+), 483 deletions(-) delete mode 100644 po/ua.po create mode 100644 po/uk.po diff --git a/po/LINGUAS b/po/LINGUAS index 606a3086..0db7a857 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -23,7 +23,7 @@ bn_IN it vi ja -ua +uk hu lt lv diff --git a/po/ua.po b/po/ua.po deleted file mode 100644 index b051694d..00000000 --- a/po/ua.po +++ /dev/null @@ -1,482 +0,0 @@ -# Ukrainian translation for Openbox. -# Copyright (C) 2007 Dmitriy Moroz -# This file is distributed under the same license as the openbox package. -# Dmitriy Moroz , 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: Openbox 3.4.2\n" -"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" -"POT-Creation-Date: 2008-11-15 22:28+0100\n" -"PO-Revision-Date: 2007-06-16 13:02+0200\n" -"Last-Translator: Dmitriy Moroz \n" -"Language-Team: Ukrainian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: openbox/actions.c:149 -#, c-format -msgid "Invalid action \"%s\" requested. No such action exists." -msgstr "Здійснено запит на некоректну дію \"%s\". Нема такої дії." - -#: openbox/actions/execute.c:128 -msgid "No" -msgstr "" - -#: openbox/actions/execute.c:129 -msgid "Yes" -msgstr "" - -#: openbox/actions/execute.c:133 -msgid "Execute" -msgstr "" - -#: openbox/actions/execute.c:142 -#, c-format -msgid "Failed to convert the path \"%s\" from utf8" -msgstr "Не вдалося сконвертувати шлях \"%s\" з utf8" - -#: openbox/actions/exit.c:52 openbox/actions/session.c:64 -#: openbox/client.c:3465 -msgid "Cancel" -msgstr "" - -#: openbox/actions/exit.c:53 -msgid "Exit" -msgstr "" - -#: openbox/actions/exit.c:56 -msgid "Are you sure you want to exit Openbox?" -msgstr "" - -#: openbox/actions/exit.c:57 -msgid "Exit Openbox" -msgstr "" - -#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the -#. name of the action you write in rc.xml -#: openbox/actions/session.c:43 -msgid "" -"The SessionLogout action is not available since Openbox was built without " -"session management support" -msgstr "" - -#: openbox/actions/session.c:65 openbox/actions/session.c:70 -msgid "Log Out" -msgstr "" - -#: openbox/actions/session.c:69 -msgid "Are you sure you want to log out?" -msgstr "" - -#: openbox/client.c:2012 -msgid "Unnamed Window" -msgstr "" - -#: openbox/client.c:2026 openbox/client.c:2058 -msgid "Killing..." -msgstr "" - -#: openbox/client.c:2028 openbox/client.c:2060 -msgid "Not Responding" -msgstr "" - -#: openbox/client.c:3454 -#, c-format -msgid "" -"The window \"%s\" does not seem to be responding. Do you want to force it " -"to exit by sending the %s signal?" -msgstr "" - -#: openbox/client.c:3456 -msgid "End Process" -msgstr "" - -#: openbox/client.c:3460 -#, c-format -msgid "" -"The window \"%s\" does not seem to be responding. Do you want to disconnect " -"it from the X server?" -msgstr "" - -#: openbox/client.c:3462 -msgid "Disconnect" -msgstr "" - -#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 -msgid "Go there..." -msgstr "Перейти...." - -#: openbox/client_list_combined_menu.c:94 -msgid "Manage desktops" -msgstr "" - -#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 -msgid "_Add new desktop" -msgstr "" - -#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 -msgid "_Remove last desktop" -msgstr "" - -#: openbox/client_list_combined_menu.c:149 -msgid "Windows" -msgstr "Вікна" - -#: openbox/client_list_menu.c:203 -msgid "Desktops" -msgstr "Стільниці" - -#: openbox/client_menu.c:258 -msgid "All desktops" -msgstr "Всі стільниці" - -#: openbox/client_menu.c:370 -msgid "_Layer" -msgstr "Шар(_L)" - -#: openbox/client_menu.c:375 -msgid "Always on _top" -msgstr "Зверху всіх вікон(_T)" - -#: openbox/client_menu.c:376 -msgid "_Normal" -msgstr "Звичайне положення(_N)" - -#: openbox/client_menu.c:377 -msgid "Always on _bottom" -msgstr "Знизу всіх вікон(_B)" - -#: openbox/client_menu.c:379 -msgid "_Send to desktop" -msgstr "Відправити на стільницю(_S)" - -#: openbox/client_menu.c:383 -msgid "Client menu" -msgstr "Меню клієнтів" - -#: openbox/client_menu.c:393 -msgid "R_estore" -msgstr "Відновити(_E)" - -#: openbox/client_menu.c:397 -msgid "_Move" -msgstr "Перемістити(_M)" - -#: openbox/client_menu.c:399 -msgid "Resi_ze" -msgstr "Змінити розмір(_Z)" - -#: openbox/client_menu.c:401 -msgid "Ico_nify" -msgstr "Згорнути(_N)" - -#: openbox/client_menu.c:405 -msgid "Ma_ximize" -msgstr "Розгорнути(_X)" - -#: openbox/client_menu.c:409 -msgid "_Roll up/down" -msgstr "Скрутити/Розкрутити(_R)" - -#: openbox/client_menu.c:411 -msgid "Un/_Decorate" -msgstr "(Від)декорувати(_D)" - -#: openbox/client_menu.c:415 -msgid "_Close" -msgstr "Закрити(_C)" - -#: openbox/config.c:781 -#, c-format -msgid "Invalid button \"%s\" specified in config file" -msgstr "Некоректна клавіша \"%s\" вказана у файлі конфігурації" - -#: openbox/keyboard.c:157 -msgid "Conflict with key binding in config file" -msgstr "Конфлікт прив'язки клавіш у файлі конфігурації" - -#: openbox/menu.c:102 openbox/menu.c:110 -#, c-format -msgid "Unable to find a valid menu file \"%s\"" -msgstr "Не вдалося знайти коректний файл меню \"%s\"" - -#: openbox/menu.c:170 -#, c-format -msgid "Failed to execute command for pipe-menu \"%s\": %s" -msgstr "Не вдалося виконати команду для pipe-меню \"%s\": %s" - -#: openbox/menu.c:184 -#, c-format -msgid "Invalid output from pipe-menu \"%s\"" -msgstr "Некоректний вивід з pipe-меню \"%s\"" - -#: openbox/menu.c:197 -#, c-format -msgid "Attempted to access menu \"%s\" but it does not exist" -msgstr "Спроба доступа до меню \"%s\" якого не існує" - -#: openbox/menu.c:367 openbox/menu.c:368 -msgid "More..." -msgstr "Більше..." - -#: openbox/mouse.c:373 -#, c-format -msgid "Invalid button \"%s\" in mouse binding" -msgstr "Некоректна клавіша \"%s\" в прив'язці клавіш мишки" - -#: openbox/mouse.c:379 -#, c-format -msgid "Invalid context \"%s\" in mouse binding" -msgstr "Некоректний контекст \"%s\" в прив'зці клавіш мишки" - -#: openbox/openbox.c:133 -#, c-format -msgid "Unable to change to home directory \"%s\": %s" -msgstr "Не вдалося перейти в домашню директорію \"%s\": %s" - -#: openbox/openbox.c:152 -msgid "Failed to open the display from the DISPLAY environment variable." -msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY" - -#: openbox/openbox.c:183 -msgid "Failed to initialize the obrender library." -msgstr "Не вдалося ініцаілізувати бібліотеку obrender" - -#: openbox/openbox.c:194 -msgid "X server does not support locale." -msgstr "X-сервер не підтримує локалі" - -#: openbox/openbox.c:196 -msgid "Cannot set locale modifiers for the X server." -msgstr "Не можу встановити модифікатори локалі для X-сервера" - -#: openbox/openbox.c:263 -msgid "Unable to find a valid config file, using some simple defaults" -msgstr "" -"Не вдалося знайти коректний файл конфігурації, використовую стандартні " -"налаштування" - -#: openbox/openbox.c:297 -msgid "Unable to load a theme." -msgstr "Не вдалося загрузити стиль" - -#: openbox/openbox.c:377 -#, c-format -msgid "" -"One or more XML syntax errors were found while parsing the Openbox " -"configuration files. See stdout for more information. The last error seen " -"was in file \"%s\" line %d, with message: %s" -msgstr "" - -#: openbox/openbox.c:379 -msgid "Openbox Syntax Error" -msgstr "" - -#: openbox/openbox.c:379 -msgid "Close" -msgstr "Закрити" - -#: openbox/openbox.c:448 -#, c-format -msgid "Restart failed to execute new executable \"%s\": %s" -msgstr "" -"При перезавантаженні не вдалося виконати новий виконуваний файл \"%s\": %s" - -#: openbox/openbox.c:518 openbox/openbox.c:520 -msgid "Copyright (c)" -msgstr "Авторські права (c)" - -#: openbox/openbox.c:529 -msgid "Syntax: openbox [options]\n" -msgstr "Синтакс: openbox [параметри]\n" - -#: openbox/openbox.c:530 -msgid "" -"\n" -"Options:\n" -msgstr "" -"\n" -"Параметри:\n" - -#: openbox/openbox.c:531 -msgid " --help Display this help and exit\n" -msgstr " --help Показати цю справку і вийти\n" - -#: openbox/openbox.c:532 -msgid " --version Display the version and exit\n" -msgstr " --vesrion Показати версію і вийти\n" - -#: openbox/openbox.c:533 -msgid " --replace Replace the currently running window manager\n" -msgstr " --replace Замінити поточний менеджер вікон\n" - -#. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." -#. aligned still, if you have to, make a new line with \n and 22 spaces. It's -#. fine to leave it as FILE though. -#: openbox/openbox.c:537 -msgid " --config-file FILE Specify the path to the config file to use\n" -msgstr "" - -#: openbox/openbox.c:538 -msgid " --sm-disable Disable connection to the session manager\n" -msgstr " --sm-disable Не з'єднуватися з сесійним менеджером\n" - -#: openbox/openbox.c:539 -msgid "" -"\n" -"Passing messages to a running Openbox instance:\n" -msgstr "" -"\n" -"Передаю повідомлення процесу Openbox що виконується\n" - -#: openbox/openbox.c:540 -msgid " --reconfigure Reload Openbox's configuration\n" -msgstr " --reconfigure Перезавантажити конфігурацію Openbox'у\n" - -#: openbox/openbox.c:541 -msgid " --restart Restart Openbox\n" -msgstr " --restart Перезапустити Openbox\n" - -#: openbox/openbox.c:542 -msgid " --exit Exit Openbox\n" -msgstr "" - -#: openbox/openbox.c:543 -msgid "" -"\n" -"Debugging options:\n" -msgstr "" -"\n" -"Налагоджувальні параметри\n" - -#: openbox/openbox.c:544 -msgid " --sync Run in synchronous mode\n" -msgstr " --sync Запустити в синхронному режимі\n" - -#: openbox/openbox.c:545 -msgid " --debug Display debugging output\n" -msgstr " --debug Показувати інформацію налагоджування\n" - -#: openbox/openbox.c:546 -msgid " --debug-focus Display debugging output for focus handling\n" -msgstr "" -" --debug-focus Показувати інформацію налагоджування для уравління\n" - -#: openbox/openbox.c:547 -msgid " --debug-xinerama Split the display into fake xinerama screens\n" -msgstr " --debug-xinerama Розбити екран на фальшиві екрани xinerama\n" - -#: openbox/openbox.c:548 -#, c-format -msgid "" -"\n" -"Please report bugs at %s\n" -msgstr "" -"\n" -"Будь-ласка, повідомляйте про помилки на %s\n" - -#: openbox/openbox.c:617 -msgid "--config-file requires an argument\n" -msgstr "" - -#: openbox/openbox.c:660 -#, c-format -msgid "Invalid command line argument \"%s\"\n" -msgstr "Некоректний командний аргумент \"%s\"\n" - -#: openbox/screen.c:102 openbox/screen.c:190 -#, c-format -msgid "A window manager is already running on screen %d" -msgstr "На дисплеї %d вже запущений менеджер вікон" - -#: openbox/screen.c:124 -#, c-format -msgid "Could not acquire window manager selection on screen %d" -msgstr "Не можу отримати вибір менеджера вікон на дисплеї %d" - -#: openbox/screen.c:145 -#, c-format -msgid "The WM on screen %d is not exiting" -msgstr "Менеджео вікон на дисплеї %d не завершується" - -#. TRANSLATORS: If you need to specify a different order of the -#. arguments, you can use %1$d for the first one and %2$d for the -#. second one. For example, -#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." -#: 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[0] "" -msgstr[1] "" - -#: openbox/screen.c:1180 -#, c-format -msgid "desktop %i" -msgstr "стільниця %i" - -#: openbox/session.c:104 -#, c-format -msgid "Unable to make directory \"%s\": %s" -msgstr "Не вдалося створити директорію \"%s\": %s" - -#: openbox/session.c:466 -#, c-format -msgid "Unable to save the session to \"%s\": %s" -msgstr "Не вдалося зберегти сесію в \"%s\": %s" - -#: openbox/session.c:605 -#, c-format -msgid "Error while saving the session to \"%s\": %s" -msgstr "Помилка при збереженні сесії в \"%s\": %s" - -#: openbox/session.c:842 -msgid "Not connected to a session manager" -msgstr "" - -#: openbox/startupnotify.c:243 -#, c-format -msgid "Running %s\n" -msgstr "Виконується %s\n" - -#: openbox/translate.c:59 -#, c-format -msgid "Invalid modifier key \"%s\" in key/mouse binding" -msgstr "" -"Некоректна назва модифікатору \"%s\" у прив'язці клавіш клавіатури/мишки" - -#: openbox/translate.c:138 -#, c-format -msgid "Invalid key code \"%s\" in key binding" -msgstr "Некоректний код клавіши \"%s\" у прив'зці клавіш" - -#: openbox/translate.c:145 -#, c-format -msgid "Invalid key name \"%s\" in key binding" -msgstr "Некоректна назва клавіши \"%s\" у прив'язці клавіш" - -#: openbox/translate.c:151 -#, c-format -msgid "Requested key \"%s\" does not exist on the display" -msgstr "Клавіша \"%s\" на яку здійснено запит - не існує на дисплеї" - -#: openbox/xerror.c:40 -#, c-format -msgid "X Error: %s" -msgstr "Помилка X-серверу: %s" - -#: openbox/prompt.c:200 -msgid "OK" -msgstr "" - -#~ msgid "Failed to execute \"%s\": %s" -#~ msgstr "Невдалося виконати \"%s\": %s" - -#~ msgid "Invalid use of action \"%s\". Action will be ignored." -#~ msgstr "Некоректне викристання дії \"%s\". Дія буде проігнорована." diff --git a/po/uk.po b/po/uk.po new file mode 100644 index 00000000..4d150398 --- /dev/null +++ b/po/uk.po @@ -0,0 +1,493 @@ +# Ukrainian translation for Openbox. +# Copyright (C) 2007 Dmitriy Moroz +# Copyright (C) 2008 Serhiy Lysovenko +# This file is distributed under the same license as the openbox package. +# Dmitriy Moroz , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: Openbox 3.4.2\n" +"Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n" +"POT-Creation-Date: 2009-07-05 13:50+0200\n" +"PO-Revision-Date: 2008-12-09 20:12+0200\n" +"Last-Translator: Serhiy Lysovenko \n" +"Language-Team: Ukrainian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: openbox/actions.c:149 +#, c-format +msgid "Invalid action \"%s\" requested. No such action exists." +msgstr "Здійснено запит на неіснуючу дію \"%s\"." + +#: openbox/actions/execute.c:128 +msgid "No" +msgstr "Ні" + +#: openbox/actions/execute.c:129 +msgid "Yes" +msgstr "Так" + +#: openbox/actions/execute.c:133 +msgid "Execute" +msgstr "Виконати" + +#: openbox/actions/execute.c:142 +#, c-format +msgid "Failed to convert the path \"%s\" from utf8" +msgstr "Не вдалося конвертувати шлях \"%s\" з utf8" + +#: openbox/actions/exit.c:52 openbox/actions/session.c:64 +#: openbox/client.c:3466 +msgid "Cancel" +msgstr "Скасувати" + +#: openbox/actions/exit.c:53 +msgid "Exit" +msgstr "Вихід" + +#: openbox/actions/exit.c:56 +msgid "Are you sure you want to exit Openbox?" +msgstr "Ви дійсно хочете вийти з Openbox?" + +#: openbox/actions/exit.c:57 +msgid "Exit Openbox" +msgstr "Вийти з Openbox" + +#. TRANSLATORS: Don't translate the word "SessionLogout" as it's the +#. name of the action you write in rc.xml +#: openbox/actions/session.c:43 +msgid "" +"The SessionLogout action is not available since Openbox was built without " +"session management support" +msgstr "" + +#: openbox/actions/session.c:65 openbox/actions/session.c:70 +msgid "Log Out" +msgstr "Вийти" + +#: openbox/actions/session.c:69 +msgid "Are you sure you want to log out?" +msgstr "Ви дійсно бажаєте завершити сеанс?" + +#: openbox/client.c:2013 +msgid "Unnamed Window" +msgstr "Неназване вікно" + +#: openbox/client.c:2027 openbox/client.c:2059 +msgid "Killing..." +msgstr "Знищення..." + +#: openbox/client.c:2029 openbox/client.c:2061 +msgid "Not Responding" +msgstr "Не відповідає" + +#: openbox/client.c:3455 +#, c-format +msgid "" +"The window \"%s\" does not seem to be responding. Do you want to force it " +"to exit by sending the %s signal?" +msgstr "" +"Схоже, вікно \"%s\" не відповідає. Чи бажаєте примусово завершити програму, " +"пославши сигнал \"%s\"?" + +#: openbox/client.c:3457 +msgid "End Process" +msgstr "Примусове завершення" + +#: openbox/client.c:3461 +#, c-format +msgid "" +"The window \"%s\" does not seem to be responding. Do you want to disconnect " +"it from the X server?" +msgstr "Вікно \"%s\" не відповідає. Чи бажаєте його від'єднати від X сервера?" + +#: openbox/client.c:3463 +msgid "Disconnect" +msgstr "Від'єднати" + +#: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91 +msgid "Go there..." +msgstr "Перейти..." + +#: openbox/client_list_combined_menu.c:94 +msgid "Manage desktops" +msgstr "Керування стільницями" + +#: openbox/client_list_combined_menu.c:95 openbox/client_list_menu.c:155 +msgid "_Add new desktop" +msgstr "Додати нову стільницю (_A)" + +#: openbox/client_list_combined_menu.c:96 openbox/client_list_menu.c:156 +msgid "_Remove last desktop" +msgstr "Видалити останню стільницю (_R)" + +#: openbox/client_list_combined_menu.c:149 +msgid "Windows" +msgstr "Вікна" + +#: openbox/client_list_menu.c:203 +msgid "Desktops" +msgstr "Стільниці" + +#: openbox/client_menu.c:258 +msgid "All desktops" +msgstr "На всіх стільницях" + +#: openbox/client_menu.c:370 +msgid "_Layer" +msgstr "Шар (_L)" + +#: openbox/client_menu.c:375 +msgid "Always on _top" +msgstr "Над усіма вікнами (_T)" + +#: openbox/client_menu.c:376 +msgid "_Normal" +msgstr "Звичайне положення (_N)" + +#: openbox/client_menu.c:377 +msgid "Always on _bottom" +msgstr "Під вікнами (_B)" + +#: openbox/client_menu.c:379 +msgid "_Send to desktop" +msgstr "Відправити на стільницю (_S)" + +#: openbox/client_menu.c:383 +msgid "Client menu" +msgstr "Меню клієнта" + +#: openbox/client_menu.c:393 +msgid "R_estore" +msgstr "Відновити (_E)" + +#: openbox/client_menu.c:397 +msgid "_Move" +msgstr "Перемістити (_M)" + +#: openbox/client_menu.c:399 +msgid "Resi_ze" +msgstr "Змінити розмір (_Z)" + +#: openbox/client_menu.c:401 +msgid "Ico_nify" +msgstr "Згорнути (_N)" + +#: openbox/client_menu.c:405 +msgid "Ma_ximize" +msgstr "Розгорнути (_X)" + +#: openbox/client_menu.c:409 +msgid "_Roll up/down" +msgstr "Скрутити/Розкрутити (_R)" + +#: openbox/client_menu.c:411 +msgid "Un/_Decorate" +msgstr "Перемкнути декорацію (_D)" + +#: openbox/client_menu.c:415 +msgid "_Close" +msgstr "Закрити (_C)" + +#: openbox/config.c:782 +#, c-format +msgid "Invalid button \"%s\" specified in config file" +msgstr "Некоректна кнопка \"%s\" вказана у файлі конфігурації" + +#: openbox/keyboard.c:157 +msgid "Conflict with key binding in config file" +msgstr "Конфлікт прив'язки клавіш у файлі конфігурації" + +#: openbox/menu.c:102 openbox/menu.c:110 +#, c-format +msgid "Unable to find a valid menu file \"%s\"" +msgstr "Не вдалося знайти коректний файл меню \"%s\"" + +#: openbox/menu.c:170 +#, c-format +msgid "Failed to execute command for pipe-menu \"%s\": %s" +msgstr "Не вдалося виконати команду для pipe-меню \"%s\": %s" + +#: openbox/menu.c:184 +#, c-format +msgid "Invalid output from pipe-menu \"%s\"" +msgstr "Некоректний вивід з pipe-меню \"%s\"" + +#: openbox/menu.c:197 +#, c-format +msgid "Attempted to access menu \"%s\" but it does not exist" +msgstr "Спроба доступу до неіснуючого меню \"%s\"" + +#: openbox/menu.c:367 openbox/menu.c:368 +msgid "More..." +msgstr "Більше..." + +#: openbox/mouse.c:373 +#, c-format +msgid "Invalid button \"%s\" in mouse binding" +msgstr "Некоректна клавіша \"%s\" в прив'язці клавіш мишки" + +#: openbox/mouse.c:379 +#, c-format +msgid "Invalid context \"%s\" in mouse binding" +msgstr "Некоректний контекст \"%s\" в прив'язці клавіш мишки" + +#: openbox/openbox.c:133 +#, c-format +msgid "Unable to change to home directory \"%s\": %s" +msgstr "Не вдалося перейти до домашнього каталогу \"%s\": %s" + +#: openbox/openbox.c:152 +msgid "Failed to open the display from the DISPLAY environment variable." +msgstr "Не вдалося відкрити дисплей зі змінної середовища DISPLAY" + +#: openbox/openbox.c:183 +msgid "Failed to initialize the obrender library." +msgstr "Не вдалося ініцаілізувати бібліотеку obrender" + +#: openbox/openbox.c:194 +msgid "X server does not support locale." +msgstr "X-сервер не підтримує локалі" + +#: openbox/openbox.c:196 +msgid "Cannot set locale modifiers for the X server." +msgstr "Не можу встановити модифікатори локалі для X-сервера" + +#: openbox/openbox.c:263 +msgid "Unable to find a valid config file, using some simple defaults" +msgstr "" +"Не вдалося знайти коректний файл конфігурації, використовую стандартні " +"налаштування" + +#: openbox/openbox.c:297 +msgid "Unable to load a theme." +msgstr "Не вдалося завантажити тему" + +#: openbox/openbox.c:377 +#, c-format +msgid "" +"One or more XML syntax errors were found while parsing the Openbox " +"configuration files. See stdout for more information. The last error seen " +"was in file \"%s\" line %d, with message: %s" +msgstr "" +"Виявлено одну або більше синтаксичних помилок XML під час сканування " +"конфігураційних файлів Openbox. Щоб дізнатись більше - перегляньте stdout. " +"Остання помічена помилка була в файлі \"%s\", стрічка %d, повідомлення: %s" + +#: openbox/openbox.c:379 +msgid "Openbox Syntax Error" +msgstr "синтаксична помилка Openbox" + +#: openbox/openbox.c:379 +msgid "Close" +msgstr "Закрити" + +#: openbox/openbox.c:448 +#, c-format +msgid "Restart failed to execute new executable \"%s\": %s" +msgstr "" +"При перезавантаженні не вдалося виконати новий виконуваний файл \"%s\": %s" + +#: openbox/openbox.c:518 openbox/openbox.c:520 +msgid "Copyright (c)" +msgstr "Авторські права (c)" + +#: openbox/openbox.c:529 +msgid "Syntax: openbox [options]\n" +msgstr "Синтакс: openbox [параметри]\n" + +#: openbox/openbox.c:530 +msgid "" +"\n" +"Options:\n" +msgstr "" +"\n" +"Параметри:\n" + +#: openbox/openbox.c:531 +msgid " --help Display this help and exit\n" +msgstr " --help Показати цю довідку і вийти\n" + +#: openbox/openbox.c:532 +msgid " --version Display the version and exit\n" +msgstr " --vesrion Показати версію і вийти\n" + +#: openbox/openbox.c:533 +msgid " --replace Replace the currently running window manager\n" +msgstr " --replace Замінити запущений менеджер вікон\n" + +#. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..." +#. aligned still, if you have to, make a new line with \n and 22 spaces. It's +#. fine to leave it as FILE though. +#: openbox/openbox.c:537 +msgid " --config-file FILE Specify the path to the config file to use\n" +msgstr " --config-file ФАЙЛ Вказати шлях до конфігураційного файлу\n" + +#: openbox/openbox.c:538 +msgid " --sm-disable Disable connection to the session manager\n" +msgstr " --sm-disable Вимкнути з'єднання з менеджером сеансу\n" + +#: openbox/openbox.c:539 +msgid "" +"\n" +"Passing messages to a running Openbox instance:\n" +msgstr "" +"\n" +"Передача повідомлень процесу Openbox, що виконується\n" + +#: openbox/openbox.c:540 +msgid " --reconfigure Reload Openbox's configuration\n" +msgstr " --reconfigure Перезавантажити конфігурацію Openbox'у\n" + +#: openbox/openbox.c:541 +msgid " --restart Restart Openbox\n" +msgstr " --restart Перезапустити Openbox\n" + +#: openbox/openbox.c:542 +msgid " --exit Exit Openbox\n" +msgstr " --exit Вийти з Openbox\n" + +#: openbox/openbox.c:543 +msgid "" +"\n" +"Debugging options:\n" +msgstr "" +"\n" +"Налагоджувальні параметри\n" + +#: openbox/openbox.c:544 +msgid " --sync Run in synchronous mode\n" +msgstr " --sync Запустити в синхронному режимі\n" + +#: openbox/openbox.c:545 +msgid " --debug Display debugging output\n" +msgstr " --debug Показувати інформацію налагоджування\n" + +#: openbox/openbox.c:546 +msgid " --debug-focus Display debugging output for focus handling\n" +msgstr "" +" --debug-focus Показувати відлагоджувальний вивід для керування " +"фокусом\n" + +#: openbox/openbox.c:547 +msgid " --debug-xinerama Split the display into fake xinerama screens\n" +msgstr " --debug-xinerama Розбити екран на фальшиві екрани xinerama\n" + +#: openbox/openbox.c:548 +#, c-format +msgid "" +"\n" +"Please report bugs at %s\n" +msgstr "" +"\n" +"Будь-ласка, повідомляйте про помилки на %s\n" + +#: openbox/openbox.c:617 +msgid "--config-file requires an argument\n" +msgstr "--config-file потребує аргументу\n" + +#: openbox/openbox.c:660 +#, c-format +msgid "Invalid command line argument \"%s\"\n" +msgstr "Некоректний аргумент \"%s\"\n" + +#: openbox/screen.c:102 openbox/screen.c:190 +#, c-format +msgid "A window manager is already running on screen %d" +msgstr "На дисплеї %d вже запущений менеджер вікон" + +#: openbox/screen.c:124 +#, c-format +msgid "Could not acquire window manager selection on screen %d" +msgstr "Не можу запустити менеджера вікон на дисплеї %d" + +#: openbox/screen.c:145 +#, c-format +msgid "The WM on screen %d is not exiting" +msgstr "Менеджер вікон на дисплеї %d не завершається" + +#. TRANSLATORS: If you need to specify a different order of the +#. arguments, you can use %1$d for the first one and %2$d for the +#. second one. For example, +#. "The current session has %2$d desktops, but Openbox is configured for %1$d ..." +#: openbox/screen.c:419 +#, fuzzy, 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[0] "" +"Openbox сконфігуровано на %d дисплеїв, але в поточній сесії використовується " +"%d. Перевищення конфігурації Openbox." +msgstr[1] "" +"Openbox сконфігуровано на %d дисплеїв, але в поточній сесії використовується " +"%d. Перевищення конфігурації Openbox." + +#: openbox/screen.c:1205 +#, c-format +msgid "desktop %i" +msgstr "стільниця %i" + +#: openbox/session.c:104 +#, c-format +msgid "Unable to make directory \"%s\": %s" +msgstr "Не вдалося створити каталог \"%s\": %s" + +#: openbox/session.c:466 +#, c-format +msgid "Unable to save the session to \"%s\": %s" +msgstr "Не вдалося зберегти сесію в \"%s\": %s" + +#: openbox/session.c:605 +#, c-format +msgid "Error while saving the session to \"%s\": %s" +msgstr "Помилка при збереженні сесії в \"%s\": %s" + +#: openbox/session.c:842 +msgid "Not connected to a session manager" +msgstr "Не під'єднано до керівника сесіями" + +#: openbox/startupnotify.c:243 +#, c-format +msgid "Running %s\n" +msgstr "Виконується %s\n" + +#: openbox/translate.c:59 +#, c-format +msgid "Invalid modifier key \"%s\" in key/mouse binding" +msgstr "" +"Некоректна назва модифікатору \"%s\" у прив'язці клавіш клавіатури/мишки" + +#: openbox/translate.c:138 +#, c-format +msgid "Invalid key code \"%s\" in key binding" +msgstr "Некоректний код клавіші \"%s\" у прив'язці клавіш" + +#: openbox/translate.c:145 +#, c-format +msgid "Invalid key name \"%s\" in key binding" +msgstr "Некоректна назва клавіші \"%s\" у прив'язці клавіш" + +#: openbox/translate.c:151 +#, c-format +msgid "Requested key \"%s\" does not exist on the display" +msgstr "Потрібної кнопки \"%s\" нема на екрані" + +#: openbox/xerror.c:40 +#, c-format +msgid "X Error: %s" +msgstr "Помилка X-серверу: %s" + +#: openbox/prompt.c:200 +msgid "OK" +msgstr "Гаразд" + +#~ msgid "Failed to execute \"%s\": %s" +#~ msgstr "Невдалося виконати \"%s\": %s" + +#~ msgid "Invalid use of action \"%s\". Action will be ignored." +#~ msgstr "Некоректне викристання дії \"%s\". Дія буде проігнорована." -- cgit v1.2.3 From 7351d86443539fd60267baed129601d923e88269 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 5 Jul 2009 14:24:14 +0200 Subject: Don't trust xinerama not to return NULL We check that xinerama is active already, but someone got a NULL here. --- openbox/extensions.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/openbox/extensions.c b/openbox/extensions.c index cd188dd0..23d3e0c8 100644 --- a/openbox/extensions.c +++ b/openbox/extensions.c @@ -85,7 +85,11 @@ void extensions_query_all(void) void extensions_xinerama_screens(Rect **xin_areas, guint *nxin) { guint i; - gint l, r, t, b; + gint n, l, r, t, b; +#ifdef XINERAMA + XineramaScreenInfo *info; +#endif + if (ob_debug_xinerama) { gint w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)); gint h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)); @@ -94,12 +98,9 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin) RECT_SET((*xin_areas)[0], 0, 0, w/2, h); RECT_SET((*xin_areas)[1], w/2, 0, w-(w/2), h); } - else #ifdef XINERAMA - if (extensions_xinerama) { - guint i; - gint n; - XineramaScreenInfo *info = XineramaQueryScreens(ob_display, &n); + else if (extensions_xinerama && + (info = XineramaQueryScreens(ob_display, &n))) { *nxin = n; *xin_areas = g_new(Rect, *nxin + 1); for (i = 0; i < *nxin; ++i) @@ -107,8 +108,8 @@ void extensions_xinerama_screens(Rect **xin_areas, guint *nxin) info[i].width, info[i].height); XFree(info); } - else #endif + else { *nxin = 1; *xin_areas = g_new(Rect, *nxin + 1); -- cgit v1.2.3 From fa4e09dd7e8b65234e833444f418e890a9185898 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 5 Jul 2009 15:53:29 +0200 Subject: Allow escaping _ in menu labels by putting __ Currently you can't mark anything that comes after the __ with _ to make that a shortcut. --- openbox/menu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openbox/menu.c b/openbox/menu.c index 23a0527a..58b6280e 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -232,10 +232,13 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut, /* you have to use a printable ascii character for shortcuts don't allow space either, so you can have like "a _ b" */ - if (VALID_SHORTCUT(*(i+1))) { - shortcut = g_unichar_tolower(g_utf8_get_char(i+1)); - *position = i - *strippedlabel; - *always_show = TRUE; + if (VALID_SHORTCUT(*(i+1)) || *(i+1) == '_') { + /* Allow you to escape the first _ by putting __ */ + if (*(i+1) != '_') { + shortcut = g_unichar_tolower(g_utf8_get_char(i+1)); + *position = i - *strippedlabel; + *always_show = TRUE; + } /* remove the '_' from the string */ for (; *i != '\0'; ++i) -- cgit v1.2.3 From 2ed56873b6a51965ff8159f8e0bbf82324f194d8 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 5 Jul 2009 16:21:28 +0200 Subject: Another debug message typo --- openbox/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbox/event.c b/openbox/event.c index 8eb612a1..ddd2e326 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -651,7 +651,7 @@ static void event_process(const XEvent *ec, gpointer data) else if (e->type == MappingNotify) { /* keyboard layout changes for modifier mapping changes. reload the modifier map, and rebind all the key bindings as appropriate */ - ob_debug("Kepboard map changed. Reloading keyboard bindings.\n"); + ob_debug("Keyboard map changed. Reloading keyboard bindings.\n"); ob_set_state(OB_STATE_RECONFIGURING); modkeys_shutdown(TRUE); modkeys_startup(TRUE); -- cgit v1.2.3 From b69ee77256dccee0764c07416fe9bc7db9e5a12d Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sun, 5 Jul 2009 20:51:04 +0200 Subject: Don't replace ~ when we shouldn't Bump glib req to 2.14 to get GRegex, now we only replace ~ with your homedir in an action if it is (at the start of the string or preceded by whitespace) and (at the end of the string or followed by (whitespace or a slash)). (?:^|(?<=[ \t]))~(?=[/ \t$]) Fixes bug #4033. --- configure.ac | 2 +- parser/parse.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 53e50013..bba1b5c6 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,7 @@ if test "$SED" = "no"; then AC_MSG_ERROR([The program "sed" is not available. This program is required to build Openbox.]) fi -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.6.0]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0]) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) diff --git a/parser/parse.c b/parser/parse.c index 636b451f..ed66f088 100644 --- a/parser/parse.c +++ b/parser/parse.c @@ -456,14 +456,16 @@ void parse_paths_shutdown(void) gchar *parse_expand_tilde(const gchar *f) { - gchar **spl; gchar *ret; + GRegex *regex; if (!f) return NULL; - spl = g_strsplit(f, "~", 0); - ret = g_strjoinv(g_get_home_dir(), spl); - g_strfreev(spl); + + regex = g_regex_new("(?:^|(?<=[ \\t]))~(?=[/ \\t$])", G_REGEX_MULTILINE | G_REGEX_RAW, 0, NULL); + ret = g_regex_replace_literal(regex, f, -1, 0, g_get_home_dir(), 0, NULL); + g_regex_unref(regex); + return ret; } -- cgit v1.2.3 From ba1ac214dfdbc0539c922e84c2318c1bf2566c0c Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlenga Date: Mon, 8 Jun 2009 00:35:49 +0200 Subject: Remove newline from startupnotify description It doesn't look good in some places, e.g. WnckTasklist (gnome-panel) [ Also update translations -- Mikael ] --- openbox/startupnotify.c | 2 +- po/ar.po | 4 ++-- po/bn_IN.po | 4 ++-- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/en@boldquot.po | 4 ++-- po/en@quot.po | 4 ++-- po/es.po | 4 ++-- po/et.po | 4 ++-- po/eu.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/lt.po | 4 ++-- po/lv.po | 4 ++-- po/nl.po | 4 ++-- po/no.po | 4 ++-- po/openbox.pot | 2 +- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sr.po | 4 ++-- po/sr@latin.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 4 ++-- po/vi.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 36 files changed, 70 insertions(+), 70 deletions(-) diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c index e13aa55c..47c95da1 100644 --- a/openbox/startupnotify.c +++ b/openbox/startupnotify.c @@ -240,7 +240,7 @@ void sn_setup_spawn_environment(const gchar *program, const gchar *name, gchar *desc; const char *id; - desc = g_strdup_printf(_("Running %s\n"), program); + desc = g_strdup_printf(_("Running %s"), program); if (sn_launcher_context_get_initiated(sn_launcher)) { sn_launcher_context_unref(sn_launcher); diff --git a/po/ar.po b/po/ar.po index bb8af255..6ecf08e8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -443,8 +443,8 @@ msgstr "" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "تشغيل %s\n" +msgid "Running %s" +msgstr "تشغيل %s" #: openbox/translate.c:59 #, c-format diff --git a/po/bn_IN.po b/po/bn_IN.po index c89217b8..b7c898c2 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -444,8 +444,8 @@ msgstr "" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "%s সঞ্চালিত হচ্ছে\n" +msgid "Running %s" +msgstr "%s সঞ্চালিত হচ্ছে" #: openbox/translate.c:59 #, c-format diff --git a/po/ca.po b/po/ca.po index 50d5a240..287af4f0 100644 --- a/po/ca.po +++ b/po/ca.po @@ -468,8 +468,8 @@ msgstr "No esteu connectats al gestor de sessions" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Executant %s\n" +msgid "Running %s" +msgstr "Executant %s" #: openbox/translate.c:59 #, c-format diff --git a/po/cs.po b/po/cs.po index 6c195cc2..49ad300e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -450,8 +450,8 @@ msgstr "Nepřipojen k session manageru" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Spouštím %s\n" +msgid "Running %s" +msgstr "Spouštím %s" #: openbox/translate.c:59 #, c-format diff --git a/po/da.po b/po/da.po index 351e1c4f..3fa8ed9d 100644 --- a/po/da.po +++ b/po/da.po @@ -458,8 +458,8 @@ msgstr "Ikke forbundet til en sessionsbehandler" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Kører %s\n" +msgid "Running %s" +msgstr "Kører %s" #: openbox/translate.c:59 #, c-format diff --git a/po/de.po b/po/de.po index 758a06c1..9a78c710 100644 --- a/po/de.po +++ b/po/de.po @@ -463,8 +463,8 @@ msgstr "Nicht mit einem Sitzungsmanager verbunden" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Starte %s\n" +msgid "Running %s" +msgstr "Starte %s" #: openbox/translate.c:59 #, c-format diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 33856fdb..cdd30d29 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -477,8 +477,8 @@ msgstr "Not connected to a session manager" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Running %s\n" +msgid "Running %s" +msgstr "Running %s" #: openbox/translate.c:59 #, c-format diff --git a/po/en@quot.po b/po/en@quot.po index adfbd9e6..ab181820 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -474,8 +474,8 @@ msgstr "Not connected to a session manager" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Running %s\n" +msgid "Running %s" +msgstr "Running %s" #: openbox/translate.c:59 #, c-format diff --git a/po/es.po b/po/es.po index 8dfe06a6..d4d9f947 100644 --- a/po/es.po +++ b/po/es.po @@ -468,8 +468,8 @@ msgstr "Sin conexión a un manejador de sesiones" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Ejecutando %s\n" +msgid "Running %s" +msgstr "Ejecutando %s" #: openbox/translate.c:59 #, c-format diff --git a/po/et.po b/po/et.po index 209f378f..9c9c9f34 100644 --- a/po/et.po +++ b/po/et.po @@ -441,8 +441,8 @@ msgstr "" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Jooksev %s\n" +msgid "Running %s" +msgstr "Jooksev %s" #: openbox/translate.c:59 #, c-format diff --git a/po/eu.po b/po/eu.po index 7257436b..8b3a52f8 100644 --- a/po/eu.po +++ b/po/eu.po @@ -458,8 +458,8 @@ msgstr "Saio kudeatzaile batera ez konektatua" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Egikaritzen %s\n" +msgid "Running %s" +msgstr "Egikaritzen %s" #: openbox/translate.c:59 #, c-format diff --git a/po/fi.po b/po/fi.po index fc2d4bec..0c5b344c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -457,8 +457,8 @@ msgstr "Ei yhteyttä istunnon hallintaan" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Suoritetaan %s\n" +msgid "Running %s" +msgstr "Suoritetaan %s" #: openbox/translate.c:59 #, c-format diff --git a/po/fr.po b/po/fr.po index a32e61cd..036d78e5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -474,8 +474,8 @@ msgstr "Non connect #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Excution de %s\n" +msgid "Running %s" +msgstr "Excution de %s" #: openbox/translate.c:59 #, c-format diff --git a/po/hr.po b/po/hr.po index f07db78a..13af7ef3 100644 --- a/po/hr.po +++ b/po/hr.po @@ -455,8 +455,8 @@ msgstr "Nije povezan sa upraviteljem sesija" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Pokrenuto %s\n" +msgid "Running %s" +msgstr "Pokrenuto %s" #: openbox/translate.c:59 #, c-format diff --git a/po/hu.po b/po/hu.po index 3aba08e5..ffa5201c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -452,8 +452,8 @@ msgstr "Nem kapcsolódunk a szekciókezelőhöz" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Futtatás %s\n" +msgid "Running %s" +msgstr "Futtatás %s" #: openbox/translate.c:59 #, c-format diff --git a/po/it.po b/po/it.po index 0b67ee8f..27d3d81f 100644 --- a/po/it.po +++ b/po/it.po @@ -463,8 +463,8 @@ msgstr "Non connesso al gestore di sessioni" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Sto eseguendo %s\n" +msgid "Running %s" +msgstr "Sto eseguendo %s" #: openbox/translate.c:59 #, c-format diff --git a/po/ja.po b/po/ja.po index 7b30619c..4af2e9b5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -449,8 +449,8 @@ msgstr "セッションマネージャに接続されていません。" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "起動中 %s\n" +msgid "Running %s" +msgstr "起動中 %s" #: openbox/translate.c:59 #, c-format diff --git a/po/lt.po b/po/lt.po index 5b2aaf88..854c4c3b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -450,8 +450,8 @@ msgstr "Neprisijungta prie sesijų sesijos tvarkyklė" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Veikia %s\n" +msgid "Running %s" +msgstr "Veikia %s" #: openbox/translate.c:59 #, c-format diff --git a/po/lv.po b/po/lv.po index 7ef4eeb0..f1a3ae1b 100644 --- a/po/lv.po +++ b/po/lv.po @@ -455,8 +455,8 @@ msgstr "Nav savienots ar sesiju pārvaldnieku" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Palaiž %s\n" +msgid "Running %s" +msgstr "Palaiž %s" #: openbox/translate.c:59 #, c-format diff --git a/po/nl.po b/po/nl.po index e2e5efaf..b635c23d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -459,8 +459,8 @@ msgstr "Niet met een sessiebeheerder verbonden" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Starten van %s\n" +msgid "Running %s" +msgstr "Starten van %s" #: openbox/translate.c:59 #, c-format diff --git a/po/no.po b/po/no.po index 5fe220d7..a702caa4 100644 --- a/po/no.po +++ b/po/no.po @@ -453,8 +453,8 @@ msgstr "Ikke tilknyttet en sesjonsbehandler" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Kjører %s\n" +msgid "Running %s" +msgstr "Kjører %s" #: openbox/translate.c:59 #, c-format diff --git a/po/openbox.pot b/po/openbox.pot index 02a9ad5c..04503945 100644 --- a/po/openbox.pot +++ b/po/openbox.pot @@ -432,7 +432,7 @@ msgstr "" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" +msgid "Running %s" msgstr "" #: openbox/translate.c:59 diff --git a/po/pl.po b/po/pl.po index 5e92036b..b0f5d52c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -445,8 +445,8 @@ msgstr "" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Uruchamianie %s\n" +msgid "Running %s" +msgstr "Uruchamianie %s" #: openbox/translate.c:59 #, c-format diff --git a/po/pt.po b/po/pt.po index 0a98580f..f9627560 100644 --- a/po/pt.po +++ b/po/pt.po @@ -460,8 +460,8 @@ msgstr "Desligado do gestor de sess #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Executando %s\n" +msgid "Running %s" +msgstr "Executando %s" #: openbox/translate.c:59 #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index 39852f6c..fe44888e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -463,8 +463,8 @@ msgstr "Não está conectado à um gerente de sessões" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Executando %s\n" +msgid "Running %s" +msgstr "Executando %s" #: openbox/translate.c:59 #, c-format diff --git a/po/ru.po b/po/ru.po index 74369801..dfbb425f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -453,8 +453,8 @@ msgstr "Не подключен к менеджеру сессии" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Запуск %s\n" +msgid "Running %s" +msgstr "Запуск %s" #: openbox/translate.c:59 #, c-format diff --git a/po/sk.po b/po/sk.po index 8ad1e60d..6f16c94c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -442,8 +442,8 @@ msgstr "" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Spúšťam %s\n" +msgid "Running %s" +msgstr "Spúšťam %s" #: openbox/translate.c:59 #, c-format diff --git a/po/sr.po b/po/sr.po index a590d4d2..5702c789 100644 --- a/po/sr.po +++ b/po/sr.po @@ -463,8 +463,8 @@ msgstr "Није повезан са управником сесија" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Извршавам %s\n" +msgid "Running %s" +msgstr "Извршавам %s" #: openbox/translate.c:59 #, c-format diff --git a/po/sr@latin.po b/po/sr@latin.po index 0a6fff2c..bf5fcdcd 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -463,8 +463,8 @@ msgstr "Nije povezan sa upravnikom sesija" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Izvršavam %s\n" +msgid "Running %s" +msgstr "Izvršavam %s" #: openbox/translate.c:59 #, c-format diff --git a/po/sv.po b/po/sv.po index 5040d2f2..96be7349 100644 --- a/po/sv.po +++ b/po/sv.po @@ -454,8 +454,8 @@ msgstr "Inte ansluten till en sessionshanterare" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Kr %s\n" +msgid "Running %s" +msgstr "Kr %s" #: openbox/translate.c:59 #, c-format diff --git a/po/tr.po b/po/tr.po index a0d9aea2..122e3bd0 100644 --- a/po/tr.po +++ b/po/tr.po @@ -458,8 +458,8 @@ msgstr "Oturum yöneticisine bağlı değil" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "%s çalışıyor\n" +msgid "Running %s" +msgstr "%s çalışıyor" #: openbox/translate.c:59 #, c-format diff --git a/po/uk.po b/po/uk.po index 4d150398..602f9fe4 100644 --- a/po/uk.po +++ b/po/uk.po @@ -453,8 +453,8 @@ msgstr "Не під'єднано до керівника сесіями" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Виконується %s\n" +msgid "Running %s" +msgstr "Виконується %s" #: openbox/translate.c:59 #, c-format diff --git a/po/vi.po b/po/vi.po index 83414869..49dd347b 100644 --- a/po/vi.po +++ b/po/vi.po @@ -452,8 +452,8 @@ msgstr "Không hàng với session quản lý" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "Đan Chạy %s\n" +msgid "Running %s" +msgstr "Đan Chạy %s" #: openbox/translate.c:59 #, c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 89a65854..61058af0 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -444,8 +444,8 @@ msgstr "未连接到会话管理器" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "运行 %s\n" +msgid "Running %s" +msgstr "运行 %s" #: openbox/translate.c:59 #, c-format diff --git a/po/zh_TW.po b/po/zh_TW.po index ccaa229a..72e6285e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -444,8 +444,8 @@ msgstr "沒有連接到作業階段管理員" #: openbox/startupnotify.c:243 #, c-format -msgid "Running %s\n" -msgstr "正在運行 %s\n" +msgid "Running %s" +msgstr "正在運行 %s" #: openbox/translate.c:59 #, c-format -- cgit v1.2.3