menu: move ToggleOmnipresent to workspaces

...and rename it to "Always on Visible Workspace"

Issue: #1316

diff --git a/docs/menu.xml b/docs/menu.xml
index b1890b65ff28cf6019675faa206b4e0715e404c8..d03f8e711bf02c2c7f465fc6c91f8f5436f2621b 100644 (file)
--- a/docs/menu.xml
+++ b/docs/menu.xml
@@ -15,7 +15,7 @@
   <item label="Decorations">
     <action name="ToggleDecorations" />
   </item>
-  <item label="AlwaysOnTop">
+  <item label="Always on Top">
     <action name="ToggleAlwaysOnTop" />
   </item>
   <!--
@@ -29,6 +29,10 @@
     <item label="Move right">
       <action name="SendToDesktop" to="right" />
     </item>
+    <separator />
+    <item label="Always on Visible Workspace">
+      <action name="ToggleOmnipresent" />
+    </item>
   </menu>
   <item label="Close">
     <action name="Close" />

diff --git a/po/de.po b/po/de.po
index 8706d693f800a2e28902084ed0ba49a25c49dc1e..f530c1e4cad942836d71898f0a6cdaf2a7d2b00c 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Dekorationen"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Immer im Vordergrund"
 
 #: src/menu/menu.c:662

diff --git a/po/es.po b/po/es.po
index 5e86b864f3cd4d008f38bf2a62b09d54e7ed0061..2252af5cf5591885f79d5d6edd768f28a3d26b14 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Decoraciones"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Siempre encima"
 
 #: src/menu/menu.c:662

diff --git a/po/id.po b/po/id.po
index 2acec2d1ece2efc001a0e96c2eab6266930033e9..46bea0f4aee51a00116bc6d41af20d03e8881981 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Dekorasi"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Selalu di Muka"
 
 #: src/menu/menu.c:662

diff --git a/po/it.po b/po/it.po
index 9c08c5fcffb2bbd5aaa79bdcd44cd1ac37522df0..fbdc4684be0f9b3950a7138b26623b5387e3396c 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Decorazioni"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Sempre sopra"
 
 #: src/menu/menu.c:662

diff --git a/po/ka.po b/po/ka.po
index 7cdde913efa1c57728fe6a4d23a505d3b8ad346d..7bb432d81b87448f858205ed884bedb9c644df81 100644 (file)
--- a/po/ka.po
+++ b/po/ka.po
@@ -43,7 +43,7 @@ msgid "Decorations"
 msgstr "დეკორაციები"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "ყოველთვისყველაზეზემოდან"
 
 #: src/menu/menu.c:662

diff --git a/po/labwc.pot b/po/labwc.pot
index a9d90fa48bf4c84e444ca7a921904cf237857c9f..eff1d14e39e23f6bb87c52fc2b3fa3b02b35ccdb 100644 (file)
--- a/po/labwc.pot
+++ b/po/labwc.pot
@@ -42,25 +42,25 @@ msgid "Decorations"
 msgstr ""
 
 #: src/menu/menu.c:724
-msgid "AlwaysOnTop"
+msgid "Always on Top"
 msgstr ""
 
-#: src/menu/menu.c:726
-msgid "ToggleOmnipresent"
-msgstr ""
-
-#: src/menu/menu.c:731
+#: src/menu/menu.c:729
 msgid "Move left"
 msgstr ""
 
-#: src/menu/menu.c:738
+#: src/menu/menu.c:736
 msgid "Move right"
 msgstr ""
 
 #: src/menu/menu.c:741
-msgid "Workspace"
+msgid "Always on Visible Workspace"
 msgstr ""
 
 #: src/menu/menu.c:744
+msgid "Workspace"
+msgstr ""
+
+#: src/menu/menu.c:747
 msgid "Close"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index 7ba83023b4fb59a38e649c6c78bd4f5dbb21cc9f..dee75e1d3f367c7e76ad4d5331019d5d1cb271ee 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Dekoracje"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Zawsze na wierzchu"
 
 #: src/menu/menu.c:662

