[gnome-applets/wip/muktupavels/gettext: 2/2] use upstream gettext



commit 8a8b4cfa1ddaa3705f8330fabd2d75997fee1c4d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Apr 1 22:57:35 2020 +0300

    use upstream gettext

 .gitlab-ci.yml                                     |  1 -
 Makefile.am                                        | 12 +++
 autogen.sh                                         |  2 -
 configure.ac                                       | 16 ++--
 data/schemas/Makefile.am                           | 43 +++++-----
 ...org.gnome.gnome-applets.battstat.gschema.xml.in | 52 ++++++++++++
 ....gnome.gnome-applets.battstat.gschema.xml.in.in | 52 ------------
 ...org.gnome.gnome-applets.charpick.gschema.xml.in | 14 +++
 ....gnome.gnome-applets.charpick.gschema.xml.in.in | 14 ---
 ...org.gnome.gnome-applets.command.gschema.xml.in} | 16 ++--
 .../org.gnome.gnome-applets.cpufreq.gschema.xml.in | 19 +++++
 ...g.gnome.gnome-applets.cpufreq.gschema.xml.in.in | 19 -----
 ...> org.gnome.gnome-applets.geyes.gschema.xml.in} |  2 +-
 ...org.gnome.gnome-applets.gweather.gschema.xml.in | 24 ++++++
 ....gnome.gnome-applets.gweather.gschema.xml.in.in | 24 ------
 ...me.gnome-applets.mini-commander.gschema.xml.in} | 40 ++++-----
 ...g.gnome.gnome-applets.multiload.gschema.xml.in} | 62 +++++++-------
 ...rg.gnome.gnome-applets.netspeed.gschema.xml.in} | 28 +++---
 ....gnome.gnome-applets.stickynotes.gschema.xml.in | 69 +++++++++++++++
 ...ome.gnome-applets.stickynotes.gschema.xml.in.in | 69 ---------------
 ...> org.gnome.gnome-applets.timer.gschema.xml.in} | 10 +--
 ...me.gnome-applets.window-buttons.gschema.xml.in} | 40 ++++-----
 ...me-applets.window-picker-applet.gschema.xml.in} | 12 +--
 ...gnome.gnome-applets.window-title.gschema.xml.in | 79 +++++++++++++++++
 ...me.gnome-applets.window-title.gschema.xml.in.in | 79 -----------------
 gnome-applets/cpufreq/cpufreq-selector/Makefile.am |  9 +-
 ....policy.in => org.gnome.cpufreqselector.policy} |  0
 po/Makevars                                        | 79 +++++++++++++++++
 po/POTFILES.in                                     | 99 +++++++++++-----------
 po/POTFILES.skip                                   | 28 +++---
 30 files changed, 549 insertions(+), 464 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73f15334d..eb25f6236 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,6 @@ variables:
                   docbook-xsl
                   gettext
                   gnome-settings-daemon-dev
-                  intltool
                   libcpufreq-dev
                   libglib2.0-dev
                   libgnome-panel-dev
diff --git a/Makefile.am b/Makefile.am
index 9db39c76d..dc6bc3430 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,9 +17,21 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
        `find "$(srcdir)/m4" -type f -name "*.m4" -print` \
+       $(srcdir)/ABOUT-NLS \
        $(srcdir)/INSTALL \
        $(srcdir)/config.h.in~ \
        $(srcdir)/configure \
+       $(srcdir)/po/Makefile.in.in \
+       $(srcdir)/po/Makevars.template \
+       $(srcdir)/po/Rules-quot \
+       $(srcdir)/po/boldquot.sed \
+       $(srcdir)/po/en@boldquot.header \
+       $(srcdir)/po/en@quot.header \
+       $(srcdir)/po/gnome-applets.pot \
+       $(srcdir)/po/insert-header.sin \
+       $(srcdir)/po/quot.sed \
+       $(srcdir)/po/remove-potcdate.sin \
+       $(srcdir)/po/stamp-po \
        $(NULL)
 
 GITIGNOREFILES = $(PACKAGE)-\*.tar.{gz,bz2,xz}
diff --git a/autogen.sh b/autogen.sh
index cdac88c3a..16a82c9df 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,8 +24,6 @@ fi
 
 set -x
 aclocal --install || exit 1
-glib-gettextize --force --copy || exit 1
-intltoolize --force --copy --automake || exit 1
 autoreconf --verbose --force --install -Wno-portability || exit 1
 { set +x; } 2>/dev/null
 
diff --git a/configure.ac b/configure.ac
index 1d5d54bfa..2942e8c88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,6 @@ GUCHARMAP3_REQUIRED=2.33.0
 POLKIT_REQUIRED=0.97
 dnl ***************************************************************************
 
-IT_PROG_INTLTOOL([0.35.0])
 PKG_PROG_PKG_CONFIG([0.19])
 
 AC_PATH_PROG([GDBUS_CODEGEN], [gdbus-codegen])
@@ -184,10 +183,17 @@ dnl ***************************************************************************
 dnl *** Set up gettext                                                      ***
 dnl ***************************************************************************
 
-GETTEXT_PACKAGE=gnome-applets-3.0
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.6])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
+
+GETTEXT_PACKAGE=gnome-applets
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
+
+dnl ***************************************************************************
+dnl *** Help                                                                ***
+dnl ***************************************************************************
 
 YELP_HELP_INIT
 
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
index a1cacf0f1..35e99333d 100644
--- a/data/schemas/Makefile.am
+++ b/data/schemas/Makefile.am
@@ -1,19 +1,19 @@
 NULL =
 
-gsettings_schemas_in_in = \
-       org.gnome.gnome-applets.battstat.gschema.xml.in.in \
-       org.gnome.gnome-applets.charpick.gschema.xml.in.in \
-       org.gnome.gnome-applets.command.gschema.xml.in.in \
-       org.gnome.gnome-applets.geyes.gschema.xml.in.in \
-       org.gnome.gnome-applets.gweather.gschema.xml.in.in \
-       org.gnome.gnome-applets.mini-commander.gschema.xml.in.in \
-       org.gnome.gnome-applets.multiload.gschema.xml.in.in \
-       org.gnome.gnome-applets.netspeed.gschema.xml.in.in \
-       org.gnome.gnome-applets.stickynotes.gschema.xml.in.in \
-       org.gnome.gnome-applets.timer.gschema.xml.in.in \
-       org.gnome.gnome-applets.window-buttons.gschema.xml.in.in \
-       org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in \
-       org.gnome.gnome-applets.window-title.gschema.xml.in.in \
+gsettings_schemas_in = \
+       org.gnome.gnome-applets.battstat.gschema.xml.in \
+       org.gnome.gnome-applets.charpick.gschema.xml.in \
+       org.gnome.gnome-applets.command.gschema.xml.in \
+       org.gnome.gnome-applets.geyes.gschema.xml.in \
+       org.gnome.gnome-applets.gweather.gschema.xml.in \
+       org.gnome.gnome-applets.mini-commander.gschema.xml.in \
+       org.gnome.gnome-applets.multiload.gschema.xml.in \
+       org.gnome.gnome-applets.netspeed.gschema.xml.in \
+       org.gnome.gnome-applets.stickynotes.gschema.xml.in \
+       org.gnome.gnome-applets.timer.gschema.xml.in \
+       org.gnome.gnome-applets.window-buttons.gschema.xml.in \
+       org.gnome.gnome-applets.window-picker-applet.gschema.xml.in \
+       org.gnome.gnome-applets.window-title.gschema.xml.in \
        $(NULL)
 
 gsettings_ENUM_NAMESPACE = org.gnome.gnome-applets
