Merge lp:~javier-lopez/ubuntu/maverick/sbackup/fix-384334 into lp:ubuntu/maverick/sbackup

Proposed by Javier López
Status: Work in progress
Proposed branch: lp:~javier-lopez/ubuntu/maverick/sbackup/fix-384334
Merge into: lp:ubuntu/maverick/sbackup
Diff against target: 344 lines (+34/-26)
26 files modified
debian/changelog (+8/-0)
po/ca.po (+1/-1)
po/cs.po (+1/-1)
po/de.po (+1/-1)
po/en_GB.po (+2/-2)
po/es.po (+1/-1)
po/fr.po (+1/-1)
po/gl.po (+1/-1)
po/hu.po (+1/-1)
po/id.po (+1/-1)
po/it.po (+1/-1)
po/ja.po (+1/-1)
po/lv.po (+1/-1)
po/messages.pot (+1/-1)
po/ms.po (+1/-1)
po/nb.po (+1/-1)
po/nl.po (+1/-1)
po/pl.po (+1/-1)
po/pt.po (+1/-1)
po/pt_BR.po (+1/-1)
po/sv.po (+1/-1)
po/tr.po (+1/-1)
po/uk.po (+1/-1)
po/zh_CN.po (+1/-1)
po/zh_TW.po (+1/-1)
simple-backup-config.glade (+1/-1)
To merge this branch: bzr merge lp:~javier-lopez/ubuntu/maverick/sbackup/fix-384334
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+31818@code.launchpad.net

Description of the change

