Merge lp:~chrismcginlay/ubuntu/natty/synaptic/synaptic-fix-706271 into lp:ubuntu/natty/synaptic
- Natty (11.04)
- synaptic-fix-706271
- Merge into natty
Proposed by
Chris McGinlay
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Michael Vogt | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~chrismcginlay/ubuntu/natty/synaptic/synaptic-fix-706271 | ||||
Merge into: | lp:ubuntu/natty/synaptic | ||||
Diff against target: |
629 lines (+66/-58) 45 files modified
debian/changelog (+8/-0) gtk/gtkbuilder/window_preferences.ui (+1/-1) po/ar.po (+1/-1) po/be.po (+1/-1) po/be@latin.po (+1/-1) po/bg.po (+1/-1) po/br.po (+1/-1) po/ca.po (+1/-1) po/cs.po (+3/-3) po/da.po (+2/-2) po/de.po (+1/-1) po/el.po (+1/-1) po/es.po (+1/-1) po/et.po (+2/-2) po/eu.po (+1/-1) po/fi.po (+1/-1) po/fr.po (+2/-2) po/gl.po (+2/-2) po/he.po (+1/-1) po/hi.po (+1/-1) po/hu.po (+2/-2) po/it.po (+1/-1) po/ja.po (+1/-1) po/ko.po (+1/-1) po/lt.po (+1/-1) po/mk.po (+1/-1) po/nl.po (+2/-2) po/no.po (+2/-2) po/pl.po (+2/-2) po/pt.po (+1/-1) po/pt_BR.po (+1/-1) po/ro.po (+2/-2) po/ru.po (+1/-1) po/sk.po (+2/-2) po/sl.po (+1/-1) po/sr.po (+1/-1) po/sr@Latn.po (+3/-3) po/sv.po (+1/-1) po/th.po (+1/-1) po/tr.po (+1/-1) po/uk.po (+1/-1) po/xh.po (+1/-1) po/zh_CN.po (+1/-1) po/zh_HK.po (+1/-1) po/zh_TW.po (+1/-1) |
||||
To merge this branch: | bzr merge lp:~chrismcginlay/ubuntu/natty/synaptic/synaptic-fix-706271 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt (community) | Approve | ||
Mathieu Trudel-Lapierre | Needs Fixing | ||
Review via email: mp+49004@code.launchpad.net |
Commit message
Description of the change
* gtk/gtkbuilder/
* po/*
- Change capitalisation of internet to Internet (LP: #706271)
Please review with caution as I am new to MOTU and bzr.
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote : | # |
review:
Needs Fixing
Revision history for this message
Michael Vogt (mvo) wrote : | # |
Thanks alot fot the fix! I merged it into trunk now (manually as bzr is having trouble merging from a lp:ubuntu branch into the normal lp:synaptic branch).
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2010-12-17 15:05:09 +0000 |
3 | +++ debian/changelog 2011-02-09 00:02:19 +0000 |
4 | @@ -1,3 +1,11 @@ |
5 | +synaptic (0.75~pre4ubuntu1) natty; urgency=low |
6 | + |
7 | + * gtk/gtkbuilder/window_preferences.ui: |
8 | + * po/* |
9 | + - Change capitalisation of internet to Internet (LP: #706271) |
10 | + |
11 | + -- Chris McGinlay <chris@NattyDev> Tue, 08 Feb 2011 23:43:23 +0000 |
12 | + |
13 | synaptic (0.75~pre4) natty; urgency=low |
14 | |
15 | * debian/control: |
16 | |
17 | === modified file 'gtk/gtkbuilder/window_preferences.ui' |
18 | --- gtk/gtkbuilder/window_preferences.ui 2010-12-07 10:29:57 +0000 |
19 | +++ gtk/gtkbuilder/window_preferences.ui 2011-02-09 00:02:19 +0000 |
20 | @@ -1792,7 +1792,7 @@ |
21 | <property name="spacing">6</property> |
22 | <child> |
23 | <object class="GtkRadioButton" id="radio_no_proxy"> |
24 | - <property name="label" translatable="yes">Direct connection to the internet</property> |
25 | + <property name="label" translatable="yes">Direct connection to the Internet</property> |
26 | <property name="visible">True</property> |
27 | <property name="can_focus">True</property> |
28 | <property name="receives_default">False</property> |
29 | |
30 | === modified file 'po/ar.po' |
31 | --- po/ar.po 2010-12-07 10:29:57 +0000 |
32 | +++ po/ar.po 2011-02-09 00:02:19 +0000 |
33 | @@ -2760,7 +2760,7 @@ |
34 | #~ msgid "Delete all cache package files now." |
35 | #~ msgstr "_حذف ملفات الحزم المخبأة" |
36 | |
37 | -#~ msgid "Direct connection to the internet" |
38 | +#~ msgid "Direct connection to the Internet" |
39 | #~ msgstr "اتصال مباشر بالانترنت" |
40 | |
41 | #~ msgid "FTP proxy: " |
42 | |
43 | === modified file 'po/be.po' |
44 | --- po/be.po 2010-12-07 10:29:57 +0000 |
45 | +++ po/be.po 2011-02-09 00:02:19 +0000 |
46 | @@ -2749,7 +2749,7 @@ |
47 | #~ msgid "Delete all cache package files now." |
48 | #~ msgstr "Выдаліць за_кэшаваныя файлы пакетаў" |
49 | |
50 | -#~ msgid "Direct connection to the internet" |
51 | +#~ msgid "Direct connection to the Internet" |
52 | #~ msgstr "Наўпроставае далучэньне да інтэрнэту" |
53 | |
54 | #~ msgid "FTP proxy: " |
55 | |
56 | === modified file 'po/be@latin.po' |
57 | --- po/be@latin.po 2010-12-07 10:29:57 +0000 |
58 | +++ po/be@latin.po 2011-02-09 00:02:19 +0000 |
59 | @@ -2769,7 +2769,7 @@ |
60 | #~ msgid "Delete all cache package files now." |
61 | #~ msgstr "_Vydal zachavanyja fajły pakunkaŭ" |
62 | |
63 | -#~ msgid "Direct connection to the internet" |
64 | +#~ msgid "Direct connection to the Internet" |
65 | #~ msgstr "Prostaje spałučeńnie ź siecivam" |
66 | |
67 | #~ msgid "FTP proxy: " |
68 | |
69 | === modified file 'po/bg.po' |
70 | --- po/bg.po 2010-12-07 10:29:57 +0000 |
71 | +++ po/bg.po 2011-02-09 00:02:19 +0000 |
72 | @@ -2761,7 +2761,7 @@ |
73 | #~ msgid "Delete all cache package files now." |
74 | #~ msgstr "Изтриване на кешираните файлове на пакетите" |
75 | |
76 | -#~ msgid "Direct connection to the internet" |
77 | +#~ msgid "Direct connection to the Internet" |
78 | #~ msgstr "Директна връзка с интернет" |
79 | |
80 | #~ msgid "FTP proxy: " |
81 | |
82 | === modified file 'po/br.po' |
83 | --- po/br.po 2010-12-07 10:29:57 +0000 |
84 | +++ po/br.po 2011-02-09 00:02:19 +0000 |
85 | @@ -2750,7 +2750,7 @@ |
86 | #~ msgid "Delete all cache package files now." |
87 | #~ msgstr "Diverkañ bremañ an holl bakadoù memoret." |
88 | |
89 | -#~ msgid "Direct connection to the internet" |
90 | +#~ msgid "Direct connection to the Internet" |
91 | #~ msgstr "Kevread eeun war genrouedad" |
92 | |
93 | #~ msgid "FTP proxy: " |
94 | |
95 | === modified file 'po/ca.po' |
96 | --- po/ca.po 2010-12-07 10:29:57 +0000 |
97 | +++ po/ca.po 2011-02-09 00:02:19 +0000 |
98 | @@ -2766,7 +2766,7 @@ |
99 | #~ msgid "Delete all cache package files now." |
100 | #~ msgstr "Elimina els fitxers de paquets de la memòria cau." |
101 | |
102 | -#~ msgid "Direct connection to the internet" |
103 | +#~ msgid "Direct connection to the Internet" |
104 | #~ msgstr "Connexió directa a Internet" |
105 | |
106 | #~ msgid "FTP proxy: " |
107 | |
108 | === modified file 'po/cs.po' |
109 | --- po/cs.po 2010-12-07 10:29:57 +0000 |
110 | +++ po/cs.po 2011-02-09 00:02:19 +0000 |
111 | @@ -1830,7 +1830,7 @@ |
112 | "Není nainstalován žádný prohlížeč nápovědy\n" |
113 | "\n" |
114 | "Abyste si mohli zobrazit manuál k Synapticu, potřebujete buď 'yelp', což je " |
115 | -"prohlížeč nápovědy pro GNOME, nebo internetový prohlížeč 'mozilla' či " |
116 | +"prohlížeč nápovědy pro GNOME, nebo Internetový prohlížeč 'mozilla' či " |
117 | "'konqueror'.\n" |
118 | "\n" |
119 | "Případně si mlžete otevřít manuálové stránky zadáním příkazu 'man synaptic' " |
120 | @@ -2770,8 +2770,8 @@ |
121 | #~ msgid "Delete all cache package files now." |
122 | #~ msgstr "Smazat všechny balíky ve vyrovnávací paměti." |
123 | |
124 | -#~ msgid "Direct connection to the internet" |
125 | -#~ msgstr "Přímé připojení k internetu" |
126 | +#~ msgid "Direct connection to the Internet" |
127 | +#~ msgstr "Přímé připojení k Internetu" |
128 | |
129 | #~ msgid "FTP proxy: " |
130 | #~ msgstr "FTP proxy: " |
131 | |
132 | === modified file 'po/da.po' |
133 | --- po/da.po 2010-12-07 10:29:57 +0000 |
134 | +++ po/da.po 2011-02-09 00:02:19 +0000 |
135 | @@ -2753,8 +2753,8 @@ |
136 | #~ msgid "Delete all cache package files now." |
137 | #~ msgstr "_Slet gemte pakkefiler" |
138 | |
139 | -#~ msgid "Direct connection to the internet" |
140 | -#~ msgstr "Direkte forbindelse til internettet" |
141 | +#~ msgid "Direct connection to the Internet" |
142 | +#~ msgstr "Direkte forbindelse til Internettet" |
143 | |
144 | #~ msgid "FTP proxy: " |
145 | #~ msgstr "FTP-mellemvært: " |
146 | |
147 | === modified file 'po/de.po' |
148 | --- po/de.po 2010-12-07 10:29:57 +0000 |
149 | +++ po/de.po 2011-02-09 00:02:19 +0000 |
150 | @@ -2796,7 +2796,7 @@ |
151 | #~ msgid "Delete all cache package files now." |
152 | #~ msgstr "Alle Paketdateien im Zwischenspeicher _löschen" |
153 | |
154 | -#~ msgid "Direct connection to the internet" |
155 | +#~ msgid "Direct connection to the Internet" |
156 | #~ msgstr "Direkte Verbindung mit dem Internet" |
157 | |
158 | #~ msgid "FTP proxy: " |
159 | |
160 | === modified file 'po/el.po' |
161 | --- po/el.po 2010-12-07 10:29:57 +0000 |
162 | +++ po/el.po 2011-02-09 00:02:19 +0000 |
163 | @@ -2760,7 +2760,7 @@ |
164 | #~ msgid "Delete all cache package files now." |
165 | #~ msgstr "Διαγραφή αρχείων από την cache τώρα." |
166 | |
167 | -#~ msgid "Direct connection to the internet" |
168 | +#~ msgid "Direct connection to the Internet" |
169 | #~ msgstr "Απ ευθείας σύνδεση στο διαδίκτυο" |
170 | |
171 | #~ msgid "FTP proxy: " |
172 | |
173 | === modified file 'po/es.po' |
174 | --- po/es.po 2010-12-07 10:29:57 +0000 |
175 | +++ po/es.po 2011-02-09 00:02:19 +0000 |
176 | @@ -2773,7 +2773,7 @@ |
177 | #~ msgid "Delete all cache package files now." |
178 | #~ msgstr "Borrar todos los paquetes de la caché ahora." |
179 | |
180 | -#~ msgid "Direct connection to the internet" |
181 | +#~ msgid "Direct connection to the Internet" |
182 | #~ msgstr "Conexión directa a Internet" |
183 | |
184 | #~ msgid "FTP proxy: " |
185 | |
186 | === modified file 'po/et.po' |
187 | --- po/et.po 2010-12-07 10:29:57 +0000 |
188 | +++ po/et.po 2011-02-09 00:02:19 +0000 |
189 | @@ -2763,8 +2763,8 @@ |
190 | #~ msgid "Delete all cache package files now." |
191 | #~ msgstr "Kustuta kohe k??ik puhverdatud paketifailid." |
192 | |
193 | -#~ msgid "Direct connection to the internet" |
194 | -#~ msgstr "P??si??hendus internetiga" |
195 | +#~ msgid "Direct connection to the Internet" |
196 | +#~ msgstr "P??si??hendus Internetiga" |
197 | |
198 | #~ msgid "FTP proxy: " |
199 | #~ msgstr "FTP proksi: " |
200 | |
201 | === modified file 'po/eu.po' |
202 | --- po/eu.po 2010-12-07 10:29:57 +0000 |
203 | +++ po/eu.po 2011-02-09 00:02:19 +0000 |
204 | @@ -2760,7 +2760,7 @@ |
205 | #~ msgid "Delete all cache package files now." |
206 | #~ msgstr "Ezabatu pakete-fitxategi guztiak cachetik" |
207 | |
208 | -#~ msgid "Direct connection to the internet" |
209 | +#~ msgid "Direct connection to the Internet" |
210 | #~ msgstr "Interneteko zuzeneko konexioa" |
211 | |
212 | #~ msgid "FTP proxy: " |
213 | |
214 | === modified file 'po/fi.po' |
215 | --- po/fi.po 2010-12-07 10:29:57 +0000 |
216 | +++ po/fi.po 2011-02-09 00:02:19 +0000 |
217 | @@ -2757,7 +2757,7 @@ |
218 | #~ msgid "Delete all cache package files now." |
219 | #~ msgstr "Poista kaikki pakettitiedostot välimuistista heti." |
220 | |
221 | -#~ msgid "Direct connection to the internet" |
222 | +#~ msgid "Direct connection to the Internet" |
223 | #~ msgstr "Suora yhteys Internetiin" |
224 | |
225 | #~ msgid "FTP proxy: " |
226 | |
227 | === modified file 'po/fr.po' |
228 | --- po/fr.po 2010-12-07 10:29:57 +0000 |
229 | +++ po/fr.po 2011-02-09 00:02:19 +0000 |
230 | @@ -2779,8 +2779,8 @@ |
231 | #~ msgid "Delete all cache package files now." |
232 | #~ msgstr "Supprimer maintenant tous les fichiers de paquets en cache." |
233 | |
234 | -#~ msgid "Direct connection to the internet" |
235 | -#~ msgstr "Connexion directe à internet" |
236 | +#~ msgid "Direct connection to the Internet" |
237 | +#~ msgstr "Connexion directe à Internet" |
238 | |
239 | #~ msgid "FTP proxy: " |
240 | #~ msgstr "Mandataire FTP : " |
241 | |
242 | === modified file 'po/gl.po' |
243 | --- po/gl.po 2010-12-07 10:29:57 +0000 |
244 | +++ po/gl.po 2011-02-09 00:02:19 +0000 |
245 | @@ -2768,8 +2768,8 @@ |
246 | #~ msgid "Delete all cache package files now." |
247 | #~ msgstr "Borrar todos os ficheiros de paquetes en caché agora." |
248 | |
249 | -#~ msgid "Direct connection to the internet" |
250 | -#~ msgstr "Conexión directa a internet" |
251 | +#~ msgid "Direct connection to the Internet" |
252 | +#~ msgstr "Conexión directa a Internet" |
253 | |
254 | #~ msgid "FTP proxy: " |
255 | #~ msgstr "Proxy FTP:" |
256 | |
257 | === modified file 'po/he.po' |
258 | --- po/he.po 2010-12-07 10:29:57 +0000 |
259 | +++ po/he.po 2011-02-09 00:02:19 +0000 |
260 | @@ -2701,7 +2701,7 @@ |
261 | #~ msgid "Delete all cache package files now." |
262 | #~ msgstr "מחיקת כל החבילות מהמטמון עכשיו." |
263 | |
264 | -#~ msgid "Direct connection to the internet" |
265 | +#~ msgid "Direct connection to the Internet" |
266 | #~ msgstr "חיבור ישיר לאינטרנט" |
267 | |
268 | #~ msgid "FTP proxy: " |
269 | |
270 | === modified file 'po/hi.po' |
271 | --- po/hi.po 2010-12-07 10:29:57 +0000 |
272 | +++ po/hi.po 2011-02-09 00:02:19 +0000 |
273 | @@ -2622,7 +2622,7 @@ |
274 | #~ msgid "Delete all cache package files now." |
275 | #~ msgstr "कैश फोल्डर की पैकेज फाइलें मिटा दें(_D)" |
276 | |
277 | -#~ msgid "Direct connection to the internet" |
278 | +#~ msgid "Direct connection to the Internet" |
279 | #~ msgstr "इन्टर्नेट से सीधा सम्पर्क" |
280 | |
281 | #~ msgid "FTP proxy: " |
282 | |
283 | === modified file 'po/hu.po' |
284 | --- po/hu.po 2010-12-07 10:29:57 +0000 |
285 | +++ po/hu.po 2011-02-09 00:02:19 +0000 |
286 | @@ -2845,8 +2845,8 @@ |
287 | msgstr "A gyorsítótárban lévő csomagfájlok azonnali törlése." |
288 | |
289 | #: ../gtk/glade/window_preferences.glade.h:35 |
290 | -msgid "Direct connection to the internet" |
291 | -msgstr "Közvetlen internetkapcsolat" |
292 | +msgid "Direct connection to the Internet" |
293 | +msgstr "Közvetlen Internetkapcsolat" |
294 | |
295 | #: ../gtk/glade/window_preferences.glade.h:37 |
296 | msgid "FTP proxy: " |
297 | |
298 | === modified file 'po/it.po' |
299 | --- po/it.po 2010-12-07 10:29:57 +0000 |
300 | +++ po/it.po 2011-02-09 00:02:19 +0000 |
301 | @@ -2795,7 +2795,7 @@ |
302 | #~ msgid "Delete all cache package files now." |
303 | #~ msgstr "Elimina tutti i pacchetti dalla cache" |
304 | |
305 | -#~ msgid "Direct connection to the internet" |
306 | +#~ msgid "Direct connection to the Internet" |
307 | #~ msgstr "Connessione diretta a Internet" |
308 | |
309 | #~ msgid "FTP proxy: " |
310 | |
311 | === modified file 'po/ja.po' |
312 | --- po/ja.po 2010-12-07 10:29:57 +0000 |
313 | +++ po/ja.po 2011-02-09 00:02:19 +0000 |
314 | @@ -2767,7 +2767,7 @@ |
315 | #~ msgid "Delete all cache package files now." |
316 | #~ msgstr "キャッシュ内のすべてのパッケージファイルを削除" |
317 | |
318 | -#~ msgid "Direct connection to the internet" |
319 | +#~ msgid "Direct connection to the Internet" |
320 | #~ msgstr "直接インターネットに接続" |
321 | |
322 | #~ msgid "FTP proxy: " |
323 | |
324 | === modified file 'po/ko.po' |
325 | --- po/ko.po 2010-12-07 10:29:57 +0000 |
326 | +++ po/ko.po 2011-02-09 00:02:19 +0000 |
327 | @@ -2739,7 +2739,7 @@ |
328 | #~ msgid "Delete all cache package files now." |
329 | #~ msgstr "임시 저장한 패키지 파일을 지금 모두 지웁니다." |
330 | |
331 | -#~ msgid "Direct connection to the internet" |
332 | +#~ msgid "Direct connection to the Internet" |
333 | #~ msgstr "인터넷에 직접 연결" |
334 | |
335 | #~ msgid "FTP proxy: " |
336 | |
337 | === modified file 'po/lt.po' |
338 | --- po/lt.po 2010-12-07 10:29:57 +0000 |
339 | +++ po/lt.po 2011-02-09 00:02:19 +0000 |
340 | @@ -2759,7 +2759,7 @@ |
341 | #~ msgid "Delete all cache package files now." |
342 | #~ msgstr "Ištrinti visas talpykloje laikomas paketų bylas." |
343 | |
344 | -#~ msgid "Direct connection to the internet" |
345 | +#~ msgid "Direct connection to the Internet" |
346 | #~ msgstr "Tiesioginis ryšys su Internetu" |
347 | |
348 | #~ msgid "FTP proxy: " |
349 | |
350 | === modified file 'po/mk.po' |
351 | --- po/mk.po 2010-12-07 10:29:57 +0000 |
352 | +++ po/mk.po 2011-02-09 00:02:19 +0000 |
353 | @@ -2738,7 +2738,7 @@ |
354 | #~ msgid "Delete all cache package files now." |
355 | #~ msgstr "_Избриши ги кешираните пакети" |
356 | |
357 | -#~ msgid "Direct connection to the internet" |
358 | +#~ msgid "Direct connection to the Internet" |
359 | #~ msgstr "Директна врска до интернет" |
360 | |
361 | #~ msgid "FTP proxy: " |
362 | |
363 | === modified file 'po/nl.po' |
364 | --- po/nl.po 2010-12-07 10:29:57 +0000 |
365 | +++ po/nl.po 2011-02-09 00:02:19 +0000 |
366 | @@ -2764,8 +2764,8 @@ |
367 | #~ msgid "Delete all cache package files now." |
368 | #~ msgstr "Gebufferde pakketbestanden ver_wijderen" |
369 | |
370 | -#~ msgid "Direct connection to the internet" |
371 | -#~ msgstr "Directe verbinding met het internet" |
372 | +#~ msgid "Direct connection to the Internet" |
373 | +#~ msgstr "Directe verbinding met het Internet" |
374 | |
375 | #~ msgid "FTP proxy: " |
376 | #~ msgstr "FTP-proxy: " |
377 | |
378 | === modified file 'po/no.po' |
379 | --- po/no.po 2010-12-07 10:29:57 +0000 |
380 | +++ po/no.po 2011-02-09 00:02:19 +0000 |
381 | @@ -2714,8 +2714,8 @@ |
382 | #~ msgid "Delete all cache package files now." |
383 | #~ msgstr "Henter pakkefiler" |
384 | |
385 | -#~ msgid "Direct connection to the internet" |
386 | -#~ msgstr "Direkte kontakt med internett" |
387 | +#~ msgid "Direct connection to the Internet" |
388 | +#~ msgstr "Direkte kontakt med Internett" |
389 | |
390 | #~ msgid "FTP proxy: " |
391 | #~ msgstr "Ftp proxy" |
392 | |
393 | === modified file 'po/pl.po' |
394 | --- po/pl.po 2010-12-07 10:29:57 +0000 |
395 | +++ po/pl.po 2011-02-09 00:02:19 +0000 |
396 | @@ -2802,8 +2802,8 @@ |
397 | #~ msgid "Delete all cache package files now." |
398 | #~ msgstr "Wykasuj podręczne archiwum pakietów (cache)" |
399 | |
400 | -#~ msgid "Direct connection to the internet" |
401 | -#~ msgstr "Bezpośrednie połączenie z internetem" |
402 | +#~ msgid "Direct connection to the Internet" |
403 | +#~ msgstr "Bezpośrednie połączenie z Internetem" |
404 | |
405 | #~ msgid "FTP proxy: " |
406 | #~ msgstr "Pośrednik FTP: " |
407 | |
408 | === modified file 'po/pt.po' |
409 | --- po/pt.po 2010-12-07 10:29:57 +0000 |
410 | +++ po/pt.po 2011-02-09 00:02:19 +0000 |
411 | @@ -2781,7 +2781,7 @@ |
412 | #~ msgid "Delete all cache package files now." |
413 | #~ msgstr "_Apagar Ficheiros de Pacotes da Cache" |
414 | |
415 | -#~ msgid "Direct connection to the internet" |
416 | +#~ msgid "Direct connection to the Internet" |
417 | #~ msgstr "Ligação directa à Internet" |
418 | |
419 | #~ msgid "FTP proxy: " |
420 | |
421 | === modified file 'po/pt_BR.po' |
422 | --- po/pt_BR.po 2010-12-07 10:29:57 +0000 |
423 | +++ po/pt_BR.po 2011-02-09 00:02:19 +0000 |
424 | @@ -2764,7 +2764,7 @@ |
425 | #~ msgid "Delete all cache package files now." |
426 | #~ msgstr "Apagar todos os arquivos de pacotes do cache agora." |
427 | |
428 | -#~ msgid "Direct connection to the internet" |
429 | +#~ msgid "Direct connection to the Internet" |
430 | #~ msgstr "Conexão direta com a Internet" |
431 | |
432 | #~ msgid "FTP proxy: " |
433 | |
434 | === modified file 'po/ro.po' |
435 | --- po/ro.po 2010-12-07 10:29:57 +0000 |
436 | +++ po/ro.po 2011-02-09 00:02:19 +0000 |
437 | @@ -2774,8 +2774,8 @@ |
438 | #~ msgid "Delete all cache package files now." |
439 | #~ msgstr "Şterge fişierele pachetelor stocate temporar acum." |
440 | |
441 | -#~ msgid "Direct connection to the internet" |
442 | -#~ msgstr "Conexiune directă la internet" |
443 | +#~ msgid "Direct connection to the Internet" |
444 | +#~ msgstr "Conexiune directă la Internet" |
445 | |
446 | #~ msgid "FTP proxy: " |
447 | #~ msgstr "Proxy FTP: " |
448 | |
449 | === modified file 'po/ru.po' |
450 | --- po/ru.po 2010-12-07 10:29:57 +0000 |
451 | +++ po/ru.po 2011-02-09 00:02:19 +0000 |
452 | @@ -2765,7 +2765,7 @@ |
453 | #~ msgid "Delete all cache package files now." |
454 | #~ msgstr "Удалить все файлы кэша пакетов." |
455 | |
456 | -#~ msgid "Direct connection to the internet" |
457 | +#~ msgid "Direct connection to the Internet" |
458 | #~ msgstr "Прямое подключение к Интернет" |
459 | |
460 | #~ msgid "FTP proxy: " |
461 | |
462 | === modified file 'po/sk.po' |
463 | --- po/sk.po 2010-12-07 10:29:57 +0000 |
464 | +++ po/sk.po 2011-02-09 00:02:19 +0000 |
465 | @@ -2750,8 +2750,8 @@ |
466 | #~ msgid "Delete all cache package files now." |
467 | #~ msgstr "Teraz zmazať všetky stiahnuté balíky z vyrovnávacej pamäte." |
468 | |
469 | -#~ msgid "Direct connection to the internet" |
470 | -#~ msgstr "Priame pripojenie k internetu" |
471 | +#~ msgid "Direct connection to the Internet" |
472 | +#~ msgstr "Priame pripojenie k Internetu" |
473 | |
474 | #~ msgid "FTP proxy: " |
475 | #~ msgstr "FTP proxy: " |
476 | |
477 | === modified file 'po/sl.po' |
478 | --- po/sl.po 2010-12-07 10:29:57 +0000 |
479 | +++ po/sl.po 2011-02-09 00:02:19 +0000 |
480 | @@ -2758,7 +2758,7 @@ |
481 | #~ msgid "Delete all cache package files now." |
482 | #~ msgstr "Izbriši vse predpomnjene pakete." |
483 | |
484 | -#~ msgid "Direct connection to the internet" |
485 | +#~ msgid "Direct connection to the Internet" |
486 | #~ msgstr "Neposredna povezava s spletom" |
487 | |
488 | #~ msgid "FTP proxy: " |
489 | |
490 | === modified file 'po/sr.po' |
491 | --- po/sr.po 2010-12-07 10:29:57 +0000 |
492 | +++ po/sr.po 2011-02-09 00:02:19 +0000 |
493 | @@ -2787,7 +2787,7 @@ |
494 | #~ msgid "Delete all cache package files now." |
495 | #~ msgstr "Замењени пакети" |
496 | |
497 | -#~ msgid "Direct connection to the internet" |
498 | +#~ msgid "Direct connection to the Internet" |
499 | #~ msgstr "Директна интернет веза" |
500 | |
501 | #~ msgid "FTP proxy: " |
502 | |
503 | === modified file 'po/sr@Latn.po' |
504 | --- po/sr@Latn.po 2010-12-07 10:29:57 +0000 |
505 | +++ po/sr@Latn.po 2011-02-09 00:02:19 +0000 |
506 | @@ -2657,7 +2657,7 @@ |
507 | #~ "Visit the home page at \n" |
508 | #~ "http://www.nongnu.org/synaptic/" |
509 | #~ msgstr "" |
510 | -#~ "Posetite stranicu projekta na internet adresi \n" |
511 | +#~ "Posetite stranicu projekta na Internet adresi \n" |
512 | #~ "http://www.nongnu.org/synaptic/" |
513 | |
514 | #~ msgid "Written by" |
515 | @@ -2787,8 +2787,8 @@ |
516 | #~ msgid "Delete all cache package files now." |
517 | #~ msgstr "Zamenjeni paketi" |
518 | |
519 | -#~ msgid "Direct connection to the internet" |
520 | -#~ msgstr "Direktna internet veza" |
521 | +#~ msgid "Direct connection to the Internet" |
522 | +#~ msgstr "Direktna Internet veza" |
523 | |
524 | #~ msgid "FTP proxy: " |
525 | #~ msgstr "„FTP“ posrednik: " |
526 | |
527 | === modified file 'po/sv.po' |
528 | --- po/sv.po 2010-12-07 10:29:57 +0000 |
529 | +++ po/sv.po 2011-02-09 00:02:19 +0000 |
530 | @@ -2770,7 +2770,7 @@ |
531 | #~ msgid "Delete all cache package files now." |
532 | #~ msgstr "Ta bort alla mellanlagrade paketfiler nu." |
533 | |
534 | -#~ msgid "Direct connection to the internet" |
535 | +#~ msgid "Direct connection to the Internet" |
536 | #~ msgstr "Direktanslutning till Internet" |
537 | |
538 | #~ msgid "FTP proxy: " |
539 | |
540 | === modified file 'po/th.po' |
541 | --- po/th.po 2010-12-07 10:29:57 +0000 |
542 | +++ po/th.po 2011-02-09 00:02:19 +0000 |
543 | @@ -2686,7 +2686,7 @@ |
544 | #~ msgid "Delete all cache package files now." |
545 | #~ msgstr "ลบแฟ้มแพกเกจในแคชทั้งหมดทันที" |
546 | |
547 | -#~ msgid "Direct connection to the internet" |
548 | +#~ msgid "Direct connection to the Internet" |
549 | #~ msgstr "เชื่อมกับอินเทอร์เน็ตโดยตรง" |
550 | |
551 | #~ msgid "FTP proxy: " |
552 | |
553 | === modified file 'po/tr.po' |
554 | --- po/tr.po 2010-12-07 10:29:57 +0000 |
555 | +++ po/tr.po 2011-02-09 00:02:19 +0000 |
556 | @@ -2740,7 +2740,7 @@ |
557 | #~ msgid "Delete all cache package files now." |
558 | #~ msgstr "Önbellekteki tüm paketleri şimdi sil." |
559 | |
560 | -#~ msgid "Direct connection to the internet" |
561 | +#~ msgid "Direct connection to the Internet" |
562 | #~ msgstr "İnternete doğrudan bağlantı" |
563 | |
564 | #~ msgid "FTP proxy: " |
565 | |
566 | === modified file 'po/uk.po' |
567 | --- po/uk.po 2010-12-07 10:29:57 +0000 |
568 | +++ po/uk.po 2011-02-09 00:02:19 +0000 |
569 | @@ -2760,7 +2760,7 @@ |
570 | #~ msgid "Delete all cache package files now." |
571 | #~ msgstr "Вилучити негайно усі локально збережені файли пакунків." |
572 | |
573 | -#~ msgid "Direct connection to the internet" |
574 | +#~ msgid "Direct connection to the Internet" |
575 | #~ msgstr "Пряме підключення до Інтернету" |
576 | |
577 | #~ msgid "FTP proxy: " |
578 | |
579 | === modified file 'po/xh.po' |
580 | --- po/xh.po 2010-12-07 10:29:57 +0000 |
581 | +++ po/xh.po 2011-02-09 00:02:19 +0000 |
582 | @@ -2752,7 +2752,7 @@ |
583 | #~ msgid "Delete all cache package files now." |
584 | #~ msgstr "_Cima iiFayili zoMqulu kuVimba" |
585 | |
586 | -#~ msgid "Direct connection to the internet" |
587 | +#~ msgid "Direct connection to the Internet" |
588 | #~ msgstr "Uqhagamshelwano oluthe ngqo kwi-intanethi" |
589 | |
590 | #~ msgid "FTP proxy: " |
591 | |
592 | === modified file 'po/zh_CN.po' |
593 | --- po/zh_CN.po 2010-12-07 10:29:57 +0000 |
594 | +++ po/zh_CN.po 2011-02-09 00:02:19 +0000 |
595 | @@ -2702,7 +2702,7 @@ |
596 | #~ msgid "Delete all cache package files now." |
597 | #~ msgstr "现在删除全部缓存的软件包文件。" |
598 | |
599 | -#~ msgid "Direct connection to the internet" |
600 | +#~ msgid "Direct connection to the Internet" |
601 | #~ msgstr "直接连接到国际互联网" |
602 | |
603 | #~ msgid "FTP proxy: " |
604 | |
605 | === modified file 'po/zh_HK.po' |
606 | --- po/zh_HK.po 2006-12-20 17:30:46 +0000 |
607 | +++ po/zh_HK.po 2011-02-09 00:02:19 +0000 |
608 | @@ -2670,7 +2670,7 @@ |
609 | msgstr "" |
610 | |
611 | #: ../gtk/window_preferences.glade.h:33 |
612 | -msgid "Direct connection to the internet" |
613 | +msgid "Direct connection to the Internet" |
614 | msgstr "" |
615 | |
616 | #: ../gtk/window_preferences.glade.h:35 |
617 | |
618 | === modified file 'po/zh_TW.po' |
619 | --- po/zh_TW.po 2010-12-07 10:29:57 +0000 |
620 | +++ po/zh_TW.po 2011-02-09 00:02:19 +0000 |
621 | @@ -2719,7 +2719,7 @@ |
622 | #~ msgid "Delete all cache package files now." |
623 | #~ msgstr "刪除套件快取檔案(_D)" |
624 | |
625 | -#~ msgid "Direct connection to the internet" |
626 | +#~ msgid "Direct connection to the Internet" |
627 | #~ msgstr "直接連線到網路" |
628 | |
629 | #~ msgid "FTP proxy: " |
I see the changes are done properly for such a merge (on a native package we handle directly in a Ubuntu branch), so I think it's good aside from minor issues:
- please use a valid email for you Launchpad account as your "ID" (the last line's email field)
- you can configure this with the DEBEMAIL and DEBFULLNAME environment variables
- new revision should just be 0.75~pre5, I think.
Note that I also can't upload/sponsor synaptic, so my opinion on this only marginally matters :D
Please, use the interface to request a new review, which should set "ubuntu-sponsors" as the reviewer.