[gnome-panel] use upstream gettext



commit 3edb228a3fcb518fda04a45f6e3f9e32820ee4c6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Nov 1 00:27:35 2016 +0200

    use upstream gettext

 Makefile.am                                        |   12 ++
 autogen.sh                                         |    2 -
 configure.ac                                       |   22 ++--
 data/Makefile.am                                   |   51 +++-----
 .../org.gnome.gnome-panel.applet.clock.gschema.xml |   57 ++++++++
 ...nome.gnome-panel.applet.clock.gschema.xml.in.in |   57 --------
 data/org.gnome.gnome-panel.applet.fish.gschema.xml |   30 ++++
 ...gnome.gnome-panel.applet.fish.gschema.xml.in.in |   30 ----
 ...nome.gnome-panel.applet.window-list.gschema.xml |   25 ++++
 ...nome-panel.applet.window-list.gschema.xml.in.in |   25 ----
 ...ome-panel.applet.workspace-switcher.gschema.xml |   20 +++
 ...nel.applet.workspace-switcher.gschema.xml.in.in |   20 ---
 data/org.gnome.gnome-panel.gschema.xml             |   96 +++++++++++++
 data/org.gnome.gnome-panel.gschema.xml.in.in       |   96 -------------
 data/org.gnome.gnome-panel.launcher.gschema.xml    |    9 ++
 ...rg.gnome.gnome-panel.launcher.gschema.xml.in.in |    9 --
 data/org.gnome.gnome-panel.menu-button.gschema.xml |   19 +++
 ...gnome.gnome-panel.menu-button.gschema.xml.in.in |   19 ---
 data/org.gnome.gnome-panel.object.gschema.xml      |   24 ++++
 .../org.gnome.gnome-panel.object.gschema.xml.in.in |   24 ----
 data/org.gnome.gnome-panel.toplevel.gschema.xml    |  145 ++++++++++++++++++++
 ...rg.gnome.gnome-panel.toplevel.gschema.xml.in.in |  145 --------------------
 gnome-panel/Makefile.am                            |    4 +-
 gnome-panel/gnome-panel.desktop.in.in              |    4 +-
 po/Makevars                                        |   78 +++++++++++
 po/POTFILES.in                                     |   41 +++---
 po/POTFILES.skip                                   |    9 --
 27 files changed, 571 insertions(+), 502 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 10bd077..e1e1a64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,10 +26,22 @@ MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
        $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
        `find "$(srcdir)/m4" -type f -name "*.m4" -print` \
+       $(srcdir)/ABOUT-NLS \
        $(srcdir)/INSTALL \
        $(srcdir)/config.h.in~ \
        $(srcdir)/configure \
        $(srcdir)/gtk-doc.make \
+       $(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-panel.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 5133615..6529e77 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,9 +24,7 @@ fi
 
 set -x
 aclocal --install || exit 1
-glib-gettextize --force --copy || exit 1
 gtkdocize --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 fc8548f..3553737 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,18 @@ LT_PREREQ([2.2.6])
 LT_INIT([dlopen disable-static])
 LT_LIB_M
 
+dnl **************************************************************************
+dnl Internationalization
+dnl **************************************************************************
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.4])
+
+GETTEXT_PACKAGE=gnome-panel
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+                   [Name of default gettext domain])
+
 # Before making a release, the LT_VERSION string should be modified.
 # The string is of the form C:R:A.
 # - If interfaces have been changed or added, but binary compatibility has
@@ -76,8 +88,6 @@ AC_ARG_ENABLE([documentation],
        [], [enable_documentation=yes])
 AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
 
-IT_PROG_INTLTOOL([0.40.6])
-
 AC_PROG_CC
 
 AM_PATH_PYTHON
@@ -200,14 +210,6 @@ dnl Applets dir
 AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/applets")
 AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/applets")
 
-dnl  Language Support
-
-GETTEXT_PACKAGE=gnome-panel-3.0
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define the gettext package to be used])
-AC_SUBST(GETTEXT_PACKAGE)
-
-AM_GLIB_GNU_GETTEXT
-
 dnl gtk-doc stuff
 
 GTK_DOC_CHECK([1.25], [--flavour no-tmpl])
diff --git a/data/Makefile.am b/data/Makefile.am
index 6ca9dc9..e825c5b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,47 +6,34 @@ SUBDIRS = \
        theme \
        $(NULL)
 