sbackup (0.10.5+nmu1ubuntu2) maverick; urgency=low

  * Fixed typo: "before click" → "before clicking" (LP: #384334)
    - simple-backup-config.glade
    - po/*

 -- chilicuil <chilicuil@i.am> Thu, 05 Aug 2010 02:19:16 -0500

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

I see rumors of a new upstream version in bug #550261. Can you pass this to the upstream maintainers? Marking WIP, change back to Needs Review if we still need to do this.

Unmerged revisions

7. By Javier López

* Fixed typo: "before click" → "before clicking" (LP: #384334)
  - simple-backup-config.glade
  - po/*

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-05-06 00:08:02 +0000
3+++ debian/changelog 2010-08-05 07:39:44 +0000
4@@ -1,3 +1,11 @@
5+sbackup (0.10.5+nmu1ubuntu2) maverick; urgency=low
6+
7+ * Fixed typo: "before click" → "before clicking" (LP: #384334)
8+ - simple-backup-config.glade
9+ - po/*
10+
11+ -- chilicuil <chilicuil@i.am> Thu, 05 Aug 2010 02:19:16 -0500
12+
13 sbackup (0.10.5+nmu1ubuntu1) maverick; urgency=low
14
15 * Merge from debian unstable. Remaining changes:
16
17=== modified file 'po/ca.po'
18--- po/ca.po 2007-05-19 16:53:10 +0000
19+++ po/ca.po 2010-08-05 07:39:44 +0000
20@@ -252,7 +252,7 @@
21 #: simple-backup-config.glade:53
22 msgid ""
23 "Do backup now, with configuration above. Don't forget to save any "
24-"modification before click this button."
25+"modification before clicking this button."
26 msgstr ""
27 "Crea la còpia de seguretat ara, amb la configuració de dalt. No oblidis "
28 "guardar qualsevol modificació abans de prémer aquest botó."
29
30=== modified file 'po/cs.po'
31--- po/cs.po 2007-05-19 16:53:10 +0000
32+++ po/cs.po 2010-08-05 07:39:44 +0000
33@@ -242,7 +242,7 @@
34 #: simple-backup-config.glade:53
35 msgid ""
36 "Do backup now, with configuration above. Don't forget to save any "
37-"modification before click this button."
38+"modification before clicking this button."
39 msgstr ""
40
41 #: simple-backup-config.glade:99
42
43=== modified file 'po/de.po'
44--- po/de.po 2007-05-19 16:53:10 +0000
45+++ po/de.po 2010-08-05 07:39:44 +0000
46@@ -282,7 +282,7 @@
47 #, fuzzy
48 msgid ""
49 "Do backup now, with configuration above. Don't forget to save any "
50-"modification before click this button."
51+"modification before clicking this button."
52 msgstr ""
53 "Jetzt eine Sicherung mit der aktuellen Konfiguration erstellen. Vergessen "
54 "Sie nicht die Änderungen zu speichern bevor Sie diese Aktion wählen."
55
56=== modified file 'po/en_GB.po'
57--- po/en_GB.po 2007-05-19 16:53:10 +0000
58+++ po/en_GB.po 2010-08-05 07:39:44 +0000
59@@ -255,10 +255,10 @@
60 #: simple-backup-config.glade:53
61 msgid ""
62 "Do backup now, with configuration above. Don't forget to save any "
63-"modification before click this button."
64+"modification before clicking this button."
65 msgstr ""
66 "Do backup now, with configuration above. Don't forget to save any "
67-"modification before click this button."
68+"modification before clicking this button."
69
70 #: simple-backup-config.glade:99
71 msgid "_Backup Now!"
72
73=== modified file 'po/es.po'
74--- po/es.po 2007-05-19 16:53:10 +0000
75+++ po/es.po 2010-08-05 07:39:44 +0000
76@@ -264,7 +264,7 @@
77 #: simple-backup-config.glade:53
78 msgid ""
79 "Do backup now, with configuration above. Don't forget to save any "
80-"modification before click this button."
81+"modification before clicking this button."
82 msgstr ""
83 "Generar una copia de respaldo ahora, con la configuración de arriba. No "
84 "olvide guardar cualquier modificación antes de presionar este botón."
85
86=== modified file 'po/fr.po'
87--- po/fr.po 2010-05-06 00:08:02 +0000
88+++ po/fr.po 2010-08-05 07:39:44 +0000
89@@ -268,7 +268,7 @@
90 #: simple-backup-config.glade:53
91 msgid ""
92 "Do backup now, with configuration above. Don't forget to save any "
93-"modification before click this button."
94+"modification before clicking this button."
95 msgstr ""
96 "Effectuer la sauvegarde maintenant, avec la configuration ci-dessus. Ne pas "
97 "oublier de sauvegarder toute modification avant de cliquer sur ce bouton."
98
99=== modified file 'po/gl.po'
100--- po/gl.po 2007-05-19 16:53:10 +0000
101+++ po/gl.po 2010-08-05 07:39:44 +0000
102@@ -261,7 +261,7 @@
103 #: simple-backup-config.glade:53
104 msgid ""
105 "Do backup now, with configuration above. Don't forget to save any "
106-"modification before click this button."
107+"modification before clicking this button."
108 msgstr ""
109
110 #: simple-backup-config.glade:99
111
112=== modified file 'po/hu.po'
113--- po/hu.po 2007-05-19 16:53:10 +0000
114+++ po/hu.po 2010-08-05 07:39:44 +0000
115@@ -251,7 +251,7 @@
116 #: simple-backup-config.glade:53
117 msgid ""
118 "Do backup now, with configuration above. Don't forget to save any "
119-"modification before click this button."
120+"modification before clicking this button."
121 msgstr ""
122
123 #: simple-backup-config.glade:99
124
125=== modified file 'po/id.po'
126--- po/id.po 2007-05-19 16:53:10 +0000
127+++ po/id.po 2010-08-05 07:39:44 +0000
128@@ -244,7 +244,7 @@
129 #: simple-backup-config.glade:53
130 msgid ""
131 "Do backup now, with configuration above. Don't forget to save any "
132-"modification before click this button."
133+"modification before clicking this button."
134 msgstr ""
135
136 #: simple-backup-config.glade:99
137
138=== modified file 'po/it.po'
139--- po/it.po 2007-05-19 16:53:10 +0000
140+++ po/it.po 2010-08-05 07:39:44 +0000
141@@ -257,7 +257,7 @@
142 #: simple-backup-config.glade:53
143 msgid ""
144 "Do backup now, with configuration above. Don't forget to save any "
145-"modification before click this button."
146+"modification before clicking this button."
147 msgstr ""
148 "Esegue il backup con la configurazione salvata. Salvare le modifiche prima "
149 "di avviare il backup."
150
151=== modified file 'po/ja.po'
152--- po/ja.po 2008-10-09 14:39:13 +0000
153+++ po/ja.po 2010-08-05 07:39:44 +0000
154@@ -249,7 +249,7 @@
155 #: simple-backup-config.glade:53
156 msgid ""
157 "Do backup now, with configuration above. Don't forget to save any "
158-"modification before click this button."
159+"modification before clicking this button."
160 msgstr "現在の設定でバックアップを開始します。このボタンを押す前に設定を保存することを忘れないでください。"
161
162 #: simple-backup-config.glade:99
163
164=== modified file 'po/lv.po'
165--- po/lv.po 2007-05-19 16:53:10 +0000
166+++ po/lv.po 2010-08-05 07:39:44 +0000
167@@ -250,7 +250,7 @@
168 #: simple-backup-config.glade:53
169 msgid ""
170 "Do backup now, with configuration above. Don't forget to save any "
171-"modification before click this button."
172+"modification before clicking this button."
173 msgstr ""
174 "Veikt reizerves kopēšanu tūlīt. Neizmirstiet saglabāt izmaiņas konfigurācijā "
175 "pirms šīs pogas spiezšanas."
176
177=== modified file 'po/messages.pot'
178--- po/messages.pot 2007-05-19 16:53:10 +0000
179+++ po/messages.pot 2010-08-05 07:39:44 +0000
180@@ -233,7 +233,7 @@
181 #: simple-backup-config.glade:53
182 msgid ""
183 "Do backup now, with configuration above. Don't forget to save any "
184-"modification before click this button."
185+"modification before clicking this button."
186 msgstr ""
187
188 #: simple-backup-config.glade:99
189
190=== modified file 'po/ms.po'
191--- po/ms.po 2007-05-19 16:53:10 +0000
192+++ po/ms.po 2010-08-05 07:39:44 +0000
193@@ -291,7 +291,7 @@
194 #: simple-backup-config.glade:53
195 msgid ""
196 "Do backup now, with configuration above. Don't forget to save any "
197-"modification before click this button."
198+"modification before clicking this button."
199 msgstr ""
200
201 #: simple-backup-config.glade:99
202
203=== modified file 'po/nb.po'
204--- po/nb.po 2007-05-19 16:53:10 +0000
205+++ po/nb.po 2010-08-05 07:39:44 +0000
206@@ -249,7 +249,7 @@
207 #: simple-backup-config.glade:53
208 msgid ""
209 "Do backup now, with configuration above. Don't forget to save any "
210-"modification before click this button."
211+"modification before clicking this button."
212 msgstr ""
213 "Utfør sikkerhetskopi nå, med ovenstående konfigurasjon. -Ikke glem å spare "
214 "dine endringer før du klikker denne knappen."
215
216=== modified file 'po/nl.po'
217--- po/nl.po 2007-05-19 16:53:10 +0000
218+++ po/nl.po 2010-08-05 07:39:44 +0000
219@@ -259,7 +259,7 @@
220 #: simple-backup-config.glade:53
221 msgid ""
222 "Do backup now, with configuration above. Don't forget to save any "
223-"modification before click this button."
224+"modification before clicking this button."
225 msgstr ""
226 "Nu een backup maken met de bovenstaande instellingen. Niet vergeten uw "
227 "wijzigingen op te slaan voor u op deze knop klikt."
228
229=== modified file 'po/pl.po'
230--- po/pl.po 2007-05-19 16:53:10 +0000
231+++ po/pl.po 2010-08-05 07:39:44 +0000
232@@ -267,7 +267,7 @@
233 #: simple-backup-config.glade:53
234 msgid ""
235 "Do backup now, with configuration above. Don't forget to save any "
236-"modification before click this button."
237+"modification before clicking this button."
238 msgstr ""
239 "Wykonaj kopię zapasową teraz, używając powyższych ustawień. Nie zapomnij "
240 "zapisać zmian przed kliknięciem tego przycisku."
241
242=== modified file 'po/pt.po'
243--- po/pt.po 2010-05-06 00:08:02 +0000
244+++ po/pt.po 2010-08-05 07:39:44 +0000
245@@ -264,7 +264,7 @@
246 #: simple-backup-config.glade:53
247 msgid ""
248 "Do backup now, with configuration above. Don't forget to save any "
249-"modification before click this button."
250+"modification before clicking this button."
251 msgstr ""
252 "Fazer o backup agora, com a configuração em cima. Não se esqueça de salvar "
253 "quaisquer modificações antes de clicar neste botão."
254
255=== modified file 'po/pt_BR.po'
256--- po/pt_BR.po 2007-05-19 16:53:10 +0000
257+++ po/pt_BR.po 2010-08-05 07:39:44 +0000
258@@ -260,7 +260,7 @@
259 #: simple-backup-config.glade:53
260 msgid ""
261 "Do backup now, with configuration above. Don't forget to save any "
262-"modification before click this button."
263+"modification before clicking this button."
264 msgstr ""
265 "Faça o backup agora, de acordo com as configurações acima. Não se esqueça de "
266 "salvar qualquer modificação antes de clicar neste botão."
267
268=== modified file 'po/sv.po'
269--- po/sv.po 2007-05-19 16:53:10 +0000
270+++ po/sv.po 2010-08-05 07:39:44 +0000
271@@ -260,7 +260,7 @@
272 #: simple-backup-config.glade:53
273 msgid ""
274 "Do backup now, with configuration above. Don't forget to save any "
275-"modification before click this button."
276+"modification before clicking this button."
277 msgstr ""
278 "Påbörja säkerhetskopering nu, med konfigurationen ovan. Glöm inte att spara "
279 "eventuella ändringar innan du klickar på denna knappen."
280
281=== modified file 'po/tr.po'
282--- po/tr.po 2007-05-19 16:53:10 +0000
283+++ po/tr.po 2010-08-05 07:39:44 +0000
284@@ -236,7 +236,7 @@
285 #: simple-backup-config.glade:53
286 msgid ""
287 "Do backup now, with configuration above. Don't forget to save any "
288-"modification before click this button."
289+"modification before clicking this button."
290 msgstr ""
291
292 #: simple-backup-config.glade:99
293
294=== modified file 'po/uk.po'
295--- po/uk.po 2007-05-19 16:53:10 +0000
296+++ po/uk.po 2010-08-05 07:39:44 +0000
297@@ -265,7 +265,7 @@
298 #: simple-backup-config.glade:53
299 msgid ""
300 "Do backup now, with configuration above. Don't forget to save any "
301-"modification before click this button."
302+"modification before clicking this button."
303 msgstr ""
304 "Розпочніть резервне копіювання. Не забудьте зберегти всі зміни в інших "
305 "видатках перед натисненням цієї кнопки."
306
307=== modified file 'po/zh_CN.po'
308--- po/zh_CN.po 2007-05-19 16:53:10 +0000
309+++ po/zh_CN.po 2010-08-05 07:39:44 +0000
310@@ -241,7 +241,7 @@
311 #: simple-backup-config.glade:53
312 msgid ""
313 "Do backup now, with configuration above. Don't forget to save any "
314-"modification before click this button."
315+"modification before clicking this button."
316 msgstr "立即使用上面的设置执行备份。点击此按钮之前,不要忘了保存设置。"
317
318 #: simple-backup-config.glade:99
319
320=== modified file 'po/zh_TW.po'
321--- po/zh_TW.po 2007-05-19 16:53:10 +0000
322+++ po/zh_TW.po 2010-08-05 07:39:44 +0000
323@@ -234,7 +234,7 @@
324 #: simple-backup-config.glade:53
325 msgid ""
326 "Do backup now, with configuration above. Don't forget to save any "
327-"modification before click this button."
328+"modification before clicking this button."
329 msgstr ""
330
331 #: simple-backup-config.glade:99
332
333=== modified file 'simple-backup-config.glade'
334--- simple-backup-config.glade 2008-06-14 22:53:10 +0000
335+++ simple-backup-config.glade 2010-08-05 07:39:44 +0000
336@@ -1558,7 +1558,7 @@
337 <property name="visible">True</property>
338 <property name="can_focus">True</property>
339 <property name="can_default">True</property>
340- <property name="tooltip" translatable="yes">Do backup now, with configuration above. Don't forget to save any modification before click this button.</property>
341+ <property name="tooltip" translatable="yes">Do backup now, with configuration above. Don't forget to save any modification before clicking this button.</property>
342 <property name="response_id">-7</property>
343 <signal name="clicked" handler="on_backupnow_clicked"/>
344 <child>

Subscribers

People subscribed via source and target branches

to all changes: