Migrate from intltool to gettext

author: Wu Xiaotian <[email protected]> 2019-05-10 15:58:33 +0800
committer: raveit65 <[email protected]> 2019-05-16 08:36:40 +0200
commit: 3324c2850b96cb99efb0c90cbf37e563a17f6f7b (patch)
tree: 1495a363a4e3ff71f69bbec779923872dfef5b74 /src
parent: 8f46993705947b1a12eac88c58a5d7b5942d3d5c (diff)
download: marco-3324c2850b96cb99efb0c90cbf37e563a17f6f7b.tar.bz2
marco-3324c2850b96cb99efb0c90cbf37e563a17f6f7b.tar.xz
6 files changed, 90 insertions, 90 deletions
diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in
index 219109e3..61f2ff4f 100644
--- a/src/50-marco-desktop-key.xml.in
+++ b/src/50-marco-desktop-key.xml.in
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+<KeyListEntries name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
 
- <KeyListEntry name="panel-run-dialog" _description="Show the panel's &quot;Run Application&quot; dialog box" />
+ <KeyListEntry name="panel-run-dialog" description="Show the panel's &quot;Run Application&quot; dialog box" />
 
- <KeyListEntry name="panel-main-menu" _description="Show the panel's main menu" />
+ <KeyListEntry name="panel-main-menu" description="Show the panel's main menu" />
 
- <KeyListEntry name="run-command-screenshot" _description="Take a screenshot" />
+ <KeyListEntry name="run-command-screenshot" description="Take a screenshot" />
 
- <KeyListEntry name="run-command-window-screenshot" _description="Take a screenshot of a window" />
+ <KeyListEntry name="run-command-window-screenshot" description="Take a screenshot of a window" />
 
- <KeyListEntry name="run-command-terminal" _description="Run a terminal" />
+ <KeyListEntry name="run-command-terminal" description="Run a terminal" />
 
- <KeyListEntry name="rename-workspace" _description="Rename current workspace" />
+ <KeyListEntry name="rename-workspace" description="Rename current workspace" />
 
 </KeyListEntries>
 
diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in
index 84276a86..39c69d8c 100644
--- a/src/50-marco-global-key.xml.in
+++ b/src/50-marco-global-key.xml.in
@@ -1,134 +1,134 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+<KeyListEntries name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
 
- <KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" />
+ <KeyListEntry name="switch-windows" description="Move between windows, using a popup window" />
 
- <KeyListEntry name="switch-group" _description="Move between windows of an application, using a popup window" />
+ <KeyListEntry name="switch-group" description="Move between windows of an application, using a popup window" />
 
- <KeyListEntry name="switch-panels" _description="Move between panels and the desktop, using a popup window" />
+ <KeyListEntry name="switch-panels" description="Move between panels and the desktop, using a popup window" />
 
- <KeyListEntry name="cycle-windows" _description="Move between windows immediately" />
+ <KeyListEntry name="cycle-windows" description="Move between windows immediately" />
 
- <KeyListEntry name="cycle-group" _description="Move between windows of an application immediately" />
+ <KeyListEntry name="cycle-group" description="Move between windows of an application immediately" />
 
- <KeyListEntry name="cycle-panels" _description="Move between panels and the desktop immediately" />
+ <KeyListEntry name="cycle-panels" description="Move between panels and the desktop immediately" />
 
- <KeyListEntry name="show-desktop" _description="Hide all normal windows and set focus to the desktop" />
+ <KeyListEntry name="show-desktop" description="Hide all normal windows and set focus to the desktop" />
 
 <KeyListEntry name="switch-to-workspace-1"
- _description="Switch to workspace 1"
+ description="Switch to workspace 1"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-2"
- _description="Switch to workspace 2"
+ description="Switch to workspace 2"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-3"
- _description="Switch to workspace 3"
+ description="Switch to workspace 3"
 value="2"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-4"
- _description="Switch to workspace 4"
+ description="Switch to workspace 4"
 value="3"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-5"
- _description="Switch to workspace 5"
+ description="Switch to workspace 5"
 value="4"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-6"
- _description="Switch to workspace 6"
+ description="Switch to workspace 6"
 value="5"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-7"
- _description="Switch to workspace 7"
+ description="Switch to workspace 7"
 value="6"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-8"
- _description="Switch to workspace 8"
+ description="Switch to workspace 8"
 value="7"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-9"
- _description="Switch to workspace 9"
+ description="Switch to workspace 9"
 value="8"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-10"
- _description="Switch to workspace 10"
+ description="Switch to workspace 10"
 value="9"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-11"
- _description="Switch to workspace 11"
+ description="Switch to workspace 11"
 value="10"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-12"
- _description="Switch to workspace 12"
+ description="Switch to workspace 12"
 value="11"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-left"
- _description="Switch to workspace on the left of the current workspace"
+ description="Switch to workspace on the left of the current workspace"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-right"
- _description="Switch to workspace on the right of the current workspace"
+ description="Switch to workspace on the right of the current workspace"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-up"
- _description="Switch to workspace above the current workspace"
+ description="Switch to workspace above the current workspace"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-down"
- _description="Switch to workspace below the current workspace"
+ description="Switch to workspace below the current workspace"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
 comparison="gt" />
 
 <KeyListEntry name="switch-to-workspace-prev"
- _description="Switch to previously selected workspace" />
+ description="Switch to previously selected workspace" />
 
 </KeyListEntries>
 
diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in
index 217354e6..5a94183a 100644
--- a/src/50-marco-window-key.xml.in
+++ b/src/50-marco-window-key.xml.in
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
+<KeyListEntries name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
 
 <KeyListEntry
 name="activate-window-menu"
- _description="Activate the window menu" />
+ description="Activate the window menu" />
 
 <KeyListEntry
 name="toggle-fullscreen"
- _description="Toggle fullscreen mode" />
+ description="Toggle fullscreen mode" />
 
 <KeyListEntry
 name="toggle-maximized"
- _description="Toggle maximization state" />
+ description="Toggle maximization state" />
 
 <KeyListEntry
 name="maximize"
- _description="Maximize window" />
+ description="Maximize window" />
 
 <KeyListEntry
 name="unmaximize"
- _description="Restore window" />
+ description="Restore window" />
 
 <KeyListEntry
 name="toggle-shaded"
- _description="Toggle shaded state" />
+ description="Toggle shaded state" />
 
 <KeyListEntry
 name="close"
- _description="Close window" />
+ description="Close window" />
 
 <KeyListEntry
 name="minimize"
- _description="Minimize window" />
+ description="Minimize window" />
 
 <KeyListEntry
 name="begin-move"
- _description="Move window" />
+ description="Move window" />
 
 <KeyListEntry
 name="begin-resize"
- _description="Resize window" />
+ description="Resize window" />
 
 <KeyListEntry
 name="toggle-on-all-workspaces"
- _description="Toggle whether window is on all workspaces or just one"
+ description="Toggle whether window is on all workspaces or just one"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -51,103 +51,103 @@
 
 <KeyListEntry
 name="raise-or-lower"
- _description="Raise window if it's covered by another window, otherwise lower it" />
+ description="Raise window if it's covered by another window, otherwise lower it" />
 
 <KeyListEntry
 name="raise"
- _description="Raise window above other windows" />
+ description="Raise window above other windows" />
 
 <KeyListEntry
 name="lower"
- _description="Lower window below other windows" />
+ description="Lower window below other windows" />
 
 <KeyListEntry
 name="maximize-vertically"
- _description="Maximize window vertically" />
+ description="Maximize window vertically" />
 
 <KeyListEntry
 name="maximize-horizontally"
- _description="Maximize window horizontally" />
+ description="Maximize window horizontally" />
 
 <KeyListEntry
 name="tile-to-side-e"
- _description="Tile window to east (right) side of screen" />
+ description="Tile window to east (right) side of screen" />
 
 <KeyListEntry
 name="tile-to-side-w"
- _description="Tile window to west (left) side of screen" />
+ description="Tile window to west (left) side of screen" />
 
 <KeyListEntry
 name="tile-to-corner-nw"
- _description="Tile window to north-west (top left) corner" />
+ description="Tile window to north-west (top left) corner" />
 
 <KeyListEntry
 name="tile-to-corner-ne"
- _description="Tile window to north-east (top right) corner" />
+ description="Tile window to north-east (top right) corner" />
 
 <KeyListEntry
 name="tile-to-corner-sw"
- _description="Tile window to south-west (bottom left) corner" />
+ description="Tile window to south-west (bottom left) corner" />
 
 <KeyListEntry
 name="tile-to-corner-se"
- _description="Tile window to south-east (bottom right) corner" />
+ description="Tile window to south-east (bottom right) corner" />
 
 <KeyListEntry
 name="move-to-corner-nw"
- _description="Move window to north-west (top left) corner" />
+ description="Move window to north-west (top left) corner" />
 
 <KeyListEntry
 name="move-to-corner-ne"
- _description="Move window to north-east (top right) corner" />
+ description="Move window to north-east (top right) corner" />
 
 <KeyListEntry
 name="move-to-corner-sw"
- _description="Move window to south-west (bottom left) corner" />
+ description="Move window to south-west (bottom left) corner" />
 
 <KeyListEntry
 name="move-to-corner-se"
- _description="Move window to south-east (bottom right) corner" />
+ description="Move window to south-east (bottom right) corner" />
 
 <KeyListEntry
 name="move-to-side-n"
- _description="Move window to north (top) side of screen" />
+ description="Move window to north (top) side of screen" />
 
 <KeyListEntry
 name="move-to-side-s"
- _description="Move window to south (bottom) side of screen" />
+ description="Move window to south (bottom) side of screen" />
 
 <KeyListEntry
 name="move-to-side-e"
- _description="Move window to east (right) side of screen" />
+ description="Move window to east (right) side of screen" />
 
 <KeyListEntry
 name="move-to-side-w"
- _description="Move window to west (left) side of screen" />
+ description="Move window to west (left) side of screen" />
 
 <KeyListEntry
 name="move-to-center"
- _description="Move window to center of screen" />
+ description="Move window to center of screen" />
 
 <KeyListEntry
 name="move-to-monitor-n"
- _description="Move window to north (top) monitor" />
+ description="Move window to north (top) monitor" />
 
 <KeyListEntry
 name="move-to-monitor-s"
- _description="Move window to south (bottom) monitor" />
+ description="Move window to south (bottom) monitor" />
 
 <KeyListEntry
 name="move-to-monitor-e"
- _description="Move window to east (right) monitor" />
+ description="Move window to east (right) monitor" />
 
 <KeyListEntry
 name="move-to-monitor-w"
- _description="Move window to west (left) monitor" />
+ description="Move window to west (left) monitor" />
 
 <KeyListEntry
 name="move-to-workspace-1"
- _description="Move window to workspace 1"
+ description="Move window to workspace 1"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -155,7 +155,7 @@
 
 <KeyListEntry
 name="move-to-workspace-2"
- _description="Move window to workspace 2"
+ description="Move window to workspace 2"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -163,7 +163,7 @@
 
 <KeyListEntry
 name="move-to-workspace-3"
- _description="Move window to workspace 3"
+ description="Move window to workspace 3"
 value="2"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -171,7 +171,7 @@
 
 <KeyListEntry
 name="move-to-workspace-4"
- _description="Move window to workspace 4"
+ description="Move window to workspace 4"
 value="3"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -179,7 +179,7 @@
 
 <KeyListEntry
 name="move-to-workspace-5"
- _description="Move window to workspace 5"
+ description="Move window to workspace 5"
 value="4"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -187,7 +187,7 @@
 
 <KeyListEntry
 name="move-to-workspace-6"
- _description="Move window to workspace 6"
+ description="Move window to workspace 6"
 value="5"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -195,7 +195,7 @@
 
 <KeyListEntry
 name="move-to-workspace-7"
- _description="Move window to workspace 7"
+ description="Move window to workspace 7"
 value="6"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -203,7 +203,7 @@
 
 <KeyListEntry
 name="move-to-workspace-8"
- _description="Move window to workspace 8"
+ description="Move window to workspace 8"
 value="7"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -211,7 +211,7 @@
 
 <KeyListEntry
 name="move-to-workspace-9"
- _description="Move window to workspace 9"
+ description="Move window to workspace 9"
 value="8"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -219,7 +219,7 @@
 
 <KeyListEntry
 name="move-to-workspace-10"
- _description="Move window to workspace 10"
+ description="Move window to workspace 10"
 value="9"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -227,7 +227,7 @@
 
 <KeyListEntry
 name="move-to-workspace-11"
- _description="Move window to workspace 11"
+ description="Move window to workspace 11"
 value="10"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -235,7 +235,7 @@
 
 <KeyListEntry
 name="move-to-workspace-12"
- _description="Move window to workspace 12"
+ description="Move window to workspace 12"
 value="11"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -243,7 +243,7 @@
 
 <KeyListEntry
 name="move-to-workspace-left"
- _description="Move window one workspace to the left"
+ description="Move window one workspace to the left"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -251,7 +251,7 @@
 
 <KeyListEntry
 name="move-to-workspace-right"
- _description="Move window one workspace to the right"
+ description="Move window one workspace to the right"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -259,7 +259,7 @@
 
 <KeyListEntry
 name="move-to-workspace-up"
- _description="Move window one workspace up"
+ description="Move window one workspace up"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
@@ -267,7 +267,7 @@
 
 <KeyListEntry
 name="move-to-workspace-down"
- _description="Move window one workspace down"
+ description="Move window one workspace down"
 value="1"
 key="num-workspaces"
 schema="org.mate.Marco.general"
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a5f8ed3..6d5c50f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -159,7 +159,8 @@ testboxes_LDADD= @MARCO_LIBS@
 testgradient_LDADD= @MARCO_LIBS@
 testasyncgetprop_LDADD= @MARCO_LIBS@
 
-@INTLTOOL_DESKTOP_RULE@
+%.desktop: %.desktop.in
+ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 desktopfilesdir=$(datadir)/applications
 desktopfiles_in_files=marco.desktop.in
@@ -174,8 +175,6 @@ wmproperties_DATA = $(wmproperties_files)
 gsettings_SCHEMAS = org.mate.marco.gschema.xml
 @GSETTINGS_RULES@
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 xmldir = @MATE_KEYBINDINGS_KEYSDIR@
 xml_in_files = \
 50-marco-desktop-key.xml.in \
@@ -183,6 +182,9 @@ xml_in_files = \
 50-marco-global-key.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
+%.xml: %.xml.in
+ $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 BUILT_SOURCES =
 CLEANFILES = \
 marco.desktop \
diff --git a/src/marco-wm.desktop.in b/src/marco-wm.desktop.in
index fc9c5318..62efebff 100644
--- a/src/marco-wm.desktop.in
+++ b/src/marco-wm.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-_Name=Marco
+Name=Marco
 Exec=marco
 # name of loadable control center module
 X-MATE-WMSettingsModule=marco
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index fe636946..0a1da4b6 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,5 +1,3 @@
-@INTLTOOL_DESKTOP_RULE@
-
 icondir=$(pkgdatadir)/icons
 icon_DATA=marco-window-demo.png
author	Wu Xiaotian <[email protected]>	2019-05-10 15:58:33 +0800
committer	raveit65 <[email protected]>	2019-05-16 08:36:40 +0200
commit	3324c2850b96cb99efb0c90cbf37e563a17f6f7b (patch)
tree	1495a363a4e3ff71f69bbec779923872dfef5b74 /src
parent	8f46993705947b1a12eac88c58a5d7b5942d3d5c (diff)
download	marco-3324c2850b96cb99efb0c90cbf37e563a17f6f7b.tar.bz2 marco-3324c2850b96cb99efb0c90cbf37e563a17f6f7b.tar.xz