-gsettings_applets_schemas_in_in =                                              \
-       org.gnome.gnome-panel.applet.fish.gschema.xml.in.in                     \
-       org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in              \
-       org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in       \
-       org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
-
-gsettings_panel_schemas_in_in =                                        \
-       org.gnome.gnome-panel.gschema.xml.in.in                 \
-       org.gnome.gnome-panel.launcher.gschema.xml.in.in        \
-       org.gnome.gnome-panel.menu-button.gschema.xml.in.in     \
-       org.gnome.gnome-panel.object.gschema.xml.in.in          \
-       org.gnome.gnome-panel.toplevel.gschema.xml.in.in
-
-gsettings_schemas_in_in =                      \
-       $(gsettings_panel_schemas_in_in)        \
-       $(gsettings_applets_schemas_in_in)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
 gsettings_ENUM_NAMESPACE = org.gnome.gnome-panel
 gsettings_ENUM_FILES = $(top_srcdir)/gnome-panel/panel-enums-gsettings.h
 
-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
-       $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < 
$< > $@
+gsettings_SCHEMAS = \
+       org.gnome.gnome-panel.applet.fish.gschema.xml \
+       org.gnome.gnome-panel.applet.window-list.gschema.xml \
+       org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml \
+       org.gnome.gnome-panel.applet.clock.gschema.xml \
+       org.gnome.gnome-panel.gschema.xml \
+       org.gnome.gnome-panel.launcher.gschema.xml \
+       org.gnome.gnome-panel.menu-button.gschema.xml \
+       org.gnome.gnome-panel.object.gschema.xml \
+       org.gnome.gnome-panel.toplevel.gschema.xml \
+       $(NULL)
 
 @GSETTINGS_RULES@
 
 default_layoutdir   = $(datadir)/gnome-panel
 default_layout_DATA = panel-default-layout.layout
 
-EXTRA_DIST =                           \
-       $(gsettings_schemas_in_in)      \
-       $(default_layout_DATA)
+EXTRA_DIST = \
+       $(gsettings_SCHEMAS) \
+       $(default_layout_DATA) \
+       $(NULL)
 