diff --git a/po/ru.po b/po/ru.po
index 4781cbf4e54d7bffa5c707fc3203366746286877..4bc18c6f13f6caee09cd1b6a6047575a5f4197f0 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Декорации"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Всегда на переднем плане"
 
 #: src/menu/menu.c:662

diff --git a/po/sv.po b/po/sv.po
index 4858e09273836de36b561b5a23a7585c2b61a140..bd49c537efa15a9152777e2729e67624990cd922 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -17,46 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/menu/menu.c:631
+#: src/menu/menu.c:698
 msgid "Reconfigure"
 msgstr "Konfigurera om"
 
-#: src/menu/menu.c:633
+#: src/menu/menu.c:700
 msgid "Exit"
-msgstr "Utgång"
+msgstr "Avsluta"
 
-#: src/menu/menu.c:649
+#: src/menu/menu.c:716
 msgid "Minimize"
 msgstr "Minimera"
 
-#: src/menu/menu.c:651
+#: src/menu/menu.c:718
 msgid "Maximize"
 msgstr "Maximera"
 
-#: src/menu/menu.c:653
+#: src/menu/menu.c:720
 msgid "Fullscreen"
 msgstr "Fullskärm"
 
-#: src/menu/menu.c:655
+#: src/menu/menu.c:722
 msgid "Decorations"
 msgstr "Dekorationer"
 
-#: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+#: src/menu/menu.c:724
+msgid "Always on Top"
 msgstr "Alltid överst"
 
-#: src/menu/menu.c:662
+#: src/menu/menu.c:729
 msgid "Move left"
 msgstr "Flytta till vänster"
 
-#: src/menu/menu.c:667
+#: src/menu/menu.c:736
 msgid "Move right"
 msgstr "Flytta till höger"
 
-#: src/menu/menu.c:672
+#: src/menu/menu.c:741
+msgid "Always on Visible Workspace"
+msgstr "Alltid på aktiv arbetsyta"
+
+#: src/menu/menu.c:744
 msgid "Workspace"
 msgstr "Arbetsyta"
 
-#: src/menu/menu.c:675
+#: src/menu/menu.c:747
 msgid "Close"
 msgstr "Stäng"

diff --git a/po/tr.po b/po/tr.po
index cbdb0cafb38d1091e55083bed364214ba12bf696..2e63d526374a80c3324dadab7bc63a44727e1d64 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -41,7 +41,7 @@ msgid "Decorations"
 msgstr "Süslemeler"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Her zaman üstte"
 
 #: src/menu/menu.c:662

diff --git a/src/menu/menu.c b/src/menu/menu.c
index 35f00b9fbf2c85757222c5a5168463dcffe49a7c..b2ee08573b81a92819077db9c160d3b9166d23f4 100644 (file)
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -721,10 +721,8 @@ init_windowmenu(struct server *server)
                fill_item("name.action", "ToggleFullscreen");
                current_item = item_create(menu, _("Decorations"), false);
                fill_item("name.action", "ToggleDecorations");
-               current_item = item_create(menu, _("AlwaysOnTop"), false);
+               current_item = item_create(menu, _("Always on Top"), false);
                fill_item("name.action", "ToggleAlwaysOnTop");
-               current_item = item_create(menu, _("ToggleOmnipresent"), false);
-               fill_item("name.action", "ToggleOmnipresent");
 
                /* Workspace sub-menu */
                struct menu *workspace_menu = menu_create(server, "workspaces", "");
@@ -738,6 +736,11 @@ init_windowmenu(struct server *server)
                current_item = item_create(workspace_menu, _("Move right"), false);
                fill_item("name.action", "SendToDesktop");
                fill_item("to.action", "right");
+               current_item = separator_create(workspace_menu, "");
+               current_item = item_create(workspace_menu,
+                       _("Always on Visible Workspace"), false);
+               fill_item("name.action", "ToggleOmnipresent");
+
                current_item = item_create(menu, _("Workspace"), true);
                current_item->submenu = workspace_menu;