merge r6677-6689 from trunk

diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml
index c1351cac57a24acd15c6ab4c7e58d00b1e0accbc..c5afcc26afbc16f7090b624b11c541ad2d1ebffe 100644 (file)
--- a/doc/rc-mouse-focus.xml
+++ b/doc/rc-mouse-focus.xml
@@ -488,7 +488,9 @@
     <mousebind button="Left" action="Press">
       <action name="Activate"/>
     </mousebind>
+  </context>
 
+  <context name="Root">
     <!-- Menus -->
     <mousebind button="Middle" action="Press">
       <action name="ShowMenu"><menu>client-list-combined-menu</menu></action>

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index a8e0c2d603e587539c6f3cf3f9c1c0097543b125..0af8ab12fb97c9a53a097c1de652e911f7be3e42 100644 (file)
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -105,6 +105,11 @@ void focus_cycle_indicator_shutdown(gboolean reconfig)
 
     RrAppearanceFree(a_focus_indicator);
 
+    stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.top));
+    stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.left));
+    stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.right));
+    stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.bottom));
+
     XDestroyWindow(ob_display, focus_indicator.top.win);
     XDestroyWindow(ob_display, focus_indicator.left.win);
     XDestroyWindow(ob_display, focus_indicator.right.win);

diff --git a/openbox/frame.c b/openbox/frame.c
index ae91e6e81201863d7bd926e22e9caa95fe9024c3..0f1df63d903e7cc922c052b3a105577b7db5223d 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -580,9 +580,20 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                         XUnmapWindow(ob_display, self->lgriptop);
                         XUnmapWindow(ob_display, self->rgriptop);
                     }
-                } else
+                } else {
+                    XUnmapWindow(ob_display, self->handleleft);
+                    XUnmapWindow(ob_display, self->handleright);
+                    XUnmapWindow(ob_display, self->lgriptop);
+                    XUnmapWindow(ob_display, self->rgriptop);
+
                     XUnmapWindow(ob_display, self->handletop);
+                }
             } else {
+                XUnmapWindow(ob_display, self->handleleft);
+                XUnmapWindow(ob_display, self->handleright);
+                XUnmapWindow(ob_display, self->lgriptop);
+                XUnmapWindow(ob_display, self->rgriptop);
+
                 XUnmapWindow(ob_display, self->handletop);
 
                 XUnmapWindow(ob_display, self->handlebottom);
@@ -618,10 +629,14 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                     XUnmapWindow(ob_display, self->lgrip);
                     XUnmapWindow(ob_display, self->rgrip);
                 }
-            } else
+            } else {
+                XUnmapWindow(ob_display, self->lgrip);
+                XUnmapWindow(ob_display, self->rgrip);
+
                 XUnmapWindow(ob_display, self->handle);
+            }
 
-            if (self->bwidth && !self->max_horz) {
+            if (self->bwidth && self->leftb) {
                 XMoveResizeWindow(ob_display, self->left,
                                   0,
                                   self->bwidth + ob_rr_theme->grip_width,
@@ -629,6 +644,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                                   self->client->area.height +
                                   self->size.top + self->size.bottom -
                                   ob_rr_theme->grip_width * 2);
+
+                XMapWindow(ob_display, self->left);
+            } else
+                XUnmapWindow(ob_display, self->left);
+
+            if (self->bwidth && self->rightb) {
                 XMoveResizeWindow(ob_display, self->right,
                                   self->client->area.width +
                                   self->cbwidth_x * 2 + self->bwidth,
@@ -638,12 +659,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                                   self->size.top + self->size.bottom -
                                   ob_rr_theme->grip_width * 2);
 
-                XMapWindow(ob_display, self->left);
                 XMapWindow(ob_display, self->right);
-            } else {
-                XUnmapWindow(ob_display, self->left);
+            } else
                 XUnmapWindow(ob_display, self->right);
-            }
 
             /* move and resize the inner border window which contains the plate
              */
@@ -1445,8 +1463,8 @@ static gboolean frame_animate_iconify(gpointer p)
         /* start where the frame is supposed to be */
         x = self->area.x;
         y = self->area.y;
-        w = self->area.width - self->bwidth * 2;
-        h = self->area.height - self->bwidth * 2;
+        w = self->area.width;
+        h = self->area.height;
     } else {
         /* start at the icon */
         x = iconx;
@@ -1499,8 +1517,7 @@ void frame_end_iconify_animation(ObFrame *self)
 
     XMoveResizeWindow(ob_display, self->window,
                       self->area.x, self->area.y,
-                      self->area.width - self->bwidth * 2,
-                      self->area.height - self->bwidth * 2);
+                      self->area.width, self->area.height);
     XFlush(ob_display);
 }
 

diff --git a/po/ca.po b/po/ca.po
index b35f90aac5aeedfaaad522703912e9f84b84b101..69cf959bfac10cbefbf0abb7832646321271fa01 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "No és pot crear el directori '%s': %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,73 +52,60 @@ msgid "All desktops"
 msgstr "Tots els escriptoris"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "Ca&pa"
+msgstr ""
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Sempre a so&bre"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "&Normal"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Sempre a so&ta"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
-msgstr "A l'escrip&tori"
+msgstr ""
 
 #: openbox/client_menu.c:365
 msgid "Client menu"
 msgstr "Menú del client"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "Restaur&a"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "&Mou"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Redimen&siona"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Mi&nimitza"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ximitza"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "En/Desen&rotlla"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "&Decoració"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
-msgstr "Tan&ca"
+msgstr ""
 
 #: openbox/config.c:666
 #, c-format
@@ -150,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Vés aquí..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -165,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "No és pot crear el directori '%s': %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -190,9 +176,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "No és pot carregar el tipus de lletra: %s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -298,9 +283,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "No és pot crear el directori '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "No és pot crear el directori '%s': %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -336,7 +321,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file necessita un argument\n"

diff --git a/po/de.po b/po/de.po
index 8f46e6851a1c39c0b18926f3f056e1985fe9b837..c4c8b1901f017bc93bc51bd875b85469d047e0a2 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Das Verzeichnis '%s' konnte nicht angelegt werden: %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,12 +52,10 @@ msgid "All desktops"
 msgstr "Alle Desktops"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "&Fenster"
+msgstr ""
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Immer im &Vordergrund"
 
@@ -66,12 +64,10 @@ msgid "&Normal"
 msgstr "&Normal"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Immer im &Hintergrund"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "&An Desktop senden"
 
