Updating branch refs/heads/master
to 94988e9aac5c756a8e3801f05fe803497a2e09d2 (commit)
from 56afc8476e9b8241775b8b332832de3e35ae283a (commit)
commit 94988e9aac5c756a8e3801f05fe803497a2e09d2
Author: Nick Schermer <[email protected]>
Date: Thu Nov 4 19:40:03 2010 +0100
Rename the glade .xml files to .glade.
It turns out the translation strings are not
extracted from .xml files, while this works
fine for .glade files.
po/POTFILES.in | 4 ++--
settings/Makefile.am | 8 ++++----
...> xfdesktop-settings-appearance-frame-ui.glade} | 0
...settings-ui.xml => xfdesktop-settings-ui.glade} | 0
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4d78d48..123841e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,8 @@ common/xfdesktop-common.c
settings/main.c
settings/xfce-backdrop-settings.desktop.in
-settings/xfdesktop-settings-appearance-frame-ui.xml
-settings/xfdesktop-settings-ui.xml
+settings/xfdesktop-settings-appearance-frame-ui.glade
+settings/xfdesktop-settings-ui.glade
src/main.c
src/menu.c
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 4897f44..7e36d30 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -47,14 +47,14 @@ BUILT_SOURCES = \
SUFFIXES: .ui
-%-ui.h: $(srcdir)/%-ui.xml Makefile
- $(AM_V_GEN) exo-csource --static --name=`basename $< .xml | sed -e
's/-/_/g'` $< >$@
+%-ui.h: $(srcdir)/%-ui.glade Makefile
+ $(AM_V_GEN) exo-csource --static --name=`basename $< .glade | sed -e
's/-/_/g'` $< >$@
endif
EXTRA_DIST = \
- xfdesktop-settings-ui.xml \
- xfdesktop-settings-appearance-frame-ui.xml \
+ xfdesktop-settings-ui.glade \
+ xfdesktop-settings-appearance-frame-ui.glade \
$(desktop_in_files)
CLEANFILES = \
diff --git a/settings/xfdesktop-settings-appearance-frame-ui.xml
b/settings/xfdesktop-settings-appearance-frame-ui.glade
similarity index 100%
rename from settings/xfdesktop-settings-appearance-frame-ui.xml
rename to settings/xfdesktop-settings-appearance-frame-ui.glade
diff --git a/settings/xfdesktop-settings-ui.xml
b/settings/xfdesktop-settings-ui.glade
similarity index 100%
rename from settings/xfdesktop-settings-ui.xml
rename to settings/xfdesktop-settings-ui.glade
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
