On po 27. dubna 2009, Klaus Ethgen wrote:
> Hi,
>
> Am Mo den 27. Apr 2009 um 22:25 schrieb Vladimir Nadvornik:
> > There is a bug report that GQview should use desktop file
> > translations[1]. This seems to be useful for us too. Does anybody have
> > any experience with it?
> >
> > [1]http://sourceforge.net/tracker/?func=detail&aid=2504393&group_id=4050&;
> >atid=104050
>
> No idea. Well, it has gqview in it but if it works, lets try.
>
This is the patch adapted for geeqie. It seems to work on clean svn checkout,
make update-po includes the desktop file strings in the po files and the
translations are added back to the desktop file.
I am however still not sure if it is completely correct. Please test.
There is at least a conflict with the po/Makefile.in.in patch. Laurent, can
you please look into it?
Vladimir
Index: configure.in
===================================================================
--- configure.in (revision 1691)
+++ configure.in (working copy)
@@ -128,7 +128,9 @@
AC_PROG_CXX
AC_STDC_HEADERS
AC_ARG_PROGRAM
+IT_PROG_INTLTOOL([0.35.0])
+
dnl checks for functions
AC_CHECK_FUNCS(strverscmp access fsync fflush)
Index: geeqie.desktop
===================================================================
--- geeqie.desktop (revision 1691)
+++ geeqie.desktop (working copy)
@@ -1,14 +1,7 @@
[Desktop Entry]
Name=Geeqie
GenericName=Image Viewer
-GenericName[et]=Piltide vaatur
-GenericName[tr]=Resim göstericisi
-GenericName[fr]=Explorateur d'images
-GenericName[hu]=Képnéző
-GenericName[es]=Visor de imágenes
Comment=View and manage images
-Comment[hu]=Képek megjelenítése és rendszerezése
-Comment[es]=Visualiza y administra imágenes
Exec=geeqie -r %F
Icon=geeqie
Type=Application
Index: Makefile.am
===================================================================
--- Makefile.am (revision 1691)
+++ Makefile.am (working copy)
@@ -11,7 +11,9 @@
readme_DATA = README COPYING ChangeLog TODO README.lirc
desktopdir = $(datadir)/applications
-desktop_DATA = geeqie.desktop
+desktop_in_files = geeqie.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+...@intltool_desktop_rule@
icondir = $(datadir)/pixmaps
icon_DATA = geeqie.png
Index: autogen.sh
===================================================================
--- autogen.sh (revision 1691)
+++ autogen.sh (working copy)
@@ -35,6 +35,12 @@
}
}
+(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`intltoolize' installed"
+ DIE=1
+}
+
(automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`automake' installed."
@@ -99,9 +105,11 @@
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running glib-gettextize..."
echo "no" | glib-gettextize --force --copy
- if [ -r po/Makefile.in.in.patch ]; then
- patch po/Makefile.in.in < po/Makefile.in.in.patch
- fi
+ echo "Running intltoolize"
+ intltoolize --copy --force --automake
+# if [ -r po/Makefile.in.in.patch ]; then
+# patch po/Makefile.in.in < po/Makefile.in.in.patch
+# fi
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
Index: geeqie.desktop.in
===================================================================
--- geeqie.desktop.in (revision 0)
+++ geeqie.desktop.in (revision 0)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=Geeqie
+_GenericName=Image Viewer
+_Comment=View and manage images
+Exec=geeqie -r %F
+Icon=geeqie
+Type=Application
+Terminal=false
+# Startup notification disabled, since the remote -r switch may not open a new window...
+#StartupNotify=false
+#StartupWMClass=geeqie
+NotShowIn=X-Geeqie;
+Categories=Application;Graphics;Viewer;
+MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-cmu-raster;image/x-sun-raster;image/x-tga;image/tiff;image/vnd.wap.wbmp;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;image/x-png;image/xpm;image/x-ico;image/x-pcx;
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in (revision 1691)
+++ po/POTFILES.in (working copy)
@@ -1,3 +1,4 @@
+./geeqie.desktop.in
./src/advanced_exif.c
./src/bar.c
./src/bar_comment.c
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel
