Merge tag 'upstream/0.25.1'

Upstream version 0.25.1

1 files changed, 12 insertions, 28 deletions

diff --git a/src/Resources.vala b/src/Resources.vala
index 138772e..bf34ae0 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -376,22 +376,27 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string MODIFY_TAGS_LABEL = _("Modify Tags");
     
     public string tag_photos_label(string name, int count) {
-        return ((count == 1) ? _("Tag Photo as “%s”") : _("Tag Photos as “%s”")).printf(name);
+        return ngettext ("Tag Photo as “%s”",
+                         "Tag Photos as “%s”",
+                         count).printf(name);
     }
     
     public string tag_photos_tooltip(string name, int count) {
-        return ((count == 1) ? _("Tag the selected photo as “%s”") :
-            _("Tag the selected photos as “%s”")).printf(name);
+        return ngettext ("Tag the selected photo as “%s”",
+                         "Tag the selected photos as “%s”",
+                         count).printf(name);
     }
     
     public string untag_photos_menu(string name, int count) {
-        return ((count == 1) ? _("Remove Tag “%s” From _Photo") :
-            _("Remove Tag “%s” From _Photos")).printf(name);
+        return ngettext ("Remove Tag “%s” From _Photo",
+                         "Remove Tag “%s” From _Photos",
+                         count).printf(name);
     }
     
     public string untag_photos_label(string name, int count) {
-        return ((count == 1) ? _("Remove Tag “%s” From Photo") :
-            _("Remove Tag “%s” From Photos")).printf(name);
+        return ngettext ("Remove Tag “%s” From Photo",
+                         "Remove Tag “%s” From Photos",
+                         count).printf(name);
     }
     
     public static string rename_tag_exists_message(string name) {
@@ -418,27 +423,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return _("Delete Search “%s”").printf(name);
     }
     
-    private unowned string rating_menu(Rating rating) {
-        switch (rating) {
-            case Rating.REJECTED:
-                return RATE_REJECTED_MENU;
-            case Rating.UNRATED:
-                return RATE_UNRATED_MENU;
-            case Rating.ONE:
-                return RATE_ONE_MENU;
-            case Rating.TWO:
-                return RATE_TWO_MENU;
-            case Rating.THREE:
-                return RATE_THREE_MENU;
-            case Rating.FOUR:
-                return RATE_FOUR_MENU;
-            case Rating.FIVE:
-                return RATE_FIVE_MENU;
-            default:
-                return RATE_UNRATED_MENU;
-        }
-    }
-
     private unowned string rating_label(Rating rating) {
         switch (rating) {
             case Rating.REJECTED: