[shotwell] Fix gettext problems

[Jim Nelson <jnelson src gnome org>]

commit c1972e2f2baa1f3679deeb8528b1747b8e6b588b
Author: Jim Nelson <jim yorba org>
Date:   Tue Nov 19 15:38:42 2013 -0800

    Fix gettext problems
    
    GNOME's pre-commit hooks discovered a couple of gettext problems in
    three translations.  This removes (by hand) the c-format specifiers
    that were causing the problem as well as adds the no-c-format comments
    in the code so the problem doesn't happen again.
    
    Finally, msgfmt -c is now used to catch these errors in the future,
    although the Makefile doesn't abort (like it should) when that
    happens.  More work necessary for that.

 Makefile                        |    4 ++--
 po/shotwell-core/hi.po          |    2 --
 po/shotwell-core/hr.po          |    2 --
 po/shotwell-core/hu.po          |    2 --
 src/PhotoPage.vala              |    4 ++++
 src/direct/DirectPhotoPage.vala |    4 ++++
 6 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/Makefile b/Makefile
index 5c709ab..3038d93 100644
--- a/Makefile
+++ b/Makefile
@@ -474,9 +474,9 @@ include src/plugins/mk/interfaces.mk
 
 $(LANG_STAMP): $(EXPANDED_CORE_PO_FILES) $(EXPANDED_EXTRAS_PO_FILES)
        @$(foreach po,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES ; \
-               msgfmt -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell.mo po/shotwell-core/$(po).po`)
+               msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell.mo po/shotwell-core/$(po).po`)
        @$(foreach po,$(EXTRAS_SUPPORTED_LANGUAGES),`mkdir -p $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES ; \
-               msgfmt -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell-extras.mo po/shotwell-extras/$(po).po`)
+               msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell-extras.mo 
po/shotwell-extras/$(po).po`)
        @touch $(LANG_STAMP)
 
 clean:
diff --git a/po/shotwell-core/hi.po b/po/shotwell-core/hi.po
index f1360fc..0abc2f9 100644
--- a/po/shotwell-core/hi.po
+++ b/po/shotwell-core/hi.po
@@ -1508,7 +1508,6 @@ msgid "Zoom _100%"
 msgstr "बड़ा-छोटा करें _100%"
 
 #: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "फ़ोटो को 100% आवर्द्धन के लिए बड़ा-छोटा करें"
 
@@ -1517,7 +1516,6 @@ msgid "Zoom _200%"
 msgstr "बड़ा-छोटा करें _200%"
 
 #: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "फ़ोटो को 200% आवर्द्धन के लिए बड़ा-छोटा करें"
 
diff --git a/po/shotwell-core/hr.po b/po/shotwell-core/hr.po
index 02e1c16..45479d9 100644
--- a/po/shotwell-core/hr.po
+++ b/po/shotwell-core/hr.po
@@ -1565,7 +1565,6 @@ msgid "Zoom _100%"
 msgstr "Povečaj _100%"
 
 #: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Povećavanje fotografije na 100%"
 
@@ -1574,7 +1573,6 @@ msgid "Zoom _200%"
 msgstr "Povečaj _200%"
 
 #: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Povećavanje fotografije na 200%"
 
diff --git a/po/shotwell-core/hu.po b/po/shotwell-core/hu.po
index 2f3fb93..caf57cd 100644
--- a/po/shotwell-core/hu.po
+++ b/po/shotwell-core/hu.po
@@ -1508,7 +1508,6 @@ msgid "Zoom _100%"
 msgstr "_100% nagyítás"
 
 #: src/PhotoPage.vala:2602 src/direct/DirectPhotoPage.vala:193
-#, c-format
 msgid "Zoom the photo to 100% magnification"
 msgstr "Fénykép 100%-os nagyítása"
 
@@ -1517,7 +1516,6 @@ msgid "Zoom _200%"
 msgstr "_200% nagyítás"
 
 #: src/PhotoPage.vala:2608 src/direct/DirectPhotoPage.vala:199
-#, c-format
 msgid "Zoom the photo to 200% magnification"
 msgstr "Fénykép 200%-os nagyítása"
 
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index b48c566..b0e75ea 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -2598,13 +2598,17 @@ public class LibraryPhotoPage : EditingHostPage {
 
         Gtk.ActionEntry actual_size = { "Zoom100", Gtk.Stock.ZOOM_100, TRANSLATABLE,
             "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
+        /// xgettext:no-c-format
         actual_size.label = _("Zoom _100%");
+        /// xgettext:no-c-format
         actual_size.tooltip = _("Zoom the photo to 100% magnification");
         actions += actual_size;
         
         Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
             "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max };
+        /// xgettext:no-c-format
         max_size.label = _("Zoom _200%");
+        /// xgettext:no-c-format
         max_size.tooltip = _("Zoom the photo to 200% magnification");
         actions += max_size;
 
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 6eb7eb0..6bc3285 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -189,13 +189,17 @@ public class DirectPhotoPage : EditingHostPage {
 
         Gtk.ActionEntry actual_size = { "Zoom100", Gtk.Stock.ZOOM_100, TRANSLATABLE,
             "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
+        /// xgettext:no-c-format
         actual_size.label = _("Zoom _100%");
+        /// xgettext:no-c-format
         actual_size.tooltip = _("Zoom the photo to 100% magnification");
         actions += actual_size;
         
         Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
             "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max };
+        /// xgettext:no-c-format
         max_size.label = _("Zoom _200%");
+        /// xgettext:no-c-format
         max_size.tooltip = _("Zoom the photo to 200% magnification");
         actions += max_size;