Merge lp:~codygarver/granite/fix-1080319 into lp:~elementary-pantheon/granite/granite

Proposed by Cody Garver
Status: Merged
Merged at revision: 505
Proposed branch: lp:~codygarver/granite/fix-1080319
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 210 lines (+77/-76)
2 files modified
lib/Widgets/DynamicNotebook.vala (+2/-2)
po/granite.pot (+75/-74)
To merge this branch: bzr merge lp:~codygarver/granite/fix-1080319
Reviewer Review Type Date Requested Status
Tom Beckmann (community) Approve
Review via email: mp+141701@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tom Beckmann (tombeckmann) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Widgets/DynamicNotebook.vala'
2--- lib/Widgets/DynamicNotebook.vala 2012-12-23 01:20:05 +0000
3+++ lib/Widgets/DynamicNotebook.vala 2013-01-03 05:40:27 +0000
4@@ -140,7 +140,7 @@
5 } else if (e.button == 3) {
6 menu.popup (null, null, null, 3, e.time);
7 uint num_tabs = (this.get_parent () as Gtk.Container).get_children ().length ();
8- close_other_m.label = ngettext ("Close Other Tab", "Close Other Tabs", num_tabs);
9+ close_other_m.label = ngettext (_("Close Other Tab"), _("Close Other Tabs"), num_tabs);
10 if (num_tabs == 1)
11 close_other_m.sensitive = false;
12 return true;
13@@ -593,4 +593,4 @@
14 return i;
15 }
16 }
17-}
18\ No newline at end of file
19+}
20
21=== modified file 'po/granite.pot'
22--- po/granite.pot 2012-12-15 14:49:51 +0000
23+++ po/granite.pot 2013-01-03 05:40:27 +0000
24@@ -8,7 +8,7 @@
25 msgstr ""
26 "Project-Id-Version: PACKAGE VERSION\n"
27 "Report-Msgid-Bugs-To: \n"
28-"POT-Creation-Date: 2012-12-15 15:44+0100\n"
29+"POT-Creation-Date: 2013-01-02 23:36-0600\n"
30 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
31 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
32 "Language-Team: LANGUAGE <LL@li.org>\n"
33@@ -16,103 +16,104 @@
34 "MIME-Version: 1.0\n"
35 "Content-Type: text/plain; charset=UTF-8\n"
36 "Content-Transfer-Encoding: 8bit\n"
37-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
38-
39-#: /home/noelco/granite/po/../lib//GtkPatch/AboutDialog.vala:40
40-msgid "Designed by:"
41-msgstr ""
42-
43-#: /home/noelco/granite/po/../lib//GtkPatch/AboutDialog.vala:59
44-msgid "Written by:"
45-msgstr ""
46-
47-#: /home/noelco/granite/po/../lib//GtkPatch/AboutDialog.vala:97
48-#, c-format
49-msgid "Copyright © %s"
50-msgstr ""
51-
52-#: /home/noelco/granite/po/../lib//GtkPatch/AboutDialog.vala:115
53-msgid "Documented by:"
54-msgstr ""
55-
56-#: /home/noelco/granite/po/../lib//GtkPatch/AboutDialog.vala:175
57-#, c-format
58-msgid "Translated by %s"
59-msgstr ""
60-
61-#: /home/noelco/granite/po/../lib//GtkPatch/AboutDialog.vala:459
62-msgid "This program is published under the terms of the "
63-msgstr ""
64-
65-#: /home/noelco/granite/po/../lib//GtkPatch/AboutDialog.vala:459
66-msgid " license, it comes with ABSOLUTELY NO WARRANTY; for details, visit "
67-msgstr ""
68-
69-#: /home/noelco/granite/po/../lib//Widgets/DatePicker.vala:31
70-msgid "%B %e, %Y"
71-msgstr ""
72-
73-#: /home/noelco/granite/po/../lib//Widgets/ContractorView.vala:103
74-msgid "Could not contact Contractor. You may need to install it"
75-msgstr ""
76-
77-#: /home/noelco/granite/po/../lib//Widgets/ContractorView.vala:103
78-msgid "No action found for this file"
79-msgstr ""
80-
81-#: /home/noelco/granite/po/../lib//Widgets/AboutDialog.vala:127
82-msgid "Translate This App"
83-msgstr ""
84-
85-#: /home/noelco/granite/po/../lib//Widgets/AboutDialog.vala:132
86-msgid "Report a Problem"
87-msgstr ""
88-
89-#: /home/noelco/granite/po/../lib//Widgets/DynamicNotebook.vala:111
90+
91+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:100
92 msgid "Close tab"
93 msgstr ""
94
95-#: /home/noelco/granite/po/../lib//Widgets/DynamicNotebook.vala:132
96+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:121
97 msgid "Close Tab"
98 msgstr ""
99
100-#: /home/noelco/granite/po/../lib//Widgets/DynamicNotebook.vala:134
101+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:123
102 msgid "Open in a new Window"
103 msgstr ""
104
105-#: /home/noelco/granite/po/../lib//Widgets/DynamicNotebook.vala:135
106+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:124
107 msgid "Duplicate"
108 msgstr ""
109
110-#: /home/noelco/granite/po/../lib//Widgets/DynamicNotebook.vala:154
111+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:143
112 msgid "Close Other Tab"
113-msgid_plural "Close Other Tabs"
114-msgstr[0] ""
115-msgstr[1] ""
116-
117-#: /home/noelco/granite/po/../lib//Widgets/DynamicNotebook.vala:339
118+msgstr ""
119+
120+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:143
121+msgid "Close Other Tabs"
122+msgstr ""
123+
124+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:328
125 msgid "New Tab"
126 msgstr ""
127
128-#: /home/noelco/granite/po/../lib//Widgets/DynamicNotebook.vala:366
129+#: /home/codygarver/granite/po/../lib//Widgets/DynamicNotebook.vala:355
130 msgid "New tab"
131 msgstr ""
132
133-#: /home/noelco/granite/po/../lib//Widgets/TimePicker.vala:63
134-#: /home/noelco/granite/po/../lib//Widgets/TimePicker.vala:129
135-msgid "%l:%M %p"
136-msgstr ""
137-
138-#: /home/noelco/granite/po/../lib//Widgets/AppMenu.vala:46
139-#: /home/noelco/granite/po/../lib//Widgets/AppMenu.vala:57
140-#: /home/noelco/granite/po/../lib//Widgets/AppMenu.vala:70
141+#: /home/codygarver/granite/po/../lib//Widgets/AppMenu.vala:46
142+#: /home/codygarver/granite/po/../lib//Widgets/AppMenu.vala:57
143+#: /home/codygarver/granite/po/../lib//Widgets/AppMenu.vala:70
144 msgid "Menu"
145 msgstr ""
146
147-#: /home/noelco/granite/po/../lib//Widgets/AppMenu.vala:80
148+#: /home/codygarver/granite/po/../lib//Widgets/AppMenu.vala:80
149 msgid "About"
150 msgstr ""
151
152-#: /home/noelco/granite/po/../lib//Application.vala:164
153+#: /home/codygarver/granite/po/../lib//Widgets/TimePicker.vala:63
154+#: /home/codygarver/granite/po/../lib//Widgets/TimePicker.vala:129
155+msgid "%l:%M %p"
156+msgstr ""
157+
158+#: /home/codygarver/granite/po/../lib//Widgets/AboutDialog.vala:127
159+msgid "Translate This App"
160+msgstr ""
161+
162+#: /home/codygarver/granite/po/../lib//Widgets/AboutDialog.vala:132
163+msgid "Report a Problem"
164+msgstr ""
165+
166+#: /home/codygarver/granite/po/../lib//Widgets/DatePicker.vala:31
167+msgid "%B %e, %Y"
168+msgstr ""
169+
170+#: /home/codygarver/granite/po/../lib//Widgets/ContractorView.vala:103
171+msgid "Could not contact Contractor. You may need to install it"
172+msgstr ""
173+
174+#: /home/codygarver/granite/po/../lib//Widgets/ContractorView.vala:103
175+msgid "No action found for this file"
176+msgstr ""
177+
178+#: /home/codygarver/granite/po/../lib//Application.vala:159
179 msgid "Website"
180 msgstr ""
181+
182+#: /home/codygarver/granite/po/../lib//GtkPatch/AboutDialog.vala:40
183+msgid "Designed by:"
184+msgstr ""
185+
186+#: /home/codygarver/granite/po/../lib//GtkPatch/AboutDialog.vala:59
187+msgid "Written by:"
188+msgstr ""
189+
190+#: /home/codygarver/granite/po/../lib//GtkPatch/AboutDialog.vala:97
191+#, c-format
192+msgid "Copyright © %s"
193+msgstr ""
194+
195+#: /home/codygarver/granite/po/../lib//GtkPatch/AboutDialog.vala:115
196+msgid "Documented by:"
197+msgstr ""
198+
199+#: /home/codygarver/granite/po/../lib//GtkPatch/AboutDialog.vala:175
200+#, c-format
201+msgid "Translated by %s"
202+msgstr ""
203+
204+#: /home/codygarver/granite/po/../lib//GtkPatch/AboutDialog.vala:460
205+msgid "This program is published under the terms of the "
206+msgstr ""
207+
208+#: /home/codygarver/granite/po/../lib//GtkPatch/AboutDialog.vala:460
209+msgid " license, it comes with ABSOLUTELY NO WARRANTY; for details, visit "
210+msgstr ""

Subscribers

People subscribed via source and target branches