Merge lp:~leonardolemos/switchboard-plug-parental-controls/fix-1605981 into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Leonardo Lemos]

* Fix strings plural form.
* Update translation template.

This branch fixes the strings plural form implementation, as described by the bug lp:1605981

=== modified file 'po/pantheon-parental-controls-plug.pot'
--- po/pantheon-parental-controls-plug.pot	2016-07-29 22:19:28 +0000
+++ po/pantheon-parental-controls-plug.pot	2016-07-31 00:21:08 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-29 15:18-0700\n"
+"POT-Creation-Date: 2016-07-30 21:16-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. //launchpad.net/switchboard-plug-parental-controls)
 #. *
@@ -44,16 +45,8 @@
 msgid "Authentication is required to change parental control settings"
 msgstr ""
 
-#: ../src/Widgets/ControlPage.vala:74
-msgid "General"
-msgstr ""
-
-#: ../src/Widgets/ControlPage.vala:75
-msgid "Internet"
-msgstr ""
-
-#: ../src/Widgets/ControlPage.vala:76
-msgid "Applications"
+#: ../src/Widgets/AppChooser.vala:71
+msgid "Search Applications"
 msgstr ""
 
 #: ../src/Widgets/UserList.vala:42
@@ -64,30 +57,6 @@
 msgid "Other Accounts"
 msgstr ""
 
-#: ../src/Widgets/WeekSpinBox.vala:44
-msgid "From:"
-msgstr ""
-
-#: ../src/Widgets/WeekSpinBox.vala:46
-msgid "To:"
-msgstr ""
-
-#: ../src/Widgets/InternetBox.vala:78
-msgid "Prevent %s from visiting these websites:"
-msgstr ""
-
-#: ../src/Widgets/InternetBox.vala:91
-msgid "Add URL"
-msgstr ""
-
-#: ../src/Widgets/InternetBox.vala:100
-msgid "Add a new URL, for example: google.com"
-msgstr ""
-
-#: ../src/Widgets/InternetBox.vala:101
-msgid "Invalid URL"
-msgstr ""
-
 #: ../src/Widgets/GeneralBox.vala:62
 msgid "Allow this user to:"
 msgstr ""
@@ -124,8 +93,24 @@
 msgid "Weekends"
 msgstr ""
 
-#: ../src/Widgets/AppChooser.vala:71
-msgid "Search Applications"
+#: ../src/Widgets/WeekSpinBox.vala:44
+msgid "From:"
+msgstr ""
+
+#: ../src/Widgets/WeekSpinBox.vala:46
+msgid "To:"
+msgstr ""
+
+#: ../src/Widgets/ControlPage.vala:74
+msgid "General"
+msgstr ""
+
+#: ../src/Widgets/ControlPage.vala:75
+msgid "Internet"
+msgstr ""
+
+#: ../src/Widgets/ControlPage.vala:76
+msgid "Applications"
 msgstr ""
 
 #: ../src/Widgets/AppsBox.vala:97
@@ -148,6 +133,22 @@
 msgid "Allow access to these apps with admin permission:"
 msgstr ""
 
+#: ../src/Widgets/InternetBox.vala:78
+msgid "Prevent %s from visiting these websites:"
+msgstr ""
+
+#: ../src/Widgets/InternetBox.vala:91
+msgid "Add URL"
+msgstr ""
+
+#: ../src/Widgets/InternetBox.vala:100
+msgid "Add a new URL, for example: google.com"
+msgstr ""
+
+#: ../src/Widgets/InternetBox.vala:101
+msgid "Invalid URL"
+msgstr ""
+
 #: ../src/Plug.vala:72
 msgid "Some settings require administrator rights to be changed"
 msgstr ""
@@ -187,19 +188,15 @@
 
 #: ../src/client/Client.vala:129
 msgid "%ld hour"
-msgstr ""
-
-#: ../src/client/Client.vala:129
-msgid "%ld hours"
-msgstr ""
+msgid_plural "%ld hours"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/client/Client.vala:133
 msgid "%ld minute"
-msgstr ""
-
-#: ../src/client/Client.vala:133
-msgid "%ld minutes"
-msgstr ""
+msgid_plural "%ld minutes"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/client/Client.vala:136
 msgid "This computer will lock after %s %s. %s"
 
=== modified file 'src/client/Client.vala'
--- src/client/Client.vala	2016-02-25 18:47:22 +0000
+++ src/client/Client.vala	2016-07-31 00:21:08 +0000
@@ -64,7 +64,7 @@
 
         private void on_show_app_lock_dialog () {
             var app_lock_dialog = new AppLock.AppLockDialog ();
-            app_lock_dialog.show_all ();            
+            app_lock_dialog.show_all ();
         }
 
         private void on_authorize (string user_name, string action_id) {
@@ -93,7 +93,7 @@
                         warning ("%s\n", e.message);
                     }
                 }
-            });            
+            });
         }
 
         private void on_launch (string[] args) {
@@ -126,12 +126,12 @@
             }
 
             if (hours > 0) {
-                hours_str = ngettext (_("%ld hour"), _("%ld hours"), (ulong)hours).printf ((ulong)hours);
+                hours_str = ngettext ("%ld hour", "%ld hours", (ulong)hours).printf ((ulong)hours);
             }
 
             if (minutes > 0) {
-                minutes_str = ngettext (_("%ld minute"), _("%ld minutes"), (ulong)minutes).printf ((ulong)minutes);
-            }  
+                minutes_str = ngettext ("%ld minute", "%ld minutes", (ulong)minutes).printf ((ulong)minutes);
+            }
 
             string body = _("This computer will lock after %s %s. %s".printf (hours_str, minutes_str, info));
 
@@ -143,4 +143,4 @@
             send_notification (null, notification);
         }
     }
- }
 \ No newline at end of file
+ }