From 2e14b902516a9f53e41b9c77110de108bca27245 Mon Sep 17 00:00:00 2001 From: Monsta Date: Mon, 15 Jun 2015 15:37:54 +0300 Subject: fixes for gschema translation taken from https://git.gnome.org/browse/eog/commit/?id=8f83ae4397bf7a477a154e5712b799fa43c60187 - bumped required intltool version to 0.50.1 - renamed and corrected gschema xml for proper intltool usage - sorted lines in po/POTFILES.in (as requested in the header) - removed obsolete lines from po/POTFILES.skip --- configure.ac | 3 +- data/Makefile.am | 23 +++--- data/org.mate.eom.gschema.xml.in | 138 ++++++++++++++++++++++++++++++++++++ data/org.mate.eom.gschema.xml.in.in | 138 ------------------------------------ po/POTFILES.in | 16 ++--- po/POTFILES.skip | 3 - 6 files changed, 157 insertions(+), 164 deletions(-) create mode 100644 data/org.mate.eom.gschema.xml.in delete mode 100644 data/org.mate.eom.gschema.xml.in.in diff --git a/configure.ac b/configure.ac index 6c6be66..5c3c0af 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ fi # *********** AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.40.0]) +IT_PROG_INTLTOOL([0.50.1]) GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) @@ -499,6 +499,7 @@ po/Makefile.in data/Makefile data/eom.pc data/eom.desktop.in +data/org.mate.eom.gschema.xml data/pixmaps/Makefile data/icons/Makefile data/icons/16x16/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 9a52d83..17331e2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -20,9 +20,6 @@ gsettings_ENUM_FILES = $(top_srcdir)/src/eom-scroll-view.h \ gsettings_SCHEMAS = org.mate.eom.gschema.xml @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - convertdir = $(datadir)/MateConf/gsettings convert_DATA = eom.convert @@ -40,20 +37,18 @@ pkgconfig_DATA = eom.pc gtkrcdir = $(pkgdatadir) gtkrc_DATA = gtkrc -EXTRA_DIST = \ +EXTRA_DIST = \ $(gtkrc_DATA) \ - $(ui_DATA) \ - $(convert_DATA) \ + $(ui_DATA) \ + $(convert_DATA) \ $(DESKTOP_IN_FILES) \ - $(appdata_in_files) \ - $(gsettings_SCHEMAS).in.in + $(appdata_in_files) -CLEANFILES = \ - eom.appdata.xml +CLEANFILES = \ + $(appdata_DATA) -DISTCLEANFILES = \ - $(DESKTOP_FILES) \ - $(gsettings_SCHEMAS_in) \ - $(gsettings_SCHEMAS) +DISTCLEANFILES = \ + $(DESKTOP_FILES) \ + $(gsettings_SCHEMAS) -include $(top_srcdir)/git.mk diff --git a/data/org.mate.eom.gschema.xml.in b/data/org.mate.eom.gschema.xml.in new file mode 100644 index 0000000..92c430b --- /dev/null +++ b/data/org.mate.eom.gschema.xml.in @@ -0,0 +1,138 @@ + + + + + + + + + + true + Automatic orientation + Whether the image should be rotated automatically based on EXIF orientation. + + + '#000000' + Background Color + The color that is used to fill the area behind the image. If the use-background-color key is not set, the color is determined by the active GTK+ theme instead. + + + true + Use a custom background color + If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color. + + + true + Interpolate Image + Whether the image should be interpolated on zoom-out. This leads to better quality but is somewhat slower than non-interpolated images. + + + true + Extrapolate Image + Whether the image should be extrapolated on zoom-in. This leads to blurry quality and is somewhat slower than non-extrapolated images. + + + 'checked' + Transparency indicator + Determines how transparency should be indicated. Valid values are checked, color and none. If color is chosen, then the trans-color key determines the color value used. + + + true + Scroll wheel zoom + Whether the scroll wheel should be used for zooming. + + + 0.05 + Zoom multiplier + The multiplier to be applied when using the mouse scroll wheel for zooming. This value defines the zooming step used for each scroll event. For example, 0.05 results in a 5% zoom increment for each scroll event and 1.00 result in a 100% zoom increment. + + + '#000000' + Transparency color + If the transparency key has the value COLOR, then this key determines the color which is used for indicating transparency. + + + + + false + Randomize the image sequence + Whether the sequence of images should be shown in an random loop. + + + true + Loop through the image sequence + Whether the sequence of images should be shown in an endless loop. + + + true + Allow zoom greater than 100% initially + If this is set to FALSE small images will not be stretched to fit into the screen initially. + + + 5 + Delay in seconds until showing the next image + A value greater than 0 determines the seconds an image stays on screen until the next one is shown automatically. Zero disables the automatic browsing. + + + + + true + Show/Hide the window toolbar. + + + true + Show/Hide the window statusbar. + + + false + Show/Hide the image collection pane. + + + 'bottom' + Image collection pane position. + + + false + Whether the image collection pane should be resizable. + + + true + Show/Hide the window side pane. + + + true + Show/Hide the image collection pane scroll buttons. + + + false + Close main window without asking to save changes. + + + false + Trash images without asking + If activated, Eye of MATE won't ask for confirmation when moving images to the trash. It will still ask if any of the files cannot be moved to the trash and would be deleted instead. + + + true + Whether the metadata list in the properties dialog should have its own page. + If activated, the detailed metadata list in the properties dialog will be moved to its own page in the dialog. This should make the dialog more usable on smaller screens, e.g. as used by netbooks. If disabled, the widget will be embedded on the "Metadata" page. + + + '' + External program to use for editing images + The desktop file name (including the ".desktop") of the application to use for editing images (when the "Edit Image" toolbar button is clicked). Set to the empty string to disable this feature. + + + true + Whether the file chooser should show the user's pictures folder if no images are loaded. + If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory. + + + + + [] + Active plugins + List of active plugins. It doesn't contain the "Location" of the active plugins. See the .eom-plugin file for obtaining the "Location" of a given plugin. + + + diff --git a/data/org.mate.eom.gschema.xml.in.in b/data/org.mate.eom.gschema.xml.in.in deleted file mode 100644 index de8c94f..0000000 --- a/data/org.mate.eom.gschema.xml.in.in +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - true - <_summary>Automatic orientation - <_description>Whether the image should be rotated automatically based on EXIF orientation. - - - '#000000' - <_summary>Background Color - <_description>The color that is used to fill the area behind the image. If the use-background-color key is not set, the color is determined by the active GTK+ theme instead. - - - true - <_summary>Use a custom background color - <_description>If this is active, the color set by the background-color key will be used to fill the area behind the image. If it is not set, the current GTK+ theme will determine the fill color. - - - true - <_summary>Interpolate Image - <_description>Whether the image should be interpolated on zoom-out. This leads to better quality but is somewhat slower than non-interpolated images. - - - true - <_summary>Extrapolate Image - <_description>Whether the image should be extrapolated on zoom-in. This leads to blurry quality and is somewhat slower than non-extrapolated images. - - - 'checked' - <_summary>Transparency indicator - <_description>Determines how transparency should be indicated. Valid values are checked, color and none. If color is chosen, then the trans-color key determines the color value used. - - - true - <_summary>Scroll wheel zoom - <_description>Whether the scroll wheel should be used for zooming. - - - 0.05 - <_summary>Zoom multiplier - <_description>The multiplier to be applied when using the mouse scroll wheel for zooming. This value defines the zooming step used for each scroll event. For example, 0.05 results in a 5% zoom increment for each scroll event and 1.00 result in a 100% zoom increment. - - - '#000000' - <_summary>Transparency color - <_description>If the transparency key has the value COLOR, then this key determines the color which is used for indicating transparency. - - - - - false - <_summary>Randomize the image sequence - <_description>Whether the sequence of images should be shown in an random loop. - - - true - <_summary>Loop through the image sequence - <_description>Whether the sequence of images should be shown in an endless loop. - - - true - <_summary>Allow zoom greater than 100% initially - <_description>If this is set to FALSE small images will not be stretched to fit into the screen initially. - - - 5 - <_summary>Delay in seconds until showing the next image - <_description>A value greater than 0 determines the seconds an image stays on screen until the next one is shown automatically. Zero disables the automatic browsing. - - - - - true - <_summary>Show/Hide the window toolbar. - - - true - <_summary>Show/Hide the window statusbar. - - - false - <_summary>Show/Hide the image collection pane. - - - 'bottom' - <_summary>Image collection pane position. - - - false - <_summary>Whether the image collection pane should be resizable. - - - true - <_summary>Show/Hide the window side pane. - - - true - <_summary>Show/Hide the image collection pane scroll buttons. - - - false - <_summary>Close main window without asking to save changes. - - - false - <_summary>Trash images without asking - <_description>If activated, Eye of MATE won't ask for confirmation when moving images to the trash. It will still ask if any of the files cannot be moved to the trash and would be deleted instead. - - - true - <_summary>Whether the metadata list in the properties dialog should have its own page. - <_description>If activated, the detailed metadata list in the properties dialog will be moved to its own page in the dialog. This should make the dialog more usable on smaller screens, e.g. as used by netbooks. If disabled, the widget will be embedded on the "Metadata" page. - - - '' - <_summary>External program to use for editing images - <_description>The desktop file name (including the ".desktop") of the application to use for editing images (when the "Edit Image" toolbar button is clicked). Set to the empty string to disable this feature. - - - true - <_summary>Whether the file chooser should show the user's pictures folder if no images are loaded. - <_description>If activated and no image is loaded in the active window, the file chooser will display the user's pictures folder using the XDG special user directories. If deactivated or the pictures folder has not been set up, it will show the current working directory. - - - - - [] - <_summary>Active plugins - <_description>List of active plugins. It doesn't contain the "Location" of the active plugins. See the .eom-plugin file for obtaining the "Location" of a given plugin. - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 63c1707..bef2e1a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,25 +3,26 @@ [encoding: UTF-8] cut-n-paste/toolbar-editor/egg-editable-toolbar.c cut-n-paste/toolbar-editor/egg-toolbar-editor.c -plugins/fullscreen/fullscreen.eom-plugin.desktop.in -plugins/fullscreen/eom-fullscreen-plugin.c -plugins/reload/reload.eom-plugin.desktop.in -plugins/reload/eom-reload-plugin.c -plugins/statusbar-date/statusbar-date.eom-plugin.desktop.in data/eom.appdata.xml.in data/eom.desktop.in.in [type: gettext/glade]data/eom-image-properties-dialog.ui [type: gettext/glade]data/eom-multiple-save-as-dialog.ui [type: gettext/glade]data/eom-preferences-dialog.ui -data/org.mate.eom.gschema.xml.in.in +[type: gettext/gsettings]data/org.mate.eom.gschema.xml.in +plugins/fullscreen/eom-fullscreen-plugin.c +plugins/fullscreen/fullscreen.eom-plugin.desktop.in +plugins/reload/eom-reload-plugin.c +plugins/reload/reload.eom-plugin.desktop.in +plugins/statusbar-date/statusbar-date.eom-plugin.desktop.in src/eom-application.c src/eom-close-confirmation-dialog.c src/eom-file-chooser.c src/eom-image.c src/eom-image-jpeg.c +src/eom-error-message-area.c src/eom-exif-details.c src/eom-exif-util.c -src/eom-error-message-area.c +src/eom-plugin-manager.c src/eom-preferences-dialog.c src/eom-print.c src/eom-print-image-setup.c @@ -33,5 +34,4 @@ src/eom-uri-converter.c src/eom-uri-converter.h src/eom-util.c src/eom-window.c -src/eom-plugin-manager.c src/main.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 474e9e3..0a43517 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,6 +1,3 @@ # List of source files that should *not* be translated. # Please keep this file sorted alphabetically. data/eom.desktop.in -data/eom-image-properties-dialog.glade -data/eom-multiple-save-as-dialog.glade -data/eom-preferences-dialog.glade -- cgit v1.2.1