@@ -21,37 +21,32 @@ gsettings_ENUM_FILES = \
        $(NULL)
 
 if BUILD_CPUFREQ_APPLET
-gsettings_schemas_in_in += \
-       org.gnome.gnome-applets.cpufreq.gschema.xml.in.in \
+gsettings_schemas_in += \
+       org.gnome.gnome-applets.cpufreq.gschema.xml.in \
        $(NULL)
 gsettings_ENUM_FILES += \
        $(top_srcdir)/gnome-applets/cpufreq/cpufreq-applet.h \
        $(NULL)
 endif
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
-gsettings_schemas_in = $(gsettings_schemas_in_in:.xml.in.in=.xml.in)
 gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
+%.gschema.xml: %.gschema.xml.in Makefile
        $(AM_V_GEN) $(SED) \
                -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' \
-               -e "s|\@PKG_DATADIR\@|$(pkgdatadir)|" \
                -e "s|\@WB_DATA_DIR\@|$(pkgdatadir)/window-buttons-applet|" \
                < $< > $@
 
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-       org.gnome.gnome-applets.cpufreq.gschema.xml.in.in \
-       $(gsettings_schemas_in_in) \
+       org.gnome.gnome-applets.cpufreq.gschema.xml.in \
+       $(gsettings_schemas_in) \
        $(NULL)
 
 CLEANFILES = \
        *.gschema.valid \
        $(gsettings__enum_file) \
-       $(gsettings_schemas_in) \
        $(gsettings_SCHEMAS) \
        $(NULL)
 
diff --git a/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in 
b/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
new file mode 100644
index 000000000..969649046
--- /dev/null
+++ b/data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
@@ -0,0 +1,52 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+       <schema id="org.gnome.gnome-applets.battstat">
+               <key name="red-value" type="i">
+                       <default>15</default>
+                       <summary>Red value level</summary>
+                       <description>The battery level below which the battery is displayed as red. Also the 
value at which the low battery warning is displayed.</description>
+               </key>
+               <key name="red-value-is-time" type="b">
+                       <default>false</default>
+                       <summary>Warn on low time rather than low percentage</summary>
+                       <description>Use the value defined in red-value as a time remaining to show the 
warning dialog rather than a percentage.</description>
+               </key>
+               <key name="low-battery-notification" type="b">
+                       <default>true</default>
+                       <summary>Low Battery Notification</summary>
+                       <description>Notify user when the battery is low.</description>
+               </key>
+               <key name="full-battery-notification" type="b">
+                       <default>false</default>
+                       <summary>Full Battery Notification</summary>
+                       <description>Notify user when the battery is full.</description>
+               </key>
+               <key name="beep" type="b">
+                       <default>false</default>
+                       <summary>Beep for warnings</summary>
+                       <description>Beep when displaying a warning.</description>
+               </key>
+               <key name="drain-from-top" type="b">
+                       <default>false</default>
+                       <summary>Drain from top</summary>
+                       <description>Show the battery meter draining from the top of the battery. Only 
implemented for traditional battery view.</description>
+               </key>
+               <key name="show-status" type="b">
+                       <default>true</default>
+                       <summary>Upright (small) battery</summary>
+                       <description>Show the upright, smaller battery on the panel.</description>
+               </key>
+               <key name="show-battery" type="b">
+                       <default>false</default>
+                       <summary>Show the horizontal battery</summary>
+                       <description>Show the traditional, horizontal battery on the panel.</description>
+               </key>
+               <key name="show-text" type="i">
+                       <default>0</default>
+                       <summary>Show the time/percent label</summary>
+                       <description>0 for no label, 1 for percentage and 2 for time remaining.</description>
+               </key>
+               <key name="no-hal" type="b">
+                       <default>false</default>
+               </key>
+       </schema>
+</schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in 
b/data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in
new file mode 100644
index 000000000..ddd5a71fa
--- /dev/null
+++ b/data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+       <schema id="org.gnome.gnome-applets.charpick">
+               <key name="current-list" type="s">
+                       <default>''</default>
+                       <summary>Characters shown on applet startup</summary>
+                       <description>The string that the user had selected when the applet was last used. 
This string will be displayed when the user starts the applet.</description>
+               </key>
+               <key name="chartable" type="as">
+                       <default>[]</default>
+                       <summary>List of available palettes</summary>
+                       <description>List of strings containing the available palettes.</description>
+               </key>
+       </schema>
+</schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.command.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.command.gschema.xml.in
similarity index 51%
rename from data/schemas/org.gnome.gnome-applets.command.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.command.gschema.xml.in
index bf35fb4e7..92ec15844 100644
--- a/data/schemas/org.gnome.gnome-applets.command.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.command.gschema.xml.in
@@ -2,25 +2,25 @@
   <schema id="org.gnome.gnome-applets.command">
     <key name="command" type="s">
       <default>'date +%T'</default>
-      <_summary>Command to execute</_summary>
-      <_description>Command/script to execute to get the output</_description>
+      <summary>Command to execute</summary>
+      <description>Command/script to execute to get the output</description>
     </key>
     <key name="interval" type="u">
       <range min="1" max="600"/>
       <default>1</default>
-      <_summary>Interval for the command</_summary>
-      <_description>Interval to execute the command (in seconds)</_description>
+      <summary>Interval for the command</summary>
+      <description>Interval to execute the command (in seconds)</description>
     </key>
     <key name="width" type="u">
       <range min="1" max="100"/>
       <default>60</default>
-      <_summary>Width of output</_summary>
-      <_description>Number of characters to display</_description>
+      <summary>Width of output</summary>
+      <description>Number of characters to display</description>
     </key>
     <key name="show-icon" type="b">
       <default>false</default>
