Merge lp:~mitya57/lightdm/translatable-labels into lp:lightdm

[Dmitry Shachnev]

Make these labels translatable:

- "Password:"
- "Guest Account"
- "Other..."

Requested in https://bugs.launchpad.net/lightdm/+bug/862427/comments/7.

[lp:~mitya57/lightdm/translatable-labels]

1267. By Dmitry Shachnev on 2011-10-23

Rebase on latest revision from lp:lightdm

=== modified file 'greeters/gtk/greeter.ui'
--- greeters/gtk/greeter.ui	2011-09-30 02:47:45 +0000
+++ greeters/gtk/greeter.ui	2011-10-23 11:22:24 +0000
@@ -82,7 +82,7 @@
                       <object class="GtkLabel" id="prompt_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label">Password:</property>
+                        <property name="label" translatable="yes">Password:</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>

=== modified file 'greeters/gtk/lightdm-gtk-greeter.c'
--- greeters/gtk/lightdm-gtk-greeter.c	2011-09-30 02:47:45 +0000
+++ greeters/gtk/lightdm-gtk-greeter.c	2011-10-23 11:22:24 +0000
@@ -576,7 +576,7 @@
         gtk_list_store_append (GTK_LIST_STORE (model), &iter);
         gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                             0, "*guest",
-                            1, "Guest Account",
+                            1, _("Guest Account"),
                             2, PANGO_WEIGHT_NORMAL,
                             3, gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "stock_person", 64, 0, NULL),
                             -1);
@@ -585,7 +585,7 @@
     gtk_list_store_append (GTK_LIST_STORE (model), &iter);
     gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                         0, "*other",
-                        1, "Other...",
+                        1, _("Other..."),
                         2, PANGO_WEIGHT_NORMAL,
                         3, gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "stock_person", 64, 0, NULL),
                         -1);