@@ -80,42 +76,34 @@ msgid "Client menu"
 msgstr ""
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "Wi&ederherstellen"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "Vers&chieben"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "&Größe ändern"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Mi&nimieren"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ximieren"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "Auf/Ab&rollen"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "&Dekoriere"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "&Schließen"
 
@@ -129,16 +117,14 @@ msgid "Conflict with key binding in config file"
 msgstr ""
 
 #: openbox/menu.c:98 openbox/menu.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to find a valid menu file '%s'"
 msgstr ""
-"Es wurde keine gültige Konfigurationsdatei gefunden, benutze einfache "
-"Standardwerte."
 
 #: openbox/menu.c:149
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr "Neustart fehlgeschlagen, um die ausführbare Datei '%s' zu starten: %s"
+msgstr ""
 
 #: openbox/menu.c:166
 #, c-format
@@ -151,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Gehe zu..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -166,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Das Verzeichnis '%s' konnte nicht angelegt werden: %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -194,9 +179,8 @@ msgstr ""
 "Standardwerte."
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Schriftart %s konnte nicht geladen werden\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -212,14 +196,12 @@ msgid "Syntax: openbox [options]\n"
 msgstr "Syntax: openbox [Optionen]\n"
 
 #: openbox/openbox.c:473
-#, fuzzy
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 "\n"
 "Optionen:\n"
-"\n"
 
 #: openbox/openbox.c:474
 msgid "  --help              Display this help and exit\n"
@@ -234,19 +216,16 @@ msgid "  --replace           Replace the currently running window manager\n"
 msgstr "  --replace           Den aktuell laufenden Fenstermanager ersetzen\n"
 
 #: openbox/openbox.c:477
-#, fuzzy
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr "  --sm-disable        Keine Verbindung zum Sitzungsmanager aufbauen\n"
 
 #: openbox/openbox.c:478
-#, fuzzy
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 "\n"
 "Nachrichten an eine laufende Openbox-Instanz weiterleiten:\n"
-"\n"
 
 #: openbox/openbox.c:479
 msgid "  --reconfigure       Reload Openbox's configuration\n"
@@ -257,15 +236,12 @@ msgid "  --restart           Restart Openbox\n"
 msgstr ""
 
 #: openbox/openbox.c:481
-#, fuzzy
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
 "\n"
-"\n"
 "Debugging Optionen:\n"
-"\n"
 
 #: openbox/openbox.c:482
 msgid "  --sync              Run in synchronous mode\n"
@@ -285,14 +261,13 @@ msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
 
 #: openbox/openbox.c:486
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
 "\n"
 "Bitte melden Sie Bugreports an: %s\n"
-"\n"
 
 #: openbox/openbox.c:578
 #, c-format
@@ -320,9 +295,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Das Verzeichnis '%s' konnte nicht angelegt werden: %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Das Verzeichnis '%s' konnte nicht angelegt werden: %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -358,11 +333,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "  --config TYPE       Specify the configuration profile to use\n"
-#~ msgstr "  --reconfigure       Openbox's Konfiguration neu laden\n"
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--config-file benötigt ein Argument\n"

diff --git a/po/es.po b/po/es.po
index 99c095f6c7e725c07aefc1151f596d71e9f170ee..375250355ed4ba8cbe177593548b16dfeeb27375 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "No se puede crear el directorio '%s': %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,71 +52,58 @@ msgid "All desktops"
 msgstr "Todos los escritorios"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "Ca&pa"
+msgstr ""
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Siempre &encima"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "&Normal"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Siempre &debajo"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
-msgstr "En&viar a escritorio"
+msgstr ""
 
 #: openbox/client_menu.c:365
 msgid "Client menu"
 msgstr "Menú del cliente"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "Rest&aurar"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "&Mover"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Redimen&sionar"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Mi&nimizar"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ximizar"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "En/Desen&rollar"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "&Decorar"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "&Cerrar"
 
@@ -150,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Ir ahí..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -165,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "No se puede crear el directorio '%s': %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -190,9 +176,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "No se puede cargar la fuente: %s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -298,9 +283,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "No se puede crear el directorio '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "No se puede crear el directorio '%s': %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -336,7 +321,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file necesita un argumento\n"

diff --git a/po/fi.po b/po/fi.po
index f14aa95aa54d4b89f0377cc7eba7b556d71ddf1d..92160a54e80726ef32788a576c155c22795562ed 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,39 +1,40 @@
 # openbox Finnish translation.
-# Copyright (C) 2005  Mikael Magnusson
+# Copyright (C) 2007  Mikael Magnusson
 # This file is distributed under the same license as the openbox package.
 # Pauli Virtanen <pauli.virtanen@hut.fi>, 2005.
+# Lauri Hakko, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.3\n"
+"Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-05-20 17:27+0200\n"
-"PO-Revision-Date: 2005-03-15 21:29+0200\n"
-"Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
-"Language-Team: Finnish <fi@li.org>\n"
+"PO-Revision-Date: 2007-05-21 00:06+0200\n"
+"Last-Translator: Lauri Hakko\n"
+"Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: openbox/action.c:954
 #, c-format
 msgid "Invalid action '%s' requested. No such action exists."
-msgstr ""
+msgstr "Virheellinen toiminto '%s'. Toimintoa ei ole olemassa"
 
 #: openbox/action.c:957
 #, c-format
 msgid "Invalid use of action '%s'. Action will be ignored."
-msgstr ""
+msgstr "Toiminnon virheellinen käyttö '%s'. Toiminto ohitetaan"
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
+msgstr "Ohjelman suorittaminen epäonnistui '%s': %s"
 
 #: openbox/action.c:1265
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
-msgstr ""
+msgstr "Polun muuntaminen utf8:sta epäonnistui: '%s'"
 
 #: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:104
 msgid "Go there..."
@@ -41,7 +42,7 @@ msgstr "Näytä tämä..."
 
 #: openbox/client_list_combined_menu.c:148
 msgid "Windows"
-msgstr ""
+msgstr "Ikkunat"
 
 #: openbox/client_list_menu.c:199
 msgid "Desktops"
@@ -52,122 +53,108 @@ msgid "All desktops"
 msgstr "Kaikkiin työtiloihin"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "K&erros"
+msgstr "&Kerros"
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Aina &päällimmäinen"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "&Tavallinen"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Aina &alimmainen"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
-msgstr "Siirrä &työtilaan"
+msgstr "&Lähetä työtilaan"
 
 #: openbox/client_menu.c:365
 msgid "Client menu"
 msgstr "Ikkunan valikko"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "&Palauta"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "S&iirrä"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "&Muuta kokoa"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Pie&nennä"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Suurenn&a"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