-CLEANFILES =                   \
-       $(gsettings__enum_file) \
-       $(gsettings_SCHEMAS_in) \
-       $(gsettings_SCHEMAS)    \
-       *.gschema.valid
+CLEANFILES = \
+       *.gschema.valid \
+       $(gsettings__enum_file) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.gnome-panel.applet.clock.gschema.xml 
b/data/org.gnome.gnome-panel.applet.clock.gschema.xml
new file mode 100644
index 0000000..3b9ae70
--- /dev/null
+++ b/data/org.gnome.gnome-panel.applet.clock.gschema.xml
@@ -0,0 +1,57 @@
+<schemalist gettext-domain="gnome-panel">
+  <schema id="org.gnome.gnome-panel.applet.clock">
+    <key name="show-tooltip" type="b">
+      <default>true</default>
+      <summary>Show date in tooltip</summary>
+      <description>If true, show date in a tooltip when the pointer is over the clock.</description>
+    </key>
+    <key name="show-weather" type="b">
+      <default>true</default>
+      <summary>Show weather in clock</summary>
+      <description>If true, display a weather icon.</description>
+    </key>
+    <key name="show-temperature" type="b">
+      <default>true</default>
+      <summary>Show temperature in clock</summary>
+      <description>If true, show the temperature next to the weather icon.</description>
+    </key>
+    <key name="show-weeks" type="b">
+      <default>true</default>
+      <summary>Show week numbers in calendar</summary>
+      <description>If true, show week numbers in the calendar.</description>
+    </key>
+    <key name="expand-appointments" type="b">
+      <default>false</default>
+      <summary>Expand list of appointments</summary>
+      <description>If true, expand the list of appointments in the calendar window.</description>
+    </key>
+    <key name="expand-birthdays" type="b">
+      <default>false</default>
+      <summary>Expand list of birthdays</summary>
+      <description>If true, expand the list of birthdays in the calendar window.</description>
+    </key>
+    <key name="expand-tasks" type="b">
+      <default>false</default>
+      <summary>Expand list of tasks</summary>
+      <description>If true, expand the list of tasks in the calendar window.</description>
+    </key>
+    <key name="expand-weather" type="b">
+      <default>false</default>
+      <summary>Expand list of weather information</summary>
+      <description>If true, expand the list of weather information in the calendar window.</description>
+    </key>
+    <key name="expand-locations" type="b">
+      <default>false</default>
+      <summary>Expand list of locations</summary>
+      <description>If true, expand the list of locations in the calendar window.</description>
+    </key>
+    <key name="cities" type="a(ssm(dd))">
+      <default>[]</default>
+      <summary>List of locations</summary>
+      <description>
+         A list of locations to display in the calendar window. Each location is a tuple of
+         display name, METAR code and coordinates.
+      </description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.applet.fish.gschema.xml 
b/data/org.gnome.gnome-panel.applet.fish.gschema.xml
new file mode 100644
index 0000000..51ba770
--- /dev/null
+++ b/data/org.gnome.gnome-panel.applet.fish.gschema.xml
@@ -0,0 +1,30 @@
+<schemalist gettext-domain="gnome-panel">
+  <schema id="org.gnome.gnome-panel.applet.fish">
+    <key name="name" type="s">
+      <default>'Wanda'</default>
+      <summary>The fish's name</summary>
+      <description>A fish without a name is a pretty dull fish. Bring your fish to life by naming 
him.</description>
+    </key>
+    <key name="image" type="s">
+      <default>'wanda.fish'</default>
+      <summary>The fish's animation pixmap</summary>
+      <description>This key specifies the filename of the pixmap which will be used for the animation 
displayed in the fish applet relative to the pixmap directory.</description>
+    </key>
+    <key name="command" type="s">
+      <default>'fortune'</default>
+      <summary>Command to execute on click</summary>
+      <description>This key specifies the command that will be tried to execute when the fish is 
clicked.</description>
+    </key>
+    <key name="speed" type="d">
+      <default>0.3</default>
+      <range min="0.01" max="10.0"/>
+      <summary>Pause per frame</summary>
+      <description>This key specifies the number of seconds each frame will be displayed.</description>
+    </key>
+    <key name="rotate" type="b">
+      <default>false</default>
+      <summary>Rotate on vertical panels</summary>
+      <description>If true, the fish's animation will be displayed rotated on vertical panels.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.applet.window-list.gschema.xml 
b/data/org.gnome.gnome-panel.applet.window-list.gschema.xml
new file mode 100644
index 0000000..124badb
--- /dev/null
+++ b/data/org.gnome.gnome-panel.applet.window-list.gschema.xml
@@ -0,0 +1,25 @@
+<schemalist gettext-domain="gnome-panel">
+  <enum id="org.gnome.gnome-panel.applet.window-list.grouping">
+    <value nick='never-group' value='0'/>
+    <value nick='auto-group' value='1'/>
+    <value nick='always-group' value='2'/>
+  </enum>
+
+  <schema id="org.gnome.gnome-panel.applet.window-list">
+    <key name="display-all-workspaces" type="b">
+      <default>false</default>
+      <summary>Show windows from all workspaces</summary>
+      <description>If true, the window list will show windows from all workspaces. Otherwise it will only 
display windows from the current workspace.</description>
+    </key>
+    <key name="group-windows" enum="org.gnome.gnome-panel.applet.window-list.grouping">
+      <default>'never-group'</default>
+      <summary>When to group windows</summary>
+      <description>Decides when to group windows from the same application on the window list. Possible 
values are "never", "auto" and "always".</description>
+    </key>
+    <key name="move-unminimized-windows" type="b">
+      <default>true</default>
+      <summary>Move windows to current workspace when unminimized</summary>
+      <description>If true, then when unminimizing a window, move it to the current workspace. Otherwise, 
switch to the workspace of the window.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml 
b/data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
new file mode 100644
index 0000000..d50b79c
--- /dev/null
+++ b/data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
@@ -0,0 +1,20 @@
+<schemalist gettext-domain="gnome-panel">
+  <schema id="org.gnome.gnome-panel.applet.workspace-switcher">
+    <key name="display-workspace-names" type="b">
+      <default>false</default>
+      <summary>Display workspace names</summary>
+      <description>If true, the workspaces in the workspace switcher will display the names of the 
workspaces. Otherwise they will display the windows on the workspace. This setting only works when the window 
manager is Metacity.</description>
+    </key>
+    <key name="display-all-workspaces" type="b">
+      <default>true</default>
+      <summary>Display all workspaces</summary>
+      <description>If true, the workspace switcher will show all workspaces. Otherwise it will only show the 
current workspace.</description>
+    </key>
+    <key name="num-rows" type="i">
+      <default>1</default>
+      <range min='1' max='16'/>
+      <summary>Rows in workspace switcher</summary>
+      <description>This key specifies how many rows (for horizontal layout) or columns (for vertical layout) 
the workspace switcher shows the workspaces in. This key is only relevant if the display_all_workspaces key 
is true.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.gschema.xml b/data/org.gnome.gnome-panel.gschema.xml
new file mode 100644
index 0000000..0071866
--- /dev/null
+++ b/data/org.gnome.gnome-panel.gschema.xml
@@ -0,0 +1,96 @@
+<schemalist gettext-domain="gnome-panel">
+
+  <schema id="org.gnome.gnome-panel" path="/org/gnome/gnome-panel/">
+    <child name="general" schema="org.gnome.gnome-panel.general"/>
+    <child name="layout" schema="org.gnome.gnome-panel.layout"/>
+    <child name="lockdown" schema="org.gnome.gnome-panel.lockdown"/>
+    <child name="run-dialog" schema="org.gnome.gnome-panel.run-dialog"/>
+  </schema>
+
+  <enum id='org.gnome.gnome-panel.icon-size'>
+    <value nick='16px' value='1'/>
+    <value nick='24px' value='3'/>
+    <value nick='32px' value='5'/>
+    <value nick='48px' value='6'/>
+  </enum>
+
+  <schema id="org.gnome.gnome-panel.general" path="/org/gnome/gnome-panel/general/">
+    <key name="enable-tooltips" type="b">
+      <default>true</default>
+      <summary>Enable tooltips</summary>
+      <description>If true, tooltips are shown for objects in panels. Tooltips can be disabled for the whole 
desktop with the gtk-enable-tooltips property in GTK+.</description>
+    </key>
+    <key name="confirm-panel-removal" type="b">
+      <default>true</default>
+      <summary>Confirm panel removal</summary>
+      <description>If true, a dialog is shown asking for confirmation if the user wants to remove a 
panel.</description>
+    </key>
+    <key name="panel-menu" enum="org.gnome.gnome-panel.icon-size">
+      <default>'24px'</default>
+      <summary>Icon size in the menus</summary>
+    </key>
+    <key name="panel-menu-bar" enum="org.gnome.gnome-panel.icon-size">
+      <default>'16px'</default>
+      <summary>Icon size for only Applications item in the Menu Bar applet</summary>
+    </key>
+    <key name="theme-variant" enum="org.gnome.gnome-panel.PanelThemeVariant">
+      <default>'system'</default>
+      <summary>Which theme variant to use</summary>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.gnome-panel.layout" path="/org/gnome/gnome-panel/layout/">
+    <key name="toplevel-id-list" type="as">
+      <default>[]</default>
+      <summary>Panel ID list</summary>
+      <description>A list of panel IDs. Each ID identifies an individual toplevel panel. The settings for 
each of these panels are stored in /apps/panel/toplevels/$(id).</description>
+    </key>
+    <key name="object-id-list" type="as">
+      <default>[]</default>
+      <summary>Panel object ID list</summary>
+      <description>A list of panel object IDs. Each ID identifies an individual panel object (e.g. an 
applet, launcher, action button or menu button/bar). The settings for each of these objects are stored in 
/apps/panel/objects/$(id).</description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.gnome-panel.lockdown" path="/org/gnome/gnome-panel/lockdown/">
+    <key name="locked-down" type="b">
+      <default>false</default>
+      <summary>Complete panel lockdown</summary>
+      <description>If true, the panel will not allow any changes to the configuration of the panel.  
Individual applets may need to be locked down separately however. The panel must be restarted for this to 
take effect.</description>
+    </key>
+    <key name="disabled-applets" type="as">
+      <default>[]</default>
+      <summary>Applet IIDs to disable from loading</summary>
+      <description>A list of applet IIDs that the panel will ignore.  This way you can disable certain 
applets from loading or showing up in the menu. For example to disable the mini-commander applet add 
'OAFIID:GNOME_MiniCommanderApplet' to this list.  The panel must be restarted for this to take 
effect.</description>
+    </key>
+    <key name="disable-force-quit" type="b">
+      <default>false</default>
+      <summary>Disable Force Quit</summary>
+      <description>If true, the panel will not allow a user to force an application to quit by removing 
access to the force quit button.</description>
+    </key>
+  </schema>
+
+  <schema id="org.gnome.gnome-panel.run-dialog" path="/org/gnome/gnome-panel/run-dialog/">
+    <key type="as" name="history">
+      <default>[]</default>
+      <summary>History of "Run Application" dialog</summary>
+      <description>The list of commands used in the past in the "Run Application" dialog.</description>
+    </key>
+    <key name="enable-program-list" type="b">
+      <default>true</default>
+      <summary>Enable program list in "Run Application" dialog</summary>
+      <description>If true, the "Known Applications" listing in the "Run Application" dialog is made 
available. Whether or not the listing is expanded when the dialog is shown is controlled by the 
show_program_list key.</description>
+    </key>
+    <key name="show-program-list" type="b">
+      <default>false</default>
+      <summary>Expand program list in "Run Application" dialog</summary>
+      <description>If true, the "Known Applications" listing in the "Run Application" dialog is expanded 
when the dialog is opened. This key is only relevant if the enable_program_list key is true.</description>
+    </key>
+    <key name="enable-autocompletion" type="b">
+      <default>true</default>
+      <summary>Enable autocompletion in "Run Application" dialog</summary>
+      <description>If true, autocompletion in the "Run Application" dialog is made available.</description>
+    </key>
+  </schema>
+
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.launcher.gschema.xml b/data/org.gnome.gnome-panel.launcher.gschema.xml
new file mode 100644
index 0000000..a788cdd
--- /dev/null
+++ b/data/org.gnome.gnome-panel.launcher.gschema.xml
@@ -0,0 +1,9 @@
+<schemalist gettext-domain="gnome-panel">
+  <schema id="org.gnome.gnome-panel.launcher">
+    <key name="location" type="s">
+      <default>''</default>
+      <summary>Launcher location</summary>
+      <description>The location of the .desktop file describing the launcher. This key is only relevant if 
the object_type key is "launcher-object".</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.menu-button.gschema.xml 
b/data/org.gnome.gnome-panel.menu-button.gschema.xml
new file mode 100644
index 0000000..d86254f
--- /dev/null
+++ b/data/org.gnome.gnome-panel.menu-button.gschema.xml
@@ -0,0 +1,19 @@
+<schemalist gettext-domain="gnome-panel">
+  <schema id="org.gnome.gnome-panel.menu-button">
+    <key name="tooltip" type="s">
+      <default>''</default>
+      <summary>Tooltip displayed for menu</summary>
+      <description>The text to display in a tooltip for this menu.</description>
+    </key>
+    <key name="custom-icon" type="s">
+      <default>''</default>
+      <summary>Icon used for button</summary>
+      <description>The location of the image file used as the icon for the object's button. If empty, the 
default icon for the menu will be used.</description>
+    </key>
+    <key name="menu-path" type="s">
+      <default>''</default>
+      <summary>Menu content path</summary>
+      <description>The path from which the menu contents is constructed. If empty, the menu will be the 
default applications menu.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.object.gschema.xml b/data/org.gnome.gnome-panel.object.gschema.xml
new file mode 100644
index 0000000..1e7e344
--- /dev/null
+++ b/data/org.gnome.gnome-panel.object.gschema.xml
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="gnome-panel">
+  <schema id="org.gnome.gnome-panel.object">
+    <key name="object-iid" type="s">
+      <default>''</default>
+      <summary>Object IID</summary>
+      <description>The implementation ID of the object - e.g. 
"ClockAppletFactory::ClockApplet".</description>
+    </key>
+    <key name="toplevel-id" type="s">
+      <default>''</default>
+      <summary>Toplevel panel containing object</summary>
+      <description>The identifier of the toplevel panel which contains this object.</description>
+    </key>
+    <key name="pack-type" enum="org.gnome.gnome-panel.PanelObjectPackType">
+      <default>'start'</default>
+      <summary>Interpret position relative to bottom/right edge</summary>
+      <description>If set to 'end', the position of the object is interpreted relative to the right (or 
bottom if vertical) edge of the panel.</description>
+    </key>
+    <key name="pack-index" type="i">
+      <default>0</default>
+      <summary>Object's position on the panel</summary>
+      <description>The position of this panel object. The position is specified by the number of pixels from 
the left (or top if vertical) panel edge.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.gnome-panel.toplevel.gschema.xml b/data/org.gnome.gnome-panel.toplevel.gschema.xml
new file mode 100644
index 0000000..873549a
--- /dev/null
+++ b/data/org.gnome.gnome-panel.toplevel.gschema.xml
@@ -0,0 +1,145 @@
+<schemalist gettext-domain="gnome-panel">
+  <schema id="org.gnome.gnome-panel.toplevel">
+    <key name="name" type="s">
+      <default>''</default>
+      <summary>Name to identify panel</summary>
+      <description>This is a human readable name which you can use to identify a panel. Its main purpose is 
to serve as the panel's window title which is useful when navigating between panels.</description>
+    </key>
+    <key name="monitor" type="i">
+      <default>0</default>
+      <summary>Xinerama monitor where the panel is displayed</summary>
+      <description>In a Xinerama setup, you may have panels on each individual monitor. This key identifies 
the current monitor the panel is displayed on.</description>
+    </key>
+    <key name="expand" type="b">
+      <default>true</default>
+      <summary>Expand to occupy entire screen width</summary>
+      <description>If true, the panel will occupy the entire screen width (height if this is a vertical 
panel). In this mode the panel can only be placed at a screen edge. If false, the panel will only be large 
enough to accommodate the applets, launchers and buttons on the panel.</description>
+    </key>
+    <key name="orientation" enum="org.gnome.gnome-panel.PanelOrientation">
+      <default>'top'</default>
+      <summary>Panel orientation</summary>
+      <description>The orientation of the panel. Possible values are "top", "bottom", "left", "right". In 
expanded mode the key specifies which screen edge the panel is on. In un-expanded mode the difference between 
"top" and "bottom" is less important - both indicate that this is a horizontal panel - but still give a 
useful hint as to how some panel objects should behave. For example, on a "top" panel a menu button will pop 
up its menu below the panel, whereas on a "bottom" panel the menu will be popped up above the 
panel.</description>
+    </key>
+    <key name="size" type="i">
+      <default>24</default>
+      <summary>Panel size</summary>
+      <description>The height (width for a vertical panel) of the panel. The panel will determine at runtime 
a minimum size based on the font size and other indicators. The maximum size is fixed at one quarter of the 
screen height (or width).</description>
+    </key>
+    <key name="x" type="i">
+      <default>0</default>
+      <summary>X co-ordinate of panel</summary>
+      <description>The location of the panel along the x-axis. This key is only relevant in un-expanded 
mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the 
orientation key.</description>
+    </key>
+    <key name="y" type="i">
+      <default>0</default>
+      <summary>Y co-ordinate of panel</summary>
+      <description>The location of the panel along the y-axis. This key is only relevant in un-expanded 
mode. In expanded mode this key is ignored and the panel is placed at the screen edge specified by the 
orientation key.</description>
+    </key>
+    <key name="x-right" type="i">
+      <default>-1</default>
+      <summary>X co-ordinate of panel, starting from the right of the screen</summary>
+      <description>The location of the panel along the x-axis, starting from the right of  the screen. If 
set to -1, the value is ignored and the value of the x key is used. If the value is greater than 0, then the 
value of the x key is ignored. This key is only relevant in un-expanded mode. In expanded mode this key is 
ignored and the panel is placed at the screen edge specified by the orientation key.</description>
+    </key>
+    <key name="y-bottom" type="i">
+      <default>-1</default>
+      <summary>Y co-ordinate of panel, starting from the bottom of the screen</summary>
+      <description>The location of the panel along the y-axis, starting from the bottom of  the screen. If 
set to -1, the value is ignored and the value of the y key is used. If the value is greater than 0, then the 
value of the y key is ignored. This key is only relevant in un-expanded mode. In expanded mode this key is 
ignored and the panel is placed at the screen edge specified by the orientation key.</description>
+    </key>
+    <key name="x-centered" type="b">
+      <default>false</default>
+      <summary>Center panel on x-axis</summary>
+      <description>If true, the x and x_right keys are ignored and the panel is placed at the center of the 
x-axis of the screen. If the panel is resized it will remain at that position - i.e. the panel will grow on 
both sides. If false, the x and x_right keys specify the location of the panel.</description>
+    </key>
+    <key name="y-centered" type="b">
+      <default>false</default>
+      <summary>Center panel on y-axis</summary>
+      <description>If true, the y and y_bottom keys are ignored and the panel is placed at the center of the 
y-axis of the screen. If the panel is resized it will remain at that position - i.e. the panel will grow on 
both sides. If false, the y and y_bottom keys specify the location of the panel.</description>
+    </key>
+    <key name="auto-hide" type="b">
+      <default>false</default>
+      <summary>Automatically hide panel into corner</summary>
+      <description>If true, the panel is automatically hidden into a corner of the screen when the pointer 
leaves the panel area. Moving the pointer to that corner again will cause the panel to 
re-appear.</description>
+    </key>
+    <key name="enable-buttons" type="b">
+      <default>false</default>
+      <summary>Enable hide buttons</summary>
+      <description>If true, buttons will be placed on each side of the panel which may be used to move the 
panel to edge of the screen, leaving only a button showing.</description>
+    </key>
+    <key name="enable-arrows" type="b">
+      <default>true</default>
+      <summary>Enable arrows on hide buttons</summary>
+      <description>If true, arrows will be placed on the hide buttons. This key is only relevant if the 
enable_buttons key is true.</description>
+    </key>
+    <key name="hide-delay" type="i">
+      <default>300</default>
+      <range min='0' max='10000'/>
+      <summary>Panel autohide delay</summary>
+      <description>Specifies the number of milliseconds delay after the pointer leaves the panel area before 
the panel is automatically hidden. This key is only relevant if the auto_hide key is true.</description>
+    </key>
+    <key name="unhide-delay" type="i">
+      <default>100</default>
+      <range min='0' max='10000'/>
+      <summary>Panel autounhide delay</summary>
+      <description>Specifies the number of milliseconds delay after the pointer enters the panel area before 
the panel is automatically re-shown. This key is only relevant if the auto_hide key is true.</description>
+    </key>
+    <key name="auto-hide-size" type="i">
+      <default>1</default>
+      <range min='1' max='100'/>
+      <summary>Visible pixels when hidden</summary>
+      <description>Specifies the number of pixels visible when the panel is automatically hidden into a 
corner. This key is only relevant if the auto_hide key is true.</description>
+    </key>
+    <key name="animation-speed" enum="org.gnome.gnome-panel.PanelAnimationSpeed">
+      <default>'fast'</default>
+      <summary>Animation speed</summary>
+      <description>The speed in which panel animations should occur. Possible values are "slow", "medium" 
and "fast". This key is only relevant if the enable_animations key is true.</description>
+    </key>
+    <child name="theme" schema="org.gnome.gnome-panel.toplevel.theme"/>
+  </schema>
+
+  <schema id="org.gnome.gnome-panel.toplevel.theme">
+
+    <key name="custom-bg-color" type="b">
+      <default>false</default>
+      <summary>Use custom background color</summary>
+    </key>
+
+    <key name="bg-color" type="s">
+      <default>'#000000'</default>
+      <summary>Background Color</summary>
+    </key>
+
+    <key name="custom-bg-image" type="b">
+      <default>false</default>
+      <summary>Use custom background image</summary>
+    </key>
+
+    <key name="bg-image" type="s">
+      <default>''</default>
+      <summary>Background image</summary>
+      <description>Specifies the file to be used for the background image. If the image contains an alpha 
channel it will be composited onto the desktop background image.</description>
+    </key>
+
+    <key name="bg-image-style" enum="org.gnome.gnome-panel.PanelBackgroundImageStyle">
+      <default>'none'</default>
+      <summary>Image options</summary>
+      <description>Determines how the image set by image-uri is rendered. Possible values are "none", 
"stretch", "fit". With "stretch", the image will be scaled to the panel dimensions and the aspect ratio of 
the image will not be maintained. With "fit", the image will be scaled (retaining the aspect ratio of the 
image) to the panel height (if horizontal).</description>
+    </key>
+
+    <key name="bg-image-rotate" type="b">
+      <default>false</default>
+      <summary>Rotate image on vertical panels</summary>
+      <description>If true, the background image will be rotated when the panel is oriented 
vertically.</description>
+    </key>
+
+    <key name="custom-fg-color" type="b">
+      <default>false</default>
+      <summary>Use custom text color</summary>
+    </key>
+
+    <key name="fg-color" type="s">
+      <default>'#ffffff'</default>
+      <summary>Text Color</summary>
+    </key>
+
+  </schema>
+</schemalist>
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 4c4bee5..d397ad7 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -223,7 +223,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 %.desktop.in: %.desktop.in.in
        $(AM_V_GEN) sed -e 's,[@]VERSION[@],$(VERSION),g' < $< > $@
 