-      <_summary>Show icon</_summary>
-      <_description>If applet icon is shown or not</_description>
+      <summary>Show icon</summary>
+      <description>If applet icon is shown or not</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in 
b/data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in
new file mode 100644
index 000000000..56ccfc4b4
--- /dev/null
+++ b/data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in
@@ -0,0 +1,19 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+       <schema id="org.gnome.gnome-applets.cpufreq">
+               <key name="cpu" type="i">
+                       <default>0</default>
+                       <summary>CPU to Monitor</summary>
+                       <description>Set the CPU to monitor. In a single processor system you don't have to 
change it.</description>
+               </key>
+               <key name="show-mode" enum="org.gnome.gnome-applets.CPUFreqShowMode">
+                       <default>'both'</default>
+                       <summary>Mode to show cpu usage</summary>
+                       <description>A 'graphic' value means to show the applet in graphic mode (pixmap 
only), 'text' to show the applet in text mode (not to show the pixmap) and 'both' to show the applet in 
graphic and text mode.</description>
+               </key>
+               <key name="show-text-mode" enum="org.gnome.gnome-applets.CPUFreqShowTextMode">
+                       <default>'frequency-unit'</default>
+                       <summary>The type of text to display (if the text is enabled).</summary>
+                       <description>A 'frequency' value means to show cpu frequency, 'frequency-unit' to 
show frequency and units, and 'percentage' to show percentage instead of frequency.</description>
+               </key>
+       </schema>
+</schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in
similarity index 74%
rename from data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in
index 6c4a5ad9e..3d2018d1d 100644
--- a/data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in
@@ -2,7 +2,7 @@
        <schema id="org.gnome.gnome-applets.geyes">
                <key name="theme-path" type="s">
                        <default>''</default>
-                       <_summary>Directory in which the theme is located</_summary>
+                       <summary>Directory in which the theme is located</summary>
                </key>
        </schema>
 </schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in 
b/data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in
new file mode 100644
index 000000000..4aaf983af
--- /dev/null
+++ b/data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.gnome-applets.gweather">
+    <key name="auto-update" type="b">
+      <default>true</default>
+      <summary>Update the data automatically</summary>
+      <description>Determines whether the applet automatically updates its weather statistics or 
not.</description>
+    </key>
+    <key name="auto-update-interval" type="i">
+      <default>1800</default>
+      <summary>Update interval</summary>
+      <description>The interval, in seconds, between automatic updates.</description>
+    </key>
+    <key name="enable-radar-map" type="b">
+      <default>false</default>
+      <summary>Display radar map</summary>
+      <description>Fetch a radar map on each update.</description>
+    </key>
+    <key name="show-notifications" type="b">
+      <default>false</default>
+      <summary>Show notification</summary>
+      <description>Show notifications for critical weather conditions</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in
similarity index 61%
rename from data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in
index 43a98a1f9..9f7d78ea5 100644
--- a/data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in
@@ -14,8 +14,8 @@
                                '^google: *(.*)$'
                        ]
                        </default>
-                       <_summary>Macro pattern list</_summary>
-                       <_description>List of entries containing strings for the macro 
patterns.</_description>
+                       <summary>Macro pattern list</summary>
+                       <description>List of entries containing strings for the macro patterns.</description>
                </key>
                <key name="macro-commands" type="as">
                        <default>
@@ -31,50 +31,50 @@
                                'gnome-open http://www.google.com/search?q=\\1'
                        ]
                        </default>
-                       <_summary>Macro command list</_summary>
-                       <_description>List of entries containing strings for the macro 
commands.</_description>
+                       <summary>Macro command list</summary>
+                       <description>List of entries containing strings for the macro commands.</description>
                </key>
        </schema>
        <schema id="org.gnome.gnome-applets.mini-commander">
                <key name="show-handle" type="b">
                        <default>false</default>
-                       <_summary>Show handle</_summary>
-                       <_description>Show a handle so the applet can be detached from the 
panel.</_description>
+                       <summary>Show handle</summary>
+                       <description>Show a handle so the applet can be detached from the panel.</description>
                </key>
                <key name="show-frame" type="b">
                        <default>false</default>
-                       <_summary>Show frame</_summary>
-                       <_description>Show a frame surrounding the applet.</_description>
+                       <summary>Show frame</summary>
+                       <description>Show a frame surrounding the applet.</description>
                </key>
                <key name="autocomplete-history" type="b">
                        <default>true</default>
-                       <_summary>Perform history autocompletion</_summary>
-                       <_description>Attempt to autocomplete a command from the history of commands 
entered.</_description>
+                       <summary>Perform history autocompletion</summary>
+                       <description>Attempt to autocomplete a command from the history of commands 
entered.</description>
                </key>
                <key name="normal-size-x" type="i">
                        <default>150</default>
-                       <_summary>Width</_summary>
-                       <_description>Width of the applet</_description>
+                       <summary>Width</summary>
+                       <description>Width of the applet</description>
                </key>
                <key name="show-default-theme" type="b">
                        <default>true</default>
-                       <_summary>Use the default theme colors</_summary>
-                       <_description>Use theme colors instead of custom ones.</_description>
+                       <summary>Use the default theme colors</summary>
+                       <description>Use theme colors instead of custom ones.</description>
                </key>
                <key name="cmd-line-color-fg" type="s">
                        <default>'rgba(255,255,255,1)'</default>
-                       <_summary>Foreground color</_summary>
-                       <_description></_description>
+                       <summary>Foreground color</summary>
+                       <description></description>
                </key>
                <key name="cmd-line-color-bg" type="s">
                        <default>'rgba(0,0,0,1)'</default>
-                       <_summary>Background color</_summary>
-                       <_description></_description>
+                       <summary>Background color</summary>
+                       <description></description>
                </key>
                <key name="history" type="as">
                        <default>[]</default>
-                       <_summary>History list</_summary>
-                       <_description>List of entries containing strings for history entries.</_description>
+                       <summary>History list</summary>
+                       <description>List of entries containing strings for history entries.</description>
                </key>
        </schema>
 </schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in
similarity index 57%
rename from data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in
index cd75e116e..414f995fd 100644
--- a/data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in
@@ -2,132 +2,132 @@
        <schema id="org.gnome.gnome-applets.multiload">
                <key name="view-cpuload" type="b">
                        <default>true</default>
-                       <_summary>Enable CPU load graph</_summary>
+                       <summary>Enable CPU load graph</summary>
                </key>
                <key name="view-memload" type="b">
                        <default>false</default>
-                       <_summary>Enable memory load graph</_summary>
+                       <summary>Enable memory load graph</summary>
                </key>
                <key name="view-netload2" type="b">
                        <default>false</default>
-                       <_summary>Enable network load graph</_summary>
+                       <summary>Enable network load graph</summary>
                </key>
                <key name="view-swapload" type="b">
                        <default>false</default>
-                       <_summary>Enable swap load graph</_summary>
+                       <summary>Enable swap load graph</summary>
                </key>
                <key name="view-loadavg" type="b">
                        <default>false</default>
-                       <_summary>Enable load average graph</_summary>
+                       <summary>Enable load average graph</summary>
                </key>
                <key name="view-diskload" type="b">
                        <default>false</default>
-                       <_summary>Enable disk load graph</_summary>
+                       <summary>Enable disk load graph</summary>
                </key>
 
                <key name="speed" type="i">
                        <default>500</default>
-                       <_summary>Applet refresh rate in milliseconds</_summary>
+                       <summary>Applet refresh rate in milliseconds</summary>
                </key>
                <key name="size" type="i">
                        <default>40</default>
-                       <_summary>Graph size</_summary>
-                       <_description>For horizontal panels, the width of the graphs in pixels.  For vertical 
panels, this is the height of the graphs.</_description>
+                       <summary>Graph size</summary>
+                       <description>For horizontal panels, the width of the graphs in pixels.  For vertical 
panels, this is the height of the graphs.</description>
                </key>
 
                <key name="cpuload-color0" type="s">
                        <default>'#0072b3'</default>
-                       <_summary>Graph color for user-related CPU activity</_summary>
+                       <summary>Graph color for user-related CPU activity</summary>
                </key>
                <key name="cpuload-color1" type="s">
                        <default>'#0092e6'</default>
-                       <_summary>Graph color for system-related CPU activity</_summary>
+                       <summary>Graph color for system-related CPU activity</summary>
                </key>
                <key name="cpuload-color2" type="s">
                        <default>'#00a3ff'</default>
-                       <_summary>Graph color for nice-related CPU activity</_summary>
+                       <summary>Graph color for nice-related CPU activity</summary>
                </key>
                <key name="cpuload-color3" type="s">
                        <default>'#002f3d'</default>
-                       <_summary>Graph color for iowait-related CPU activity</_summary>
+                       <summary>Graph color for iowait-related CPU activity</summary>
                </key>
                <key name="cpuload-color4" type="s">
                        <default>'#000000'</default>
-                       <_summary>CPU graph background color</_summary>
+                       <summary>CPU graph background color</summary>
                </key>
 
                <key name="memload-color0" type="s">
                        <default>'#00b35b'</default>
-                       <_summary>Graph color for user-related memory usage</_summary>
+                       <summary>Graph color for user-related memory usage</summary>
                </key>
                <key name="memload-color1" type="s">
                        <default>'#00e675'</default>
-                       <_summary>Graph color for shared memory</_summary>
+                       <summary>Graph color for shared memory</summary>
                </key>
                <key name="memload-color2" type="s">
                        <default>'#00ff82'</default>
-                       <_summary>Graph color for buffer memory</_summary>
+                       <summary>Graph color for buffer memory</summary>
                </key>
                <key name="memload-color3" type="s">
                        <default>'#AAF5D0'</default>
-                       <_summary>Graph color for cached memory</_summary>
+                       <summary>Graph color for cached memory</summary>
                </key>
                <key name="memload-color4" type="s">
                        <default>'#000000'</default>
-                       <_summary>Memory graph background color</_summary>
+                       <summary>Memory graph background color</summary>
                </key>
 
                <key name="netload2-color0" type="s">
                        <default>'#fce94f'</default>
-                       <_summary>Graph color for input network activity</_summary>
+                       <summary>Graph color for input network activity</summary>
                </key>
                <key name="netload2-color1" type="s">
                        <default>'#edd400'</default>
-                       <_summary>Graph color for output network activity</_summary>
+                       <summary>Graph color for output network activity</summary>
                </key>
                <key name="netload2-color2" type="s">
                        <default>'#c4a000'</default>
-                       <_summary>Graph color for loopback network usage</_summary>
+                       <summary>Graph color for loopback network usage</summary>
                </key>
                <key name="netload2-color3" type="s">
                        <default>'#AAF5D0'</default>
-                       <_summary>Network graph background color</_summary>
+                       <summary>Network graph background color</summary>
                </key>
 
                <key name="swapload-color0" type="s">
                        <default>'#8b00c3'</default>
-                       <_summary>Graph color for user-related swap usage</_summary>
+                       <summary>Graph color for user-related swap usage</summary>
                </key>
                <key name="swapload-color1" type="s">
                        <default>'#edd400'</default>
-                       <_summary>Swap graph background color</_summary>
+                       <summary>Swap graph background color</summary>
                </key>
 
                <key name="loadavg-color0" type="s">
                        <default>'#d50000'</default>
-                       <_summary>Graph color for load average</_summary>
+                       <summary>Graph color for load average</summary>
                </key>
                <key name="loadavg-color1" type="s">
                        <default>'#edd400'</default>
-                       <_summary>Load graph background color</_summary>
+                       <summary>Load graph background color</summary>
                </key>
                
                <key name="diskload-color0" type="s">
                        <default>'#C65000'</default>
-                       <_summary>Graph color for disk read</_summary>
+                       <summary>Graph color for disk read</summary>
                </key>
                <key name="diskload-color1" type="s">
                        <default>'#FF6700'</default>
-                       <_summary>Graph color for disk write</_summary>
+                       <summary>Graph color for disk write</summary>
                </key>
                <key name="diskload-color2" type="s">
                        <default>'#c4a000'</default>
-                       <_summary>Background color for disk load graph</_summary>
+                       <summary>Background color for disk load graph</summary>
                </key>
                
                <key name="system-monitor" type="s">
                        <default>'gnome-system-monitor.desktop'</default>
-                       <_summary>The desktop description file to execute as the system monitor</_summary>
+                       <summary>The desktop description file to execute as the system monitor</summary>
                </key>
        </schema>
 </schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in
similarity index 57%
rename from data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in
index 20cc884e4..2f9e99c05 100644
--- a/data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in
@@ -3,56 +3,56 @@
 
     <key name="show-sum" type="b">
       <default>false</default>
-      <_summary>Show sum</_summary>
-      <_description>Show sum instead of in &amp; out</_description>
+      <summary>Show sum</summary>
+      <description>Show sum instead of in &amp; out</description>
     </key>
 
     <key name="show-bits" type="b">
       <default>false</default>
-      <_summary>Show bits</_summary>
-      <_description>Show bits instead of bytes</_description>
+      <summary>Show bits</summary>
+      <description>Show bits instead of bytes</description>
     </key>
 
     <key name="change-icon" type="b">
       <default>true</default>