-msgstr "&Rullaa"
+msgstr "Rullaa ylös/alas"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "Piirrä/poista &kehykset"
+msgstr "(Epä)reunusta"
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "&Sulje"
 
 #: openbox/config.c:666
 #, c-format
 msgid "Invalid button '%s' specified in config file"
-msgstr ""
+msgstr "Virheellinen painike '%s' määritelty konfiguraatio tiedostossa"
 
 #: openbox/keyboard.c:162
 msgid "Conflict with key binding in config file"
-msgstr ""
+msgstr "Päällekäisiä key bindejä konfiguraatio tiedostossa"
 
 #: openbox/menu.c:98 openbox/menu.c:106
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
-msgstr ""
+msgstr "Toimivaa menu tiedostoa ei löytynyt '%s'"
 
 #: openbox/menu.c:149
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr ""
+msgstr "Putki-menun komennon suorittaminen epäonnistui"
 
 #: openbox/menu.c:166
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
-msgstr ""
+msgstr "Virheellinen tulos putki-menusta '%s'"
 
 #: openbox/menu.c:179
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
-msgstr ""
+msgstr "Menun '%s' lukemista yritettiin mutta sitä ei ole olemassa"
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Näytä tämä..."
+msgstr "Lisää..."
 
 #: openbox/mouse.c:338
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
-msgstr ""
+msgstr "Virheellinen nappi '%s' hiiribindeissä"
 
 #: openbox/mouse.c:344
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
-msgstr ""
+msgstr "Virheellinen asiayhteys '%s' hiiribindeissä"
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
+msgstr "Kotihakemistoon vaihtaminen epäonnistui '%s': '%s'"
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -175,11 +162,11 @@ msgstr ""
 
 #: openbox/openbox.c:179
 msgid "Failed to initialize the render library."
-msgstr ""
+msgstr "render kirjaston käynnistäminen epäonnistui"
 
 #: openbox/openbox.c:185
 msgid "X server does not support locale."
-msgstr ""
+msgstr "X serveri ei tue localea"
 
 #: openbox/openbox.c:187
 msgid "Cannot set locale modifiers for the X server."
@@ -187,61 +174,64 @@ msgstr ""
 
 #: openbox/openbox.c:248
 msgid "Unable to find a valid config file, using some simple defaults"
-msgstr ""
+msgstr "Oikeanlaista konfiguraation tiedostoa ei löytynyt, käytetään joitain yksinkertaisia oletusarvoja"
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Kirjasinlajin lataaminen epäonnistui: %s\n"
+msgstr "Teeman lataaminen epäonnistui"
 
 #: openbox/openbox.c:393
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
-msgstr ""
+msgstr "Uudelleenkäynnistyi epäonnistui käynnistämään uutta ohjelmaa '%s': %s"
 
 #: openbox/openbox.c:461 openbox/openbox.c:463
 msgid "Copyright (c)"
-msgstr ""
+msgstr "Tekijänoikeudet (c)"
 
 #: openbox/openbox.c:472
 msgid "Syntax: openbox [options]\n"
-msgstr ""
+msgstr "Syntaksi: openbox [ominaisuudet]\n"
 
 #: openbox/openbox.c:473
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
+"\n"
+"Ominaisuudet:\n"
 
 #: openbox/openbox.c:474
 msgid "  --help              Display this help and exit\n"
-msgstr ""
+msgstr "  --help              Näytä tämä apu ja sulje\n"
 
 #: openbox/openbox.c:475
 msgid "  --version           Display the version and exit\n"
-msgstr ""
+msgstr "  --version           Näytä versio ja sulje\n"
 
 #: openbox/openbox.c:476
 msgid "  --replace           Replace the currently running window manager\n"
-msgstr ""
+msgstr "  --replace           Korvaa päällä oleva window manager\n"
 
 #: openbox/openbox.c:477
 msgid "  --sm-disable        Disable connection to the session manager\n"
-msgstr ""
+msgstr "  --sm-disable        Estä yhteys session manageriin\n"
 
 #: openbox/openbox.c:478
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
+"\n"
+"Lähetetään viestejä päällä olevaan Openboxiin\n"
 
 #: openbox/openbox.c:479
 msgid "  --reconfigure       Reload Openbox's configuration\n"
-msgstr ""
+msgstr "  --reconfigure       Lataa Openboxin konfiguraation uudelleen\n"
 
 #: openbox/openbox.c:480
 msgid "  --restart           Restart Openbox\n"
-msgstr ""
+msgstr "  --restart           Käynnistä Openbox uudelleen\n"
 
 #: openbox/openbox.c:481
 msgid ""
@@ -251,7 +241,7 @@ msgstr ""
 
 #: openbox/openbox.c:482
 msgid "  --sync              Run in synchronous mode\n"
-msgstr ""
+msgstr "  --sync              aja synkroni tilassa\n"
 
 #: openbox/openbox.c:483
 msgid "  --debug             Display debugging output\n"
@@ -271,11 +261,13 @@ msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
+"\n"
+"Ilmoita virheistä: %s\n"
 
 #: openbox/openbox.c:578
 #, c-format
 msgid "Invalid command line argument '%s'\n"
-msgstr ""
+msgstr "Virheellinen komentorivi käsky '%s'\n"
 
 #: openbox/screen.c:85 openbox/screen.c:186
 #, c-format
@@ -298,9 +290,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Hakemiston \"%s\" luonti epäonnistui: %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -335,8 +327,4 @@ msgstr ""
 #: openbox/xerror.c:39
 #, c-format
 msgid "X Error: %s"
-msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file tarvitsee parametrin\n"
+msgstr "X virhe: %s"

diff --git a/po/fr.po b/po/fr.po
index fd4ffa0f61db7abaf50e979782e6fe75300163e6..029836af3df917c1e4dd415f7de932095e3ee280 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2004 Mikael Magnusson
 # This file is distributed under the same license as the Openbox package.
 # tioui <leonptitlouis@wanadoo.fr>, 2004.
+# Cyrille Bagard <nocbos@gmail.com>, 2007.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.2\n"
+"Project-Id-Version: Openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2007-05-20 17:27+0200\n"
-"PO-Revision-Date: 2004-06-11 23:06+0200\n"
-"Last-Translator: Julien Louis <leonptitlouis@wanadoo.fr>\n"
+"POT-Creation-Date: 2007-05-21 00:04+0200\n"
+"PO-Revision-Date: 2007-05-21 00:53+0200\n"
+"Last-Translator: Cyrille Bagard <nocbos@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -18,22 +19,22 @@ msgstr ""
 #: openbox/action.c:954
 #, c-format
 msgid "Invalid action '%s' requested. No such action exists."
