i18n: port from intltool to gettext

Signed-off-by: Marty E. Plummer <[email protected]>

20 files changed, 40 insertions, 45 deletions

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index ac926f8..ec4054d 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,33 +1,28 @@
-desktop_gschemas_in = \
-	org.mate.accessibility-keyboard.gschema.xml.in \
-	org.mate.accessibility-startup.gschema.xml.in \
-	org.mate.applications-at-mobility.gschema.xml.in \
-	org.mate.applications-at-visual.gschema.xml.in \
-	org.mate.applications-browser.gschema.xml.in \
-	org.mate.applications-calculator.gschema.xml.in \
-	org.mate.applications-office.gschema.xml.in \
-	org.mate.applications-terminal.gschema.xml.in \
-	org.mate.background.gschema.xml.in \
-	org.mate.debug.gschema.xml.in \
-	org.mate.file-views.gschema.xml.in \
-	org.mate.interface.gschema.xml.in \
-	org.mate.lockdown.gschema.xml.in \
-	org.mate.peripherals-keyboard.gschema.xml.in \
-	org.mate.peripherals-mouse.gschema.xml.in \
-	org.mate.sound.gschema.xml.in \
-	org.mate.thumbnail-cache.gschema.xml.in \
-	org.mate.thumbnailers.gschema.xml.in \
-	org.mate.typing-break.gschema.xml.in
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_SCHEMAS = $(desktop_gschemas_in:.xml.in=.xml)
+gsettings_SCHEMAS = \
+	org.mate.accessibility-keyboard.gschema.xml \
+	org.mate.accessibility-startup.gschema.xml \
+	org.mate.applications-at-mobility.gschema.xml \
+	org.mate.applications-at-visual.gschema.xml \
+	org.mate.applications-browser.gschema.xml \
+	org.mate.applications-calculator.gschema.xml \
+	org.mate.applications-office.gschema.xml \
+	org.mate.applications-terminal.gschema.xml \
+	org.mate.background.gschema.xml \
+	org.mate.debug.gschema.xml \
+	org.mate.file-views.gschema.xml \
+	org.mate.interface.gschema.xml \
+	org.mate.lockdown.gschema.xml \
+	org.mate.peripherals-keyboard.gschema.xml \
+	org.mate.peripherals-mouse.gschema.xml \
+	org.mate.sound.gschema.xml \
+	org.mate.thumbnail-cache.gschema.xml \
+	org.mate.thumbnailers.gschema.xml \
+	org.mate.typing-break.gschema.xml
 
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	$(desktop_gschemas_in)
+	$(gsettings_SCHEMAS)
 
 CLEANFILES = \
-	$(gsettings_SCHEMAS) \
 	*.gschema.valid
diff --git a/schemas/org.mate.accessibility-keyboard.gschema.xml.in b/schemas/org.mate.accessibility-keyboard.gschema.xml
index 36dea0b..26f295e 100644
--- a/schemas/org.mate.accessibility-keyboard.gschema.xml.in
+++ b/schemas/org.mate.accessibility-keyboard.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.accessibility-keyboard" path="/org/mate/desktop/accessibility/keyboard/">
     <key name="enable" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.accessibility-startup.gschema.xml.in b/schemas/org.mate.accessibility-startup.gschema.xml
index c2c3aec..0c7a56d 100644
--- a/schemas/org.mate.accessibility-startup.gschema.xml.in
+++ b/schemas/org.mate.accessibility-startup.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.accessibility-startup" path="/org/mate/desktop/accessibility/startup/">
     <key name="exec-ats" type="as">
       <default>[]</default>
diff --git a/schemas/org.mate.applications-at-mobility.gschema.xml.in b/schemas/org.mate.applications-at-mobility.gschema.xml
index 993f2ea..4acb619 100644
--- a/schemas/org.mate.applications-at-mobility.gschema.xml.in
+++ b/schemas/org.mate.applications-at-mobility.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-at-mobility" path="/org/mate/desktop/applications/at/mobility/">
     <key name="exec" type="s">
       <default>'dasher'</default>
diff --git a/schemas/org.mate.applications-at-visual.gschema.xml.in b/schemas/org.mate.applications-at-visual.gschema.xml
index a4f3c96..6f40493 100644
--- a/schemas/org.mate.applications-at-visual.gschema.xml.in
+++ b/schemas/org.mate.applications-at-visual.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-at-visual" path="/org/mate/desktop/applications/at/visual/">
     <key name="exec" type="s">
       <default>'orca'</default>
diff --git a/schemas/org.mate.applications-browser.gschema.xml.in b/schemas/org.mate.applications-browser.gschema.xml
index 47d009f..8f7f6cc 100644
--- a/schemas/org.mate.applications-browser.gschema.xml.in
+++ b/schemas/org.mate.applications-browser.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-browser" path="/org/mate/desktop/applications/browser/">
     <key name="exec" type="s">
       <default>'mozilla'</default>
diff --git a/schemas/org.mate.applications-calculator.gschema.xml.in b/schemas/org.mate.applications-calculator.gschema.xml
index 40966d5..d252bd6 100644
--- a/schemas/org.mate.applications-calculator.gschema.xml.in
+++ b/schemas/org.mate.applications-calculator.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-calculator" path="/org/mate/desktop/applications/calculator/">
     <key name="exec" type="s">
       <default>'mate-calc'</default>
