aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-19 03:07:24 (GMT)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-28 11:15:10 (GMT)
commit63e66a576086d64c1d94a6a1eb5564bec1b72744 (patch)
tree97b73d1bbe5ba22d3e1dad8bcbfb8c3b06edf55a
parent1af74353182e22ff17748bdf8ffc3cc2c180fd3f (diff)
Auto-translate camera.desktop
Add the needed logic to auto-translate camera.desktop. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Makefile.am23
-rw-r--r--Makefile.in37
-rw-r--r--camorama.desktop.in4
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac2
-rw-r--r--po/LINGUAS48
-rw-r--r--po/POTFILES.in2
7 files changed, 76 insertions, 44 deletions
diff --git a/Makefile.am b/Makefile.am
index e4bc823..d1ab325 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,21 +5,15 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
SUBDIRS = src pixmaps data po
EXTRA_DIST = autogen.sh \
- camorama.desktop \
camorama.desktop.in \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES=\
- camorama.desktop \
+ camorama.desktop \
po/camorama.pot
-DISTCLEANFILES=\
- intltool-extract\
- intltool-merge \
- intltool-update
-
pixmapdir = $(datadir)/pixmaps
install-data-local:
@@ -28,12 +22,12 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pixmapdir); \
$(mkinstalldirs) $(DESTDIR)$(datadir)/camorama/pixmaps; \
for pixmap in $(srcdir)/pixmaps/*.png; do \
- if test -f $$pixmap; then \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pixmapdir); \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/camorama/pixmaps; \
- fi \
- done \
- fi
+ if test -f $$pixmap; then \
+ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pixmapdir); \
+ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/camorama/pixmaps; \
+ fi \
+ done \
+fi
dist-hook:
if test -d pixmaps; then \
@@ -45,4 +39,5 @@ dist-hook:
done \
fi
-
+camorama.desktop: camorama.desktop.in
+ msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
diff --git a/Makefile.in b/Makefile.in
index c27f201..9d93f85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,7 +99,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = camorama.desktop
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -187,11 +187,10 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/camorama.desktop.in \
- $(srcdir)/config.h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
- INSTALL NEWS README THANKS TODO compile config.guess \
- config.rpath config.sub depcomp install-sh missing \
- mkinstalldirs
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
+ TODO compile config.guess config.rpath config.sub depcomp \
+ install-sh missing mkinstalldirs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -362,21 +361,15 @@ desktop_in_files = camorama.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
SUBDIRS = src pixmaps data po
EXTRA_DIST = autogen.sh \
- camorama.desktop \
camorama.desktop.in \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
CLEANFILES = \
- camorama.desktop \
+ camorama.desktop \
po/camorama.pot
-DISTCLEANFILES = \
- intltool-extract\
- intltool-merge \
- intltool-update
-
pixmapdir = $(datadir)/pixmaps
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -430,8 +423,6 @@ $(srcdir)/config.h.in: $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-camorama.desktop: $(top_builddir)/config.status $(srcdir)/camorama.desktop.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
@@ -786,7 +777,6 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -888,12 +878,12 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pixmapdir); \
$(mkinstalldirs) $(DESTDIR)$(datadir)/camorama/pixmaps; \
for pixmap in $(srcdir)/pixmaps/*.png; do \
- if test -f $$pixmap; then \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pixmapdir); \
- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/camorama/pixmaps; \
- fi \
- done \
- fi
+ if test -f $$pixmap; then \
+ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pixmapdir); \
+ $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/camorama/pixmaps; \
+ fi \
+ done \
+fi
dist-hook:
if test -d pixmaps; then \
@@ -905,6 +895,9 @@ dist-hook:
done \
fi
+camorama.desktop: camorama.desktop.in
+ msgfmt --desktop -d $(top_srcdir)/po --template $< -o $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/camorama.desktop.in b/camorama.desktop.in
index d80e6e2..9a7f080 100644
--- a/camorama.desktop.in
+++ b/camorama.desktop.in
@@ -1,6 +1,6 @@
[Desktop Entry]
-_Name=Camorama Webcam Viewer
-_Comment=View, alter and save images from a webcam
+Name=Camorama Webcam Viewer
+Comment=View, alter and save images from a webcam
Exec=camorama
Terminal=0
Type=Application
diff --git a/configure b/configure
index 59fae43..cb09250 100755
--- a/configure
+++ b/configure
@@ -2780,7 +2780,6 @@ $as_echo "#define PACKAGE camorama" >>confdefs.h
$as_echo "#define VERSION 0.19" >>confdefs.h
-ALL_LINGUAS="am ar az be bg bs ca cs da de dz en_CA en_GB es eu fa fi fr ga gl gu hi hr it ja lv mk ml ms nb ne nl pa pl pt pt_BR rw sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
@@ -8430,7 +8429,7 @@ fi
-ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/camorama.schemas camorama.desktop pixmaps/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/camorama.schemas pixmaps/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -9182,7 +9181,6 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/camorama.schemas") CONFIG_FILES="$CONFIG_FILES data/camorama.schemas" ;;
- "camorama.desktop") CONFIG_FILES="$CONFIG_FILES camorama.desktop" ;;
"pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
diff --git a/configure.ac b/configure.ac
index c033014..9110723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,6 @@ AM_CONFIG_HEADER(config.h)
AC_DEFINE(PACKAGE, AC_PACKAGE_NAME, [package name])
AC_DEFINE(VERSION, AC_PACKAGE_VERSION, [package version])
-ALL_LINGUAS="am ar az be bg bs ca cs da de dz en_CA en_GB es eu fa fi fr ga gl gu hi hr it ja lv mk ml ms nb ne nl pa pl pt pt_BR rw sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
AM_GNU_GETTEXT_VERSION([0.19.8])
AM_GNU_GETTEXT([external])
@@ -50,7 +49,6 @@ AC_OUTPUT([
src/Makefile
data/Makefile
data/camorama.schemas
- camorama.desktop
pixmaps/Makefile
po/Makefile.in
])
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..bf32415
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,48 @@
+am
+ar
+az
+be
+bg
+bs
+ca
+cs
+da
+de
+dz
+en_CA
+en_GB
+es
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+hi
+hr
+it
+ja
+lv
+mk
+ml
+ms
+nb
+ne
+nl
+pa
+pl
+pt
+pt_BR
+rw
+sl
+sq
+sr
+sr@Latn
+sv
+ta
+tr
+uk
+vi
+zh_CN
+zh_TW
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 46ed19a..ad19fde 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
camorama.appdata.xml
-camorama.desktop
+camorama.desktop.in
data/camorama.glade
data/camorama.schemas
src/callbacks.c

Privacy Policy