-msgstr ""
+msgstr "Action demandée '%s' invalide. Aucune action de ce type n'existe."
 
 #: openbox/action.c:957
 #, c-format
 msgid "Invalid use of action '%s'. Action will be ignored."
-msgstr ""
+msgstr "Utilisation invalide de l'action '%s'. L'action sera ignorée."
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Impossible de créer le répertoire '%s': %s"
+msgstr "Echec de l'exécution de '%s': %s"
 
 #: openbox/action.c:1265
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
-msgstr ""
+msgstr "Echec de la conversion du chemin '%s' depuis l'UTF-8"
 
 #: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:104
 msgid "Go there..."
@@ -41,7 +42,7 @@ msgstr "Aller 
 
 #: openbox/client_list_combined_menu.c:148
 msgid "Windows"
-msgstr ""
+msgstr "Fenêtres"
 
 #: openbox/client_list_menu.c:199
 msgid "Desktops"
@@ -52,27 +53,22 @@ msgid "All desktops"
 msgstr "Tous les bureaux"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "E&mplacement"
+msgstr "Disp&osition"
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Toujours au &premier plan"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "&Normal"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Toujours en &arrière plan"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "Envoyer vers le &bureau"
 
@@ -81,189 +77,197 @@ msgid "Client menu"
 msgstr "Menu de la fenêtre"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "R&estaurer"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "&Déplacer"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Redimen&sionner"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Ico&nifier"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ximiser"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "En/Dé&rouler"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "Dé&corer"
+msgstr "Ne pas/Dé&corer"
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "&Fermer"
 
 #: openbox/config.c:666
 #, c-format
 msgid "Invalid button '%s' specified in config file"
-msgstr ""
+msgstr "Bouton indiqué dans le fichier de configuration '%s' invalide"
 
 #: openbox/keyboard.c:162
 msgid "Conflict with key binding in config file"
-msgstr ""
+msgstr "Conflit entre les raccourcis clavier dans le fichier de configuration"
 
 #: openbox/menu.c:98 openbox/menu.c:106
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
-msgstr ""
+msgstr "Impossible de trouver un fichier de menus valide '%s'"
 
 #: openbox/menu.c:149
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr ""
+msgstr "Echec lors de l'exécution de la commande pour un pipe-menu '%s': %s"
 
 #: openbox/menu.c:166
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
-msgstr ""
+msgstr "Sortie du pipe-menu invalide '%s'"
 
 #: openbox/menu.c:179
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
-msgstr ""
+msgstr "Tentative d'accès au menu '%s' qui n'existe pas"
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Aller à..."
+msgstr "D'avantage..."
 
 #: openbox/mouse.c:338
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
-msgstr ""
+msgstr "Bouton '%s' invalide dans le paramétrage de la souris"
 
 #: openbox/mouse.c:344
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
-msgstr ""
+msgstr "Contexte '%s' invalide dans le paramétrage de la souris"
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Impossible de créer le répertoire '%s': %s"
+msgstr "Impossible de changer vers le répertoire de l'utilisateur '%s': %s"
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
 msgstr ""
+"Echec de l'ouverture de l'affichage depuis la variable d'environnement "
+"DISPLAY."
 
 #: openbox/openbox.c:179
 msgid "Failed to initialize the render library."
-msgstr ""
+msgstr "Echec de l'initialisation de la bibliothèque de rendu."
 
 #: openbox/openbox.c:185
 msgid "X server does not support locale."
-msgstr ""
+msgstr "Le serveur X ne supporte pas la localisation."
 
 #: openbox/openbox.c:187
 msgid "Cannot set locale modifiers for the X server."
 msgstr ""
+"Impossible d'appliquer les modifications de localisation pour le serveur X."
 
 #: openbox/openbox.c:248
 msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
+"Impossible de trouver un fichier de configuration valide ; utilisation de "
+"défauts simples"
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Impossible de charger la police : %s\n"
+msgstr "Impossible de charger un thème."
 
 #: openbox/openbox.c:393
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
 msgstr ""
+"Le redémarrage n'a pas réussi à exécuter le nouvel exécutable '%s': %s"
 
 #: openbox/openbox.c:461 openbox/openbox.c:463
 msgid "Copyright (c)"
-msgstr ""
+msgstr "Copyright (c)"
 
 #: openbox/openbox.c:472
 msgid "Syntax: openbox [options]\n"
-msgstr ""
+msgstr "Syntaxe: openbox [options]\n"
 
 #: openbox/openbox.c:473
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
+"\n"
+"Options:\n"
 
 #: openbox/openbox.c:474
 msgid "  --help              Display this help and exit\n"
-msgstr ""
+msgstr "  --help              Affiche cette aide et quitte\n"
 
 #: openbox/openbox.c:475
 msgid "  --version           Display the version and exit\n"
-msgstr ""
+msgstr "  --version           Affiche la version et quitte\n"
 
 #: openbox/openbox.c:476
 msgid "  --replace           Replace the currently running window manager\n"
 msgstr ""
+"  --replace           Remplace le gestionnaire de fenêtres actuellement en "
+"usage\n"
 
 #: openbox/openbox.c:477
 msgid "  --sm-disable        Disable connection to the session manager\n"
 msgstr ""
+"  --sm-disable        Désactive la connexion au gestionnaire de sessions\n"
 
 #: openbox/openbox.c:478
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
+"\n"
+"Passage de messages à l'instance d'Openbox en marche:\n"
 
 #: openbox/openbox.c:479
 msgid "  --reconfigure       Reload Openbox's configuration\n"
-msgstr ""
+msgstr "  --reconfigure       Recharge la configuration d'Openbox\n"
 
 #: openbox/openbox.c:480
 msgid "  --restart           Restart Openbox\n"
-msgstr ""
+msgstr "  --restart           Redémarre Openbox\n"
 
 #: openbox/openbox.c:481
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
+"\n"
+"Options de déboguage:\n"
 
 #: openbox/openbox.c:482
 msgid "  --sync              Run in synchronous mode\n"
-msgstr ""
+msgstr "  --sync              Exécute en mode synchrone\n"
 
 #: openbox/openbox.c:483
 msgid "  --debug             Display debugging output\n"
-msgstr ""
+msgstr "  --debug             Affiche la sortie de déboguage\n"
 
 #: openbox/openbox.c:484
 msgid "  --debug-focus       Display debugging output for focus handling\n"
 msgstr ""
+"  --debug-focus       Affiche la sortie de déboguage pour la gestion du "
+"focus\n"
 
 #: openbox/openbox.c:485
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
 msgstr ""
