Merge lp:~foxxtrot/lernid/pot-updates into lp:lernid

Proposed by Jeff Craig
Status: Rejected
Rejected by: Michael Budde
Proposed branch: lp:~foxxtrot/lernid/pot-updates
Merge into: lp:lernid
Diff against target: 172 lines (+70/-61)
2 files modified
bin/lernid (+1/-1)
po/lernid.pot (+69/-60)
To merge this branch: bzr merge lp:~foxxtrot/lernid/pot-updates
Reviewer Review Type Date Requested Status
Jono Bacon Pending
Review via email: mp+16941@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jeff Craig (foxxtrot) wrote :

Rebuild the POT file with the most recent translatable entries, and make the label for the "Schedule" column in the "Sessions" tab, translatable.

Revision history for this message
Michael Budde (mbudde) wrote :

It seems that your patch have become obsolete and is no longer relevant. But thank you for your contribution anyway!

Unmerged revisions

91. By Jeff Craig

Add Translator entry for Schedule label in Session tab.

90. By Jeff Craig <craig@ford-prefect>

Updated POT file to include new strings since last time POT file was updated.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/lernid'
2--- bin/lernid 2010-01-05 00:14:46 +0000
3+++ bin/lernid 2010-01-07 01:28:15 +0000
4@@ -165,7 +165,7 @@
5 self.schedule_tv = self.builder.get_object("schedule_tv")
6 self.schedule_model = gtk.ListStore(str, str, str, str)
7 self.schedule_tv.set_model(self.schedule_model)
8- self.tvcolumn = gtk.TreeViewColumn("Schedule")
9+ self.tvcolumn = gtk.TreeViewColumn(_("Schedule"))
10 self.cellpb = gtk.CellRendererPixbuf()
11 self.cell_date = gtk.CellRendererText()
12 self.cell_time = gtk.CellRendererText()
13
14=== modified file 'po/lernid.pot'
15--- po/lernid.pot 2009-12-23 10:11:56 +0000
16+++ po/lernid.pot 2010-01-07 01:28:15 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: PACKAGE VERSION\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2009-12-23 02:11-0800\n"
22+"POT-Creation-Date: 2010-01-06 17:21-0800\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -16,36 +16,32 @@
27 "Content-Type: text/plain; charset=CHARSET\n"
28 "Content-Transfer-Encoding: 8bit\n"
29
30-#: ../data/ui/LernidWindow.ui.h:1
31-msgid "Browser"
32-msgstr ""
33-
34-#: ../data/ui/LernidWindow.ui.h:2
35-msgid "Chatroom"
36-msgstr ""
37-
38-#: ../data/ui/LernidWindow.ui.h:3
39-msgid "Classroom"
40-msgstr ""
41-
42-#: ../data/ui/LernidWindow.ui.h:4 ../lernid.desktop.in.h:1
43-msgid "Lernid"
44-msgstr ""
45-
46-#: ../data/ui/LernidWindow.ui.h:5
47-msgid "Not Connected."
48-msgstr ""
49-
50-#: ../data/ui/LernidWindow.ui.h:6
51-msgid "Session"
52-msgstr ""
53-
54-#: ../data/ui/LernidWindow.ui.h:7
55-msgid "_Event"
56-msgstr ""
57-
58-#: ../data/ui/LernidWindow.ui.h:8
59-msgid "_Help"
60+#: ../bin/lernid:278
61+msgid "%d %B %Y"
62+msgstr ""
63+
64+#: ../bin/lernid:326
65+msgid "' session is in progress..."
66+msgstr ""
67+
68+#: ../bin/lernid:386
69+msgid "...starts in 10 minutes!"
70+msgstr ""
71+
72+#: ../bin/lernid:466 ../bin/lernid:467
73+msgid "Connected to "
74+msgstr ""
75+
76+#: ../bin/lernid:496
77+msgid "Disconnecting from "
78+msgstr ""
79+
80+#: ../bin/lernid:641
81+msgid "Show debug messages"
82+msgstr ""
83+
84+#: ../bin/lernid:168
85+msgid "Schedule"
86 msgstr ""
87
88 #: ../data/ui/AboutLernidDialog.ui.h:1
89@@ -72,41 +68,54 @@
90 msgid "translator-credits"
91 msgstr ""
92
93-#: ../lernid.desktop.in.h:2
94-msgid "Participate in online learning events"
95-msgstr ""
96-
97 #: ../data/ui/ConnectDialog.ui.h:1
98 msgid "Choose an event"
99 msgstr ""
100
101 #: ../data/ui/ConnectDialog.ui.h:2
102-msgid "Event"
103+msgid "Event:"
104 msgstr ""
105
106 #: ../data/ui/ConnectDialog.ui.h:3
107-msgid "Nickname"
108-msgstr ""
109-
110-#. Translators: this is in strftime format. See http://docs.python.org/library/time.html#time.strftime
111-#. This is the format of the displayed date.
112-#. The month name is localized: it defaults to something like "15 June 2010" for 'en' or "15 Juin 2009" for 'fr', etc.
113-#: ../bin/lernid.py:205
114-msgid "%d %B %Y"
115-msgstr ""
116-
117-#: ../bin/lernid.py:244
118-msgid "' session is starting..."
119-msgstr ""
120-
121-#: ../bin/lernid.py:364 ../bin/lernid.py:365
122-msgid "Connected to "
123-msgstr ""
124-
125-#: ../bin/lernid.py:394
126-msgid "Disconnecting from "
127-msgstr ""
128-
129-#: ../bin/lernid.py:486
130-msgid "Show debug messages"
131+msgid "Nickname:"
132+msgstr ""
133+
134+#: ../data/ui/LernidWindow.ui.h:1
135+msgid "Browser"
136+msgstr ""
137+
138+#: ../data/ui/LernidWindow.ui.h:2
139+msgid "Chatroom"
140+msgstr ""
141+
142+#: ../data/ui/LernidWindow.ui.h:3
143+msgid "Classroom"
144+msgstr ""
145+
146+#: ../data/ui/LernidWindow.ui.h:4
147+msgid "Lernid"
148+msgstr ""
149+
150+#: ../data/ui/LernidWindow.ui.h:5
151+msgid "Session"
152+msgstr ""
153+
154+#: ../data/ui/LernidWindow.ui.h:6
155+msgid "_Event"
156+msgstr ""
157+
158+#: ../data/ui/LernidWindow.ui.h:7
159+msgid "_Fullscreen"
160+msgstr ""
161+
162+#: ../data/ui/LernidWindow.ui.h:8
163+msgid "_Help"
164+msgstr ""
165+
166+#: ../data/ui/LernidWindow.ui.h:9
167+msgid "_Statusbar"
168+msgstr ""
169+
170+#: ../data/ui/LernidWindow.ui.h:10
171+msgid "_View"
172 msgstr ""

Subscribers

People subscribed via source and target branches