diff --git a/schemas/org.mate.applications-office.gschema.xml.in b/schemas/org.mate.applications-office.gschema.xml
index 9ae3908..367f498 100644
--- a/schemas/org.mate.applications-office.gschema.xml.in
+++ b/schemas/org.mate.applications-office.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-office" path="/org/mate/desktop/applications/">
     <child name="calendar" schema="org.mate.applications-office.calendar"/>
     <child name="tasks" schema="org.mate.applications-office.tasks"/>
diff --git a/schemas/org.mate.applications-terminal.gschema.xml.in b/schemas/org.mate.applications-terminal.gschema.xml
index 8351509..3e3a5a2 100644
--- a/schemas/org.mate.applications-terminal.gschema.xml.in
+++ b/schemas/org.mate.applications-terminal.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.applications-terminal" path="/org/mate/desktop/applications/terminal/">
     <key name="exec" type="s">
       <default>'mate-terminal'</default>
diff --git a/schemas/org.mate.background.gschema.xml.in b/schemas/org.mate.background.gschema.xml.in
index 50619d5..519bd39 100644
--- a/schemas/org.mate.background.gschema.xml.in
+++ b/schemas/org.mate.background.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <enum id="org.mate.background.picture-options-enum">
 	<value nick="wallpaper" value="0"/>
 	<value nick="zoom" value="1"/>
diff --git a/schemas/org.mate.debug.gschema.xml.in b/schemas/org.mate.debug.gschema.xml
index 63e7319..929a77c 100644
--- a/schemas/org.mate.debug.gschema.xml.in
+++ b/schemas/org.mate.debug.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.debug" path="/org/mate/debug/">
     <key name="caja" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.file-views.gschema.xml.in b/schemas/org.mate.file-views.gschema.xml
index 35b846a..4e034b3 100644
--- a/schemas/org.mate.file-views.gschema.xml.in
+++ b/schemas/org.mate.file-views.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.file-views" path="/org/mate/desktop/file-views/">
     <key name="icon-theme" type="s">
       <default>'crux_teal'</default>
diff --git a/schemas/org.mate.interface.gschema.xml.in b/schemas/org.mate.interface.gschema.xml
index bcb2a61..d30be52 100644
--- a/schemas/org.mate.interface.gschema.xml.in
+++ b/schemas/org.mate.interface.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.interface" path="/org/mate/desktop/interface/">
     <key name="accessibility" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.lockdown.gschema.xml.in b/schemas/org.mate.lockdown.gschema.xml
index 1517bd1..5d6f12a 100644
--- a/schemas/org.mate.lockdown.gschema.xml.in
+++ b/schemas/org.mate.lockdown.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.lockdown" path="/org/mate/desktop/lockdown/">
     <key name="disable-command-line" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.peripherals-keyboard.gschema.xml.in b/schemas/org.mate.peripherals-keyboard.gschema.xml
index 7143f2d..f519987 100644
--- a/schemas/org.mate.peripherals-keyboard.gschema.xml.in
+++ b/schemas/org.mate.peripherals-keyboard.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <enum id="org.mate.peripherals-keyboard.NumLockState">
     <value nick="off" value="0"/>
     <value nick="on" value="1"/>
diff --git a/schemas/org.mate.peripherals-mouse.gschema.xml.in b/schemas/org.mate.peripherals-mouse.gschema.xml
index d1247d4..4c7d02c 100644
--- a/schemas/org.mate.peripherals-mouse.gschema.xml.in
+++ b/schemas/org.mate.peripherals-mouse.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.peripherals-mouse" path="/org/mate/desktop/peripherals/mouse/">
     <key name="left-handed" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.sound.gschema.xml.in b/schemas/org.mate.sound.gschema.xml
index 7117689..6e12556 100644
--- a/schemas/org.mate.sound.gschema.xml.in
+++ b/schemas/org.mate.sound.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.sound" path="/org/mate/desktop/sound/">
     <key name="default-mixer-device" type="s">
       <default>''</default>
diff --git a/schemas/org.mate.thumbnail-cache.gschema.xml.in b/schemas/org.mate.thumbnail-cache.gschema.xml
index eebbe5d..8242e92 100644
--- a/schemas/org.mate.thumbnail-cache.gschema.xml.in
+++ b/schemas/org.mate.thumbnail-cache.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.thumbnail-cache" path="/org/mate/desktop/thumbnail-cache/">
     <key name="maximum-age" type="i">
       <default>180</default>
diff --git a/schemas/org.mate.thumbnailers.gschema.xml.in b/schemas/org.mate.thumbnailers.gschema.xml
index 3f0f099..4191410 100644
--- a/schemas/org.mate.thumbnailers.gschema.xml.in
+++ b/schemas/org.mate.thumbnailers.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.thumbnailers" path="/org/mate/desktop/thumbnailers/">
     <key name="disable-all" type="b">
       <default>false</default>
diff --git a/schemas/org.mate.typing-break.gschema.xml.in b/schemas/org.mate.typing-break.gschema.xml
index 5420e84..af1a8ff 100644
--- a/schemas/org.mate.typing-break.gschema.xml.in
+++ b/schemas/org.mate.typing-break.gschema.xml
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+<schemalist gettext-domain="mate-desktop">
   <schema id="org.mate.typing-break" path="/org/mate/desktop/typing-break/">
     <key name="type-time" type="i">
       <default>60</default>