Complete commit @1747 (intltool usage)

With using intltool the localisation will fail cause of missing
desktop.in file. Also the old desktop files are obsoleted by this
commit.

Also it is not necessary any more to have a './' in front of the files
in POTFILES.in.

diff --git a/geeqie.desktop b/geeqie.desktop.in
similarity index 90%
rename from geeqie.desktop
rename to geeqie.desktop.in
index e74a0dd..edc67d6 100644 (file)
--- a/geeqie.desktop
+++ b/geeqie.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Geeqie
-GenericName=Image Viewer
-Comment=View and manage images
+_Name=Geeqie
+_GenericName=Image Viewer
+_Comment=View and manage images
 Exec=geeqie -r %F
 Icon=geeqie
 Type=Application

diff --git a/plugins/rotate/rotate.desktop b/plugins/rotate/rotate.desktop
deleted file mode 100644 (file)
index 2257da9..0000000
--- a/plugins/rotate/rotate.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Apply the orientation to image content
-
-# call the helper script
-Exec=geeqie-rotate %f
-
-# Desktop files that are usable only in Geeqie should be marked like this:
-Categories=X-Geeqie;
-OnlyShowIn=X-Geeqie;
-
-# Show in menu "Edit/Orientation"
-X-Geeqie-Menu-Path=EditMenu/OrientationMenu
-
-# It can be made verbose
-# X-Geeqie-Verbose=true
-
-MimeType=image/jpeg;image/png;image/tiff;

diff --git a/plugins/symlink/symlink.desktop b/plugins/symlink/symlink.desktop
deleted file mode 100644 (file)
index f82a706..0000000
--- a/plugins/symlink/symlink.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Symlink
-
-# call the helper script
-Exec=geeqie-symlink %f
-
-# Desktop files that are usable only in Geeqie should be marked like this:
-Categories=X-Geeqie;
-OnlyShowIn=X-Geeqie;
-
-# Show in menu "File"
-X-Geeqie-Menu-Path=FileMenu/FileOpsSection
-
-# This is a filter - $GEEQIE_DESTINATION is required
-X-Geeqie-Filter=true
-
-# It can be made verbose
-# X-Geeqie-Verbose=true

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3e1818e..c7753b7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,60 +1,62 @@
-./geeqie.desktop.in
-./plugins/rotate/rotate.desktop.in
-./plugins/symlink/symlink.desktop.in
-./src/advanced_exif.c
-./src/bar.c
-./src/bar_comment.c
-./src/bar_exif.c
-./src/bar_gps.c
-./src/bar_histogram.c
-./src/bar_keywords.c
-./src/bar_sort.c
-./src/cache.c
-./src/cache_maint.c
-./src/collect-dlg.c
-./src/collect-io.c
-./src/collect-table.c
-./src/collect.c
-./src/color-man.c
-./src/desktop_file.c
-./src/dupe.c
-./src/editors.c
-./src/exif-common.c
-./src/exif.c
-./src/filedata.c
-./src/fullscreen.c
-./src/histogram.c
-./src/history_list.c
-./src/image-overlay.c
-./src/image.c
-./src/img-view.c
-./src/layout.c
-./src/layout_config.c
-./src/layout_image.c
-./src/layout_util.c
-./src/lirc.c
-./src/logwindow.c
-./src/main.c
-./src/menu.c
-./src/metadata.c
-./src/options.c
-./src/pan-view.c
-./src/preferences.c
-./src/print.c
-./src/rcfile.c
-./src/remote.c
-./src/search.c
-./src/secure_save.c
-./src/thumb.c
-./src/trash.c
-./src/ui_bookmark.c
-./src/ui_fileops.c
-./src/ui_help.c
-./src/ui_pathsel.c
-./src/ui_tabcomp.c
-./src/utilops.c
-./src/view_dir.c
-./src/view_file.c
-./src/view_file_icon.c
-./src/view_file_list.c
-./src/window.c
+geeqie.desktop.in
+plugins/rotate/rotate.desktop.in
+plugins/symlink/symlink.desktop.in
+plugins/ufraw/geeqie-ufraw-recursive.desktop.in
+plugins/ufraw/geeqie-ufraw.desktop.in
+src/advanced_exif.c
+src/bar.c
+src/bar_comment.c
+src/bar_exif.c
+src/bar_gps.c
+src/bar_histogram.c
+src/bar_keywords.c
+src/bar_sort.c
+src/cache.c
+src/cache_maint.c
+src/collect-dlg.c
+src/collect-io.c
+src/collect-table.c
+src/collect.c
+src/color-man.c
+src/desktop_file.c
+src/dupe.c
+src/editors.c
+src/exif-common.c
+src/exif.c
+src/filedata.c
+src/fullscreen.c
+src/histogram.c
+src/history_list.c
+src/image-overlay.c
+src/image.c
+src/img-view.c
+src/layout.c
+src/layout_config.c
+src/layout_image.c
+src/layout_util.c
+src/lirc.c
+src/logwindow.c
+src/main.c
+src/menu.c
+src/metadata.c
+src/options.c
+src/pan-view.c
+src/preferences.c
+src/print.c
+src/rcfile.c
+src/remote.c
+src/search.c
+src/secure_save.c
+src/thumb.c
+src/trash.c
+src/ui_bookmark.c
+src/ui_fileops.c
+src/ui_help.c
+src/ui_pathsel.c
+src/ui_tabcomp.c
+src/utilops.c
+src/view_dir.c
+src/view_file.c
+src/view_file_icon.c
+src/view_file_list.c
+src/window.c