-@INTLTOOL_DESKTOP_RULE@
+%.desktop: %.desktop.in
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
+               -d $(top_srcdir)/po && mv $@-t $@
 
 EXTRA_DIST =                                   \
        $(ui_FILES)                             \
diff --git a/gnome-panel/gnome-panel.desktop.in.in b/gnome-panel/gnome-panel.desktop.in.in
index 0877786..0007dc7 100644
--- a/gnome-panel/gnome-panel.desktop.in.in
+++ b/gnome-panel/gnome-panel.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-_Name=Panel
-_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
+Name=Panel
+Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
 Icon=gnome-panel
 Exec=gnome-panel
 Terminal=false
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..5b96a1f
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# 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_
+
+# 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 = Free Software Foundation, Inc.
+
+# 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 =
+
+# 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 =
+
+# 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 = no
+
+# 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 593a9f6..b6bfdc1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,49 +1,48 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
 applets/clock/calendar-client.c
 applets/clock/calendar-window.c
 applets/clock/clock-applet.c
 applets/clock/clock-location.c
 applets/clock/clock-location-tile.c
 applets/clock/clock-module.c
-[type: gettext/glade]applets/clock/clock-menu.ui
-[type: gettext/glade]applets/clock/clock.ui
+applets/clock/clock-menu.ui
+applets/clock/clock.ui
 applets/clock/clock-utils.c
 applets/fish/fish-applet.c
 applets/fish/fish-module.c
-[type: gettext/glade]applets/fish/fish-menu.ui
-[type: gettext/glade]applets/fish/fish.ui
+applets/fish/fish-menu.ui
+applets/fish/fish.ui
 applets/notification-area/na-applet.c
 applets/notification-area/na-module.c
 applets/notification-area/na-tray-manager.c
 applets/status-notifier/sn-module.c
 applets/wncklet/showdesktop.c
 applets/wncklet/window-list.c
-[type: gettext/glade]applets/wncklet/window-list-menu.ui
-[type: gettext/glade]applets/wncklet/window-list.ui
+applets/wncklet/window-list-menu.ui
+applets/wncklet/window-list.ui
 applets/wncklet/window-menu.c
 applets/wncklet/wncklet.c
 applets/wncklet/wncklet-module.c
 applets/wncklet/workspace-switcher.c
-[type: gettext/glade]applets/wncklet/workspace-switcher-menu.ui
-[type: gettext/glade]applets/wncklet/workspace-switcher.ui
-data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
-data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
-data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
-data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in.in
-data/org.gnome.gnome-panel.gschema.xml.in.in
-data/org.gnome.gnome-panel.launcher.gschema.xml.in.in
-data/org.gnome.gnome-panel.menu-button.gschema.xml.in.in
-data/org.gnome.gnome-panel.object.gschema.xml.in.in
-data/org.gnome.gnome-panel.toplevel.gschema.xml.in.in
+applets/wncklet/workspace-switcher-menu.ui
+applets/wncklet/workspace-switcher.ui
+data/org.gnome.gnome-panel.applet.clock.gschema.xml
+data/org.gnome.gnome-panel.applet.fish.gschema.xml
+data/org.gnome.gnome-panel.applet.window-list.gschema.xml
+data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
+data/org.gnome.gnome-panel.gschema.xml
+data/org.gnome.gnome-panel.launcher.gschema.xml
+data/org.gnome.gnome-panel.menu-button.gschema.xml
+data/org.gnome.gnome-panel.object.gschema.xml
+data/org.gnome.gnome-panel.toplevel.gschema.xml
 gnome-panel/applet.c
 gnome-panel/button-widget.c
 gnome-panel/gnome-desktop-item-edit.c
 gnome-panel/gnome-panel.desktop.in.in
 gnome-panel/gp-arrow-button.c
 gnome-panel/gp-properties-dialog.c
