Merge lp:~kelemeng/synaptic/bug688897 into lp:~mvo/synaptic/gtk3

Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 1812
Proposed branch: lp:~kelemeng/synaptic/bug688897
Merge into: lp:~mvo/synaptic/gtk3
Diff against target: 346 lines (+68/-65)
5 files modified
gtk/gtkbuilder/window_main.ui (+21/-21)
gtk/rgfindwindow.cc (+1/-1)
pixmaps/Makefile.am (+2/-2)
po/POTFILES.in (+37/-34)
po/POTFILES.skip (+7/-7)
To merge this branch: bzr merge lp:~kelemeng/synaptic/bug688897
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Review via email: mp+43422@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Wonderful, thanks a lot for those fixes!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/gtkbuilder/window_main.ui'
2--- gtk/gtkbuilder/window_main.ui 2010-11-16 20:53:10 +0000
3+++ gtk/gtkbuilder/window_main.ui 2010-12-11 11:31:16 +0000
4@@ -21,7 +21,7 @@
5 <object class="GtkMenu" id="file1_menu">
6 <child>
7 <object class="GtkImageMenuItem" id="menu_open">
8- <property name="label">_Read Markings...</property>
9+ <property name="label" translatable="yes">_Read Markings...</property>
10 <property name="visible">True</property>
11 <property name="use_underline">True</property>
12 <property name="use_stock">True</property>
13@@ -30,7 +30,7 @@
14 </child>
15 <child>
16 <object class="GtkImageMenuItem" id="menu_save">
17- <property name="label">_Save Markings</property>
18+ <property name="label" translatable="yes">_Save Markings</property>
19 <property name="visible">True</property>
20 <property name="use_underline">True</property>
21 <property name="use_stock">True</property>
22@@ -39,7 +39,7 @@
23 </child>
24 <child>
25 <object class="GtkImageMenuItem" id="menu_save_as">
26- <property name="label">Save Markings _As...</property>
27+ <property name="label" translatable="yes">Save Markings _As...</property>
28 <property name="visible">True</property>
29 <property name="use_underline">True</property>
30 <property name="use_stock">True</property>
31@@ -89,7 +89,7 @@
32 </child>
33 <child>
34 <object class="GtkImageMenuItem" id="menu_exit">
35- <property name="label">_Quit</property>
36+ <property name="label" translatable="yes">_Quit</property>
37 <property name="visible">True</property>
38 <property name="use_underline">True</property>
39 <property name="use_stock">True</property>
40@@ -110,7 +110,7 @@
41 <object class="GtkMenu" id="actions1_menu">
42 <child>
43 <object class="GtkImageMenuItem" id="undo1">
44- <property name="label">_Undo</property>
45+ <property name="label" translatable="yes">_Undo</property>
46 <property name="visible">True</property>
47 <property name="use_underline">True</property>
48 <property name="use_stock">True</property>
49@@ -120,7 +120,7 @@
50 </child>
51 <child>
52 <object class="GtkImageMenuItem" id="redo1">
53- <property name="label">_Redo</property>
54+ <property name="label" translatable="yes">_Redo</property>
55 <property name="visible">True</property>
56 <property name="use_underline">True</property>
57 <property name="use_stock">True</property>
58@@ -143,7 +143,7 @@
59 </child>
60 <child>
61 <object class="GtkImageMenuItem" id="menu_search">
62- <property name="label">_Search...</property>
63+ <property name="label" translatable="yes">_Search...</property>
64 <property name="visible">True</property>
65 <property name="use_underline">True</property>
66 <property name="use_stock">True</property>
67@@ -158,7 +158,7 @@
68 </child>
69 <child>
70 <object class="GtkImageMenuItem" id="menu_update_packages">
71- <property name="label">_Reload Package Information</property>
72+ <property name="label" translatable="yes">_Reload Package Information</property>
73 <property name="visible">True</property>
74 <property name="use_underline">True</property>
75 <property name="use_stock">True</property>
76@@ -168,7 +168,7 @@
77 </child>
78 <child>
79 <object class="GtkImageMenuItem" id="add_cdrom">
80- <property name="label">_Add CD-ROM...</property>
81+ <property name="label" translatable="yes">_Add CD-ROM...</property>
82 <property name="visible">True</property>
83 <property name="use_underline">True</property>
84 <property name="use_stock">True</property>
85@@ -182,7 +182,7 @@
86 </child>
87 <child>
88 <object class="GtkImageMenuItem" id="menu_upgrade_all">
89- <property name="label">_Mark All Upgrades...</property>
90+ <property name="label" translatable="yes">_Mark All Upgrades...</property>
91 <property name="visible">True</property>
92 <property name="use_underline">True</property>
93 <property name="use_stock">True</property>
94@@ -213,7 +213,7 @@
95 </child>
96 <child>
97 <object class="GtkImageMenuItem" id="menu_proceed">
98- <property name="label">A_pply Marked Changes</property>
99+ <property name="label" translatable="yes">A_pply Marked Changes</property>
100 <property name="visible">True</property>
101 <property name="use_underline">True</property>
102 <property name="use_stock">True</property>
103@@ -234,7 +234,7 @@
104 <object class="GtkMenu" id="menu_package_menu">
105 <child>
106 <object class="GtkImageMenuItem" id="menu_keep">
107- <property name="label">U_nmark</property>
108+ <property name="label" translatable="yes">U_nmark</property>
109 <property name="visible">True</property>
110 <property name="use_underline">True</property>
111 <property name="use_stock">True</property>
112@@ -244,7 +244,7 @@
113 </child>
114 <child>
115 <object class="GtkImageMenuItem" id="menu_install">
116- <property name="label">Mark for _Installation</property>
117+ <property name="label" translatable="yes">Mark for _Installation</property>
118 <property name="visible">True</property>
119 <property name="use_underline">True</property>
120 <property name="use_stock">True</property>
121@@ -254,7 +254,7 @@
122 </child>
123 <child>
124 <object class="GtkImageMenuItem" id="menu_reinstall">
125- <property name="label">Mark for R_einstallation</property>
126+ <property name="label" translatable="yes">Mark for R_einstallation</property>
127 <property name="visible">True</property>
128 <property name="use_underline">True</property>
129 <property name="use_stock">True</property>
130@@ -263,7 +263,7 @@
131 </child>
132 <child>
133 <object class="GtkImageMenuItem" id="menu_upgrade">
134- <property name="label">Mark for _Upgrade</property>
135+ <property name="label" translatable="yes">Mark for _Upgrade</property>
136 <property name="visible">True</property>
137 <property name="use_underline">True</property>
138 <property name="use_stock">True</property>
139@@ -273,7 +273,7 @@
140 </child>
141 <child>
142 <object class="GtkImageMenuItem" id="menu_remove">
143- <property name="label">Mark for _Removal</property>
144+ <property name="label" translatable="yes">Mark for _Removal</property>
145 <property name="visible">True</property>
146 <property name="use_underline">True</property>
147 <property name="use_stock">True</property>
148@@ -283,7 +283,7 @@
149 </child>
150 <child>
151 <object class="GtkImageMenuItem" id="menu_purge">
152- <property name="label">Mark for Co_mplete Removal</property>
153+ <property name="label" translatable="yes">Mark for Co_mplete Removal</property>
154 <property name="visible">True</property>
155 <property name="use_underline">True</property>
156 <property name="use_stock">True</property>
157@@ -356,7 +356,7 @@
158 </child>
159 <child>
160 <object class="GtkImageMenuItem" id="menu_details">
161- <property name="label">_Properties</property>
162+ <property name="label" translatable="yes">_Properties</property>
163 <property name="visible">True</property>
164 <property name="use_underline">True</property>
165 <property name="use_stock">True</property>
166@@ -394,7 +394,7 @@
167 </child>
168 <child>
169 <object class="GtkImageMenuItem" id="edit_filter">
170- <property name="label">_Filters</property>
171+ <property name="label" translatable="yes">_Filters</property>
172 <property name="visible">True</property>
173 <property name="use_underline">True</property>
174 <property name="use_stock">True</property>
175@@ -489,7 +489,7 @@
176 <object class="GtkMenu" id="help1_menu">
177 <child>
178 <object class="GtkImageMenuItem" id="menu_help">
179- <property name="label">_Contents</property>
180+ <property name="label" translatable="yes">_Contents</property>
181 <property name="visible">True</property>
182 <property name="use_underline">True</property>
183 <property name="use_stock">True</property>
184@@ -515,7 +515,7 @@
185 </child>
186 <child>
187 <object class="GtkImageMenuItem" id="menu_about">
188- <property name="label">_About</property>
189+ <property name="label" translatable="yes">_About</property>
190 <property name="visible">True</property>
191 <property name="use_underline">True</property>
192 <property name="use_stock">True</property>
193
194=== modified file 'gtk/rgfindwindow.cc'
195--- gtk/rgfindwindow.cc 2010-11-12 17:24:11 +0000
196+++ gtk/rgfindwindow.cc 2010-12-11 11:31:16 +0000
197@@ -126,7 +126,7 @@
198 GTK_COMBO_BOX(_comboSearchType)));
199 for (int i = 0; SearchTypes[i] != NULL; i++) {
200 gtk_list_store_append(comboStore, &comboIter);
201- gtk_list_store_set(comboStore, &comboIter, 0, SearchTypes[i], -1);
202+ gtk_list_store_set(comboStore, &comboIter, 0, _(SearchTypes[i]), -1);
203 }
204 crt = gtk_cell_renderer_text_new();
205 gtk_cell_layout_clear(GTK_CELL_LAYOUT(_comboSearchType));
206
207=== modified file 'pixmaps/Makefile.am'
208--- pixmaps/Makefile.am 2006-08-08 11:47:27 +0000
209+++ pixmaps/Makefile.am 2010-12-11 11:31:16 +0000
210@@ -5,7 +5,7 @@
211 appicondir = $(datadir)/pixmaps
212 appicon_DATA = synaptic.png
213
214-buttondir = $(datadir)/synaptic/glade
215+buttondir = $(datadir)/synaptic/gtkbuilder
216 button_DATA = update_small.png \
217 upgrade_small.png \
218 distupgrade_small.png\
219@@ -24,7 +24,7 @@
220 yellow.png \
221 red.png
222
223-abouticondir = $(datadir)/synaptic/glade
224+abouticondir = $(datadir)/synaptic/gtkbuilder
225 abouticon_DATA = deb.png \
226 cnc.png \
227 logo.png
228
229=== modified file 'po/POTFILES.in'
230--- po/POTFILES.in 2010-10-19 09:27:24 +0000
231+++ po/POTFILES.in 2010-12-11 11:31:16 +0000
232@@ -22,14 +22,17 @@
233 gtk/rgcdscanner.cc
234 gtk/rgaboutpanel.cc
235 gtk/rgcacheprogress.cc
236+gtk/rgchangelogdialog.cc
237 gtk/rgchangeswindow.cc
238 gtk/rgdebinstallprogress.cc
239+gtk/rgfindwindow.h
240 gtk/rgpreferenceswindow.cc
241 gtk/rgdummyinstallprogress.cc
242 gtk/rgfetchprogress.cc
243 gtk/rgfiltermanager.cc
244 gtk/rginstallprogress.cc
245 gtk/rglogview.cc
246+gtk/rgmainwindow.h
247 gtk/rgdummyinstallprogress.cc
248 gtk/rgpkgdetails.cc
249 gtk/rgmainwindow.cc
250@@ -42,40 +45,40 @@
251 gtk/rgfindwindow.cc
252 gtk/rgsetoptwindow.cc
253 gtk/rgtaskswin.cc
254-gtk/gtkbuilder/window_main.ui
255-gtk/gtkbuilder/window_about.ui
256-gtk/gtkbuilder/window_find.ui
257-gtk/gtkbuilder/window_fetch.ui
258-gtk/gtkbuilder/window_changes.ui
259-gtk/gtkbuilder/window_preferences.ui
260-gtk/gtkbuilder/window_disc_name.ui
261-gtk/gtkbuilder/window_setopt.ui
262-gtk/gtkbuilder/window_summary.ui
263-gtk/gtkbuilder/window_filters.ui
264-gtk/gtkbuilder/window_repositories.ui
265-gtk/gtkbuilder/window_rginstall_progress.ui
266-gtk/gtkbuilder/window_rgdebinstall_progress.ui
267-gtk/gtkbuilder/window_rginstall_progress_msgs.ui
268-gtk/gtkbuilder/window_tasks.ui
269-gtk/gtkbuilder/window_zvtinstallprogress.ui
270-gtk/gtkbuilder/dialog_welcome.ui
271-gtk/gtkbuilder/dialog_unmet.ui
272-gtk/gtkbuilder/dialog_changelog.ui
273-gtk/gtkbuilder/dialog_update_failed.ui
274-gtk/gtkbuilder/window_iconlegend.ui
275-gtk/gtkbuilder/window_zvtinstallprogress.ui
276-gtk/gtkbuilder/window_details.ui
277-gtk/gtkbuilder/dialog_download_error.ui
278-gtk/gtkbuilder/dialog_update_outdated.ui
279-gtk/gtkbuilder/window_logview.ui
280-gtk/gtkbuilder/dialog_quit.ui
281-gtk/gtkbuilder/dialog_conffile.ui
282-gtk/gtkbuilder/dialog_change_version.ui
283-gtk/gtkbuilder/dialog_upgrade.ui
284-gtk/gtkbuilder/dialog_task_descr.ui
285-gtk/gtkbuilder/dialog_authentication.ui
286-gtk/gtkbuilder/dialog_disc_label.ui
287-gtk/gtkbuilder/dialog_new_repositroy.ui
288+[type: gettext/glade]gtk/gtkbuilder/window_main.ui
289+[type: gettext/glade]gtk/gtkbuilder/window_about.ui
290+[type: gettext/glade]gtk/gtkbuilder/window_find.ui
291+[type: gettext/glade]gtk/gtkbuilder/window_fetch.ui
292+[type: gettext/glade]gtk/gtkbuilder/window_changes.ui
293+[type: gettext/glade]gtk/gtkbuilder/window_preferences.ui
294+[type: gettext/glade]gtk/gtkbuilder/window_disc_name.ui
295+[type: gettext/glade]gtk/gtkbuilder/window_setopt.ui
296+[type: gettext/glade]gtk/gtkbuilder/window_summary.ui
297+[type: gettext/glade]gtk/gtkbuilder/window_filters.ui
298+[type: gettext/glade]gtk/gtkbuilder/window_repositories.ui
299+[type: gettext/glade]gtk/gtkbuilder/window_rginstall_progress.ui
300+[type: gettext/glade]gtk/gtkbuilder/window_rgdebinstall_progress.ui
301+[type: gettext/glade]gtk/gtkbuilder/window_rginstall_progress_msgs.ui
302+[type: gettext/glade]gtk/gtkbuilder/window_tasks.ui
303+[type: gettext/glade]gtk/gtkbuilder/window_zvtinstallprogress.ui
304+[type: gettext/glade]gtk/gtkbuilder/dialog_welcome.ui
305+[type: gettext/glade]gtk/gtkbuilder/dialog_unmet.ui
306+[type: gettext/glade]gtk/gtkbuilder/dialog_changelog.ui
307+[type: gettext/glade]gtk/gtkbuilder/dialog_update_failed.ui
308+[type: gettext/glade]gtk/gtkbuilder/window_iconlegend.ui
309+[type: gettext/glade]gtk/gtkbuilder/window_zvtinstallprogress.ui
310+[type: gettext/glade]gtk/gtkbuilder/window_details.ui
311+[type: gettext/glade]gtk/gtkbuilder/dialog_download_error.ui
312+[type: gettext/glade]gtk/gtkbuilder/dialog_update_outdated.ui
313+[type: gettext/glade]gtk/gtkbuilder/window_logview.ui
314+[type: gettext/glade]gtk/gtkbuilder/dialog_quit.ui
315+[type: gettext/glade]gtk/gtkbuilder/dialog_conffile.ui
316+[type: gettext/glade]gtk/gtkbuilder/dialog_change_version.ui
317+[type: gettext/glade]gtk/gtkbuilder/dialog_upgrade.ui
318+[type: gettext/glade]gtk/gtkbuilder/dialog_task_descr.ui
319+[type: gettext/glade]gtk/gtkbuilder/dialog_authentication.ui
320+[type: gettext/glade]gtk/gtkbuilder/dialog_disc_label.ui
321+[type: gettext/glade]gtk/gtkbuilder/dialog_new_repositroy.ui
322 data/synaptic.desktop.in
323 data/synaptic-kde.desktop.in
324 gtk/rgfiltermanager.h
325
326=== modified file 'po/POTFILES.skip'
327--- po/POTFILES.skip 2007-07-23 13:28:19 +0000
328+++ po/POTFILES.skip 2010-12-11 11:31:16 +0000
329@@ -14,10 +14,10 @@
330 wings/rwuserdialog.cc
331 wings/synaptic.cc
332
333-# unused glade files
334-gtk/glade/dialog_columns.glade
335-gtk/glade/dialog_example.glade
336-gtk/glade/dialog_proposed_new_repositories.glade
337-gtk/glade/druid_repository.glade
338-gtk/glade/window_install_progress.glade
339-gtk/glade/window_procceed.glade
340+# unused gtkbuilder files
341+gtk/gtkbuilder/dialog_columns.ui
342+gtk/gtkbuilder/dialog_example.ui
343+gtk/gtkbuilder/dialog_proposed_new_repositories.ui
344+gtk/gtkbuilder/druid_repository.ui
345+gtk/gtkbuilder/window_install_progress.ui
346+gtk/gtkbuilder/window_procceed.ui

Subscribers

People subscribed via source and target branches

to all changes: