summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/ar.gmobin5500 -> 5500 bytes
-rw-r--r--po/ar.po22
-rw-r--r--po/az.gmobin6590 -> 6590 bytes
-rw-r--r--po/az.po22
-rw-r--r--po/ca.gmobin6677 -> 6677 bytes
-rw-r--r--po/ca.po22
-rw-r--r--po/cs.gmobin6209 -> 6209 bytes
-rw-r--r--po/cs.po22
-rw-r--r--po/de.gmobin7031 -> 7031 bytes
-rw-r--r--po/de.po25
-rw-r--r--po/es.gmobin5673 -> 5673 bytes
-rw-r--r--po/es.po22
-rw-r--r--po/es_MX.gmobin6146 -> 6146 bytes
-rw-r--r--po/es_MX.po22
-rw-r--r--po/fi.gmobin6208 -> 6208 bytes
-rw-r--r--po/fi.po22
-rw-r--r--po/fr.gmobin7197 -> 7246 bytes
-rw-r--r--po/fr.po23
-rw-r--r--po/hi.gmobin9180 -> 9180 bytes
-rw-r--r--po/hi.po22
-rw-r--r--po/hu.gmobin6599 -> 6599 bytes
-rw-r--r--po/hu.po22
-rw-r--r--po/ja.gmobin6276 -> 6276 bytes
-rw-r--r--po/ja.po22
-rw-r--r--po/ko.gmobin4298 -> 4298 bytes
-rw-r--r--po/ko.po22
-rw-r--r--po/lt.gmobin4461 -> 4461 bytes
-rw-r--r--po/lt.po22
-rw-r--r--po/ms.gmobin6218 -> 6218 bytes
-rw-r--r--po/ms.po22
-rw-r--r--po/nl.gmobin6189 -> 6189 bytes
-rw-r--r--po/nl.po22
-rw-r--r--po/pl.gmobin6097 -> 6022 bytes
-rw-r--r--po/pl.po128
-rw-r--r--po/pt_PT.gmobin5945 -> 5945 bytes
-rw-r--r--po/pt_PT.po22
-rw-r--r--po/ru.gmobin7991 -> 7991 bytes
-rw-r--r--po/ru.po22
-rw-r--r--po/sv.gmobin6112 -> 6112 bytes
-rw-r--r--po/sv.po22
-rw-r--r--po/ta.gmobin9991 -> 9991 bytes
-rw-r--r--po/ta.po22
-rw-r--r--po/tr.gmobin6525 -> 6440 bytes
-rw-r--r--po/tr.po129
-rw-r--r--po/uk.gmobin8277 -> 8277 bytes
-rw-r--r--po/uk.po22
-rw-r--r--po/vi.gmobin6784 -> 6784 bytes
-rw-r--r--po/vi.po22
-rw-r--r--po/xfwm4.pot22
-rw-r--r--po/zh_CN.gmobin5863 -> 5863 bytes
-rw-r--r--po/zh_CN.po22
-rw-r--r--po/zh_TW.gmobin5949 -> 5949 bytes
-rwxr-xr-xpo/zh_TW.po22
-rw-r--r--src/client.c17
-rw-r--r--src/client.h10
-rw-r--r--src/events.c11
-rw-r--r--src/hints.c21
-rw-r--r--src/hints.h5
-rw-r--r--src/main.c28
-rw-r--r--src/menu.c1
-rw-r--r--src/menu.h35
61 files changed, 604 insertions, 335 deletions
diff --git a/po/ar.gmo b/po/ar.gmo
index 02d3361fc..f7ddb4cf4 100644
--- a/po/ar.gmo
+++ b/po/ar.gmo
Binary files differ
diff --git a/po/ar.po b/po/ar.po
index d4068a5a7..bc35345e4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-01-31 12:54+0100\n"
"Last-Translator: Nabil Ben Khalifa <nabil_benkhalifa@yahoo.fr>\n"
"Language-Team: Arabic \n"
@@ -394,37 +394,41 @@ msgstr "ال_صق"
msgid "Uns_tick"
msgstr "ا_لغاء الصاق"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
#, fuzzy
msgid "Send to..."
msgstr "تغيير الى ..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "اغل_ق"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "إبادة"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "إ_غلاق"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "إعادة تشغيل"
-#: src/menu.c:165
+#: src/menu.c:166
#, fuzzy, c-format
msgid "Workspace %i"
msgstr "_بيئة العمل"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: لم يتمكن GtkMenu من الإمساك بالمؤشر\n"
diff --git a/po/az.gmo b/po/az.gmo
index 4e8d115b5..b9a622698 100644
--- a/po/az.gmo
+++ b/po/az.gmo
Binary files differ
diff --git a/po/az.po b/po/az.po
index 002e7e3ca..12f601fff 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm 4\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-12-13 01:12+0200\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -386,36 +386,40 @@ msgstr "_Bütün Sahələrə"
msgid "Uns_tick"
msgstr "Bu iş _sahəsinə"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Göndər..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Bağla"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Sonlandır"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "Çı_x"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Yenidən Başlat"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "İş Sahəsi %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu oxu ala bilmədi\n"
diff --git a/po/ca.gmo b/po/ca.gmo
index 4b32769dc..9c92fcf8f 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
Binary files differ
diff --git a/po/ca.po b/po/ca.po
index c1b93e084..fd2964ded 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfce 4\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-08-05 13:01+0100\n"
"Last-Translator: Carles Mu-oz Gorriz <carlesmu@internautas.org>\n"
"Language-Team: ca <LL@li.org>\n"
@@ -387,36 +387,40 @@ msgstr "_Omnipresent"
msgid "Uns_tick"
msgstr "No _omnipresent"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Envia a..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "Tan_ca"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Destrueix"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Surt"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Reinicia"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "À_rea de treball %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu no ha pogut capturar el punter\n"
diff --git a/po/cs.gmo b/po/cs.gmo
index ea5845137..ef0a37f9e 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
Binary files differ
diff --git a/po/cs.po b/po/cs.po
index ddf4313f6..c8106c30a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Lukas Konarovsky <daeltar@daeltar.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,36 +386,40 @@ msgstr "_Přilepit"
msgid "Uns_tick"
msgstr "Od_lepit"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Poslat na..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "Za_vřit"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Zničit"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Konec"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Restart"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Plocha %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu failed to grab the pointer\n"
diff --git a/po/de.gmo b/po/de.gmo
index 00d78e1f4..b0f391561 100644
--- a/po/de.gmo
+++ b/po/de.gmo
Binary files differ
diff --git a/po/de.po b/po/de.po
index f3102f4e7..8c3dc6d89 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-12-23 22:55-0000\n"
"Last-Translator: Moritz Heiber <moe@lunar-linux.org>\n"
"Language-Team: none <none@none>\n"
@@ -160,6 +160,7 @@ msgstr "Titelleistenschrift"
msgid "Title Alignment"
msgstr "Titelleistenausrichtung"
+#. XXX
#: mcs-plugin/xfwm4_plugin.c:1344
msgid "Text alignment inside title bar :"
msgstr "Textausrichtung in der Titelleiste:"
@@ -374,36 +375,40 @@ msgstr "Fest_kleben"
msgid "Uns_tick"
msgstr "_Lösen"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr "Immer obenauf"
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Wechseln zu ..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Schließen"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Zerstören"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Beenden"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Neu starten"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Virtueller Desktop %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenue konnte die Position des Mauszeigers nicht feststellen\n"
@@ -452,4 +457,4 @@ msgstr ""
#: src/tabwin.c:70
msgid "Switch to ..."
-msgstr "Wechseln zu ..." \ No newline at end of file
+msgstr "Wechseln zu ..."
diff --git a/po/es.gmo b/po/es.gmo
index 6028f5c03..674cd4286 100644
--- a/po/es.gmo
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index 1691d11ca..4d33fb93d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-01-23 22:06+0100\n"
"Last-Translator: Jaime Buffery <the_new_guiri@yahoo.es>\n"
"Language-Team: none <LL@li.org>\n"
@@ -393,37 +393,41 @@ msgstr "P_egar"
msgid "Uns_tick"
msgstr "Des_pegar"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
#, fuzzy
msgid "Send to..."
msgstr "Cambiar a ..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Cerrar"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Destruir"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Salir"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Reiniciar"
-#: src/menu.c:165
+#: src/menu.c:166
#, fuzzy, c-format
msgid "Workspace %i"
msgstr "Esc_ritorio"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu falló al intentar conseguir el puntero\n"
diff --git a/po/es_MX.gmo b/po/es_MX.gmo
index d59a5228e..28ae31c29 100644
--- a/po/es_MX.gmo
+++ b/po/es_MX.gmo
Binary files differ
diff --git a/po/es_MX.po b/po/es_MX.po
index a7740a57c..06288e7a8 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-01-23 22:06+0100\n"
"Last-Translator: Jaime Buffery <the_new_guiri@yahoo.es>\n"
"Language-Team: none <LL@li.org>\n"
@@ -387,37 +387,41 @@ msgstr "P_egar"
msgid "Uns_tick"
msgstr "Des_pegar"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
#, fuzzy
msgid "Send to..."
msgstr "Enviar a ..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Cerrar"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Destruir"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Salir"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Reiniciar"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Escritorio %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu no pudo posesionarse del puntero\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index 5138fc77e..8f5ceaec2 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
Binary files differ
diff --git a/po/fi.po b/po/fi.po
index 7147f60ae..8069c8de6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-05-27 22:53--200\n"
"Last-Translator: Ilkka Ollakka <ilkka.j.ollakka@students.oamk.fi>\n"
"Language-Team: <>\n"
@@ -379,36 +379,40 @@ msgstr "_Kiinnitä"
msgid "Uns_tick"
msgstr "Pois_ta Kiinnitys"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Vaihda ..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "Sulj_e"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Tuhoa"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Lopeta"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Käynnistä uudelleen"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Työpöytä %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu epäonnistui osoittimen haltuunotossa\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 31af2eeb4..90eeac43d 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index c01ac5fc4..398f43d2c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-01-22 00:36+0100\n"
"Last-Translator: Olivier Fourdan <fourdan@xfce.org>\n"
"Language-Team: none <LL@li.org>\n"
@@ -161,6 +161,7 @@ msgstr "Fonte de titre"
msgid "Title Alignment"
msgstr "Alignement du titre"
+#. XXX
#: mcs-plugin/xfwm4_plugin.c:1344
msgid "Text alignment inside title bar :"
msgstr "Alignement du texte dans la barre de titre :"
@@ -381,36 +382,40 @@ msgstr "_Coller"
msgid "Uns_tick"
msgstr "Dé_coller"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr "A_ide contextuelle"
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr "Placer au dessus"
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Placer sur..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Fermer"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Détruire"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Quitter"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Redémarrer"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Bureau %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu n'a pas pu capturer le pointeur\n"
diff --git a/po/hi.gmo b/po/hi.gmo
index 7577f738e..2942b82e1 100644
--- a/po/hi.gmo
+++ b/po/hi.gmo
Binary files differ
diff --git a/po/hi.po b/po/hi.po
index cd2ec92b4..225c7f106 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4.hi.po\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-11-01 18:18+0530\n"
"Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
"Language-Team: Hindi <indlinux-group@lists.sourceforge.net>\n"
@@ -389,37 +389,41 @@ msgstr "स्टिक (_t)"
msgid "Uns_tick"
msgstr "अनस्टिक (_t)"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "को भेजें..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "बंद करें (_C)"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "नष्ट करें"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "निकलें (_Q)"
# gnome-session/session-properties.c:173
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "पुन शुरु करें"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "कार्यस्थान %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: जीटीके मेन्यू पाइन्टर पकड़ने में असफल\n"
diff --git a/po/hu.gmo b/po/hu.gmo
index 7e7f3be5b..0d78190f9 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
Binary files differ
diff --git a/po/hu.po b/po/hu.po
index 0628c0d8b..8f41c5670 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: hu\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-07-16 16:19+0200\n"
"Last-Translator: Egmont Koblinger <egmont@uhulinux.hu>\n"
"Language-Team: Hungarian <hu@li.org>\n"
@@ -387,36 +387,40 @@ msgstr "Megjelenés m_inden munkaterületen"
msgid "Uns_tick"
msgstr "Munkaterületre _korlátozás"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Áthelye_zés másik munkaterületre..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Bezárás"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Megölés"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Kilépés"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Újraindítás"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "%i. munkaterület"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu nem tudta elkapni a mutatót\n"
diff --git a/po/ja.gmo b/po/ja.gmo
index aa85caa2e..e33222b33 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
Binary files differ
diff --git a/po/ja.po b/po/ja.po
index f32ae4734..cfcef8d84 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-05-27 22:00+0900\n"
"Last-Translator: Zhao Ji <zhao-ji@awz.ne.jp>\n"
"Language-Team: none <none@none>\n"
@@ -384,36 +384,40 @@ msgstr "貼る(_t)"
msgid "Uns_tick"
msgstr "はがす(_t)"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "送る..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "閉じる(_C)"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "殺す"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "終了(_Q)"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "再起動"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "ワークスペース %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenuはポインターを取得できませんでした\n"
diff --git a/po/ko.gmo b/po/ko.gmo
index f56966660..728877d88 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
Binary files differ
diff --git a/po/ko.po b/po/ko.po
index 4a638f940..ff7bab2a7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-08-02 03:36+0900\n"
"Last-Translator: ByungHyun Choi<byunghyunchoi@rtlinux.or.kr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -379,36 +379,40 @@ msgstr "모든 작업공간에 보이기(_t)"
msgid "Uns_tick"
msgstr "현재 작업공간에 보이기(_t)"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "다른 작업공간으로..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "닫기(_C)"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "강제 종료"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "종료(_Q)"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "다시 시작"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "작업공간 %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr ""
diff --git a/po/lt.gmo b/po/lt.gmo
index 84616bad7..b9b7c33ae 100644
--- a/po/lt.gmo
+++ b/po/lt.gmo
Binary files differ
diff --git a/po/lt.po b/po/lt.po
index e7e4ad07d..c23f0e76a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 3.99.2\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-08-16 15:44+0300\n"
"Last-Translator: Mantas <zaz@xxx.lt>\n"
"Language-Team: Lithuania <komp_lt@konf.lt>\n"
@@ -383,36 +383,40 @@ msgstr "Priseg_ti"
msgid "Uns_tick"
msgstr "Nuseg_ti"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Siųsti į..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Uždaryti"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Sunaikinti"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Baigti"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Perkrauti"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Darbo laukas %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr ""
diff --git a/po/ms.gmo b/po/ms.gmo
index 8baca1610..b8a988608 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
Binary files differ
diff --git a/po/ms.po b/po/ms.po
index f29a65aa5..6bb1d3373 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 3.99.3\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-08-31 14:10+0800\n"
"Last-Translator: Harun Musa <mharun@gmx.net>\n"
"Language-Team: Malay <translation-team-ms@list.sourceforge.net>\n"
@@ -384,36 +384,40 @@ msgstr "L_ekat"
msgid "Uns_tick"
msgstr "Nyah_lekat"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Hantar ke..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Tutup"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Musnah"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Keluar"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Mulasemula"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Ruangkerja %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu gagal untuk grab penunjuk\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index d06cbe33b..d12a7cbb7 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
Binary files differ
diff --git a/po/nl.po b/po/nl.po
index c93787887..772cf3ca2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Jasper Huijsmans <huysmans@users.sourceforge.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,36 +386,40 @@ msgstr "_Plakken"
msgid "Uns_tick"
msgstr "_Loslaten"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Zenden naar..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Sluiten"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Vernietigen"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "A_fsluiten"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "_Herstarten"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Bureaublad %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu kon de pointer niet vasthouden\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index b3a4a3f52..cf96e9d15 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index 5184abe06..96f276f29 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,7 +2,7 @@
# Copyright (C) 2003 Olivier Fourdan <fourdan@xfce.org>
# This file is distributed under the same license as the XFce4.
# Paweł Pastuła <pastulap@poczta.onet.pl>, 2003
-#--
+# --
# Daniel Mróz <beorn@alpha.pl>, 2003
#
# Changes:
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-11-11 16:23+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-12-25 19:40+0100\n"
"Last-Translator: Daniel Mróz <beorn@alpha.pl>\n"
"Language-Team: none <none@none>\n"
@@ -20,37 +20,75 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
-#: mcs-plugin/margins_plugin.c:133 mcs-plugin/margins_plugin.c:235
-#: mcs-plugin/margins_plugin.c:254
-msgid "Workspace Margins"
-msgstr "Marginesy Obszaru Roboczego"
-
-#: mcs-plugin/margins_plugin.c:217
-msgid "Adjust workspace margins"
-msgstr "Ustaw marginesy obszaru roboczego"
-
-#: mcs-plugin/margins_plugin.c:241
+#: mcs-plugin/margins.c:124
msgid ""
"Margins are areas on the edges of the screen where no window will be placed"
msgstr ""
"Marginesy to obszary ekranu, w których nie zostanie umieszczone żadne okno"
-#: mcs-plugin/margins_plugin.c:281
+#: mcs-plugin/margins.c:131
+msgid "Workspace Margins"
+msgstr "Marginesy Obszaru Roboczego"
+
+#: mcs-plugin/margins.c:159
msgid "Left :"
msgstr "Lewy :"
-#: mcs-plugin/margins_plugin.c:301
+#: mcs-plugin/margins.c:179
msgid "Right :"
msgstr "Prawy :"
-#: mcs-plugin/margins_plugin.c:321
+#: mcs-plugin/margins.c:199
msgid "Top :"
msgstr "Górny :"
-#: mcs-plugin/margins_plugin.c:341
+#: mcs-plugin/margins.c:219
msgid "Bottom :"
msgstr "Dolny :"
+#: mcs-plugin/plugin.c:112 mcs-plugin/plugin.c:157
+#, fuzzy
+msgid "Workspaces and Margins"
+msgstr "Marginesy Obszaru Roboczego"
+
+#. Number of workspaces
+#: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
+#, fuzzy
+msgid "Workspaces"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/plugin.c:179
+msgid "Margins"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:337
+msgid "Change name"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:349
+#, fuzzy, c-format
+msgid "Workspace %d"
+msgstr "Obszar roboczy %i"
+
+#: mcs-plugin/workspaces.c:359
+msgid "Name:"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:447
+msgid "Click on a workspace name to edit it"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:519
+#, fuzzy
+msgid "Number of workspaces:"
+msgstr "Zmiana obszaru roboczego"
+
+#. Workspace names
+#: mcs-plugin/workspaces.c:550
+#, fuzzy
+msgid "Workspace names"
+msgstr "Marginesy Obszaru Roboczego"
+
#: mcs-plugin/xfwm4_plugin.c:116
msgid "Title"
msgstr "Tytuł"
@@ -276,12 +314,12 @@ msgstr "Akcja do wykonania przy podwójnym kliknięciu na pasku tytułowym :"
msgid "Advanced"
msgstr "Zaawansowane"
-#: src/client.c:499
+#: src/client.c:508
#, c-format
msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
msgstr ""
-#: src/events.c:1496
+#: src/events.c:1490
#, c-format
msgid "%s: Operation not supported (yet)\n"
msgstr "%s: Operaracja jeszcze nie obsługiwana\n"
@@ -301,7 +339,17 @@ msgstr "%s: Inny Menadżer Okien jest już uruchomiony"
msgid "%s: Missing data from default files"
msgstr "%s: Brak danych z domyślnych plików"
-#: src/main.c:431
+#: src/main.c:413
+#, c-format
+msgid "%s: Failed to enter daemon mode: %s"
+msgstr ""
+
+#: src/main.c:421
+#, c-format
+msgid "%s: Failed to create new process: %s"
+msgstr ""
+
+#: src/main.c:442
#, c-format
msgid "%s: Unknown error occured"
msgstr "%s: Wystąpił nieznany błąd"
@@ -343,72 +391,80 @@ msgid "Uns_tick"
msgstr "Odep_nij"
#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
+msgid "Always on top"
+msgstr ""
+
+#: src/menu.c:54
#, fuzzy
msgid "Send to..."
msgstr "Przenieś na..."
-#: src/menu.c:53
+#: src/menu.c:56
msgid "_Close"
msgstr "_Zamknij"
-#: src/menu.c:56
+#: src/menu.c:59
msgid "Destroy"
msgstr "Zniszcz"
-#: src/menu.c:59
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Wyjdź"
-#: src/menu.c:60
+#: src/menu.c:63
msgid "Restart"
msgstr ""
-#: src/menu.c:163
+#: src/menu.c:166
#, fuzzy, c-format
msgid "Workspace %i"
msgstr "Obszar roboczy %i"
-#: src/menu.c:405
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu nie uzyskało wskaźnika\n"
-#: src/settings.c:288
+#: src/settings.c:315
#, fuzzy, c-format
msgid "%s: Missing defaults file"
msgstr "%s: Brak pliku danych domyślnych"
-#: src/settings.c:520
+#: src/settings.c:553
#, c-format
msgid "%s: Cannot allocate active color %s\n"
msgstr "%s: Nie mogę zaalokować aktywnego koloru %s\n"
-#: src/settings.c:527
+#: src/settings.c:560
#, c-format
msgid "%s: Cannot parse active color %s\n"
msgstr "%s: Nie mogę zidentyfikować aktywnego koloru %s\n"
-#: src/settings.c:571
+#: src/settings.c:604
#, c-format
msgid "%s: Cannot allocate inactive color %s\n"
msgstr "%s: Nie mogę zaalokować nieaktywnego koloru %s\n"
-#: src/settings.c:578
+#: src/settings.c:611
#, c-format
msgid "%s: Cannot parse inactive color %s\n"
msgstr "%s: Nie mogę zidentyfikować nieaktywnego koloru %s\n"
-#: src/settings.c:765
+#: src/settings.c:798
#, c-format
msgid "%s: specified key theme \"%s\" missing, using default"
msgstr "%s: podany temat \"%s\" nie istnieje, używam domyślnego"
-#: src/settings.c:775
+#: src/settings.c:808
#, fuzzy, c-format
msgid "%s: Missing values in defaults file"
msgstr "%s: Brak wartości w pliku danych domyślnych"
-#: src/settings.c:1122
+#: src/settings.c:1155
#, c-format
msgid "%s: Workspace count not set, using rc value: %i"
msgstr "%s: Liczba obszarów roboczych nie ustawiona, używam wartości: %i"
@@ -417,6 +473,9 @@ msgstr "%s: Liczba obszarów roboczych nie ustawiona, używam wartości: %i"
msgid "Switch to ..."
msgstr "Przełącz do ..."
+#~ msgid "Adjust workspace margins"
+#~ msgstr "Ustaw marginesy obszaru roboczego"
+
#~ msgid "Window style"
#~ msgstr "Styl okna"
@@ -446,7 +505,8 @@ msgstr "Przełącz do ..."
#, fuzzy
#~ msgid "%s: Property %s on window 0x%lx contains invalid UTF-8 characters\n"
-#~ msgstr "%s: Właściwość %s dla okna (%lx) zawiera nieprawidłowe znaki UTF-8\n"
+#~ msgstr ""
+#~ "%s: Właściwość %s dla okna (%lx) zawiera nieprawidłowe znaki UTF-8\n"
#~ msgid "%s: Using GTK+-%d.%d.%d"
#~ msgstr "%s: Używam GTK+-%d.%d.%d"
diff --git a/po/pt_PT.gmo b/po/pt_PT.gmo
index ca613bbbb..c030523b0 100644
--- a/po/pt_PT.gmo
+++ b/po/pt_PT.gmo
Binary files differ
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 2e04313b7..9bc2c1a34 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-09-12 22:02+0100\n"
"Last-Translator: Nuno Donato <nunodonato@sapo.pt>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -388,36 +388,40 @@ msgstr "_Omnipresente"
msgid "Uns_tick"
msgstr "Remo_ver Omnipresença"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Enviar para..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Fechar"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Destruir"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Sair"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Reiniciar"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Area de Trabalho %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu falhou a captar o ponteiro\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index fa106f0ec..cec0c1d48 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
Binary files differ
diff --git a/po/ru.po b/po/ru.po
index 7381b4401..8d2d2909d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-09-03 22:20+0300\n"
"Last-Translator: Dan Korostelev <daniel@ats.energo.ru>\n"
"Language-Team: Russian <daniel@ats.energo.ru>\n"
@@ -377,36 +377,40 @@ msgstr "Приклеить"
msgid "Uns_tick"
msgstr "Отклеить"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Перенести на..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "Закрыть"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Убить"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "Выход"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Перезапуск"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Рабочее место %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu не смог получить курсор\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index af5631eb3..221222997 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/sv.po b/po/sv.po
index 1c7a8182b..4d71edde2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,36 +386,40 @@ msgstr "K_listrigt"
msgid "Uns_tick"
msgstr "O_klistrigt"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Skicka till..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "S_täng"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Förstör"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "A_vsluta"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Starta om"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Arbetsyta %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu misslyckades attfånga pekaren\n"
diff --git a/po/ta.gmo b/po/ta.gmo
index fcd4cc02b..5acc10548 100644
--- a/po/ta.gmo
+++ b/po/ta.gmo
Binary files differ
diff --git a/po/ta.po b/po/ta.po
index 5a9332061..ff02eab55 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Tamil XFWM4\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-09-24 18:05-0500\n"
"Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n"
"Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -384,36 +384,40 @@ msgstr "ஒட்_டு"
msgid "Uns_tick"
msgstr "ஒட்டா_தே"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "இவ்வேலை இடத்தில் போடுக ..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_மூடு"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "அழி"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_வெளிச்செல்"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "மறுபடியும் தொடங்கு"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "வேலை þடம் %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenuக்கு சுட்டியை பெற முடியவில்லை\n"
diff --git a/po/tr.gmo b/po/tr.gmo
index 362735af6..bf6d0bdcc 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
Binary files differ
diff --git a/po/tr.po b/po/tr.po
index 4421281f0..968ee895c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,46 +6,84 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-22 21:23+0200\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-12-13 22:56+0200\n"
"Last-Translator: Erçin EKER <erc.caldera@gmx.net>\n"
"Language-Team: Turkish <tr@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
-
-#: mcs-plugin/margins_plugin.c:133 mcs-plugin/margins_plugin.c:235
-#: mcs-plugin/margins_plugin.c:254
-msgid "Workspace Margins"
-msgstr "Çalışma Alanı Sınırları"
-
-#: mcs-plugin/margins_plugin.c:217
-msgid "Adjust workspace margins"
-msgstr "Çalışma alanı sınırlarını ayarlayın"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
-#: mcs-plugin/margins_plugin.c:241
+#: mcs-plugin/margins.c:124
msgid ""
"Margins are areas on the edges of the screen where no window will be placed"
msgstr ""
"Sınırlar ekranın kenarlarında pencere yerleştirilmeyecek bölgeleri belirler"
-#: mcs-plugin/margins_plugin.c:281
+#: mcs-plugin/margins.c:131
+msgid "Workspace Margins"
+msgstr "Çalışma Alanı Sınırları"
+
+#: mcs-plugin/margins.c:159
msgid "Left :"
msgstr "Sol :"
-#: mcs-plugin/margins_plugin.c:301
+#: mcs-plugin/margins.c:179
msgid "Right :"
msgstr "Sağ :"
-#: mcs-plugin/margins_plugin.c:321
+#: mcs-plugin/margins.c:199
msgid "Top :"
msgstr "Üst :"
-#: mcs-plugin/margins_plugin.c:341
+#: mcs-plugin/margins.c:219
msgid "Bottom :"
msgstr "Alt :"
+#: mcs-plugin/plugin.c:112 mcs-plugin/plugin.c:157
+#, fuzzy
+msgid "Workspaces and Margins"
+msgstr "Çalışma Alanı Sınırları"
+
+#. Number of workspaces
+#: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
+#, fuzzy
+msgid "Workspaces"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/plugin.c:179
+msgid "Margins"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:337
+msgid "Change name"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:349
+#, fuzzy, c-format
+msgid "Workspace %d"
+msgstr "Çalışma alanı %i"
+
+#: mcs-plugin/workspaces.c:359
+msgid "Name:"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:447
+msgid "Click on a workspace name to edit it"
+msgstr ""
+
+#: mcs-plugin/workspaces.c:519
+#, fuzzy
+msgid "Number of workspaces:"
+msgstr "Çalışma alanlarını değiştir"
+
+#. Workspace names
+#: mcs-plugin/workspaces.c:550
+#, fuzzy
+msgid "Workspace names"
+msgstr "Çalışma Alanı Sınırları"
+
#: mcs-plugin/xfwm4_plugin.c:116
msgid "Title"
msgstr "Başlık"
@@ -271,12 +309,12 @@ msgstr "Başlık çubuğuna çift tıklandığında uygulanacak eylem :"
msgid "Advanced"
msgstr "Gelişmiş"
-#: src/client.c:496
+#: src/client.c:508
#, c-format
msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
msgstr "%s: Yönetilmeyen net_wm_stat (pencere 0x%lx)"
-#: src/events.c:1453
+#: src/events.c:1490
#, c-format
msgid "%s: Operation not supported (yet)\n"
msgstr "%s: İşlem desteklenmiyor (henüz)\n"
@@ -296,7 +334,17 @@ msgstr "%s: Başka bir pencere yöneticisi zaten çalışıyor"
msgid "%s: Missing data from default files"
msgstr "%s: Öntanımlı dosyalarda eksik veri"
-#: src/main.c:431
+#: src/main.c:413
+#, c-format
+msgid "%s: Failed to enter daemon mode: %s"
+msgstr ""
+
+#: src/main.c:421
+#, c-format
+msgid "%s: Failed to create new process: %s"
+msgstr ""
+
+#: src/main.c:442
#, c-format
msgid "%s: Unknown error occured"
msgstr "%s: Bilinmeyen bir hata oluştu"
@@ -338,71 +386,80 @@ msgid "Uns_tick"
msgstr "Sab_it değil"
#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
+msgid "Always on top"
+msgstr ""
+
+#: src/menu.c:54
msgid "Send to..."
msgstr "Gönder..."
-#: src/menu.c:53
+#: src/menu.c:56
msgid "_Close"
msgstr "_Kapat"
-#: src/menu.c:56
+#: src/menu.c:59
msgid "Destroy"
msgstr "Yok Et"
-#: src/menu.c:59
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Çıkış"
-#: src/menu.c:60
+#: src/menu.c:63
msgid "Restart"
msgstr "Yeni_den Başlat"
-#: src/menu.c:163
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Çalışma alanı %i"
-#: src/menu.c:405
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu işaretçiyi kullanamıyor\n"
-#: src/settings.c:285
+#: src/settings.c:315
#, c-format
msgid "%s: Missing defaults file"
msgstr "%s: Öntanımlı dosyalar unutulmuş"
-#: src/settings.c:510
+#: src/settings.c:553
#, c-format
msgid "%s: Cannot allocate active color %s\n"
msgstr "%s: Aktif renk algılanamıyor %s\n"
-#: src/settings.c:517
+#: src/settings.c:560
#, c-format
msgid "%s: Cannot parse active color %s\n"
msgstr "%s: Aktif renk çözümlenemiyor %s\n"
-#: src/settings.c:561
+#: src/settings.c:604
#, c-format
msgid "%s: Cannot allocate inactive color %s\n"
msgstr "%s: Aktif olmayan renk algılanamıyor %s\n"
-#: src/settings.c:568
+#: src/settings.c:611
#, c-format
msgid "%s: Cannot parse inactive color %s\n"
msgstr "%s: Aktif olmayan renk çözümlenemiyor %s\n"
-#: src/settings.c:755
+#: src/settings.c:798
#, c-format
msgid "%s: specified key theme \"%s\" missing, using default"
-msgstr "%s: belirlenen \"%s\" tuş teması bulunamıyor, öntanımlı olan kullanılıyor"
+msgstr ""
+"%s: belirlenen \"%s\" tuş teması bulunamıyor, öntanımlı olan kullanılıyor"
-#: src/settings.c:765
+#: src/settings.c:808
#, c-format
msgid "%s: Missing values in defaults file"
msgstr "%s: Öntanımlı dosyalarda değerler unutulmuş"
-#: src/settings.c:1106
+#: src/settings.c:1155
#, c-format
msgid "%s: Workspace count not set, using rc value: %i"
msgstr "%s: Çalışma alanı uygulanamıyor, rc değeri kullanılıyor: %i"
@@ -411,3 +468,5 @@ msgstr "%s: Çalışma alanı uygulanamıyor, rc değeri kullanılıyor: %i"
msgid "Switch to ..."
msgstr "Geç ..."
+#~ msgid "Adjust workspace margins"
+#~ msgstr "Çalışma alanı sınırlarını ayarlayın"
diff --git a/po/uk.gmo b/po/uk.gmo
index 8d2ed4a4c..a9aebcc56 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
Binary files differ
diff --git a/po/uk.po b/po/uk.po
index ab2f3b724..addd7f83a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-10-26 15:12+0200\n"
"Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
@@ -385,36 +385,40 @@ msgstr "При_ліпити"
msgid "Uns_tick"
msgstr "Від_ліпити"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Відправити на..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "_Закрити"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Знищити"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "Ви_йти"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Перезапустити"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Робочу область %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu не вдалось захопити вказівник\n"
diff --git a/po/vi.gmo b/po/vi.gmo
index 093655f9d..0f3b0450b 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
Binary files differ
diff --git a/po/vi.po b/po/vi.po
index 560478eb1..c74117df0 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-10-24 23:55+9\n"
"Last-Translator: Lâm Vĩnh Niên <nienvl@yahoo.ca>\n"
"Language-Team: none <LL@li.org>\n"
@@ -383,36 +383,40 @@ msgstr "_Dán"
msgid "Uns_tick"
msgstr "Thá_o dán"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "Gửi đến..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "Đón_g"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "Huỷ bỏ"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "_Thoát"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "Khởi động lại"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "Không gian làm việc %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu không bắt được con trỏ\n"
diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 82182f626..7e6f21610 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-12-23 07:34+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -374,36 +374,40 @@ msgstr ""
msgid "Uns_tick"
msgstr ""
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr ""
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr ""
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr ""
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr ""
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr ""
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr ""
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr ""
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index fe66cd639..871b0ee3e 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
Binary files differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bd11d7ce0..e85c8976c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4 1.0.0\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-07-08 20:52+0100\n"
"Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n"
"Language-Team: none <LL@li.org>\n"
@@ -384,36 +384,40 @@ msgstr "粘连(_T)"
msgid "Uns_tick"
msgstr "分离(_T)"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "发送到 ..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "关闭(_C)"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "结束"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "退出(_Q)"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "重启"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "工作区 %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu 无法获取鼠标\n"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index f076726fb..5d228a3e0 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
Binary files differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e434c5e14..d4617135d 100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfwm4\n"
-"POT-Creation-Date: 2003-12-21 22:35+0100\n"
+"POT-Creation-Date: 2004-01-03 22:16+0100\n"
"PO-Revision-Date: 2003-08-29 21:12+0800\n"
"Last-Translator: umm <umm@pchome.com.tw>\n"
"Language-Team: <>\n"
@@ -382,36 +382,40 @@ msgstr "貼連(_T)"
msgid "Uns_tick"
msgstr "分離(_T)"
-#: src/menu.c:51 src/menu.c:52
+#: src/menu.c:51
+msgid "Context _help"
+msgstr ""
+
+#: src/menu.c:52 src/menu.c:53
msgid "Always on top"
msgstr ""
-#: src/menu.c:53
+#: src/menu.c:54
msgid "Send to..."
msgstr "傳送到..."
-#: src/menu.c:55
+#: src/menu.c:56
msgid "_Close"
msgstr "關閉(_C)"
-#: src/menu.c:58
+#: src/menu.c:59
msgid "Destroy"
msgstr "結束"
-#: src/menu.c:61
+#: src/menu.c:62
msgid "_Quit"
msgstr "退出(_Q)"
-#: src/menu.c:62
+#: src/menu.c:63
msgid "Restart"
msgstr "重新啟動"
-#: src/menu.c:165
+#: src/menu.c:166
#, c-format
msgid "Workspace %i"
msgstr "工作區 %i"
-#: src/menu.c:407
+#: src/menu.c:408
#, c-format
msgid "%s: GtkMenu failed to grab the pointer\n"
msgstr "%s: GtkMenu 無法取得鼠標\n"
diff --git a/src/client.c b/src/client.c
index 6dcbdb27f..8c3bf41aa 100644
--- a/src/client.c
+++ b/src/client.c
@@ -2793,6 +2793,10 @@ clientGetWMProtocols (Client * c)
FLAG_SET (c->wm_flags,
(wm_protocols_flags & WM_PROTOCOLS_TAKE_FOCUS) ?
WM_FLAG_TAKEFOCUS : 0);
+ /* KDE extension */
+ FLAG_SET (c->wm_flags,
+ (wm_protocols_flags & WM_PROTOCOLS_CONTEXT_HELP) ?
+ WM_FLAG_CONTEXT_HELP : 0);
}
static inline void
@@ -3899,6 +3903,19 @@ clientKill (Client * c)
}
void
+clientEnterContextMenuState (Client * c)
+{
+ g_return_if_fail (c != NULL);
+ TRACE ("entering clientEnterContextMenuState");
+ TRACE ("Showing the what's this help for client \"%s\" (0x%lx)", c->name, c->window);
+
+ if (FLAG_TEST (c->wm_flags, WM_FLAG_CONTEXT_HELP))
+ {
+ sendClientMessage (c->window, wm_protocols, kde_net_wm_context_help);
+ }
+}
+
+void
clientRaise (Client * c)
{
g_return_if_fail (c != NULL);
diff --git a/src/client.h b/src/client.h
index 3015d2ec1..b2980b2e5 100644
--- a/src/client.h
+++ b/src/client.h
@@ -128,15 +128,6 @@
#define ALL_WORKSPACES (int) 0xFFFFFFFF
-/*
-#define CLIENT_FLAG_TEST(c,f) (c->client_flag & (f))
-#define CLIENT_FLAG_TEST_ALL(c,f) ((c->client_flag & (f)) == (f))
-#define CLIENT_FLAG_TEST_AND_NOT(c,f1,f2) ((c->client_flag & (f1 | f2)) == (f1))
-#define CLIENT_FLAG_SET(c,f) (c->client_flag |= (f))
-#define CLIENT_FLAG_UNSET(c,f) (c->client_flag &= ~(f))
-#define CLIENT_FLAG_TOGGLE(c,f) (c->client_flag ^= (f))
- */
-
/* Convenient macros */
#define FLAG_TEST(flag,bits) (flag & (bits))
#define FLAG_TEST_ALL(flag,bits) ((flag & (bits)) == (bits))
@@ -282,6 +273,7 @@ void clientHide (Client *, int, gboolean);
void clientHideAll (Client *, int);
void clientClose (Client *);
void clientKill (Client *);
+void clientEnterContextMenuState (Client *);
void clientRaise (Client *);
void clientLower (Client *);
void clientSetLayer (Client *, int);
diff --git a/src/events.c b/src/events.c
index 8c8ae7bca..89875a557 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1724,6 +1724,10 @@ menu_callback (Menu * menu, MenuOp op, Window client_xwindow,
frameDraw (c, FALSE, FALSE);
clientClose (c);
break;
+ case MENU_OP_CONTEXT_HELP:
+ clientEnterContextMenuState (c);
+ frameDraw (c, FALSE, FALSE);
+ break;
case MENU_OP_ABOVE:
case MENU_OP_NORMAL:
clientToggleAbove (c);
@@ -1819,6 +1823,13 @@ show_popup_cb (GtkWidget * widget, GdkEventButton * ev, gpointer data)
insensitive |= MENU_OP_STICK;
}
}
+
+ /* KDE extension */
+ clientGetWMProtocols(c);
+ if (FLAG_TEST (c->wm_flags, WM_FLAG_CONTEXT_HELP))
+ {
+ ops |= MENU_OP_CONTEXT_HELP;
+ }
if (FLAG_TEST(c->flags, CLIENT_FLAG_ABOVE))
{
diff --git a/src/hints.c b/src/hints.c
index 88d3ca1f5..f1426a326 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -121,6 +121,9 @@ Atom net_wm_window_type_utility;
Atom net_workarea;
Atom utf8_string;
+/* KDE extension */
+Atom kde_net_wm_context_help;
+
static gboolean
check_type_and_format (Display * dpy, Window w, Atom a, int expected_format,
Atom expected_type, int n_items, int format, Atom type)
@@ -242,6 +245,11 @@ getWMProtocols (Display * dpy, Window w)
{
result |= WM_PROTOCOLS_DELETE_WINDOW;
}
+ // KDE extension
+ if (*ap == (Atom) kde_net_wm_context_help)
+ {
+ result |= WM_PROTOCOLS_CONTEXT_HELP;
+ }
}
}
else
@@ -260,6 +268,11 @@ getWMProtocols (Display * dpy, Window w)
{
result |= WM_PROTOCOLS_DELETE_WINDOW;
}
+ // KDE extension
+ if (*ap == (Atom) kde_net_wm_context_help)
+ {
+ result |= WM_PROTOCOLS_CONTEXT_HELP;
+ }
}
}
}
@@ -291,6 +304,14 @@ initGnomeHints (Display * dpy)
win_workspace = XInternAtom (dpy, "_WIN_WORKSPACE", FALSE);
}
+void
+initKDEHints (Display * dpy)
+{
+ TRACE ("entering initKDEHints");
+
+ kde_net_wm_context_help = XInternAtom (dpy, "_NET_WM_CONTEXT_HELP", FALSE);
+}
+
gboolean
getHint (Display * dpy, Window w, Atom a, long *value)
{
diff --git a/src/hints.h b/src/hints.h
index 71191dc47..0c17bc1fe 100644
--- a/src/hints.h
+++ b/src/hints.h
@@ -73,6 +73,7 @@
#define WM_PROTOCOLS_TAKE_FOCUS (1L<<0)
#define WM_PROTOCOLS_DELETE_WINDOW (1L<<1)
+#define WM_PROTOCOLS_CONTEXT_HELP (1L<<2)
#define WIN_LAYER_DESKTOP 0
#define WIN_LAYER_BELOW 2
@@ -176,6 +177,9 @@ extern Atom net_wm_window_type_toolbar;
extern Atom net_wm_window_type_utility;
extern Atom net_workarea;
+/* KDE extension */
+extern Atom kde_net_wm_context_help;
+
void initICCCMHints (Display *);
unsigned long getWMState (Display *, Window);
void setWMState (Display *, Window, unsigned long);
@@ -183,6 +187,7 @@ void initMotifHints (Display *);
PropMwmHints *getMotifHints (Display *, Window);
unsigned int getWMProtocols (Display *, Window);
void initGnomeHints (Display *);
+void initKDEHints (Display *);
gboolean getHint (Display *, Window, Atom, long *);
void setHint (Display *, Window, Atom, long);
void getGnomeDesktopMargins (Display *, int, int *);
diff --git a/src/main.c b/src/main.c
index a01539f47..a0ea08cc2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -151,9 +151,9 @@ static char *build_session_filename(SessionClient *client_session)
path = (gchar *)xfce_get_userdir();
if (!g_file_test(path, G_FILE_TEST_IS_DIR) && mkdir(path, 0755) < 0) {
- g_warning("Unable to create xfce user dir %s: %s",
- path, g_strerror(errno));
- return NULL;
+ g_warning("Unable to create xfce user dir %s: %s",
+ path, g_strerror(errno));
+ return NULL;
}
path = xfce_get_userfile("sessions", NULL);
@@ -306,7 +306,7 @@ initialize (int argc, char **argv)
initMotifHints (dpy);
initGnomeHints (dpy);
initNetHints (dpy);
-
+ initKDEHints (dpy);
initModifiers (dpy);
root_cursor = XCreateFontCursor (dpy, XC_left_ptr);
@@ -409,23 +409,23 @@ main (int argc, char **argv)
if (daemon_mode)
{
#ifdef HAVE_DAEMON
- if (daemon(TRUE, TRUE) < 0) {
- g_warning(_("%s: Failed to enter daemon mode: %s"),
- g_get_prgname(), g_strerror(errno));
- exit(EXIT_FAILURE);
- }
+ if (daemon(TRUE, TRUE) < 0) {
+ g_warning(_("%s: Failed to enter daemon mode: %s"),
+ g_get_prgname(), g_strerror(errno));
+ exit(EXIT_FAILURE);
+ }
#else /* !HAVE_DAEMON */
switch (fork ())
{
case -1:
g_warning (_("%s: Failed to create new process: %s"),
- g_get_prgname(), g_strerror(errno));
+ g_get_prgname(), g_strerror(errno));
exit (1);
break;
case 0: /* child */
#ifdef HAVE_SETSID
- /* detach from terminal session */
- (void)setsid();
+ /* detach from terminal session */
+ (void)setsid();
#endif /* !HAVE_SETSID */
break;
default: /* parent */
@@ -433,9 +433,9 @@ main (int argc, char **argv)
break;
}
#endif /* !HAVE_DAEMON */
- }
+ }
- /* enter GTK main loop */
+ /* enter GTK main loop */
gtk_main ();
break;
default:
diff --git a/src/menu.c b/src/menu.c
index fd47474f5..9f0369223 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -48,6 +48,7 @@ static MenuItem menuitems[] = {
{MENU_OP_UNSHADE, "gtk-goto-bottom", N_("Un_shade")},
{MENU_OP_STICK, "gtk-add", N_("S_tick")},
{MENU_OP_UNSTICK, "gtk-remove", N_("Uns_tick")},
+ {MENU_OP_CONTEXT_HELP, "gtk-help", N_("Context _help")},
{MENU_OP_ABOVE, NULL, N_("Always on top")},
{MENU_OP_NORMAL, "gtk-apply", N_("Always on top")},
{MENU_OP_WORKSPACES, NULL, N_("Send to...")},
diff --git a/src/menu.h b/src/menu.h
index 5284e06b7..ae4193882 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -31,24 +31,25 @@
typedef enum
{
- MENU_OP_SEPARATOR = 0,
- MENU_OP_MAXIMIZE = 1 << 0,
- MENU_OP_UNMAXIMIZE = 1 << 1,
- MENU_OP_MINIMIZE = 1 << 2,
+ MENU_OP_SEPARATOR = 0,
+ MENU_OP_MAXIMIZE = 1 << 0,
+ MENU_OP_UNMAXIMIZE = 1 << 1,
+ MENU_OP_MINIMIZE = 1 << 2,
MENU_OP_MINIMIZE_ALL = 1 << 3,
- MENU_OP_UNMINIMIZE = 1 << 4,
- MENU_OP_SHADE = 1 << 5,
- MENU_OP_UNSHADE = 1 << 6,
- MENU_OP_STICK = 1 << 7,
- MENU_OP_UNSTICK = 1 << 8,
- MENU_OP_DELETE = 1 << 9,
- MENU_OP_DESTROY = 1 << 10,
- MENU_OP_WORKSPACES = 1 << 11,
- MENU_OP_QUIT = 1 << 12,
- MENU_OP_RESTART = 1 << 13,
- MENU_OP_OTHER = 1 << 14,
- MENU_OP_ABOVE = 1 << 15,
- MENU_OP_NORMAL = 1 << 16
+ MENU_OP_UNMINIMIZE = 1 << 4,
+ MENU_OP_SHADE = 1 << 5,
+ MENU_OP_UNSHADE = 1 << 6,
+ MENU_OP_STICK = 1 << 7,
+ MENU_OP_UNSTICK = 1 << 8,
+ MENU_OP_DELETE = 1 << 9,
+ MENU_OP_DESTROY = 1 << 10,
+ MENU_OP_WORKSPACES = 1 << 11,
+ MENU_OP_QUIT = 1 << 12,
+ MENU_OP_RESTART = 1 << 13,
+ MENU_OP_ABOVE = 1 << 14,
+ MENU_OP_NORMAL = 1 << 15,
+ MENU_OP_CONTEXT_HELP = 1 << 16,
+ MENU_OP_OTHER = 1 << 17
}
MenuOp;