+"  --debug-xinerama    Découpe l'affichage en écrans xinerama factices\n"
 
 #: openbox/openbox.c:486
 #, c-format
@@ -271,26 +275,30 @@ msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
+"\n"
+"Veuillez soumettre les rapports de bogues à %s\n"
 
 #: openbox/openbox.c:578
 #, c-format
 msgid "Invalid command line argument '%s'\n"
-msgstr ""
+msgstr "Argument de la ligne de commande invalide '%s'\n"
 
 #: openbox/screen.c:85 openbox/screen.c:186
 #, c-format
 msgid "A window manager is already running on screen %d"
-msgstr ""
+msgstr "Un gestionnaire de fenêtres est déjà lancé sur l'écran %d"
 
 #: openbox/screen.c:122
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
 msgstr ""
+"Impossible d'acquérir la sélection du gestionnaire de fenêtres pour l'écran %d"
 
 #: openbox/screen.c:143
 #, c-format
 msgid "The WM on screen %d is not exiting"
 msgstr ""
+"Le gestionnaire de fenêtres sur l'écran %d n'est pas en train de quitter"
 
 #: openbox/session.c:100
 #, c-format
@@ -298,45 +306,43 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Impossible de créer le répertoire '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Impossible de créer le répertoire '%s': %s"
+msgstr "Impossible de sauvegarder la session de '%s': %s"
 
 #: openbox/session.c:552
 #, c-format
 msgid "Error while saving the session to '%s': %s"
-msgstr ""
+msgstr "Erreur lors de la sauvegarde de la session de '%s': %s"
 
 #: openbox/startupnotify.c:237
 #, c-format
 msgid "Running %s\n"
-msgstr ""
+msgstr "Excécution de %s\n"
 
 #: openbox/translate.c:58
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
 msgstr ""
+"Touche de modification '%s' invalide dans le paramétrage du clavier / de la "
+"souris"
 
 #: openbox/translate.c:135
 #, c-format
 msgid "Invalid key code '%s' in key binding"
-msgstr ""
+msgstr "Code de touche '%s' invalide dans le raccourci clavier"
 
 #: openbox/translate.c:142
 #, c-format
 msgid "Invalid key name '%s' in key binding"
-msgstr ""
+msgstr "Nom de touche '%s' invalide dans le raccourci clavier"
 
 #: openbox/translate.c:148
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
-msgstr ""
+msgstr "La touche demandée '%s' n'existe pas pour l'affichage"
 
 #: openbox/xerror.c:39
 #, c-format
 msgid "X Error: %s"
-msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file requiert un argument\n"
+msgstr "Erreur X: %s"

diff --git a/po/hr.po b/po/hr.po
index 10a0d5895a1bce4e580e142668670a991d2361b8..8285305f0d1f8f50a402a4908604471e84cd752d 100644 (file)
--- a/po/hr.po
+++ b/po/hr.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Nemogu napraviti direktorij '%s': %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,27 +52,22 @@ msgid "All desktops"
 msgstr "Sve radne površine"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "&Razina"
+msgstr ""
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Uvijek na &vrhu"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "&Normalno"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Uvijek na &dnu"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "&Pošalji na radnu površinu"
 
@@ -81,27 +76,22 @@ msgid "Client menu"
 msgstr "Meni klijenta"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "Ponovno uspostav&i"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "Po&makni"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Prom&jeni veličinu"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Iko&nificiraj"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "M&aksimiziraj"
 
@@ -110,12 +100,10 @@ msgid "&Roll up/down"
 msgstr ""
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "De&koriraj"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "&Zatvori"
 
@@ -149,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Odi na..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -164,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Nemogu napraviti direktorij '%s': %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -189,9 +176,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Nemogu učitati slova: %s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -297,9 +283,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Nemogu napraviti direktorij '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Nemogu napraviti direktorij '%s': %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -335,7 +321,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file zahtjeva argument\n"

diff --git a/po/no.po b/po/no.po
index 434313729da16bacd97d5236b8817b554e950536..ba2956381372e7be867f9cc0196a49401b3e960f 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,47 +1,47 @@
 # Norwegian messages for openbox
-# Copyright (C) 2004 Mikael Magnusson
+# Copyright (C) 2007 Dana Jansens
 # This file is distributed under the same license as the openbox package.
-# Øyvind Albrigtsen, 2004.
 #
+# Michael Kjelbergvik Thung <postlogic@switch-case.org>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: openbox 3.2\n"
+"Project-Id-Version: openbox 3.4\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2007-05-20 17:27+0200\n"
-"PO-Revision-Date: 2004-03-29 18:33:39+0200\n"
-"Last-Translator: Øyvind Albrigtsen\n"
+"PO-Revision-Date: 2007-05-20 18:41+0200\n"
+"Last-Translator: Michael Kjelbergvik Thung <postlogic@switch-case.org>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: openbox/action.c:954
 #, c-format
 msgid "Invalid action '%s' requested. No such action exists."
-msgstr ""
+msgstr "Ugyldig operasjon '%s' etterspurt. Operasjonen finnes ikke."
 
 #: openbox/action.c:957
 #, c-format
 msgid "Invalid use of action '%s'. Action will be ignored."
-msgstr ""
+msgstr "Ugyldig bruk av aksjonen '%s'. Aksjonen vil bli ignorert."
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Kunde ikke lage katalogen '%s': %s"
+msgstr "Kunne ikke kjøre '%s': %s"
 
 #: openbox/action.c:1265
 #, c-format
 msgid "Failed to convert the path '%s' from utf8"
-msgstr ""
+msgstr "Feil ved konvertering av '%s' fra utf8 "
 
 #: openbox/client_list_combined_menu.c:102 openbox/client_list_menu.c:104
 msgid "Go there..."
-msgstr "Gå dit"
+msgstr "Gå dit..."
 
 #: openbox/client_list_combined_menu.c:148
 msgid "Windows"
-msgstr ""
+msgstr "Vinduer"
 
 #: openbox/client_list_menu.c:199
 msgid "Desktops"
@@ -52,152 +52,137 @@ msgid "All desktops"
 msgstr "Alle skrivebord"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
 msgstr "La&g"
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
-msgstr "Alltid ø&verst"
+msgstr "Alltid ø&verst"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "Nor&mal"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Alltid &nederst"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "&Send til"
 
 #: openbox/client_menu.c:365
 msgid "Client menu"
-msgstr "Klient meny"
+msgstr "Klient-meny"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "Tilbak&estill"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "&Flytt"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
-msgstr "Endre s&tørrelse"
+msgstr "Endre s&tørrelse"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "&Minimer"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ximer"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "&Rull opp/ned"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "&Dekorer"
+msgstr "Fjern/Legg til &dekorasjon"
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "&Lukk"
 
 #: openbox/config.c:666
 #, c-format
 msgid "Invalid button '%s' specified in config file"
-msgstr ""
+msgstr "Ugyldig tast '%s' spesifisert i konfigurasjonsfilen"
 
 #: openbox/keyboard.c:162
 msgid "Conflict with key binding in config file"
-msgstr ""
+msgstr "Konflikt med hurtigtastbinding i konfigurasjonsfilen"
 
 #: openbox/menu.c:98 openbox/menu.c:106
 #, c-format
 msgid "Unable to find a valid menu file '%s'"
-msgstr ""
+msgstr "Kan ikke finne en gyldig menyfil '%s'"
 
 #: openbox/menu.c:149
 #, c-format
 msgid "Failed to execute command for pipe-menu '%s': %s"
-msgstr ""
+msgstr "Kunne ikke kjøre kommando for pipe-meny '%s': %s"
 
 #: openbox/menu.c:166
 #, c-format
 msgid "Invalid output from pipe-menu '%s'"
-msgstr ""
+msgstr "Ugyldig utdata fra pipe-menyen '%s'"
 
 #: openbox/menu.c:179
 #, c-format
 msgid "Attempted to access menu '%s' but it does not exist"
-msgstr ""
+msgstr "Forsøkte å åpne menyen '%s', men denne finnes ikke"
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Gå dit"
+msgstr "Mer..."
 
 #: openbox/mouse.c:338
 #, c-format
 msgid "Invalid button '%s' in mouse binding"
-msgstr ""
+msgstr "Ugyldig knapp '%s' i binding for mus"
 
 #: openbox/mouse.c:344
 #, c-format
 msgid "Invalid context '%s' in mouse binding"
-msgstr ""
+msgstr "Ugyldig innhold '%s' i binding for mus"
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Kunde ikke lage katalogen '%s': %s"
+msgstr "Kan ikke endre til hjemmekatalogen '%s': %s"
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
-msgstr ""
+msgstr "Kunne ikke åpne displayet fra DISPLAY-miljøvariabelen"
 
 #: openbox/openbox.c:179
 msgid "Failed to initialize the render library."
-msgstr ""
+msgstr "Kunne ikke starte render-biblioteket."
 
 #: openbox/openbox.c:185
 msgid "X server does not support locale."
-msgstr ""
+msgstr "X-serveren støtter ikke lokalisering."
 
 #: openbox/openbox.c:187
 msgid "Cannot set locale modifiers for the X server."
-msgstr ""
+msgstr "Kan ikke stille inn lokaliseringsmodifikatorene for X-serveren."
 
 #: openbox/openbox.c:248
 msgid "Unable to find a valid config file, using some simple defaults"
-msgstr ""
+msgstr "Kunne ikke finne en gyldig konfigurasjonsfil, bruker standardverdier"
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Kunde ikke laste fonten \"%s\"\n"
+msgstr "Kan ikke laste et tema."
 
 #: openbox/openbox.c:393
 #, c-format
 msgid "Restart failed to execute new executable '%s': %s"
-msgstr ""
+msgstr "Restart kunne ikke starte nytt program '%s': %s"
 
 #: openbox/openbox.c:461 openbox/openbox.c:463
 msgid "Copyright (c)"
@@ -205,39 +190,43 @@ msgstr ""
 
 #: openbox/openbox.c:472
 msgid "Syntax: openbox [options]\n"
-msgstr ""
+msgstr "Syntax: openbox [alternativer\n"
 
 #: openbox/openbox.c:473
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
+"\n"
+"Alternativ:\n"
 
 #: openbox/openbox.c:474
 msgid "  --help              Display this help and exit\n"
-msgstr ""
+msgstr "  --help              Vise denne hjelpeteksten og avslutt\n"
 
 #: openbox/openbox.c:475
 msgid "  --version           Display the version and exit\n"
-msgstr ""
+msgstr "  --version           Vis versjonsnummeret og avslutt\n"
 
 #: openbox/openbox.c:476
 msgid "  --replace           Replace the currently running window manager\n"
-msgstr ""
+msgstr "  --replace           Erstatt den kjørende vindusbehandleren\n"
 
 #: openbox/openbox.c:477
 msgid "  --sm-disable        Disable connection to the session manager\n"
-msgstr ""
+msgstr "  --sm-disable        Deaktiver tilkobling til sesjonsbehandleren\n"
 
 #: openbox/openbox.c:478
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
+"\n"
+"Sender beskjeder til en kjørende Openbox-instans:\n"
 
 #: openbox/openbox.c:479
 msgid "  --reconfigure       Reload Openbox's configuration\n"
-msgstr ""
+msgstr "  --reconfigure       Oppdater Openbox' konfigurasjon\n"
 
 #: openbox/openbox.c:480
 msgid "  --restart           Restart Openbox\n"
@@ -248,22 +237,24 @@ msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
+"\n"
+"Debug-alternativ:\n"
 
 #: openbox/openbox.c:482
 msgid "  --sync              Run in synchronous mode\n"
-msgstr ""
+msgstr "  --sync              Kjør i synkron-modus\n"
 
 #: openbox/openbox.c:483
 msgid "  --debug             Display debugging output\n"
-msgstr ""
+msgstr "  --debug             Vis debuggingsinformasjon\n"
 
 #: openbox/openbox.c:484
 msgid "  --debug-focus       Display debugging output for focus handling\n"
-msgstr ""
+msgstr "  --debug-focus       Vis debuggingsinformasjon for fokus-håndtering\n"
 
 #: openbox/openbox.c:485
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
-msgstr ""
+msgstr "  -debug-xinerama    Splitt displayet for falske xinerama-skjermer\n"
 
 #: openbox/openbox.c:486
 #, c-format
@@ -271,72 +262,70 @@ msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
+"\n"
+"Vennligst rapporter bugs til %s\n"
 
 #: openbox/openbox.c:578
 #, c-format
 msgid "Invalid command line argument '%s'\n"
-msgstr ""
+msgstr "Ugyldig kommandolinje-argument '%s'\n"
 
 #: openbox/screen.c:85 openbox/screen.c:186
 #, c-format
 msgid "A window manager is already running on screen %d"
-msgstr ""
+msgstr "En vindusbehandler kjører allerede på skjerm %d"
 
 #: openbox/screen.c:122
 #, c-format
 msgid "Could not acquire window manager selection on screen %d"
