Light Display Manager

Merge lp:~timovwb/lightdm/fix-for-868613 into lp:lightdm/1.0

  1. fix-for-868613
  2. Merge into 1.0
Proposed by Timo Vanwynsberghe
Status: Merged
Merged at revision: 1279
Proposed branch: lp:~timovwb/lightdm/fix-for-868613
Merge into: lp:lightdm/1.0
Diff against target: 34 lines (+3/-3)
2 files modified
greeters/gtk/greeter.ui (+1/-1)
greeters/gtk/lightdm-gtk-greeter.c (+2/-2)
To merge this branch: bzr merge lp:~timovwb/lightdm/fix-for-868613
Reviewer Review Type Date Requested Status
Robert Ancell Pending
LightDM Development Team Pending
Review via email: mp+78705@code.launchpad.net

Description of the change

Fixed some non-translatable strings. This includes setting the "Password:" label in the ui file and "Guest account" and "Others.." in the source code. All in the gtk greeter.

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

I merged this but didn't set the UI field as translated - this field is always set in lightdm-gtk-greeter.c before being shown.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'greeters/gtk/greeter.ui'
2--- greeters/gtk/greeter.ui 2011-09-20 01:49:16 +0000
3+++ greeters/gtk/greeter.ui 2011-10-08 11:07:24 +0000
4@@ -83,7 +83,7 @@
5 <object class="GtkLabel" id="prompt_label">
6 <property name="visible">True</property>
7 <property name="can_focus">False</property>
8- <property name="label">Password:</property>
9+ <property name="label" translatable="yes">Password:</property>
10 </object>
11 <packing>
12 <property name="expand">False</property>
13
14=== modified file 'greeters/gtk/lightdm-gtk-greeter.c'
15--- greeters/gtk/lightdm-gtk-greeter.c 2011-09-30 02:35:16 +0000
16+++ greeters/gtk/lightdm-gtk-greeter.c 2011-10-08 11:07:24 +0000
17@@ -609,7 +609,7 @@
18 gtk_list_store_append (GTK_LIST_STORE (model), &iter);
19 gtk_list_store_set (GTK_LIST_STORE (model), &iter,
20 0, "*guest",
21- 1, "Guest Account",
22+ 1, _("Guest Account"),
23 2, PANGO_WEIGHT_NORMAL,
24 3, gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "stock_person", 64, 0, NULL),
25 -1);
26@@ -618,7 +618,7 @@
27 gtk_list_store_append (GTK_LIST_STORE (model), &iter);
28 gtk_list_store_set (GTK_LIST_STORE (model), &iter,
29 0, "*other",
30- 1, "Other...",
31+ 1, _("Other..."),
32 2, PANGO_WEIGHT_NORMAL,
33 3, gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "stock_person", 64, 0, NULL),
34 -1);

Subscribers

People subscribed via source and target branches