Merge lp:~seb128/unity-control-center/user-accounts-translatable into lp:unity-control-center

[Sebastien Bacher]

user-accounts: Mark some strings as translatable

user-accounts: Mark some strings as translatable

That's a backport of https://git.gnome.org/browse/gnome-control-center/commit/panels/user-accounts/um-history-dialog.c?id=aa3af401147c9550bc19d14b5cdaf5588083f7c1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12769
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/97

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/96/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'panels/user-accounts/um-history-dialog.c'
--- panels/user-accounts/um-history-dialog.c	2014-03-12 17:32:51 +0000
+++ panels/user-accounts/um-history-dialog.c	2014-04-04 13:48:39 +0000
@@ -92,15 +92,23 @@
         }
         else {
                 date = g_date_time_add_days (um->week, 6);
-                from = g_date_time_format (um->week, "%b %e");
+                /* Translators: This is a date format string in the style of "Feb 18",
+                   shown as the first day of a week on login history dialog. */
+                from = g_date_time_format (um->week, C_("login history week label","%b %e"));
                 if (g_date_time_get_year (um->week) == g_date_time_get_year (um->current_week)) {
-                        to = g_date_time_format (date, "%b %e");
+                        /* Translators: This is a date format string in the style of "Feb 24",
+                           shown as the last day of a week on login history dialog. */
+                        to = g_date_time_format (date, C_("login history week label","%b %e"));
                 }
                 else {
-                        to = g_date_time_format (date, "%b %e, %Y");
+                        /* Translators: This is a date format string in the style of "Feb 24, 2013",
+                           shown as the last day of a week on login history dialog. */
+                        to = g_date_time_format (date, C_("login history week label","%b %e, %Y"));
                 }
 
-                label = g_strconcat (from, " - ", to, NULL);
+                /* Translators: This indicates a week label on a login history.
+                   The first %s is the first day of a week, and the second %s the last day. */
+                label = g_strdup_printf(C_("login history week label", "%s - %s"), from, to);
 
                 g_date_time_unref (date);
                 g_free (from);
@@ -182,8 +190,12 @@
         GtkWidget *label;
 
         date = get_smart_date (datetime);
-        time = g_date_time_format (datetime, "%k:%M");
-        str = g_strconcat (date, ", ", time, NULL);
+        /* Translators: This is a time format string in the style of "22:58".
+           It indicates a login time which follows a date. */
+        time = g_date_time_format (datetime, C_("login date-time", "%k:%M"));
+        /* Translators: This indicates a login date-time.
+           The first %s is a date, and the second %s a time. */
+        str = g_strdup_printf(C_("login date-time", "%s, %s"), date, time);
         label = gtk_label_new (str);
         gtk_widget_set_halign (label, GTK_ALIGN_START);
         gtk_grid_attach (GTK_GRID (grid), label, 1, line, 1, 1);
@@ -244,13 +256,13 @@
 
                 if (history.logout_time > 0 && history.logout_time < to) {
                         datetime = g_date_time_new_from_unix_local (history.logout_time);
-                        add_record (grid, datetime, "Session Ended", line);
+                        add_record (grid, datetime, _("Session Ended"), line);
                         line++;
                 }
 
                 if (history.login_time >= from) {
                         datetime = g_date_time_new_from_unix_local (history.login_time);
-                        add_record (grid, datetime, "Session Started", line);
+                        add_record (grid, datetime, _("Session Started"), line);
                         line++;
                 }
         }
 
=== modified file 'panels/user-accounts/um-user-panel.c'
--- panels/user-accounts/um-user-panel.c	2014-02-21 15:48:18 +0000
+++ panels/user-accounts/um-user-panel.c	2014-04-04 13:48:39 +0000
@@ -619,9 +619,13 @@
         else if (time > 0) {
                 date_time = g_date_time_new_from_unix_local (time);
                 date_str = get_smart_date (date_time);
-                time_str = g_date_time_format (date_time, "%k:%M");
+                /* Translators: This is a time format string in the style of "22:58".
+                   It indicates a login time which follows a date. */
+                time_str = g_date_time_format (date_time, C_("login date-time", "%k:%M"));
 
-                text = g_strconcat (date_str, ", ", time_str, NULL);
+                /* Translators: This indicates a login date-time.
+                   The first %s is a date, and the second %s a time. */
+                text = g_strdup_printf(C_("login date-time", "%s, %s"), date_str, time_str);
 
                 g_date_time_unref (date_time);
                 g_free (date_str);
 
=== modified file 'panels/user-accounts/um-utils.c'
--- panels/user-accounts/um-utils.c	2014-03-18 22:04:15 +0000
+++ panels/user-accounts/um-utils.c	2014-04-04 13:48:39 +0000
@@ -819,10 +819,12 @@
         }
         else {
                 if (g_date_time_get_year (date) == g_date_time_get_year (today)) {
-                        label = g_date_time_format (date, "%b %e");
+                        /* Translators: This is a date format string in the style of "Feb 24". */
+                        label = g_date_time_format (date, _("%b %e"));
                 }
                 else {
-                        label = g_date_time_format (date, "%b %e, %Y");
+                        /* Translators: This is a date format string in the style of "Feb 24, 2013". */
+                        label = g_date_time_format (date, _("%b %e, %Y"));
                 }
         }