-      <_summary>Change icon</_summary>
-      <_description>Change icon according to the selected device</_description>
+      <summary>Change icon</summary>
+      <description>Change icon according to the selected device</description>
     </key>
 
     <key name="auto-change-device" type="b">
       <default>true</default>
-      <_summary>Auto change device</_summary>
+      <summary>Auto change device</summary>
     </key>
 
     <key name="refresh-time" type="i">
       <default>1000</default>
-      <_summary>Refresh time</_summary>
-      <_description>Refresh time in milliseconds</_description>
+      <summary>Refresh time</summary>
+      <description>Refresh time in milliseconds</description>
     </key>
 
     <key name="device" type="s">
       <default>''</default>
-      <_summary>Network device</_summary>
+      <summary>Network device</summary>
     </key>
 
     <key name="up-command" type="s">
       <default>''</default>
-      <_summary>Up command</_summary>
+      <summary>Up command</summary>
     </key>
 
     <key name="down-command" type="s">
       <default>''</default>
-      <_summary>Down command</_summary>
+      <summary>Down command</summary>
     </key>
 
     <key name="in-color" type="s">
       <default>'#de2847'</default>
-      <_summary>In graph color</_summary>
+      <summary>In graph color</summary>
     </key>
 
     <key name="out-color" type="s">
       <default>'#3728de'</default>
-      <_summary>Out graph color</_summary>
+      <summary>Out graph color</summary>
     </key>
 
   </schema>
diff --git a/data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in 
b/data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in
new file mode 100644
index 000000000..853aa6f43
--- /dev/null
+++ b/data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in
@@ -0,0 +1,69 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+       <schema id="org.gnome.gnome-applets.stickynotes">
+               <key name="default-width" type="i">
+                       <default>100</default>
+                       <summary>Default width for new notes</summary>
+                       <description>Default width for new sticky notes in pixels.</description>
+               </key>
+               <key name="default-height" type="i">
+                       <default>100</default>
+                       <summary>Default height for new notes</summary>
+                       <description>Default height for new notes</description>
+               </key>
+               <key name="default-color" type="s">
+                       <default>'rgb(236,248,51)'</default>
+                       <summary>Default color for new notes</summary>
+                       <description>Default color for new sticky notes. This can be standard name, 
hexadecimal value, RGB color or RGBA color.</description>
+               </key>
+               <key name="default-font-color" type="s">
+                       <default>'rgb(0,0,0)'</default>
+                       <summary>Default color for font</summary>
+                       <description>Default font color for new sticky notes. This can be standard name, 
hexadecimal value, RGB color or RGBA color.</description>
+               </key>
+               <key name="default-font" type="s">
+                       <default>'Sans 10'</default>
+                       <summary>Default font for new notes</summary>
+                       <description>Default font for new sticky notes. This should be a Pango Font Name, for 
example "Sans Italic 10".</description>
+               </key>
+               <key name="sticky" type="b">
+                       <default>true</default>
+                       <summary>Sticky notes' workspace stickyness</summary>
+                       <description>Specifies whether the sticky notes are visible on ALL workspaces on the 
desktop, or not.</description>
+               </key>
+               <key name="locked" type="b">
+                       <default>false</default>
+                       <summary>Sticky notes' locked state</summary>
+                       <description>Specifies whether the sticky notes are locked (non-editable) or 
not.</description>
+               </key>
+               <key name="date-format" type="s">
+                       <default>'%x'</default>
+                       <summary>Date format of note's title</summary>
+                       <description>By default, sticky notes are given the current date as the title when 
they are created. This format is used; anything that can be parsed by strftime() is valid.</description>
+               </key>
+               <key name="use-system-color" type="b">
+                       <default>true</default>
+                       <summary>Whether to use the default system color</summary>
+                       <description>If this option is disabled, a custom color can be used as the default 
color for all sticky notes.</description>
+               </key>
+               <key name="use-system-font" type="b">
+                       <default>true</default>
+                       <summary>Whether to use the default system font</summary>
+                       <description>If this option is disabled, a custom font can be used as the default 
font for all sticky notes.</description>
+               </key>
+               <key name="force-default" type="b">
+                       <default>false</default>
+                       <summary>Whether to force the default color and font on all notes</summary>
+                       <description>If this option is enabled, the custom colors and fonts that have been 
assigned to individual notes will be ignored.</description>
+               </key>
+               <key name="desktop-hide" type="b">
+                       <default>true</default>
+                       <summary>Whether to hide all notes when the desktop is selected</summary>
+                       <description>If this option is enabled, selecting the desktop in any way will 
automatically hide all the open notes.</description>
+               </key>
+               <key name="confirm-deletion" type="b">
+                       <default>true</default>
+                       <summary>Whether to ask for confirmation when deleting a note</summary>
+                       <description>Empty notes are always deleted without confirmation.</description>
+               </key>
+       </schema>
+</schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in
similarity index 58%
rename from data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in
index 4482d184d..fefb7db86 100644
--- a/data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in
@@ -1,20 +1,20 @@
 <schemalist gettext-domain="@GETTEXT_PACKAGE@">
   <schema id="org.gnome.gnome-applets.timer">
     <key name="name" type="s">
-      <_default l10n="messages">'Timer'</_default>
-      <_summary>Name of timer</_summary>
+      <default l10n="messages">'Timer'</default>
+      <summary>Name of timer</summary>
     </key>
     <key name="duration" type="i">
       <default>10</default>
-      <_summary>Duration of timer in seconds</_summary>
+      <summary>Duration of timer in seconds</summary>
     </key>
     <key name="show-notification" type="b">
       <default>true</default>
-      <_summary>Show notification popup when timer finish</_summary>
+      <summary>Show notification popup when timer finish</summary>
     </key>
     <key name="show-dialog" type="b">
       <default>false</default>
-      <_summary>Show dialog window when timer finish</_summary>
+      <summary>Show dialog window when timer finish</summary>
     </key>
   </schema>
 </schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in
similarity index 70%
rename from data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in
index ac1e42f99..26af0ab36 100755
--- a/data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in
@@ -74,23 +74,23 @@
     </key>
     <key name="use-metacity-layout" type="b">
       <default>true</default>
-      <_summary>Determines whether we use custom or Metacity's button layout</_summary>
-      <_description>When disabled, this applet's button_layout string will be used to order the 
buttons.</_description>
+      <summary>Determines whether we use custom or Metacity's button layout</summary>
+      <description>When disabled, this applet's button_layout string will be used to order the 
buttons.</description>
     </key>
     <key name="button-layout" type="s">
       <default>'minimize,maximize,close'</default>
-      <_summary>Layout of buttons.</_summary>
-      <_description>Essentially a copy from Metacity's button_layout, but we can modify it for custom 
settings.</_description>
+      <summary>Layout of buttons.</summary>
+      <description>Essentially a copy from Metacity's button_layout, but we can modify it for custom 
settings.</description>
     </key>
     <key name="theme" type="s">
       <default>'default'</default>
-      <_summary>Button theme</_summary>
-      <_description>Name of a folder located in windowapplets/themes/ or "custom".</_description>
+      <summary>Button theme</summary>
+      <description>Name of a folder located in windowapplets/themes/ or "custom".</description>
     </key>
     <key name="orientation" type="i">
       <default>0</default>
-      <_summary>Button orientation</_summary>
-      <_description>May be used to set a static button orientation. Setting this value to 1 will ensure the 
buttons are always displayed horizontally. Setting it to 2 will do the same but vertically. The default 
setting 0 will set it automatically according to the panel.</_description>
+      <summary>Button orientation</summary>
+      <description>May be used to set a static button orientation. Setting this value to 1 will ensure the 
buttons are always displayed horizontally. Setting it to 2 will do the same but vertically. The default 
setting 0 will set it automatically according to the panel.</description>
     </key>
     <key name="button-minimize-hidden" type="b">
       <default>false</default>
@@ -103,33 +103,33 @@
     </key>
     <key name="hide-on-unmaximized" type="b">
       <default>false</default>
-      <_summary>Hides buttons when there are no windows present.</_summary>
-      <_description>When enabled, the buttons will disappear when there are no maximized (or active) windows 
on the screen.</_description>
+      <summary>Hides buttons when there are no windows present.</summary>
+      <description>When enabled, the buttons will disappear when there are no maximized (or active) windows 
on the screen.</description>
     </key>
     <key name="only-maximized" type="b">
       <default>true</default>
-      <_summary>Only control maximized windows.</_summary>
-      <_description>When enabled, the window buttons will always control the upper-most maximized 
window.</_description>
+      <summary>Only control maximized windows.</summary>
+      <description>When enabled, the window buttons will always control the upper-most maximized 
window.</description>
     </key>
     <key name="reverse-order" type="b">
       <default>false</default>
-      <_summary>Reverse the buttons placement.</_summary>
-      <_description>When enabled, the window buttons will be placed in reverse order (right to left instead 
of left to right, or bottom to top instead of top to bottom).</_description>
+      <summary>Reverse the buttons placement.</summary>
+      <description>When enabled, the window buttons will be placed in reverse order (right to left instead 
of left to right, or bottom to top instead of top to bottom).</description>
     </key>
     <key name="click-effect" type="b">
       <default>true</default>
-      <_summary>Enable click effect.</_summary>
-      <_description>When enabled, the button will change image to 'clicked' whenever it is 
clicked.</_description>
+      <summary>Enable click effect.</summary>
+      <description>When enabled, the button will change image to 'clicked' whenever it is 
clicked.</description>
     </key>
     <key name="hover-effect" type="b">
       <default>true</default>
-      <_summary>Enable hover effect.</_summary>
-      <_description>When enabled, the button will change image to 'hovered' whenever the mouse passes 
it.</_description>
+      <summary>Enable hover effect.</summary>
+      <description>When enabled, the button will change image to 'hovered' whenever the mouse passes 
it.</description>
     </key>
     <key name="show-tooltips" type="b">
       <default>false</default>
-      <_summary>Show tooltips on buttons.</_summary>
-      <_description>When enabled, each button will display its own tooltip, describing the function that it 
represents.</_description>
+      <summary>Show tooltips on buttons.</summary>
+      <description>When enabled, each button will display its own tooltip, describing the function that it 
represents.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in 
b/data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
similarity index 52%
rename from data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in
rename to data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
index c57f210b1..5b6785fdb 100644
--- a/data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in
+++ b/data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
@@ -2,24 +2,24 @@
     <schema id="org.gnome.gnome-applets.window-picker-applet">
         <key name="show-all-windows" type="b">
             <default>true</default>
-            <_summary>Show windows from all workspaces.</_summary>
+            <summary>Show windows from all workspaces.</summary>
         </key>
         <key name="show-home-title" type="b">
             <default>false</default>
-            <_summary>Show the home title and logout button in the window title if no window is selected and 
active (maximized)</_summary>
+            <summary>Show the home title and logout button in the window title if no window is selected and 
active (maximized)</summary>
         </key>
         <key name="show-application-title" type="b">
             <default>false</default>
-            <_summary>Show the application title when an application is active and maximized</_summary>
+            <summary>Show the application title when an application is active and maximized</summary>
         </key>
         <key name="icons-greyscale" type="b">
             <default>false</default>
-            <_summary>All icons except the current active window icon are greyed out.
-            Disable to have colored icons for all windows</_summary>
+            <summary>All icons except the current active window icon are greyed out.
+            Disable to have colored icons for all windows</summary>
         </key>
         <key name="expand-task-list" type="b">
             <default>false</default>
-            <_summary>Whether the task list will expand automatically and use all available space.</_summary>
+            <summary>Whether the task list will expand automatically and use all available space.</summary>
         </key>
     </schema>
 </schemalist>
diff --git a/data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in 
b/data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
new file mode 100755
index 000000000..3411bff94
--- /dev/null
+++ b/data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
@@ -0,0 +1,79 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.gnome.gnome-applets.window-title">
+    <key name="hide-on-unmaximized" type="b">
+      <default>false</default>
+      <summary>Hides title when there are no windows present.</summary>
+      <description>When enabled, the title will disappear when there are no maximized (or active) windows on 
the screen.</description>
+    </key>
+    <key name="only-maximized" type="b">
+      <default>true</default>
+      <summary>Only control maximized windows.</summary>
+      <description>When enabled, the window title will always display the upper-most maximized window's 
name.</description>
+    </key>
+    <key name="alignment" type="d">
+      <default>0.5</default>
+      <summary>Set the title alignment.</summary>
+      <description>Legal values are between 0 and 1.</description>
+    </key>
+    <key name="swap-order" type="b">
+      <default>false</default>
+      <summary>Swap icon and title.</summary>
+      <description>When enabled, window title will be on the left side and the icon on the right 
side.</description>
+    </key>
+    <key name="expand-applet" type="b">
+      <default>true</default>
+      <summary>Expand the applet</summary>
+      <description>When enabled, the applet will use up all available space in the panel.</description>
+    </key>
+    <key name="hide-icon" type="b">
+      <default>false</default>
+      <summary>Hide the icon</summary>
+      <description>When enabled, the window icon will not be displayed.</description>
+    </key>
+    <key name="hide-title" type="b">
+      <default>false</default>
+      <summary>Hide the title</summary>
+      <description>When enabled, the window title will not be displayed.</description>
+    </key>
+    <key name="show-tooltips" type="b">
+      <default>false</default>
+      <summary>Show tooltips over title and icon</summary>
+      <description>When enabled, a tooltip carrying the name of the currently active window will be 
shown.</description>
+    </key>
+    <key name="title-size" type="i">
+      <default>16</default>
+      <summary>Minimal title size</summary>
+      <description>This size is used when the applet is not expanded or otherwise to determine the minimal 
size the title label can be shrunk to. The value represents the amount of pixels either in width or height, 
depending on the panel orientation.</description>
+    </key>
+    <key name="custom-style" type="b">
+      <default>false</default>
+      <summary>Use a custom style.</summary>
+      <description>When enabled, custom font style and color will be used. When disabled, system theme 
defaults will be used.</description>
+    </key>
+    <key name="show-window-menu" type="b">
+      <default>false</default>
+      <summary>Show the window action menu on right click.</summary>
+      <description>Will cause the window action menu to appear when the title is right-clicked. This 
experimental feature is still under development! Warning! In current feature state you will be unable to 
access the applet action menu via title-right click when this option is enabled! You may still do so by 
right-clicking the icon if it is not hidden.</description>
+    </key>
+    <key name="title-active-font" type="s">
+      <default>'Sans 10'</default>
+      <summary>Active title font.</summary>
+      <description>Font name and size for the active window state.</description>
+    </key>
+    <key name="title-inactive-font" type="s">
+      <default>'Sans 10'</default>
+      <summary>Inactive title font.</summary>
+      <description>Font name and size for the inactive window state.</description>
+    </key>
+    <key name="title-active-color-fg" type="s">
+      <default>'#000000'</default>
+      <summary>Active title foreground color.</summary>
+      <description>Title foreground color in hex format for the active window state.</description>
+    </key>
+    <key name="title-inactive-color-fg" type="s">
+      <default>'#808080'</default>
+      <summary>Inactive title foreground color.</summary>
+      <description>Title foreground color in hex format for the inactive window state.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/gnome-applets/cpufreq/cpufreq-selector/Makefile.am 
b/gnome-applets/cpufreq/cpufreq-selector/Makefile.am
index 238dbd10b..0f782a71f 100644
--- a/gnome-applets/cpufreq/cpufreq-selector/Makefile.am
+++ b/gnome-applets/cpufreq/cpufreq-selector/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 dbus_services_in_files = org.gnome.CPUFreqSelector.service.in
 dbus_conf_files = org.gnome.CPUFreqSelector.conf
-polkit_in_files = org.gnome.cpufreqselector.policy.in
+polkit_files = org.gnome.cpufreqselector.policy
 
 if BUILD_CPUFREQ_SELECTOR
 bin_PROGRAMS = cpufreq-selector
@@ -43,9 +43,7 @@ dbus_confdir = $(sysconfdir)/dbus-1/system.d
 dbus_conf_DATA = $(dbus_conf_files)
 
 polkitdir = $(datadir)/polkit-1/actions
-polkit_DATA = $(polkit_in_files:.policy.in=.policy)
-
-@INTLTOOL_POLICY_RULE@
+polkit_DATA = $(polkit_files)
 
 cpufreq-selector-gen.h:
 cpufreq-selector-gen.c: ../org.gnome.CPUFreqSelector.xml
@@ -61,14 +59,13 @@ BUILT_SOURCES = \
 CLEANFILES = \
        $(BUILT_SOURCES) \
        $(dbus_services_DATA) \
-       $(polkit_DATA) \
        $(NULL)
 endif
 
 EXTRA_DIST = \
        $(dbus_services_in_files) \
        $(dbus_conf_files) \
-       $(polkit_in_files) \
+       $(polkit_files) \
        $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy.in 
b/gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy
similarity index 100%
rename from gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy.in
rename to gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 000000000..2a203d197
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,79 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 
--keyword=g_dngettext:2,3 --add-comments
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = GNOME Applets authors
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU = no
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://gitlab.gnome.org/GNOME/gnome-applets/issues
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = yes
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
+
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fe7efec1e..fddd4bb96 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,97 +1,96 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 #
-[encoding: UTF-8]
-data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.command.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in.in
-data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in.in
-[type: gettext/glade]gnome-applets/accessx-status/accessx-status-applet-menu.ui
+data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.command.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
+gnome-applets/accessx-status/accessx-status-applet-menu.ui
 gnome-applets/accessx-status/accessx-status-applet.c
-[type: gettext/glade]gnome-applets/battstat/battstat-applet-menu.ui
-[type: gettext/glade]gnome-applets/battstat/battstat-applet.ui
+gnome-applets/battstat/battstat-applet-menu.ui
+gnome-applets/battstat/battstat-applet.ui
 gnome-applets/battstat/battstat-applet.c
 gnome-applets/battstat/properties.c
-[type: gettext/glade]gnome-applets/brightness/brightness-applet-menu.ui
+gnome-applets/brightness/brightness-applet-menu.ui
 gnome-applets/brightness/brightness-applet.c
-[type: gettext/glade]gnome-applets/charpick/charpick-applet-menu.ui
+gnome-applets/charpick/charpick-applet-menu.ui
 gnome-applets/charpick/charpick-applet.c
 gnome-applets/charpick/properties.c
-[type: gettext/glade]gnome-applets/command/command-applet-menu.ui
+gnome-applets/command/command-applet-menu.ui
 gnome-applets/command/command-applet.c
-[type: gettext/glade]gnome-applets/cpufreq/cpufreq-applet-menu.ui
-[type: gettext/glade]gnome-applets/cpufreq/cpufreq-preferences.ui
+gnome-applets/cpufreq/cpufreq-applet-menu.ui
+gnome-applets/cpufreq/cpufreq-preferences.ui
 gnome-applets/cpufreq/cpufreq-applet.c
 gnome-applets/cpufreq/cpufreq-popup.c
 gnome-applets/cpufreq/cpufreq-prefs.c
-gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy.in
-[type: gettext/glade]gnome-applets/drivemount/drivemount-applet-menu.ui
+gnome-applets/cpufreq/cpufreq-selector/org.gnome.cpufreqselector.policy
+gnome-applets/drivemount/drivemount-applet-menu.ui
 gnome-applets/drivemount/drive-button.c
 gnome-applets/drivemount/drivemount-applet.c
 gnome-applets/ga-module.c
-[type: gettext/glade]gnome-applets/geyes/geyes-applet-menu.ui
+gnome-applets/geyes/geyes-applet-menu.ui
 gnome-applets/geyes/geyes-applet.c
 gnome-applets/geyes/themes.c
-[type: gettext/glade]gnome-applets/gweather/gweather-applet-menu.ui
+gnome-applets/gweather/gweather-applet-menu.ui
 gnome-applets/gweather/gweather-applet.c
 gnome-applets/gweather/gweather-dialog.c
 gnome-applets/gweather/gweather-pref.c