-msgstr ""
+msgstr "Kunne ikke hendte vindusbehandlerens markering på skjerm %d"
 
 #: openbox/screen.c:143
 #, c-format
 msgid "The WM on screen %d is not exiting"
-msgstr ""
+msgstr "Vindusbehandleren på skjerm %d vil ikke avslutte"
 
 #: openbox/session.c:100
 #, c-format
 msgid "Unable to make directory '%s': %s"
-msgstr "Kunde ikke lage katalogen '%s': %s"
+msgstr "Kan ikke lage katalog '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Kunde ikke lage katalogen '%s': %s"
+msgstr "Kan ikke lagre sesjon til '%s': %s"
 
 #: openbox/session.c:552
 #, c-format
 msgid "Error while saving the session to '%s': %s"
-msgstr ""
+msgstr "Feil ved lagring av sesjon til '%s': %s"
 
 #: openbox/startupnotify.c:237
 #, c-format
 msgid "Running %s\n"
-msgstr ""
+msgstr "Kjører %s\n"
 
 #: openbox/translate.c:58
 #, c-format
 msgid "Invalid modifier key '%s' in key/mouse binding"
-msgstr ""
+msgstr "Ugyldig modifikasjonsknapp '%s' i binding for tast/mus"
 
 #: openbox/translate.c:135
 #, c-format
 msgid "Invalid key code '%s' in key binding"
-msgstr ""
+msgstr "Ugyldig tastekode '%s' i hurtigtastbinding"
 
 #: openbox/translate.c:142
 #, c-format
 msgid "Invalid key name '%s' in key binding"
-msgstr ""
+msgstr "Ugyldig tastenavn '%s' i hurtigtastbinding"
 
 #: openbox/translate.c:148
 #, c-format
 msgid "Requested key '%s' does not exist on the display"
-msgstr ""
+msgstr "Ønsket tast '%s' eksisterer ikke i displayet"
 
 #: openbox/xerror.c:39
 #, c-format
 msgid "X Error: %s"
-msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file krever et argument\n"
+msgstr "Feil i X: %s"

diff --git a/po/pl.po b/po/pl.po
index 72b5096c174f91f85e4f90a6c658fa4efabfb855..20b65359de3e87db114ed819339814eadb92e6cc 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Nie mogę utworzyć katalogu '%s': %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,27 +52,22 @@ msgid "All desktops"
 msgstr "Wszystkie pulpity"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "Warstwa"
+msgstr ""
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Zawsze na &wierzchu"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "&Normalnie"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Zawsze pod &spodem"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "Wyślij na &pulpit"
 
@@ -81,42 +76,34 @@ msgid "Client menu"
 msgstr "Menu klienta"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "Prz&ywróć"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "Prz&esuń"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Zmień &rozmiar"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Mi&nimalizuj"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ksymalizuj"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "Ro/&Zwiń"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "Obra&mówka"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "Z&amknij"
 
@@ -150,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Przejdź..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -165,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Nie mogę utworzyć katalogu '%s': %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -190,9 +176,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Nie mogę załadować czcionki: %s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -298,9 +283,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Nie mogę utworzyć katalogu '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Nie mogę utworzyć katalogu '%s': %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -336,7 +321,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file wymaga argumentu\n"

diff --git a/po/pt.po b/po/pt.po
index e6bcf7840b0f678371158edc0c5b63ffe23c689e..1ed3cdc22d85494932cd8f1fb3e5ee9df9c13793 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Incapaz de criar o directório '%s': %s "
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,27 +52,22 @@ msgid "All desktops"
 msgstr "Todas as áreas de trabalho"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "&Camada"
+msgstr ""
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Sempre em &cima"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "&Normal"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Sempre no &fundo"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "Enviar para área de &trabalho"
 
@@ -81,42 +76,34 @@ msgid "Client menu"
 msgstr "Menu de clientes"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "R&estaurar"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "&Mover"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Redimen&sionar"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Mi&nimizar"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ximizar"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "En/Desen&rolar"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "&Decorar"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "&Fechar"
 
@@ -150,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Ir até..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -165,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Incapaz de criar o directório '%s': %s "
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -190,9 +176,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Incapaz de carregar a fonte: %s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -298,9 +283,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Incapaz de criar o directório '%s': %s "
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Incapaz de criar o directório '%s': %s "
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -336,7 +321,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file requer um argumento\n"

diff --git a/po/ru.po b/po/ru.po
index 2f1550b45579a7032a5b3640ac0020fb93c2eec6..2050fc2cf1e4e8309d7551008b867d024d0eac21 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Невозможно создать каталог '%s': %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,27 +52,22 @@ msgid "All desktops"
 msgstr "Все рабочие места"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
 msgstr "Расположить(&L)"
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Всегда на переднем плане(&T)"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "Обычно(&N)"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Всегда на заднем плане(&B)"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "Переместить на рабочее место(&S)"
 
@@ -81,42 +76,34 @@ msgid "Client menu"
 msgstr "Меню клиента"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "Восстановить(&E)"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "Переместить(&M)"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Изменить размер(&Z)"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Свернуть(&N)"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Развернуть на весь экран(&X)"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "Скрутить/Раскрутить(&R)"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "Убрать оформление(&D)"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "Закрыть(&C)"
 
@@ -150,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Перейти..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -165,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Невозможно создать каталог '%s': %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -190,9 +176,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Невозможно загрузить шрифт: %s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -298,9 +283,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Невозможно создать каталог '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Невозможно создать каталог '%s': %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -336,7 +321,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file требует параметр\n"

diff --git a/po/sk.po b/po/sk.po
index f0a1f8ee90206e894ed889d825598e70d929c764..c2e69d4d10be74de7d131418a5884f4f384ecc9d 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -26,9 +26,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "Nebolo možné vytvoriť adresár '%s': %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -52,27 +52,22 @@ msgid "All desktops"
 msgstr "Všetky plochy"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
-msgstr "&Vrstva"
+msgstr ""
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "Vždy &navrchu"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "Nor&málna"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "Vždy &dole"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "&Poslať na plochu"
 
@@ -81,42 +76,34 @@ msgid "Client menu"
 msgstr "Menu klienta"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "&Obnoviť"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "Pre&sunúť"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "Z&mena veľkosti"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "Do iko&ny"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "Ma&ximalizovať"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "Ro/&Zvinúť"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "&Dekorácia"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "Z&avrieť"
 
@@ -150,9 +137,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "Prejsť na..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -165,9 +151,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "Nebolo možné vytvoriť adresár '%s': %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -190,9 +176,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "Nepodarilo sa načítať font: %s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -298,9 +283,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "Nebolo možné vytvoriť adresár '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "Nebolo možné vytvoriť adresár '%s': %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -336,7 +321,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file vyžaduje parameter\n"