-[type: gettext/glade]gnome-panel/gp-properties-dialog.ui
+gnome-panel/gp-properties-dialog.ui
 gnome-panel/launcher.c
 gnome-panel/libpanel-applet-private/gp-applet-frame.c
 gnome-panel/libpanel-util/panel-error.c
@@ -54,7 +53,7 @@ gnome-panel/main.c
 gnome-panel/menu.c
 gnome-panel/panel-action-button.c
 gnome-panel/panel-addto-dialog.c
-[type: gettext/glade]gnome-panel/panel-addto-dialog.ui
+gnome-panel/panel-addto-dialog.ui
 gnome-panel/panel-applet-frame.c
 gnome-panel/panel-bindings.c
 gnome-panel/panel.c
@@ -69,7 +68,7 @@ gnome-panel/panel-menu-items.c
 gnome-panel/panel-image-menu-item.c
 gnome-panel/panel-recent.c
 gnome-panel/panel-run-dialog.c
-[type: gettext/glade]gnome-panel/panel-run-dialog.ui
+gnome-panel/panel-run-dialog.ui
 gnome-panel/panel-separator.c
 gnome-panel/panel-stock-icons.c
 gnome-panel/panel-toplevel.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 2909b39..ab627b0 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,12 +1,3 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-data/org.gnome.gnome-panel.applet.clock.gschema.xml.in
-data/org.gnome.gnome-panel.applet.fish.gschema.xml.in
-data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in
-data/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml.in
-data/org.gnome.gnome-panel.gschema.xml.in
-data/org.gnome.gnome-panel.launcher.gschema.xml.in
-data/org.gnome.gnome-panel.menu-button.gschema.xml.in
-data/org.gnome.gnome-panel.object.gschema.xml.in
-data/org.gnome.gnome-panel.toplevel.gschema.xml.in
 gnome-panel/gnome-panel.desktop.in



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