-[type: gettext/glade]gnome-applets/inhibit/inhibit-applet-menu.ui
+gnome-applets/inhibit/inhibit-applet-menu.ui
 gnome-applets/inhibit/inhibit-applet.c
 gnome-applets/mini-commander/about.c
 gnome-applets/mini-commander/command-line.c
 gnome-applets/mini-commander/help.c
 gnome-applets/mini-commander/mini-commander-applet.c
-[type: gettext/glade]gnome-applets/mini-commander/mini-commander-applet-menu.ui
-[type: gettext/glade]gnome-applets/mini-commander/mini-commander.ui
+gnome-applets/mini-commander/mini-commander-applet-menu.ui
+gnome-applets/mini-commander/mini-commander.ui
 gnome-applets/mini-commander/preferences.c
-[type: gettext/glade]gnome-applets/multiload/multiload-applet-menu.ui
+gnome-applets/multiload/multiload-applet-menu.ui
 gnome-applets/multiload/multiload-applet.c
 gnome-applets/multiload/netspeed.c
 gnome-applets/multiload/properties.c
-[type: gettext/glade]gnome-applets/netspeed/netspeed-menu.ui
+gnome-applets/netspeed/netspeed-menu.ui
 gnome-applets/netspeed/netspeed-applet.c
 gnome-applets/netspeed/preferences.c
 gnome-applets/sticky-notes/sticky-notes-applet.c
 gnome-applets/sticky-notes/sticky-notes-applet-callbacks.c
 gnome-applets/sticky-notes/sticky-notes-callbacks.c
 gnome-applets/sticky-notes/sticky-notes.c
-[type: gettext/glade]gnome-applets/sticky-notes/ui/sticky-notes-applet-menu.ui
-[type: gettext/glade]gnome-applets/sticky-notes/ui/sticky-notes-delete-all.ui
-[type: gettext/glade]gnome-applets/sticky-notes/ui/sticky-notes-delete.ui
-[type: gettext/glade]gnome-applets/sticky-notes/ui/sticky-notes-note-menu.ui
-[type: gettext/glade]gnome-applets/sticky-notes/ui/sticky-notes-note.ui
-[type: gettext/glade]gnome-applets/sticky-notes/ui/sticky-notes-preferences.ui
-[type: gettext/glade]gnome-applets/sticky-notes/ui/sticky-notes-properties.ui
-[type: gettext/glade]gnome-applets/timer/timer-applet-menu.ui
+gnome-applets/sticky-notes/ui/sticky-notes-applet-menu.ui
+gnome-applets/sticky-notes/ui/sticky-notes-delete-all.ui
+gnome-applets/sticky-notes/ui/sticky-notes-delete.ui
+gnome-applets/sticky-notes/ui/sticky-notes-note-menu.ui
+gnome-applets/sticky-notes/ui/sticky-notes-note.ui
+gnome-applets/sticky-notes/ui/sticky-notes-preferences.ui
+gnome-applets/sticky-notes/ui/sticky-notes-properties.ui
+gnome-applets/timer/timer-applet-menu.ui
 gnome-applets/timer/timer-applet.c
 gnome-applets/tracker-search-bar/tracker-applet.c
 gnome-applets/tracker-search-bar/tracker-results-window.c
-[type: gettext/glade]gnome-applets/tracker-search-bar/tracker-search-bar-menu.ui
-[type: gettext/glade]gnome-applets/tracker-search-bar/tracker-search-bar.ui
+gnome-applets/tracker-search-bar/tracker-search-bar-menu.ui
+gnome-applets/tracker-search-bar/tracker-search-bar.ui
 gnome-applets/trash/trash-applet.c
 gnome-applets/trash/trash-empty.c
-[type: gettext/glade]gnome-applets/trash/trash-empty.ui
-[type: gettext/glade]gnome-applets/trash/trash-menu.ui
+gnome-applets/trash/trash-empty.ui
+gnome-applets/trash/trash-menu.ui
 gnome-applets/window-buttons/window-buttons.c
-[type: gettext/glade]gnome-applets/window-buttons/window-buttons.ui
-[type: gettext/glade]gnome-applets/window-buttons/window-buttons-menu.ui
+gnome-applets/window-buttons/window-buttons.ui
+gnome-applets/window-buttons/window-buttons-menu.ui
 gnome-applets/window-picker/task-item.c
 gnome-applets/window-picker/wp-about-dialog.c
 gnome-applets/window-picker/wp-applet.c
-[type: gettext/glade]gnome-applets/window-picker/wp-menu.ui
-[type: gettext/glade]gnome-applets/window-picker/wp-preferences-dialog.ui
+gnome-applets/window-picker/wp-menu.ui
+gnome-applets/window-picker/wp-preferences-dialog.ui
 gnome-applets/window-picker/wp-task-title.c
-[type: gettext/glade]gnome-applets/window-title/window-title.ui
-[type: gettext/glade]gnome-applets/window-title/window-title-menu.ui
+gnome-applets/window-title/window-title.ui
+gnome-applets/window-title/window-title-menu.ui
 gnome-applets/window-title/window-title.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 303519707..a231be6a1 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -3,17 +3,17 @@
 # Please keep this file sorted alphabetically (in the ASCII sense:
 # upper-case before lower-case).
 #
-data/schemas/org.gnome.gnome-applets.battstat.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.charpick.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.command.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.geyes.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.gweather.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.multiload.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.timer.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml.in
-data/schemas/org.gnome.gnome-applets.window-title.gschema.xml.in
+data/schemas/org.gnome.gnome-applets.battstat.gschema.xml
+data/schemas/org.gnome.gnome-applets.charpick.gschema.xml
+data/schemas/org.gnome.gnome-applets.command.gschema.xml
+data/schemas/org.gnome.gnome-applets.cpufreq.gschema.xml
+data/schemas/org.gnome.gnome-applets.geyes.gschema.xml
+data/schemas/org.gnome.gnome-applets.gweather.gschema.xml
+data/schemas/org.gnome.gnome-applets.mini-commander.gschema.xml
+data/schemas/org.gnome.gnome-applets.multiload.gschema.xml
+data/schemas/org.gnome.gnome-applets.netspeed.gschema.xml
+data/schemas/org.gnome.gnome-applets.stickynotes.gschema.xml
+data/schemas/org.gnome.gnome-applets.timer.gschema.xml
+data/schemas/org.gnome.gnome-applets.window-buttons.gschema.xml
+data/schemas/org.gnome.gnome-applets.window-picker-applet.gschema.xml
+data/schemas/org.gnome.gnome-applets.window-title.gschema.xml


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]