diff --git a/po/sv.po b/po/sv.po
index 42407f5a6afc329c4750f39611b93854a553b074..cb14be79491a7dcb5108a7513f6a67f8d06c4635 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -254,7 +254,7 @@ msgstr "  --debug-focus       Visa debuginformation f
 
 #: openbox/openbox.c:485
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
-msgstr "  --debug-xinerama    Dela skärmen i fejkade xinerama-skärmar"
+msgstr "  --debug-xinerama    Dela skärmen i fejkade xinerama-skärmar\n"
 
 #: openbox/openbox.c:486
 #, c-format

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 40939ab581b54a52a434b39011ed60240ff0000e..c7e4c2e732e4a38a8e238cf04c6b349a95cf1baf 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -27,9 +27,9 @@ msgid "Invalid use of action '%s'. Action will be ignored."
 msgstr ""
 
 #: openbox/action.c:1226 openbox/action.c:1244 openbox/action.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to execute '%s': %s"
-msgstr "無法製作目錄 '%s': %s"
+msgstr ""
 
 #: openbox/action.c:1265
 #, c-format
@@ -53,27 +53,22 @@ msgid "All desktops"
 msgstr "所有桌面(&A)"
 
 #: openbox/client_menu.c:351
-#, fuzzy
 msgid "&Layer"
 msgstr "圖層(&L)"
 
 #: openbox/client_menu.c:356
-#, fuzzy
 msgid "Always on &top"
 msgstr "最上層(&T)"
 
 #: openbox/client_menu.c:357
-#, fuzzy
 msgid "&Normal"
 msgstr "一般(&N)"
 
 #: openbox/client_menu.c:358
-#, fuzzy
 msgid "Always on &bottom"
 msgstr "最下層(&B)"
 
 #: openbox/client_menu.c:361
-#, fuzzy
 msgid "&Send to desktop"
 msgstr "傳送到桌面(&S)"
 
@@ -82,42 +77,34 @@ msgid "Client menu"
 msgstr "客戶端選單"
 
 #: openbox/client_menu.c:371
-#, fuzzy
 msgid "R&estore"
 msgstr "還原(&E)"
 
 #: openbox/client_menu.c:379
-#, fuzzy
 msgid "&Move"
 msgstr "移動(&M)"
 
 #: openbox/client_menu.c:381
-#, fuzzy
 msgid "Resi&ze"
 msgstr "重新調整大小(&Z)"
 
 #: openbox/client_menu.c:383
-#, fuzzy
 msgid "Ico&nify"
 msgstr "最小化(&N)"
 
 #: openbox/client_menu.c:391
-#, fuzzy
 msgid "Ma&ximize"
 msgstr "最大化(&X)"
 
 #: openbox/client_menu.c:399
-#, fuzzy
 msgid "&Roll up/down"
 msgstr "向上捲動/向下捲動(&R)"
 
 #: openbox/client_menu.c:401
-#, fuzzy
 msgid "Un/&Decorate"
-msgstr "裝飾(&D)"
+msgstr ""
 
 #: openbox/client_menu.c:411
-#, fuzzy
 msgid "&Close"
 msgstr "關閉(&C)"
 
@@ -151,9 +138,8 @@ msgid "Attempted to access menu '%s' but it does not exist"
 msgstr ""
 
 #: openbox/menu.c:331 openbox/menu.c:332
-#, fuzzy
 msgid "More..."
-msgstr "到那裡去..."
+msgstr ""
 
 #: openbox/mouse.c:338
 #, c-format
@@ -166,9 +152,9 @@ msgid "Invalid context '%s' in mouse binding"
 msgstr ""
 
 #: openbox/openbox.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to change to home directory '%s': %s"
-msgstr "無法製作目錄 '%s': %s"
+msgstr ""
 
 #: openbox/openbox.c:148
 msgid "Failed to open the display from the DISPLAY environment variable."
@@ -191,9 +177,8 @@ msgid "Unable to find a valid config file, using some simple defaults"
 msgstr ""
 
 #: openbox/openbox.c:274
-#, fuzzy
 msgid "Unable to load a theme."
-msgstr "無法載入字型：%s\n"
+msgstr ""
 
 #: openbox/openbox.c:393
 #, c-format
@@ -299,9 +284,9 @@ msgid "Unable to make directory '%s': %s"
 msgstr "無法製作目錄 '%s': %s"
 
 #: openbox/session.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to save the session to '%s': %s"
-msgstr "無法製作目錄 '%s': %s"
+msgstr ""
 
 #: openbox/session.c:552
 #, c-format
@@ -337,7 +322,3 @@ msgstr ""
 #, c-format
 msgid "X Error: %s"
 msgstr ""
-
-#, fuzzy
-#~ msgid "--config requires an argument\n"
-#~ msgstr "--sm-save-file 要求引數\n"

diff --git a/render/render.c b/render/render.c
index 82e6f96e3d155d1a0830eca6a7742ded5a0f9a8e..8623455f6c06091e6c55335ca48531eb393b8f5b 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -40,7 +40,7 @@ static void pixel_data_to_pixmap(RrAppearance *l,
 
 Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
 {
-    gint i, transferred = 0, sw, sh, partial_w, partial_h;
+    gint i, transferred = 0, sw, sh, partial_w, partial_h, force_transfer = 0;
     RrPixel32 *source, *dest;
     Pixmap oldp = None;
     RrRect tarea; /* area in which to draw textures */
@@ -160,14 +160,18 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
                         &a->texture[i].data.rgba,
                         a->w, a->h,
                         &tarea);
+            force_transfer = 1;
         break;
         }
     }
 
     if (!transferred) {
         transferred = 1;
-        if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced))
+        if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced) ||
+            force_transfer)
+        {
             pixel_data_to_pixmap(a, 0, 0, w, h);
+        }
     }
 
     return oldp;

diff --git a/render/render.h b/render/render.h
index ac1deb4b0bf3ab8e32ce8e21b4a02c27ba2424dd..982ce12ca79d61fb43087aceaa774d59d5ac61c4 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -195,7 +195,7 @@ struct _RrAppearance {
 
 #define RrDefaultFontFamily       "arial,sans"
 #define RrDefaultFontSize         8
-#define RrDefaultFontWeight       RR_FONTWEIGHT_NORMAL
+#define RrDefaultFontWeight       RR_FONTWEIGHT_BOLD
 #define RrDefaultFontSlant        RR_FONTSLANT_NORMAL
 
 RrInstance* RrInstanceNew (Display *display, gint screen);