Checkbox

Merge lp:~cr3/checkbox/binaries into lp:checkbox

  1. binaries
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1510
Proposed branch: lp:~cr3/checkbox/binaries
Merge into: lp:checkbox
Diff against target: 3479 lines (+571/-1037)
42 files modified
debian/changelog (+1/-0)
debian/checkbox-qt.install (+1/-1)
debian/checkbox.config (+0/-2)
debian/checkbox.install (+1/-1)
debian/checkbox.links (+1/-0)
debian/checkbox.templates (+0/-12)
debian/control (+7/-5)
debian/po/ast.po (+29/-45)
debian/po/cs.po (+15/-43)
debian/po/de.po (+37/-49)
debian/po/en_AU.po (+35/-47)
debian/po/en_GB.po (+35/-47)
debian/po/es.po (+37/-48)
debian/po/fr.po (+15/-43)
debian/po/he.po (+15/-43)
debian/po/hu.po (+25/-45)
debian/po/it.po (+36/-47)
debian/po/ja.po (+36/-48)
debian/po/nl.po (+37/-49)
debian/po/oc.po (+15/-43)
debian/po/pl.po (+15/-43)
debian/po/pt_BR.po (+36/-48)
debian/po/ro.po (+15/-43)
debian/po/ru.po (+15/-43)
debian/po/templates.pot (+16/-44)
debian/po/tr.po (+15/-43)
debian/po/uk.po (+15/-43)
debian/po/zh_CN.po (+15/-43)
debian/po/zh_TW.po (+28/-45)
debian/pycompat (+0/-1)
debian/rules (+3/-1)
debian/watch (+0/-3)
patches/0.4 (+3/-3)
patches/0.5 (+3/-3)
patches/0.8 (+3/-3)
patches/0.9 (+3/-3)
po/checkbox.pot (+1/-1)
qt/checkbox-qt.desktop.in (+1/-1)
qt/com.canonical.QtCheckbox.service (+1/-1)
scripts/ipmi_test (+1/-1)
scripts/process_wait (+3/-2)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~cr3/checkbox/binaries
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Marc Tardif (community) Needs Resubmitting
Mathieu Trudel-Lapierre (community) Approve
Review via email: mp+114681@code.launchpad.net

Description of the change

Here's a preliminary attempt to install binaries under /usr/lib. I haven't tested this across architectures, so your guidance would be much appreciate to validate this works as expected. Thanks!

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

That's good enough for packaging to installs the file in that directory now... but are they still going to work properly?

Now, this won't take into account running multiple checkbox architectures on the same system, but I guess we don't really want to support that anyway, do we?

review: Needs Information
Revision history for this message
Marc Tardif (cr3) wrote :

It would be nice if the packaging was done properly so that it could potentially work on multiple architectures, but it's not important to the point of spending a week just working on this. I tried to look at some documentation on the subject and then compare that against packages that should presumably work correctly. For example, I read this page:

  http://wiki.debian.org/Multiarch/Implementation

which states, among many other things:

  Update debian/compat to '9'.

Then, I looked at the network-manager package where debian/compat is set to '8' rather than '9'. This kind of discrepancy leads me to believe there might be other discrepancies. So, I'm really not sure how to package checkbox more properly than I have in this merge request. Any suggestions?

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

NM is not multiarch, IIRC.

Also, checkbox is not a library, just needs a few binary scripts to run as tests, and I doubt there is a use in running the 32-bit and the 64-bit versions of the same test on the same machine. This merge request looks sufficient. Please feel free to commit :)

Just make sure to run lintian and look at the results when preparing a package, it should catch most of the issues we might be interested in re: location of files.

review: Approve
lp:~cr3/checkbox/binaries updated
1508. By Marc Tardif

Added ${shlibs:Depends} to checkbox depends.

1509. By Marc Tardif

Updated po files.

1510. By Marc Tardif

Incremented standards version in debian/control from 3.9.2 to 3.9.3.

1511. By Marc Tardif

Fixed ipmi_test script to pass syntax check.

1512. By Marc Tardif

Migrated patches to python3.

1513. By Marc Tardif

Migrated process_wait script to python3.

1514. By Marc Tardif

Removed apport_prompt/default_enabled and apport_prompt/default_package from preseedable configs.

1515. By Marc Tardif

Updated po files.

1516. By Marc Tardif

Added ${shlibs:Depends} to checkbox-qt depends.

1517. By Marc Tardif

Removed debian/pycompat which is not really needed with dh_python2/3.

1518. By Marc Tardif

Removed debian/watch which is not needed with a native package.

1519. By Marc Tardif

Moved /usr/share/checkbox/qt to /usr/lib/checkbox/qt because it contains binaries.

1520. By Marc Tardif

Fixed lintian warning about missing python depends.

Revision history for this message
Marc Tardif (cr3) wrote :

Thanks for the review! While we're fixing this lintian error, I decided to fix a few more errors and warnings. This was the output before:

Now running lintian...
W: checkbox source: out-of-date-standards-version 3.9.2 (current is 3.9.3)
W: checkbox source: debian-watch-file-in-native-package
E: checkbox: arch-dependent-file-in-usr-share usr/share/checkbox/scripts/clocktest
E: checkbox: arch-dependent-file-in-usr-share usr/share/checkbox/scripts/threaded_memtest
E: checkbox: missing-dependency-on-libc needed by usr/share/checkbox/scripts/clocktest and 1 others
W: checkbox: making-assumptions-about-interfaces-in-templates checkbox/plugins/apport_prompt/default_enabled
E: checkbox: missing-dependency-on-python-support python-support (>= 0.90)
E: checkbox: python-script-but-no-python-dep usr/share/checkbox/patches/0.4
E: checkbox: python-script-but-no-python-dep usr/share/checkbox/patches/0.5
E: checkbox: python-script-but-no-python-dep usr/share/checkbox/patches/0.8
E: checkbox: python-script-but-no-python-dep usr/share/checkbox/patches/0.9
E: checkbox: shell-script-fails-syntax-check usr/share/checkbox/scripts/ipmi_test
E: checkbox: python-script-but-no-python-dep usr/share/checkbox/scripts/process_wait
E: checkbox-qt: arch-dependent-file-in-usr-share usr/share/checkbox/qt/checkbox-qt-service
E: checkbox-qt: missing-dependency-on-libc needed by usr/share/checkbox/qt/checkbox-qt-service
W: checkbox-qt: desktop-entry-invalid-category QT usr/share/applications/checkbox-qt.desktop
Finished running lintian.

And, this is the output now:

Now running lintian...
Finished running lintian.

Just in case the package was not building thin air, I installed the resulting package at checkbox-qt at least comes up. So, I'll resubmit this merge request and add the checkbox developers for this round of review.

review: Needs Resubmitting
lp:~cr3/checkbox/binaries updated
1521. By Marc Tardif

Merged from trunk.

Revision history for this message
Marc Tardif (cr3) wrote :

Launchpad was complaining about conflicts in po files, so I merged from trunk and pushed the changes.

review: Needs Resubmitting
Revision history for this message
Daniel Manrique (roadmr) wrote :

Awesome, I liked the cleverness of moving the entire scripts/ directory and *then* symlinking /usr/share/checkbox/scripts/ to it :)

I also noticed we're shipping the .c files for threaded_memtest and clocktest, but I checked against a 12.04 system and it's the same, so it's OK then it seems.

Thanks, I'll merge this!

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 2012-07-11 21:33:08 +0000
3+++ debian/changelog 2012-07-12 20:20:27 +0000
4@@ -71,6 +71,7 @@
5
6 [Marc Tardif]
7 * Fixed duplicate jobs appearing in the store when rerunning jobs.
8+ * Fixed packaging to install scripts under /usr/lib.
9
10 [Daniel Manrique]
11 * Added a message file format test that does some simplistic checks
12
13=== modified file 'debian/checkbox-qt.install'
14--- debian/checkbox-qt.install 2012-02-07 22:33:29 +0000
15+++ debian/checkbox-qt.install 2012-07-12 20:20:27 +0000
16@@ -1,6 +1,6 @@
17 usr/bin/checkbox-qt
18 usr/share/applications/checkbox-qt.desktop
19-usr/share/checkbox/qt/*
20 usr/share/checkbox/examples/checkbox-qt.ini
21 usr/share/dbus-1/services/*
22+usr/lib/checkbox/qt/*
23 usr/lib/python*/*-packages/checkbox_qt/*
24
25=== modified file 'debian/checkbox.config'
26--- debian/checkbox.config 2011-03-29 13:28:41 +0000
27+++ debian/checkbox.config 2012-07-12 20:20:27 +0000
28@@ -8,8 +8,6 @@
29 db_input medium checkbox/plugins/jobs_info/whitelist || true
30 db_input medium checkbox/plugins/launchpad_exchange/transport_url || true
31 db_input medium checkbox/plugins/launchpad_prompt/email || true
32- db_input medium checkbox/plugins/apport_prompt/default_enabled || true
33- db_input medium checkbox/plugins/apport_prompt/default_package || true
34 db_input medium checkbox/plugins/proxy_info/http_proxy || true
35 db_input medium checkbox/plugins/proxy_info/https_proxy || true
36 db_go
37
38=== modified file 'debian/checkbox.install'
39--- debian/checkbox.install 2011-06-24 16:08:58 +0000
40+++ debian/checkbox.install 2012-07-12 20:20:27 +0000
41@@ -9,8 +9,8 @@
42 usr/share/checkbox/patches/*
43 usr/share/checkbox/plugins/*
44 usr/share/checkbox/report/*
45-usr/share/checkbox/scripts/*
46 usr/share/checkbox/examples/checkbox.ini
47 usr/lib/python*/*-packages/checkbox/*
48+usr/lib/checkbox/bin/*
49 usr/share/apport/package-hooks/source_checkbox.py
50 usr/share/apport/general-hooks/checkbox.py
51
52=== modified file 'debian/checkbox.links'
53--- debian/checkbox.links 2009-09-16 19:46:55 +0000
54+++ debian/checkbox.links 2012-07-12 20:20:27 +0000
55@@ -1,1 +1,2 @@
56 etc/checkbox.d usr/share/checkbox/configs
57+usr/lib/checkbox/bin usr/share/checkbox/scripts
58
59=== modified file 'debian/checkbox.templates'
60--- debian/checkbox.templates 2011-03-29 13:28:41 +0000
61+++ debian/checkbox.templates 2012-07-12 20:20:27 +0000
62@@ -1,15 +1,3 @@
63-Template: checkbox/plugins/apport_prompt/default_enabled
64-Type: boolean
65-_Description: Enable bug reporting by default?
66- If this option is set to Yes, then checkbox will ask if the user wants
67- to file a bug for failing tests, even if apport is not enabled.
68-
69-Template: checkbox/plugins/apport_prompt/default_package
70-Type: string
71-_Description: Default package to report bugs against:
72- When filing a new bug through checkbox, if it does not guess the
73- package, the default package that the bug will be file against.
74-
75 Template: checkbox/plugins/jobs_info/blacklist
76 Type: string
77 _Description: Test suite blacklist:
78
79=== modified file 'debian/control'
80--- debian/control 2012-07-11 17:22:55 +0000
81+++ debian/control 2012-07-12 20:20:27 +0000
82@@ -2,13 +2,15 @@
83 Section: utils
84 Priority: optional
85 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
86-Standards-Version: 3.9.2
87+Standards-Version: 3.9.3
88 X-Python3-Version: >= 3.2
89 Build-Depends: debhelper (>= 9.2),
90 dh-translations,
91 libqt4-dev,
92 po-debconf,
93- python3 (>= 3.2),
94+ python,
95+ python-distutils-extra,
96+ python3,
97 python3-distutils-extra,
98 qt4-qmake
99 Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk
100@@ -16,14 +18,13 @@
101 Package: checkbox
102 Section: python
103 Architecture: any
104-Depends: debconf, python3-lxml, udev, ${misc:Depends}, ${python3:Depends}
105+Depends: debconf, python3-lxml, udev, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
106 Recommends: dpkg (>= 1.13),
107 gir1.2-gst-plugins-base-0.10 | gir1.2-gst-plugins-base-1.0,
108 gstreamer0.10-gconf | gstreamer1.0-plugins-good,
109 lsb-release,
110 perl,
111 pm-utils,
112- python-apport,
113 python3-apt,
114 python3-dbus,
115 python3-gi
116@@ -92,7 +93,8 @@
117 libqt4-dbus,
118 libqtgui4,
119 python3-dbus,
120- ${misc:Depends}
121+ ${misc:Depends},
122+ ${shlibs:Depends}
123 Description: QT4 interface for checkbox
124 This project provides an extensible interface for system testing. The
125 results can then be sent to Launchpad.
126
127=== modified file 'debian/po/ast.po'
128--- debian/po/ast.po 2012-07-12 18:21:13 +0000
129+++ debian/po/ast.po 2012-07-12 20:20:27 +0000
130@@ -7,7 +7,7 @@
131 msgstr ""
132 "Project-Id-Version: checkbox\n"
133 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
134-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
135+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
136 "PO-Revision-Date: 2012-03-21 15:41+0000\n"
137 "Last-Translator: Xandru <xandru@softastur.org>\n"
138 "Language-Team: Asturian <ast@li.org>\n"
139@@ -18,104 +18,88 @@
140 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
141 "X-Generator: Launchpad (build 15531)\n"
142
143-#. Type: boolean
144-#. Description
145-#: ../checkbox.templates:1001
146-msgid "Enable bug reporting by default? "
147-msgstr "¿Activar informes de fallos de mou predetermináu? "
148-
149-#. Type: boolean
150-#. Description
151-#: ../checkbox.templates:1001
152-msgid ""
153-"If this option is set to Yes, then checkbox will ask if the user wants to "
154-"file a bug for failing tests, even if apport is not enabled."
155-msgstr ""
156-"Si esta opción s'afita a Sí, Checkbox va entrugar al usuariu si desea "
157-"informar de fallos por cada prueba fallida, inclusive si apport ta activáu."
158-
159-#. Type: string
160-#. Description
161-#: ../checkbox.templates:2001
162-msgid "Default package to report bugs against:"
163-msgstr "Paquete predetermináu escontra'l qu'informar de fallos:"
164-
165-#. Type: string
166-#. Description
167-#: ../checkbox.templates:2001
168-msgid ""
169-"When filing a new bug through checkbox, if it does not guess the package, "
170-"the default package that the bug will be file against."
171-msgstr ""
172-
173-#. Type: string
174-#. Description
175-#: ../checkbox.templates:3001
176+#. Type: string
177+#. Description
178+#: ../checkbox.templates:1001
179 msgid "Test suite blacklist:"
180 msgstr ""
181
182 #. Type: string
183 #. Description
184-#: ../checkbox.templates:3001
185+#: ../checkbox.templates:1001
186 msgid "List of job files to never run when testing with checkbox."
187 msgstr ""
188
189 #. Type: string
190 #. Description
191-#: ../checkbox.templates:4001
192+#: ../checkbox.templates:2001
193 msgid "Test suite whitelist:"
194 msgstr ""
195
196 #. Type: string
197 #. Description
198-#: ../checkbox.templates:4001
199+#: ../checkbox.templates:2001
200 msgid "List of jobs to run when testing with checkbox."
201 msgstr "Llista de xeres a executar mientres se faen pruebes con checkbox."
202
203 #. Type: string
204 #. Description
205-#: ../checkbox.templates:5001
206+#: ../checkbox.templates:3001
207 msgid "Transport URL:"
208 msgstr ""
209
210 #. Type: string
211 #. Description
212-#: ../checkbox.templates:5001
213+#: ../checkbox.templates:3001
214 msgid "URL where to send submissions."
215 msgstr ""
216
217 #. Type: string
218 #. Description
219-#: ../checkbox.templates:6001
220+#: ../checkbox.templates:4001
221 msgid "Launchpad E-mail:"
222 msgstr "Corréu de Launchpad:"
223
224 #. Type: string
225 #. Description
226-#: ../checkbox.templates:6001
227+#: ../checkbox.templates:4001
228 msgid "E-mail address used to sign in to Launchpad."
229 msgstr "Direición de corréu usada p'aniciar sesión en Launchpad."
230
231 #. Type: string
232 #. Description
233-#: ../checkbox.templates:7001
234+#: ../checkbox.templates:5001
235 msgid "HTTP Proxy:"
236 msgstr "Proxy HTTP:"
237
238 #. Type: string
239 #. Description
240-#: ../checkbox.templates:7001
241+#: ../checkbox.templates:5001
242 msgid "HTTP proxy to use instead of the one specified in environment."
243 msgstr "Proxy HTTP a usar en llugar del especificáu nel entornu."
244
245 #. Type: string
246 #. Description
247-#: ../checkbox.templates:8001
248+#: ../checkbox.templates:6001
249 msgid "HTTPS Proxy:"
250 msgstr "Proxy HTTPS:"
251
252 #. Type: string
253 #. Description
254-#: ../checkbox.templates:8001
255+#: ../checkbox.templates:6001
256 msgid "HTTPS proxy to use instead of the one specified in environment."
257 msgstr "Proxy HTTPS a usar en llugar del especificáu nel entornu."
258+
259+#~ msgid "Enable bug reporting by default? "
260+#~ msgstr "¿Activar informes de fallos de mou predetermináu? "
261+
262+#~ msgid ""
263+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
264+#~ "file a bug for failing tests, even if apport is not enabled."
265+#~ msgstr ""
266+#~ "Si esta opción s'afita a Sí, Checkbox va entrugar al usuariu si desea "
267+#~ "informar de fallos por cada prueba fallida, inclusive si apport ta "
268+#~ "activáu."
269+
270+#~ msgid "Default package to report bugs against:"
271+#~ msgstr "Paquete predetermináu escontra'l qu'informar de fallos:"
272
273=== modified file 'debian/po/cs.po'
274--- debian/po/cs.po 2012-07-12 18:21:13 +0000
275+++ debian/po/cs.po 2012-07-12 20:20:27 +0000
276@@ -7,7 +7,7 @@
277 msgstr ""
278 "Project-Id-Version: checkbox\n"
279 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
280-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
281+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
282 "PO-Revision-Date: 2012-03-05 19:27+0000\n"
283 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
284 "Language-Team: Czech <cs@li.org>\n"
285@@ -18,102 +18,74 @@
286 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
287 "X-Generator: Launchpad (build 15531)\n"
288
289-#. Type: boolean
290-#. Description
291-#: ../checkbox.templates:1001
292-msgid "Enable bug reporting by default? "
293-msgstr ""
294-
295-#. Type: boolean
296-#. Description
297-#: ../checkbox.templates:1001
298-msgid ""
299-"If this option is set to Yes, then checkbox will ask if the user wants to "
300-"file a bug for failing tests, even if apport is not enabled."
301-msgstr ""
302-
303-#. Type: string
304-#. Description
305-#: ../checkbox.templates:2001
306-msgid "Default package to report bugs against:"
307-msgstr ""
308-
309-#. Type: string
310-#. Description
311-#: ../checkbox.templates:2001
312-msgid ""
313-"When filing a new bug through checkbox, if it does not guess the package, "
314-"the default package that the bug will be file against."
315-msgstr ""
316-
317-#. Type: string
318-#. Description
319-#: ../checkbox.templates:3001
320+#. Type: string
321+#. Description
322+#: ../checkbox.templates:1001
323 msgid "Test suite blacklist:"
324 msgstr ""
325
326 #. Type: string
327 #. Description
328-#: ../checkbox.templates:3001
329+#: ../checkbox.templates:1001
330 msgid "List of job files to never run when testing with checkbox."
331 msgstr ""
332
333 #. Type: string
334 #. Description
335-#: ../checkbox.templates:4001
336+#: ../checkbox.templates:2001
337 msgid "Test suite whitelist:"
338 msgstr ""
339
340 #. Type: string
341 #. Description
342-#: ../checkbox.templates:4001
343+#: ../checkbox.templates:2001
344 msgid "List of jobs to run when testing with checkbox."
345 msgstr ""
346
347 #. Type: string
348 #. Description
349-#: ../checkbox.templates:5001
350+#: ../checkbox.templates:3001
351 msgid "Transport URL:"
352 msgstr ""
353
354 #. Type: string
355 #. Description
356-#: ../checkbox.templates:5001
357+#: ../checkbox.templates:3001
358 msgid "URL where to send submissions."
359 msgstr ""
360
361 #. Type: string
362 #. Description
363-#: ../checkbox.templates:6001
364+#: ../checkbox.templates:4001
365 msgid "Launchpad E-mail:"
366 msgstr ""
367
368 #. Type: string
369 #. Description
370-#: ../checkbox.templates:6001
371+#: ../checkbox.templates:4001
372 msgid "E-mail address used to sign in to Launchpad."
373 msgstr ""
374
375 #. Type: string
376 #. Description
377-#: ../checkbox.templates:7001
378+#: ../checkbox.templates:5001
379 msgid "HTTP Proxy:"
380 msgstr ""
381
382 #. Type: string
383 #. Description
384-#: ../checkbox.templates:7001
385+#: ../checkbox.templates:5001
386 msgid "HTTP proxy to use instead of the one specified in environment."
387 msgstr ""
388
389 #. Type: string
390 #. Description
391-#: ../checkbox.templates:8001
392+#: ../checkbox.templates:6001
393 msgid "HTTPS Proxy:"
394 msgstr ""
395
396 #. Type: string
397 #. Description
398-#: ../checkbox.templates:8001
399+#: ../checkbox.templates:6001
400 msgid "HTTPS proxy to use instead of the one specified in environment."
401 msgstr ""
402
403=== modified file 'debian/po/de.po'
404--- debian/po/de.po 2012-07-12 18:21:13 +0000
405+++ debian/po/de.po 2012-07-12 20:20:27 +0000
406@@ -7,7 +7,7 @@
407 msgstr ""
408 "Project-Id-Version: checkbox\n"
409 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
410-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
411+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
412 "PO-Revision-Date: 2011-09-27 06:16+0000\n"
413 "Last-Translator: Hendrik Knackstedt <Unknown>\n"
414 "Language-Team: German <de@li.org>\n"
415@@ -18,49 +18,15 @@
416 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
417 "X-Generator: Launchpad (build 15531)\n"
418
419-#. Type: boolean
420-#. Description
421-#: ../checkbox.templates:1001
422-msgid "Enable bug reporting by default? "
423-msgstr "Fehlerberichterstattung standardmäßig aktivieren? "
424-
425-#. Type: boolean
426-#. Description
427-#: ../checkbox.templates:1001
428-msgid ""
429-"If this option is set to Yes, then checkbox will ask if the user wants to "
430-"file a bug for failing tests, even if apport is not enabled."
431-msgstr ""
432-"Wenn diese Option auf Ja gesetzt ist, wird Checkbox den Nutzer fragen, ob "
433-"ein Fehlerbericht für fehlgeschlagene Tests erstellt werden soll, auch wenn "
434-"apport nicht aktiviert ist."
435-
436-#. Type: string
437-#. Description
438-#: ../checkbox.templates:2001
439-msgid "Default package to report bugs against:"
440-msgstr "Paket, für das standardmäßig Fehlerberichte erstellt werden:"
441-
442-#. Type: string
443-#. Description
444-#: ../checkbox.templates:2001
445-msgid ""
446-"When filing a new bug through checkbox, if it does not guess the package, "
447-"the default package that the bug will be file against."
448-msgstr ""
449-"Wenn ein neuer Fehlerbericht mithilfe von Checkbox erstellt und das "
450-"betroffene Paket nicht erkannt wird, wird der Fehlerbericht für das "
451-"angegebene standardmäßige Paket erstellt."
452-
453-#. Type: string
454-#. Description
455-#: ../checkbox.templates:3001
456+#. Type: string
457+#. Description
458+#: ../checkbox.templates:1001
459 msgid "Test suite blacklist:"
460 msgstr "Sperrliste der Testsammlung:"
461
462 #. Type: string
463 #. Description
464-#: ../checkbox.templates:3001
465+#: ../checkbox.templates:1001
466 msgid "List of job files to never run when testing with checkbox."
467 msgstr ""
468 "Liste der Aufträge, die während des Testens mit Checkbox niemals ausgeführt "
469@@ -68,50 +34,50 @@
470
471 #. Type: string
472 #. Description
473-#: ../checkbox.templates:4001
474+#: ../checkbox.templates:2001
475 msgid "Test suite whitelist:"
476 msgstr "Positivliste der Testsammlung:"
477
478 #. Type: string
479 #. Description
480-#: ../checkbox.templates:4001
481+#: ../checkbox.templates:2001
482 msgid "List of jobs to run when testing with checkbox."
483 msgstr ""
484 "Liste der Aufträge, die während des Testens mit Checkbox ausgeführt werden."
485
486 #. Type: string
487 #. Description
488-#: ../checkbox.templates:5001
489+#: ../checkbox.templates:3001
490 msgid "Transport URL:"
491 msgstr "Transport-URL:"
492
493 #. Type: string
494 #. Description
495-#: ../checkbox.templates:5001
496+#: ../checkbox.templates:3001
497 msgid "URL where to send submissions."
498 msgstr "URL, an welche die Ergebnisse gesendet werden."
499
500 #. Type: string
501 #. Description
502-#: ../checkbox.templates:6001
503+#: ../checkbox.templates:4001
504 msgid "Launchpad E-mail:"
505 msgstr "Launchpad-E-Mail:"
506
507 #. Type: string
508 #. Description
509-#: ../checkbox.templates:6001
510+#: ../checkbox.templates:4001
511 msgid "E-mail address used to sign in to Launchpad."
512 msgstr "E-Mail-Adresse, die zum Anmelden bei Launchpad verwendet wird."
513
514 #. Type: string
515 #. Description
516-#: ../checkbox.templates:7001
517+#: ../checkbox.templates:5001
518 msgid "HTTP Proxy:"
519 msgstr "HTTP-Proxy:"
520
521 #. Type: string
522 #. Description
523-#: ../checkbox.templates:7001
524+#: ../checkbox.templates:5001
525 msgid "HTTP proxy to use instead of the one specified in environment."
526 msgstr ""
527 "HTTP-Proxy, der anstelle des in den Umgebungseinstellungen festgelegten "
528@@ -119,14 +85,36 @@
529
530 #. Type: string
531 #. Description
532-#: ../checkbox.templates:8001
533+#: ../checkbox.templates:6001
534 msgid "HTTPS Proxy:"
535 msgstr "HTTPS-Proxy:"
536
537 #. Type: string
538 #. Description
539-#: ../checkbox.templates:8001
540+#: ../checkbox.templates:6001
541 msgid "HTTPS proxy to use instead of the one specified in environment."
542 msgstr ""
543 "HTTPS-Proxy, der anstelle des in den Umgebungseinstellungen festgelegten "
544 "Proxys verwendet wird."
545+
546+#~ msgid "Enable bug reporting by default? "
547+#~ msgstr "Fehlerberichterstattung standardmäßig aktivieren? "
548+
549+#~ msgid ""
550+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
551+#~ "file a bug for failing tests, even if apport is not enabled."
552+#~ msgstr ""
553+#~ "Wenn diese Option auf Ja gesetzt ist, wird Checkbox den Nutzer fragen, ob "
554+#~ "ein Fehlerbericht für fehlgeschlagene Tests erstellt werden soll, auch "
555+#~ "wenn apport nicht aktiviert ist."
556+
557+#~ msgid "Default package to report bugs against:"
558+#~ msgstr "Paket, für das standardmäßig Fehlerberichte erstellt werden:"
559+
560+#~ msgid ""
561+#~ "When filing a new bug through checkbox, if it does not guess the "
562+#~ "package, the default package that the bug will be file against."
563+#~ msgstr ""
564+#~ "Wenn ein neuer Fehlerbericht mithilfe von Checkbox erstellt und das "
565+#~ "betroffene Paket nicht erkannt wird, wird der Fehlerbericht für das "
566+#~ "angegebene standardmäßige Paket erstellt."
567
568=== modified file 'debian/po/en_AU.po'
569--- debian/po/en_AU.po 2012-07-12 18:21:13 +0000
570+++ debian/po/en_AU.po 2012-07-12 20:20:27 +0000
571@@ -7,7 +7,7 @@
572 msgstr ""
573 "Project-Id-Version: checkbox\n"
574 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
575-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
576+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
577 "PO-Revision-Date: 2011-07-21 02:39+0000\n"
578 "Last-Translator: Jared Norris <jrnorris@gmail.com>\n"
579 "Language-Team: English (Australia) <en_AU@li.org>\n"
580@@ -18,106 +18,94 @@
581 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
582 "X-Generator: Launchpad (build 15531)\n"
583
584-#. Type: boolean
585-#. Description
586-#: ../checkbox.templates:1001
587-msgid "Enable bug reporting by default? "
588-msgstr "Enable bug reporting by default? "
589-
590-#. Type: boolean
591-#. Description
592-#: ../checkbox.templates:1001
593-msgid ""
594-"If this option is set to Yes, then checkbox will ask if the user wants to "
595-"file a bug for failing tests, even if apport is not enabled."
596-msgstr ""
597-"If this option is set to Yes, then checkbox will ask if the user wants to "
598-"file a bug for failing tests, even if apport is not enabled."
599-
600-#. Type: string
601-#. Description
602-#: ../checkbox.templates:2001
603-msgid "Default package to report bugs against:"
604-msgstr "Default package to report bugs against:"
605-
606-#. Type: string
607-#. Description
608-#: ../checkbox.templates:2001
609-msgid ""
610-"When filing a new bug through checkbox, if it does not guess the package, "
611-"the default package that the bug will be file against."
612-msgstr ""
613-"When filing a new bug through checkbox, if it does not guess the package, "
614-"the default package that the bug will be file against."
615-
616-#. Type: string
617-#. Description
618-#: ../checkbox.templates:3001
619+#. Type: string
620+#. Description
621+#: ../checkbox.templates:1001
622 msgid "Test suite blacklist:"
623 msgstr "Test suite blacklist:"
624
625 #. Type: string
626 #. Description
627-#: ../checkbox.templates:3001
628+#: ../checkbox.templates:1001
629 msgid "List of job files to never run when testing with checkbox."
630 msgstr "List of job files to never run when testing with checkbox."
631
632 #. Type: string
633 #. Description
634-#: ../checkbox.templates:4001
635+#: ../checkbox.templates:2001
636 msgid "Test suite whitelist:"
637 msgstr "Test suite whitelist:"
638
639 #. Type: string
640 #. Description
641-#: ../checkbox.templates:4001
642+#: ../checkbox.templates:2001
643 msgid "List of jobs to run when testing with checkbox."
644 msgstr "List of jobs to run when testing with checkbox."
645
646 #. Type: string
647 #. Description
648-#: ../checkbox.templates:5001
649+#: ../checkbox.templates:3001
650 msgid "Transport URL:"
651 msgstr "Transport URL:"
652
653 #. Type: string
654 #. Description
655-#: ../checkbox.templates:5001
656+#: ../checkbox.templates:3001
657 msgid "URL where to send submissions."
658 msgstr "URL where to send submissions."
659
660 #. Type: string
661 #. Description
662-#: ../checkbox.templates:6001
663+#: ../checkbox.templates:4001
664 msgid "Launchpad E-mail:"
665 msgstr "Launchpad E-mail:"
666
667 #. Type: string
668 #. Description
669-#: ../checkbox.templates:6001
670+#: ../checkbox.templates:4001
671 msgid "E-mail address used to sign in to Launchpad."
672 msgstr "E-mail address used to sign in to Launchpad."
673
674 #. Type: string
675 #. Description
676-#: ../checkbox.templates:7001
677+#: ../checkbox.templates:5001
678 msgid "HTTP Proxy:"
679 msgstr "HTTP Proxy:"
680
681 #. Type: string
682 #. Description
683-#: ../checkbox.templates:7001
684+#: ../checkbox.templates:5001
685 msgid "HTTP proxy to use instead of the one specified in environment."
686 msgstr "HTTP proxy to use instead of the one specified in environment."
687
688 #. Type: string
689 #. Description
690-#: ../checkbox.templates:8001
691+#: ../checkbox.templates:6001
692 msgid "HTTPS Proxy:"
693 msgstr "HTTPS Proxy:"
694
695 #. Type: string
696 #. Description
697-#: ../checkbox.templates:8001
698+#: ../checkbox.templates:6001
699 msgid "HTTPS proxy to use instead of the one specified in environment."
700 msgstr "HTTPS proxy to use instead of the one specified in environment."
701+
702+#~ msgid "Enable bug reporting by default? "
703+#~ msgstr "Enable bug reporting by default? "
704+
705+#~ msgid ""
706+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
707+#~ "file a bug for failing tests, even if apport is not enabled."
708+#~ msgstr ""
709+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
710+#~ "file a bug for failing tests, even if apport is not enabled."
711+
712+#~ msgid "Default package to report bugs against:"
713+#~ msgstr "Default package to report bugs against:"
714+
715+#~ msgid ""
716+#~ "When filing a new bug through checkbox, if it does not guess the "
717+#~ "package, the default package that the bug will be file against."
718+#~ msgstr ""
719+#~ "When filing a new bug through checkbox, if it does not guess the "
720+#~ "package, the default package that the bug will be file against."
721
722=== modified file 'debian/po/en_GB.po'
723--- debian/po/en_GB.po 2012-07-12 18:21:13 +0000
724+++ debian/po/en_GB.po 2012-07-12 20:20:27 +0000
725@@ -7,7 +7,7 @@
726 msgstr ""
727 "Project-Id-Version: checkbox\n"
728 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
729-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
730+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
731 "PO-Revision-Date: 2011-08-09 23:13+0000\n"
732 "Last-Translator: Alfredo Hernández <Unknown>\n"
733 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
734@@ -18,106 +18,94 @@
735 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
736 "X-Generator: Launchpad (build 15531)\n"
737
738-#. Type: boolean
739-#. Description
740-#: ../checkbox.templates:1001
741-msgid "Enable bug reporting by default? "
742-msgstr "Enable bug reporting by default? "
743-
744-#. Type: boolean
745-#. Description
746-#: ../checkbox.templates:1001
747-msgid ""
748-"If this option is set to Yes, then checkbox will ask if the user wants to "
749-"file a bug for failing tests, even if apport is not enabled."
750-msgstr ""
751-"If this option is set to Yes, then checkbox will ask if the user wants to "
752-"file a bug for failing tests, even if apport is not enabled."
753-
754-#. Type: string
755-#. Description
756-#: ../checkbox.templates:2001
757-msgid "Default package to report bugs against:"
758-msgstr "Default package to report bugs against:"
759-
760-#. Type: string
761-#. Description
762-#: ../checkbox.templates:2001
763-msgid ""
764-"When filing a new bug through checkbox, if it does not guess the package, "
765-"the default package that the bug will be file against."
766-msgstr ""
767-"When filing a new bug through checkbox, if it does not guess the package, "
768-"the default package that the bug will be file against."
769-
770-#. Type: string
771-#. Description
772-#: ../checkbox.templates:3001
773+#. Type: string
774+#. Description
775+#: ../checkbox.templates:1001
776 msgid "Test suite blacklist:"
777 msgstr "Test suite blacklist:"
778
779 #. Type: string
780 #. Description
781-#: ../checkbox.templates:3001
782+#: ../checkbox.templates:1001
783 msgid "List of job files to never run when testing with checkbox."
784 msgstr "List of job files to never run when testing with checkbox."
785
786 #. Type: string
787 #. Description
788-#: ../checkbox.templates:4001
789+#: ../checkbox.templates:2001
790 msgid "Test suite whitelist:"
791 msgstr "Test suite whitelist:"
792
793 #. Type: string
794 #. Description
795-#: ../checkbox.templates:4001
796+#: ../checkbox.templates:2001
797 msgid "List of jobs to run when testing with checkbox."
798 msgstr "List of jobs to run when testing with checkbox."
799
800 #. Type: string
801 #. Description
802-#: ../checkbox.templates:5001
803+#: ../checkbox.templates:3001
804 msgid "Transport URL:"
805 msgstr "Transport URL:"
806
807 #. Type: string
808 #. Description
809-#: ../checkbox.templates:5001
810+#: ../checkbox.templates:3001
811 msgid "URL where to send submissions."
812 msgstr "URL where to send submissions."
813
814 #. Type: string
815 #. Description
816-#: ../checkbox.templates:6001
817+#: ../checkbox.templates:4001
818 msgid "Launchpad E-mail:"
819 msgstr "Launchpad E-mail:"
820
821 #. Type: string
822 #. Description
823-#: ../checkbox.templates:6001
824+#: ../checkbox.templates:4001
825 msgid "E-mail address used to sign in to Launchpad."
826 msgstr "E-mail address used to sign in to Launchpad."
827
828 #. Type: string
829 #. Description
830-#: ../checkbox.templates:7001
831+#: ../checkbox.templates:5001
832 msgid "HTTP Proxy:"
833 msgstr "HTTP Proxy:"
834
835 #. Type: string
836 #. Description
837-#: ../checkbox.templates:7001
838+#: ../checkbox.templates:5001
839 msgid "HTTP proxy to use instead of the one specified in environment."
840 msgstr "HTTP proxy to use instead of the one specified in environment."
841
842 #. Type: string
843 #. Description
844-#: ../checkbox.templates:8001
845+#: ../checkbox.templates:6001
846 msgid "HTTPS Proxy:"
847 msgstr "HTTPS Proxy:"
848
849 #. Type: string
850 #. Description
851-#: ../checkbox.templates:8001
852+#: ../checkbox.templates:6001
853 msgid "HTTPS proxy to use instead of the one specified in environment."
854 msgstr "HTTPS proxy to use instead of the one specified in environment."
855+
856+#~ msgid "Enable bug reporting by default? "
857+#~ msgstr "Enable bug reporting by default? "
858+
859+#~ msgid ""
860+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
861+#~ "file a bug for failing tests, even if apport is not enabled."
862+#~ msgstr ""
863+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
864+#~ "file a bug for failing tests, even if apport is not enabled."
865+
866+#~ msgid "Default package to report bugs against:"
867+#~ msgstr "Default package to report bugs against:"
868+
869+#~ msgid ""
870+#~ "When filing a new bug through checkbox, if it does not guess the "
871+#~ "package, the default package that the bug will be file against."
872+#~ msgstr ""
873+#~ "When filing a new bug through checkbox, if it does not guess the "
874+#~ "package, the default package that the bug will be file against."
875
876=== modified file 'debian/po/es.po'
877--- debian/po/es.po 2012-07-12 18:21:13 +0000
878+++ debian/po/es.po 2012-07-12 20:20:27 +0000
879@@ -7,7 +7,7 @@
880 msgstr ""
881 "Project-Id-Version: checkbox\n"
882 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
883-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
884+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
885 "PO-Revision-Date: 2012-04-06 14:01+0000\n"
886 "Last-Translator: Daniel Manrique <daniel.manrique@canonical.com>\n"
887 "Language-Team: Spanish <es@li.org>\n"
888@@ -18,48 +18,15 @@
889 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
890 "X-Generator: Launchpad (build 15531)\n"
891
892-#. Type: boolean
893-#. Description
894-#: ../checkbox.templates:1001
895-msgid "Enable bug reporting by default? "
896-msgstr "¿Activar informes de error de manera predeterminada? "
897-
898-#. Type: boolean
899-#. Description
900-#: ../checkbox.templates:1001
901-msgid ""
902-"If this option is set to Yes, then checkbox will ask if the user wants to "
903-"file a bug for failing tests, even if apport is not enabled."
904-msgstr ""
905-"Si esta opción se establece a Sí, Checkbox preguntará al usuario si desea "
906-"informar de errores por cada prueba fallida, aún si apport está desactivado."
907-
908-#. Type: string
909-#. Description
910-#: ../checkbox.templates:2001
911-msgid "Default package to report bugs against:"
912-msgstr "Paquete predeterminado sobre el cual informar errores:"
913-
914-#. Type: string
915-#. Description
916-#: ../checkbox.templates:2001
917-msgid ""
918-"When filing a new bug through checkbox, if it does not guess the package, "
919-"the default package that the bug will be file against."
920-msgstr ""
921-"Cuando se reporta un error a través de Comprobación del Sistema, si no se "
922-"logra determinar automáticamente el paquete, éste es el paquete contra el "
923-"cual se reportará el error."
924-
925-#. Type: string
926-#. Description
927-#: ../checkbox.templates:3001
928+#. Type: string
929+#. Description
930+#: ../checkbox.templates:1001
931 msgid "Test suite blacklist:"
932 msgstr "Lista negra del conjunto de pruebas:"
933
934 #. Type: string
935 #. Description
936-#: ../checkbox.templates:3001
937+#: ../checkbox.templates:1001
938 msgid "List of job files to never run when testing with checkbox."
939 msgstr ""
940 "Lista de archivos de trabajo a no ejecutar cuando se prueba con Comprobación "
941@@ -67,61 +34,83 @@
942
943 #. Type: string
944 #. Description
945-#: ../checkbox.templates:4001
946+#: ../checkbox.templates:2001
947 msgid "Test suite whitelist:"
948 msgstr "Lista blanca del conjunto de pruebas:"
949
950 #. Type: string
951 #. Description
952-#: ../checkbox.templates:4001
953+#: ../checkbox.templates:2001
954 msgid "List of jobs to run when testing with checkbox."
955 msgstr "Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
956
957 #. Type: string
958 #. Description
959-#: ../checkbox.templates:5001
960+#: ../checkbox.templates:3001
961 msgid "Transport URL:"
962 msgstr "URL de transporte:"
963
964 #. Type: string
965 #. Description
966-#: ../checkbox.templates:5001
967+#: ../checkbox.templates:3001
968 msgid "URL where to send submissions."
969 msgstr "URL de destino de los envíos."
970
971 #. Type: string
972 #. Description
973-#: ../checkbox.templates:6001
974+#: ../checkbox.templates:4001
975 msgid "Launchpad E-mail:"
976 msgstr "Correo electrónico de Launchpad:"
977
978 #. Type: string
979 #. Description
980-#: ../checkbox.templates:6001
981+#: ../checkbox.templates:4001
982 msgid "E-mail address used to sign in to Launchpad."
983 msgstr ""
984 "Dirección de correo electrónico usada para iniciar sesión en Launchpad."
985
986 #. Type: string
987 #. Description
988-#: ../checkbox.templates:7001
989+#: ../checkbox.templates:5001
990 msgid "HTTP Proxy:"
991 msgstr "Proxy HTTP:"
992
993 #. Type: string
994 #. Description
995-#: ../checkbox.templates:7001
996+#: ../checkbox.templates:5001
997 msgid "HTTP proxy to use instead of the one specified in environment."
998 msgstr "Proxy HTTP que se usará en lugar del especificado en el entorno."
999
1000 #. Type: string
1001 #. Description
1002-#: ../checkbox.templates:8001
1003+#: ../checkbox.templates:6001
1004 msgid "HTTPS Proxy:"
1005 msgstr "Proxy HTTPS:"
1006
1007 #. Type: string
1008 #. Description
1009-#: ../checkbox.templates:8001
1010+#: ../checkbox.templates:6001
1011 msgid "HTTPS proxy to use instead of the one specified in environment."
1012 msgstr "Proxy HTTPS que se usará en lugar del especificado en el entorno."
1013+
1014+#~ msgid "Enable bug reporting by default? "
1015+#~ msgstr "¿Activar informes de error de manera predeterminada? "
1016+
1017+#~ msgid ""
1018+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
1019+#~ "file a bug for failing tests, even if apport is not enabled."
1020+#~ msgstr ""
1021+#~ "Si esta opción se establece a Sí, Checkbox preguntará al usuario si desea "
1022+#~ "informar de errores por cada prueba fallida, aún si apport está "
1023+#~ "desactivado."
1024+
1025+#~ msgid "Default package to report bugs against:"
1026+#~ msgstr "Paquete predeterminado sobre el cual informar errores:"
1027+
1028+#~ msgid ""
1029+#~ "When filing a new bug through checkbox, if it does not guess the "
1030+#~ "package, the default package that the bug will be file against."
1031+#~ msgstr ""
1032+#~ "Cuando se reporta un error a través de Comprobación del Sistema, si no se "
1033+#~ "logra determinar automáticamente el paquete, éste es el paquete contra el "
1034+#~ "cual se reportará el error."
1035
1036=== modified file 'debian/po/fr.po'
1037--- debian/po/fr.po 2012-07-12 18:21:13 +0000
1038+++ debian/po/fr.po 2012-07-12 20:20:27 +0000
1039@@ -7,7 +7,7 @@
1040 msgstr ""
1041 "Project-Id-Version: checkbox\n"
1042 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
1043-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
1044+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
1045 "PO-Revision-Date: 2011-07-19 10:27+0000\n"
1046 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1047 "Language-Team: French <fr@li.org>\n"
1048@@ -18,102 +18,74 @@
1049 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
1050 "X-Generator: Launchpad (build 15531)\n"
1051
1052-#. Type: boolean
1053-#. Description
1054-#: ../checkbox.templates:1001
1055-msgid "Enable bug reporting by default? "
1056-msgstr ""
1057-
1058-#. Type: boolean
1059-#. Description
1060-#: ../checkbox.templates:1001
1061-msgid ""
1062-"If this option is set to Yes, then checkbox will ask if the user wants to "
1063-"file a bug for failing tests, even if apport is not enabled."
1064-msgstr ""
1065-
1066-#. Type: string
1067-#. Description
1068-#: ../checkbox.templates:2001
1069-msgid "Default package to report bugs against:"
1070-msgstr ""
1071-
1072-#. Type: string
1073-#. Description
1074-#: ../checkbox.templates:2001
1075-msgid ""
1076-"When filing a new bug through checkbox, if it does not guess the package, "
1077-"the default package that the bug will be file against."
1078-msgstr ""
1079-
1080-#. Type: string
1081-#. Description
1082-#: ../checkbox.templates:3001
1083+#. Type: string
1084+#. Description
1085+#: ../checkbox.templates:1001
1086 msgid "Test suite blacklist:"
1087 msgstr ""
1088
1089 #. Type: string
1090 #. Description
1091-#: ../checkbox.templates:3001
1092+#: ../checkbox.templates:1001
1093 msgid "List of job files to never run when testing with checkbox."
1094 msgstr ""
1095
1096 #. Type: string
1097 #. Description
1098-#: ../checkbox.templates:4001
1099+#: ../checkbox.templates:2001
1100 msgid "Test suite whitelist:"
1101 msgstr ""
1102
1103 #. Type: string
1104 #. Description
1105-#: ../checkbox.templates:4001
1106+#: ../checkbox.templates:2001
1107 msgid "List of jobs to run when testing with checkbox."
1108 msgstr ""
1109
1110 #. Type: string
1111 #. Description
1112-#: ../checkbox.templates:5001
1113+#: ../checkbox.templates:3001
1114 msgid "Transport URL:"
1115 msgstr ""
1116
1117 #. Type: string
1118 #. Description
1119-#: ../checkbox.templates:5001
1120+#: ../checkbox.templates:3001
1121 msgid "URL where to send submissions."
1122 msgstr ""
1123
1124 #. Type: string
1125 #. Description
1126-#: ../checkbox.templates:6001
1127+#: ../checkbox.templates:4001
1128 msgid "Launchpad E-mail:"
1129 msgstr ""
1130
1131 #. Type: string
1132 #. Description
1133-#: ../checkbox.templates:6001
1134+#: ../checkbox.templates:4001
1135 msgid "E-mail address used to sign in to Launchpad."
1136 msgstr ""
1137
1138 #. Type: string
1139 #. Description
1140-#: ../checkbox.templates:7001
1141+#: ../checkbox.templates:5001
1142 msgid "HTTP Proxy:"
1143 msgstr ""
1144
1145 #. Type: string
1146 #. Description
1147-#: ../checkbox.templates:7001
1148+#: ../checkbox.templates:5001
1149 msgid "HTTP proxy to use instead of the one specified in environment."
1150 msgstr ""
1151
1152 #. Type: string
1153 #. Description
1154-#: ../checkbox.templates:8001
1155+#: ../checkbox.templates:6001
1156 msgid "HTTPS Proxy:"
1157 msgstr ""
1158
1159 #. Type: string
1160 #. Description
1161-#: ../checkbox.templates:8001
1162+#: ../checkbox.templates:6001
1163 msgid "HTTPS proxy to use instead of the one specified in environment."
1164 msgstr ""
1165
1166=== modified file 'debian/po/he.po'
1167--- debian/po/he.po 2012-07-12 18:21:13 +0000
1168+++ debian/po/he.po 2012-07-12 20:20:27 +0000
1169@@ -7,7 +7,7 @@
1170 msgstr ""
1171 "Project-Id-Version: checkbox\n"
1172 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
1173-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
1174+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
1175 "PO-Revision-Date: 2011-07-26 09:45+0000\n"
1176 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1177 "Language-Team: Hebrew <he@li.org>\n"
1178@@ -18,102 +18,74 @@
1179 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
1180 "X-Generator: Launchpad (build 15531)\n"
1181
1182-#. Type: boolean
1183-#. Description
1184-#: ../checkbox.templates:1001
1185-msgid "Enable bug reporting by default? "
1186-msgstr ""
1187-
1188-#. Type: boolean
1189-#. Description
1190-#: ../checkbox.templates:1001
1191-msgid ""
1192-"If this option is set to Yes, then checkbox will ask if the user wants to "
1193-"file a bug for failing tests, even if apport is not enabled."
1194-msgstr ""
1195-
1196-#. Type: string
1197-#. Description
1198-#: ../checkbox.templates:2001
1199-msgid "Default package to report bugs against:"
1200-msgstr ""
1201-
1202-#. Type: string
1203-#. Description
1204-#: ../checkbox.templates:2001
1205-msgid ""
1206-"When filing a new bug through checkbox, if it does not guess the package, "
1207-"the default package that the bug will be file against."
1208-msgstr ""
1209-
1210-#. Type: string
1211-#. Description
1212-#: ../checkbox.templates:3001
1213+#. Type: string
1214+#. Description
1215+#: ../checkbox.templates:1001
1216 msgid "Test suite blacklist:"
1217 msgstr ""
1218
1219 #. Type: string
1220 #. Description
1221-#: ../checkbox.templates:3001
1222+#: ../checkbox.templates:1001
1223 msgid "List of job files to never run when testing with checkbox."
1224 msgstr ""
1225
1226 #. Type: string
1227 #. Description
1228-#: ../checkbox.templates:4001
1229+#: ../checkbox.templates:2001
1230 msgid "Test suite whitelist:"
1231 msgstr ""
1232
1233 #. Type: string
1234 #. Description
1235-#: ../checkbox.templates:4001
1236+#: ../checkbox.templates:2001
1237 msgid "List of jobs to run when testing with checkbox."
1238 msgstr ""
1239
1240 #. Type: string
1241 #. Description
1242-#: ../checkbox.templates:5001
1243+#: ../checkbox.templates:3001
1244 msgid "Transport URL:"
1245 msgstr ""
1246
1247 #. Type: string
1248 #. Description
1249-#: ../checkbox.templates:5001
1250+#: ../checkbox.templates:3001
1251 msgid "URL where to send submissions."
1252 msgstr ""
1253
1254 #. Type: string
1255 #. Description
1256-#: ../checkbox.templates:6001
1257+#: ../checkbox.templates:4001
1258 msgid "Launchpad E-mail:"
1259 msgstr ""
1260
1261 #. Type: string
1262 #. Description
1263-#: ../checkbox.templates:6001
1264+#: ../checkbox.templates:4001
1265 msgid "E-mail address used to sign in to Launchpad."
1266 msgstr ""
1267
1268 #. Type: string
1269 #. Description
1270-#: ../checkbox.templates:7001
1271+#: ../checkbox.templates:5001
1272 msgid "HTTP Proxy:"
1273 msgstr ""
1274
1275 #. Type: string
1276 #. Description
1277-#: ../checkbox.templates:7001
1278+#: ../checkbox.templates:5001
1279 msgid "HTTP proxy to use instead of the one specified in environment."
1280 msgstr ""
1281
1282 #. Type: string
1283 #. Description
1284-#: ../checkbox.templates:8001
1285+#: ../checkbox.templates:6001
1286 msgid "HTTPS Proxy:"
1287 msgstr ""
1288
1289 #. Type: string
1290 #. Description
1291-#: ../checkbox.templates:8001
1292+#: ../checkbox.templates:6001
1293 msgid "HTTPS proxy to use instead of the one specified in environment."
1294 msgstr ""
1295
1296=== modified file 'debian/po/hu.po'
1297--- debian/po/hu.po 2012-07-12 18:21:13 +0000
1298+++ debian/po/hu.po 2012-07-12 20:20:27 +0000
1299@@ -7,7 +7,7 @@
1300 msgstr ""
1301 "Project-Id-Version: checkbox\n"
1302 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
1303-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
1304+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
1305 "PO-Revision-Date: 2011-07-18 12:57+0000\n"
1306 "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1307 "Language-Team: Hungarian <hu@li.org>\n"
1308@@ -18,104 +18,84 @@
1309 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
1310 "X-Generator: Launchpad (build 15531)\n"
1311
1312-#. Type: boolean
1313-#. Description
1314-#: ../checkbox.templates:1001
1315-msgid "Enable bug reporting by default? "
1316-msgstr "Legyen a hibajelentés engedélyezve alapértelmezetten? "
1317-
1318-#. Type: boolean
1319-#. Description
1320-#: ../checkbox.templates:1001
1321-msgid ""
1322-"If this option is set to Yes, then checkbox will ask if the user wants to "
1323-"file a bug for failing tests, even if apport is not enabled."
1324-msgstr ""
1325-"Ha ez a funkció engedélyezve van, a Checkbox sikertelen teszt esetén "
1326-"felkínálja a hibajelentést, akkor is, ha az apport nincs engedélyezve."
1327-
1328-#. Type: string
1329-#. Description
1330-#: ../checkbox.templates:2001
1331-msgid "Default package to report bugs against:"
1332-msgstr ""
1333-
1334-#. Type: string
1335-#. Description
1336-#: ../checkbox.templates:2001
1337-msgid ""
1338-"When filing a new bug through checkbox, if it does not guess the package, "
1339-"the default package that the bug will be file against."
1340-msgstr ""
1341-
1342-#. Type: string
1343-#. Description
1344-#: ../checkbox.templates:3001
1345+#. Type: string
1346+#. Description
1347+#: ../checkbox.templates:1001
1348 msgid "Test suite blacklist:"
1349 msgstr ""
1350
1351 #. Type: string
1352 #. Description
1353-#: ../checkbox.templates:3001
1354+#: ../checkbox.templates:1001
1355 msgid "List of job files to never run when testing with checkbox."
1356 msgstr ""
1357
1358 #. Type: string
1359 #. Description
1360-#: ../checkbox.templates:4001
1361+#: ../checkbox.templates:2001
1362 msgid "Test suite whitelist:"
1363 msgstr ""
1364
1365 #. Type: string
1366 #. Description
1367-#: ../checkbox.templates:4001
1368+#: ../checkbox.templates:2001
1369 msgid "List of jobs to run when testing with checkbox."
1370 msgstr ""
1371
1372 #. Type: string
1373 #. Description
1374-#: ../checkbox.templates:5001
1375+#: ../checkbox.templates:3001
1376 msgid "Transport URL:"
1377 msgstr ""
1378
1379 #. Type: string
1380 #. Description
1381-#: ../checkbox.templates:5001
1382+#: ../checkbox.templates:3001
1383 msgid "URL where to send submissions."
1384 msgstr ""
1385
1386 #. Type: string
1387 #. Description
1388-#: ../checkbox.templates:6001
1389+#: ../checkbox.templates:4001
1390 msgid "Launchpad E-mail:"
1391 msgstr ""
1392
1393 #. Type: string
1394 #. Description
1395-#: ../checkbox.templates:6001
1396+#: ../checkbox.templates:4001
1397 msgid "E-mail address used to sign in to Launchpad."
1398 msgstr ""
1399
1400 #. Type: string
1401 #. Description
1402-#: ../checkbox.templates:7001
1403+#: ../checkbox.templates:5001
1404 msgid "HTTP Proxy:"
1405 msgstr ""
1406
1407 #. Type: string
1408 #. Description
1409-#: ../checkbox.templates:7001
1410+#: ../checkbox.templates:5001
1411 msgid "HTTP proxy to use instead of the one specified in environment."
1412 msgstr ""
1413
1414 #. Type: string
1415 #. Description
1416-#: ../checkbox.templates:8001
1417+#: ../checkbox.templates:6001
1418 msgid "HTTPS Proxy:"
1419 msgstr ""
1420
1421 #. Type: string
1422 #. Description
1423-#: ../checkbox.templates:8001
1424+#: ../checkbox.templates:6001
1425 msgid "HTTPS proxy to use instead of the one specified in environment."
1426 msgstr ""
1427+
1428+#~ msgid "Enable bug reporting by default? "
1429+#~ msgstr "Legyen a hibajelentés engedélyezve alapértelmezetten? "
1430+
1431+#~ msgid ""
1432+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
1433+#~ "file a bug for failing tests, even if apport is not enabled."
1434+#~ msgstr ""
1435+#~ "Ha ez a funkció engedélyezve van, a Checkbox sikertelen teszt esetén "
1436+#~ "felkínálja a hibajelentést, akkor is, ha az apport nincs engedélyezve."
1437
1438=== modified file 'debian/po/it.po'
1439--- debian/po/it.po 2012-07-12 18:21:13 +0000
1440+++ debian/po/it.po 2012-07-12 20:20:27 +0000
1441@@ -7,7 +7,7 @@
1442 msgstr ""
1443 "Project-Id-Version: checkbox\n"
1444 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
1445-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
1446+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
1447 "PO-Revision-Date: 2011-09-22 14:07+0000\n"
1448 "Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n"
1449 "Language-Team: Italian <it@li.org>\n"
1450@@ -18,47 +18,15 @@
1451 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
1452 "X-Generator: Launchpad (build 15531)\n"
1453
1454-#. Type: boolean
1455-#. Description
1456-#: ../checkbox.templates:1001
1457-msgid "Enable bug reporting by default? "
1458-msgstr "Abilitare in modo predefinito la segnalazione di bug? "
1459-
1460-#. Type: boolean
1461-#. Description
1462-#: ../checkbox.templates:1001
1463-msgid ""
1464-"If this option is set to Yes, then checkbox will ask if the user wants to "
1465-"file a bug for failing tests, even if apport is not enabled."
1466-msgstr ""
1467-"Se questa opzione è impostata a Sì, checkbox chiederà all'utente se vuole "
1468-"segnalare un bug per i test falliti, anche se apport non è abilitato."
1469-
1470-#. Type: string
1471-#. Description
1472-#: ../checkbox.templates:2001
1473-msgid "Default package to report bugs against:"
1474-msgstr "Pacchetto predefinito rispetto al quale segnalare i bug:"
1475-
1476-#. Type: string
1477-#. Description
1478-#: ../checkbox.templates:2001
1479-msgid ""
1480-"When filing a new bug through checkbox, if it does not guess the package, "
1481-"the default package that the bug will be file against."
1482-msgstr ""
1483-"Pacchetto predefinito rispetto al quale segnalare i bug, se non ne viene "
1484-"ipotizzato alcuno, quando un nuovo bug viene segnalato attraverso checkbox."
1485-
1486-#. Type: string
1487-#. Description
1488-#: ../checkbox.templates:3001
1489+#. Type: string
1490+#. Description
1491+#: ../checkbox.templates:1001
1492 msgid "Test suite blacklist:"
1493 msgstr "Blacklist dei set di test:"
1494
1495 #. Type: string
1496 #. Description
1497-#: ../checkbox.templates:3001
1498+#: ../checkbox.templates:1001
1499 msgid "List of job files to never run when testing with checkbox."
1500 msgstr ""
1501 "Elenco dei file di lavori che non devono essere mai eseguiti durante i test "
1502@@ -66,49 +34,49 @@
1503
1504 #. Type: string
1505 #. Description
1506-#: ../checkbox.templates:4001
1507+#: ../checkbox.templates:2001
1508 msgid "Test suite whitelist:"
1509 msgstr "Whitelist dei set di test:"
1510
1511 #. Type: string
1512 #. Description
1513-#: ../checkbox.templates:4001
1514+#: ../checkbox.templates:2001
1515 msgid "List of jobs to run when testing with checkbox."
1516 msgstr "Elenco dei lavori da eseguire durante i test con checkbox."
1517
1518 #. Type: string
1519 #. Description
1520-#: ../checkbox.templates:5001
1521+#: ../checkbox.templates:3001
1522 msgid "Transport URL:"
1523 msgstr "URL di trasporto:"
1524
1525 #. Type: string
1526 #. Description
1527-#: ../checkbox.templates:5001
1528+#: ../checkbox.templates:3001
1529 msgid "URL where to send submissions."
1530 msgstr "URL al quale effettuare gli invii."
1531
1532 #. Type: string
1533 #. Description
1534-#: ../checkbox.templates:6001
1535+#: ../checkbox.templates:4001
1536 msgid "Launchpad E-mail:"
1537 msgstr "Email Launchpad:"
1538
1539 #. Type: string
1540 #. Description
1541-#: ../checkbox.templates:6001
1542+#: ../checkbox.templates:4001
1543 msgid "E-mail address used to sign in to Launchpad."
1544 msgstr "Indirizzo email usato per accedere a Launchpad."
1545
1546 #. Type: string
1547 #. Description
1548-#: ../checkbox.templates:7001
1549+#: ../checkbox.templates:5001
1550 msgid "HTTP Proxy:"
1551 msgstr "Proxy HTTP:"
1552
1553 #. Type: string
1554 #. Description
1555-#: ../checkbox.templates:7001
1556+#: ../checkbox.templates:5001
1557 msgid "HTTP proxy to use instead of the one specified in environment."
1558 msgstr ""
1559 "Proxy HTTP da usare al posto di quello specificato nella variabile "
1560@@ -116,14 +84,35 @@
1561
1562 #. Type: string
1563 #. Description
1564-#: ../checkbox.templates:8001
1565+#: ../checkbox.templates:6001
1566 msgid "HTTPS Proxy:"
1567 msgstr "Proxy HTTPS:"
1568
1569 #. Type: string
1570 #. Description
1571-#: ../checkbox.templates:8001
1572+#: ../checkbox.templates:6001
1573 msgid "HTTPS proxy to use instead of the one specified in environment."
1574 msgstr ""
1575 "Proxy HTTPS da usare al posto di quello specificato nella variabile "
1576 "d'ambiente."
1577+
1578+#~ msgid "Enable bug reporting by default? "
1579+#~ msgstr "Abilitare in modo predefinito la segnalazione di bug? "
1580+
1581+#~ msgid ""
1582+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
1583+#~ "file a bug for failing tests, even if apport is not enabled."
1584+#~ msgstr ""
1585+#~ "Se questa opzione è impostata a Sì, checkbox chiederà all'utente se vuole "
1586+#~ "segnalare un bug per i test falliti, anche se apport non è abilitato."
1587+
1588+#~ msgid "Default package to report bugs against:"
1589+#~ msgstr "Pacchetto predefinito rispetto al quale segnalare i bug:"
1590+
1591+#~ msgid ""
1592+#~ "When filing a new bug through checkbox, if it does not guess the "
1593+#~ "package, the default package that the bug will be file against."
1594+#~ msgstr ""
1595+#~ "Pacchetto predefinito rispetto al quale segnalare i bug, se non ne viene "
1596+#~ "ipotizzato alcuno, quando un nuovo bug viene segnalato attraverso "
1597+#~ "checkbox."
1598
1599=== modified file 'debian/po/ja.po'
1600--- debian/po/ja.po 2012-07-12 18:21:13 +0000
1601+++ debian/po/ja.po 2012-07-12 20:20:27 +0000
1602@@ -7,7 +7,7 @@
1603 msgstr ""
1604 "Project-Id-Version: checkbox\n"
1605 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
1606-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
1607+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
1608 "PO-Revision-Date: 2011-07-25 17:03+0000\n"
1609 "Last-Translator: Fumihito YOSHIDA <hito@kugutsu.org>\n"
1610 "Language-Team: Japanese <ja@li.org>\n"
1611@@ -18,107 +18,95 @@
1612 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
1613 "X-Generator: Launchpad (build 15531)\n"
1614
1615-#. Type: boolean
1616-#. Description
1617-#: ../checkbox.templates:1001
1618-msgid "Enable bug reporting by default? "
1619-msgstr "デフォルトでバグ報告を有効にしますか？ "
1620-
1621-#. Type: boolean
1622-#. Description
1623-#: ../checkbox.templates:1001
1624-msgid ""
1625-"If this option is set to Yes, then checkbox will ask if the user wants to "
1626-"file a bug for failing tests, even if apport is not enabled."
1627-msgstr ""
1628-"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどう"
1629-"か、checkboxが確認するようになります。これはapportが有効になっていなくても機"
1630-"能します。"
1631-
1632-#. Type: string
1633-#. Description
1634-#: ../checkbox.templates:2001
1635-msgid "Default package to report bugs against:"
1636-msgstr "デフォルトでバグ報告の対象とするパッケージ:"
1637-
1638-#. Type: string
1639-#. Description
1640-#: ../checkbox.templates:2001
1641-msgid ""
1642-"When filing a new bug through checkbox, if it does not guess the package, "
1643-"the default package that the bug will be file against."
1644-msgstr ""
1645-"checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デ"
1646-"フォルトのパッケージ名を用いて報告します。"
1647-
1648-#. Type: string
1649-#. Description
1650-#: ../checkbox.templates:3001
1651+#. Type: string
1652+#. Description
1653+#: ../checkbox.templates:1001
1654 msgid "Test suite blacklist:"
1655 msgstr "テストスイートのブラックリスト:"
1656
1657 #. Type: string
1658 #. Description
1659-#: ../checkbox.templates:3001
1660+#: ../checkbox.templates:1001
1661 msgid "List of job files to never run when testing with checkbox."
1662 msgstr "checkboxによるテスト時に、実行しないジョブのリスト。"
1663
1664 #. Type: string
1665 #. Description
1666-#: ../checkbox.templates:4001
1667+#: ../checkbox.templates:2001
1668 msgid "Test suite whitelist:"
1669 msgstr "テストスイートのホワイトリスト:"
1670
1671 #. Type: string
1672 #. Description
1673-#: ../checkbox.templates:4001
1674+#: ../checkbox.templates:2001
1675 msgid "List of jobs to run when testing with checkbox."
1676 msgstr "checkboxによるテスト時に、実行するジョブのリスト。"
1677
1678 #. Type: string
1679 #. Description
1680-#: ../checkbox.templates:5001
1681+#: ../checkbox.templates:3001
1682 msgid "Transport URL:"
1683 msgstr "送信先URL:"
1684
1685 #. Type: string
1686 #. Description
1687-#: ../checkbox.templates:5001
1688+#: ../checkbox.templates:3001
1689 msgid "URL where to send submissions."
1690 msgstr ""
1691
1692 #. Type: string
1693 #. Description
1694-#: ../checkbox.templates:6001
1695+#: ../checkbox.templates:4001
1696 msgid "Launchpad E-mail:"
1697 msgstr ""
1698
1699 #. Type: string
1700 #. Description
1701-#: ../checkbox.templates:6001
1702+#: ../checkbox.templates:4001
1703 msgid "E-mail address used to sign in to Launchpad."
1704 msgstr "Launchpadへのサインインに用いるメールアドレス。"
1705
1706 #. Type: string
1707 #. Description
1708-#: ../checkbox.templates:7001
1709+#: ../checkbox.templates:5001
1710 msgid "HTTP Proxy:"
1711 msgstr "HTTP Proxy:"
1712
1713 #. Type: string
1714 #. Description
1715-#: ../checkbox.templates:7001
1716+#: ../checkbox.templates:5001
1717 msgid "HTTP proxy to use instead of the one specified in environment."
1718 msgstr "環境設定で指定されているProxyとは別の、登録時に利用するHTTP Proxy。"
1719
1720 #. Type: string
1721 #. Description
1722-#: ../checkbox.templates:8001
1723+#: ../checkbox.templates:6001
1724 msgid "HTTPS Proxy:"
1725 msgstr "HTTPS Proxy:"
1726
1727 #. Type: string
1728 #. Description
1729-#: ../checkbox.templates:8001
1730+#: ../checkbox.templates:6001
1731 msgid "HTTPS proxy to use instead of the one specified in environment."
1732 msgstr "環境設定で指定されているProxyとは別の、登録時に利用するHTTPS Proxy。"
1733+
1734+#~ msgid "Enable bug reporting by default? "
1735+#~ msgstr "デフォルトでバグ報告を有効にしますか？ "
1736+
1737+#~ msgid ""
1738+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
1739+#~ "file a bug for failing tests, even if apport is not enabled."
1740+#~ msgstr ""
1741+#~ "このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかど"
1742+#~ "うか、checkboxが確認するようになります。これはapportが有効になっていなくて"
1743+#~ "も機能します。"
1744+
1745+#~ msgid "Default package to report bugs against:"
1746+#~ msgstr "デフォルトでバグ報告の対象とするパッケージ:"
1747+
1748+#~ msgid ""
1749+#~ "When filing a new bug through checkbox, if it does not guess the "
1750+#~ "package, the default package that the bug will be file against."
1751+#~ msgstr ""
1752+#~ "checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デ"
1753+#~ "フォルトのパッケージ名を用いて報告します。"
1754
1755=== modified file 'debian/po/nl.po'
1756--- debian/po/nl.po 2012-07-12 18:21:13 +0000
1757+++ debian/po/nl.po 2012-07-12 20:20:27 +0000
1758@@ -7,7 +7,7 @@
1759 msgstr ""
1760 "Project-Id-Version: checkbox\n"
1761 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
1762-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
1763+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
1764 "PO-Revision-Date: 2011-08-17 12:02+0000\n"
1765 "Last-Translator: Rachid <Unknown>\n"
1766 "Language-Team: Dutch <nl@li.org>\n"
1767@@ -18,49 +18,15 @@
1768 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
1769 "X-Generator: Launchpad (build 15531)\n"
1770
1771-#. Type: boolean
1772-#. Description
1773-#: ../checkbox.templates:1001
1774-msgid "Enable bug reporting by default? "
1775-msgstr "Bugs rapporteren standaard inschakelen? "
1776-
1777-#. Type: boolean
1778-#. Description
1779-#: ../checkbox.templates:1001
1780-msgid ""
1781-"If this option is set to Yes, then checkbox will ask if the user wants to "
1782-"file a bug for failing tests, even if apport is not enabled."
1783-msgstr ""
1784-"Wanneer deze optie is ingeschakeld zal checkbox vragen of de gebruiker een "
1785-"bug wilt rapporteren voor mislukte tests, zelfs wanneer apport is "
1786-"uitgeschakeld."
1787-
1788-#. Type: string
1789-#. Description
1790-#: ../checkbox.templates:2001
1791-msgid "Default package to report bugs against:"
1792-msgstr "Standaard pakket om bugs voor te rapporteren:"
1793-
1794-#. Type: string
1795-#. Description
1796-#: ../checkbox.templates:2001
1797-msgid ""
1798-"When filing a new bug through checkbox, if it does not guess the package, "
1799-"the default package that the bug will be file against."
1800-msgstr ""
1801-"Wanneer een nieuwe bug wordt gerapporteerd via checkbox, en het het pakket "
1802-"kan niet geraden worden, dan zal de bug worden gerapporteerd voor het "
1803-"standaardpakket."
1804-
1805-#. Type: string
1806-#. Description
1807-#: ../checkbox.templates:3001
1808+#. Type: string
1809+#. Description
1810+#: ../checkbox.templates:1001
1811 msgid "Test suite blacklist:"
1812 msgstr "Testsuite zwarte lijst:"
1813
1814 #. Type: string
1815 #. Description
1816-#: ../checkbox.templates:3001
1817+#: ../checkbox.templates:1001
1818 msgid "List of job files to never run when testing with checkbox."
1819 msgstr ""
1820 "Lijst van taken die nooit uitgevoerd moeten worden wanneer er getest wordt "
1821@@ -68,13 +34,13 @@
1822
1823 #. Type: string
1824 #. Description
1825-#: ../checkbox.templates:4001
1826+#: ../checkbox.templates:2001
1827 msgid "Test suite whitelist:"
1828 msgstr "Testsuite witte lijst:"
1829
1830 #. Type: string
1831 #. Description
1832-#: ../checkbox.templates:4001
1833+#: ../checkbox.templates:2001
1834 msgid "List of jobs to run when testing with checkbox."
1835 msgstr ""
1836 "Lijst van taken die uitgevoerd moeten worden wanneer er getest wordt met "
1837@@ -82,37 +48,37 @@
1838
1839 #. Type: string
1840 #. Description
1841-#: ../checkbox.templates:5001
1842+#: ../checkbox.templates:3001
1843 msgid "Transport URL:"
1844 msgstr "Transport-URL:"
1845
1846 #. Type: string
1847 #. Description
1848-#: ../checkbox.templates:5001
1849+#: ../checkbox.templates:3001
1850 msgid "URL where to send submissions."
1851 msgstr "URL waar de inzendingen naartoe worden gestuurd."
1852
1853 #. Type: string
1854 #. Description
1855-#: ../checkbox.templates:6001
1856+#: ../checkbox.templates:4001
1857 msgid "Launchpad E-mail:"
1858 msgstr "Launchpad e-mail:"
1859
1860 #. Type: string
1861 #. Description
1862-#: ../checkbox.templates:6001
1863+#: ../checkbox.templates:4001
1864 msgid "E-mail address used to sign in to Launchpad."
1865 msgstr "E-mailadres om bij Launchpad aan te melden."
1866
1867 #. Type: string
1868 #. Description
1869-#: ../checkbox.templates:7001
1870+#: ../checkbox.templates:5001
1871 msgid "HTTP Proxy:"
1872 msgstr "HTTP-proxy:"
1873
1874 #. Type: string
1875 #. Description
1876-#: ../checkbox.templates:7001
1877+#: ../checkbox.templates:5001
1878 msgid "HTTP proxy to use instead of the one specified in environment."
1879 msgstr ""
1880 "HTTP-proxy om te gebruiken in plaats van degene die in de omgeving is "
1881@@ -120,14 +86,36 @@
1882
1883 #. Type: string
1884 #. Description
1885-#: ../checkbox.templates:8001
1886+#: ../checkbox.templates:6001
1887 msgid "HTTPS Proxy:"
1888 msgstr "HTTPS-proxy:"
1889
1890 #. Type: string
1891 #. Description
1892-#: ../checkbox.templates:8001
1893+#: ../checkbox.templates:6001
1894 msgid "HTTPS proxy to use instead of the one specified in environment."
1895 msgstr ""
1896 "HTTPS-proxy om te gebruiken in plaats van degene die in de omgeving is "
1897 "ingesteld."
1898+
1899+#~ msgid "Enable bug reporting by default? "
1900+#~ msgstr "Bugs rapporteren standaard inschakelen? "
1901+
1902+#~ msgid ""
1903+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
1904+#~ "file a bug for failing tests, even if apport is not enabled."
1905+#~ msgstr ""
1906+#~ "Wanneer deze optie is ingeschakeld zal checkbox vragen of de gebruiker "
1907+#~ "een bug wilt rapporteren voor mislukte tests, zelfs wanneer apport is "
1908+#~ "uitgeschakeld."
1909+
1910+#~ msgid "Default package to report bugs against:"
1911+#~ msgstr "Standaard pakket om bugs voor te rapporteren:"
1912+
1913+#~ msgid ""
1914+#~ "When filing a new bug through checkbox, if it does not guess the "
1915+#~ "package, the default package that the bug will be file against."
1916+#~ msgstr ""
1917+#~ "Wanneer een nieuwe bug wordt gerapporteerd via checkbox, en het het "
1918+#~ "pakket kan niet geraden worden, dan zal de bug worden gerapporteerd voor "
1919+#~ "het standaardpakket."
1920
1921=== modified file 'debian/po/oc.po'
1922--- debian/po/oc.po 2012-07-12 18:21:13 +0000
1923+++ debian/po/oc.po 2012-07-12 20:20:27 +0000
1924@@ -7,7 +7,7 @@
1925 msgstr ""
1926 "Project-Id-Version: checkbox\n"
1927 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
1928-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
1929+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
1930 "PO-Revision-Date: 2012-02-24 07:45+0000\n"
1931 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
1932 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
1933@@ -18,102 +18,74 @@
1934 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
1935 "X-Generator: Launchpad (build 15531)\n"
1936
1937-#. Type: boolean
1938-#. Description
1939-#: ../checkbox.templates:1001
1940-msgid "Enable bug reporting by default? "
1941-msgstr ""
1942-
1943-#. Type: boolean
1944-#. Description
1945-#: ../checkbox.templates:1001
1946-msgid ""
1947-"If this option is set to Yes, then checkbox will ask if the user wants to "
1948-"file a bug for failing tests, even if apport is not enabled."
1949-msgstr ""
1950-
1951-#. Type: string
1952-#. Description
1953-#: ../checkbox.templates:2001
1954-msgid "Default package to report bugs against:"
1955-msgstr ""
1956-
1957-#. Type: string
1958-#. Description
1959-#: ../checkbox.templates:2001
1960-msgid ""
1961-"When filing a new bug through checkbox, if it does not guess the package, "
1962-"the default package that the bug will be file against."
1963-msgstr ""
1964-
1965-#. Type: string
1966-#. Description
1967-#: ../checkbox.templates:3001
1968+#. Type: string
1969+#. Description
1970+#: ../checkbox.templates:1001
1971 msgid "Test suite blacklist:"
1972 msgstr ""
1973
1974 #. Type: string
1975 #. Description
1976-#: ../checkbox.templates:3001
1977+#: ../checkbox.templates:1001
1978 msgid "List of job files to never run when testing with checkbox."
1979 msgstr ""
1980
1981 #. Type: string
1982 #. Description
1983-#: ../checkbox.templates:4001
1984+#: ../checkbox.templates:2001
1985 msgid "Test suite whitelist:"
1986 msgstr ""
1987
1988 #. Type: string
1989 #. Description
1990-#: ../checkbox.templates:4001
1991+#: ../checkbox.templates:2001
1992 msgid "List of jobs to run when testing with checkbox."
1993 msgstr ""
1994
1995 #. Type: string
1996 #. Description
1997-#: ../checkbox.templates:5001
1998+#: ../checkbox.templates:3001
1999 msgid "Transport URL:"
2000 msgstr ""
2001
2002 #. Type: string
2003 #. Description
2004-#: ../checkbox.templates:5001
2005+#: ../checkbox.templates:3001
2006 msgid "URL where to send submissions."
2007 msgstr ""
2008
2009 #. Type: string
2010 #. Description
2011-#: ../checkbox.templates:6001
2012+#: ../checkbox.templates:4001
2013 msgid "Launchpad E-mail:"
2014 msgstr ""
2015
2016 #. Type: string
2017 #. Description
2018-#: ../checkbox.templates:6001
2019+#: ../checkbox.templates:4001
2020 msgid "E-mail address used to sign in to Launchpad."
2021 msgstr ""
2022
2023 #. Type: string
2024 #. Description
2025-#: ../checkbox.templates:7001
2026+#: ../checkbox.templates:5001
2027 msgid "HTTP Proxy:"
2028 msgstr "Mandatari HTTP :"
2029
2030 #. Type: string
2031 #. Description
2032-#: ../checkbox.templates:7001
2033+#: ../checkbox.templates:5001
2034 msgid "HTTP proxy to use instead of the one specified in environment."
2035 msgstr ""
2036
2037 #. Type: string
2038 #. Description
2039-#: ../checkbox.templates:8001
2040+#: ../checkbox.templates:6001
2041 msgid "HTTPS Proxy:"
2042 msgstr ""
2043
2044 #. Type: string
2045 #. Description
2046-#: ../checkbox.templates:8001
2047+#: ../checkbox.templates:6001
2048 msgid "HTTPS proxy to use instead of the one specified in environment."
2049 msgstr ""
2050
2051=== modified file 'debian/po/pl.po'
2052--- debian/po/pl.po 2012-07-12 18:21:13 +0000
2053+++ debian/po/pl.po 2012-07-12 20:20:27 +0000
2054@@ -7,7 +7,7 @@
2055 msgstr ""
2056 "Project-Id-Version: checkbox\n"
2057 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
2058-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
2059+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
2060 "PO-Revision-Date: 2011-07-18 21:11+0000\n"
2061 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2062 "Language-Team: Polish <pl@li.org>\n"
2063@@ -18,102 +18,74 @@
2064 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
2065 "X-Generator: Launchpad (build 15531)\n"
2066
2067-#. Type: boolean
2068-#. Description
2069-#: ../checkbox.templates:1001
2070-msgid "Enable bug reporting by default? "
2071-msgstr ""
2072-
2073-#. Type: boolean
2074-#. Description
2075-#: ../checkbox.templates:1001
2076-msgid ""
2077-"If this option is set to Yes, then checkbox will ask if the user wants to "
2078-"file a bug for failing tests, even if apport is not enabled."
2079-msgstr ""
2080-
2081-#. Type: string
2082-#. Description
2083-#: ../checkbox.templates:2001
2084-msgid "Default package to report bugs against:"
2085-msgstr ""
2086-
2087-#. Type: string
2088-#. Description
2089-#: ../checkbox.templates:2001
2090-msgid ""
2091-"When filing a new bug through checkbox, if it does not guess the package, "
2092-"the default package that the bug will be file against."
2093-msgstr ""
2094-
2095-#. Type: string
2096-#. Description
2097-#: ../checkbox.templates:3001
2098+#. Type: string
2099+#. Description
2100+#: ../checkbox.templates:1001
2101 msgid "Test suite blacklist:"
2102 msgstr ""
2103
2104 #. Type: string
2105 #. Description
2106-#: ../checkbox.templates:3001
2107+#: ../checkbox.templates:1001
2108 msgid "List of job files to never run when testing with checkbox."
2109 msgstr ""
2110
2111 #. Type: string
2112 #. Description
2113-#: ../checkbox.templates:4001
2114+#: ../checkbox.templates:2001
2115 msgid "Test suite whitelist:"
2116 msgstr ""
2117
2118 #. Type: string
2119 #. Description
2120-#: ../checkbox.templates:4001
2121+#: ../checkbox.templates:2001
2122 msgid "List of jobs to run when testing with checkbox."
2123 msgstr ""
2124
2125 #. Type: string
2126 #. Description
2127-#: ../checkbox.templates:5001
2128+#: ../checkbox.templates:3001
2129 msgid "Transport URL:"
2130 msgstr ""
2131
2132 #. Type: string
2133 #. Description
2134-#: ../checkbox.templates:5001
2135+#: ../checkbox.templates:3001
2136 msgid "URL where to send submissions."
2137 msgstr ""
2138
2139 #. Type: string
2140 #. Description
2141-#: ../checkbox.templates:6001
2142+#: ../checkbox.templates:4001
2143 msgid "Launchpad E-mail:"
2144 msgstr ""
2145
2146 #. Type: string
2147 #. Description
2148-#: ../checkbox.templates:6001
2149+#: ../checkbox.templates:4001
2150 msgid "E-mail address used to sign in to Launchpad."
2151 msgstr ""
2152
2153 #. Type: string
2154 #. Description
2155-#: ../checkbox.templates:7001
2156+#: ../checkbox.templates:5001
2157 msgid "HTTP Proxy:"
2158 msgstr ""
2159
2160 #. Type: string
2161 #. Description
2162-#: ../checkbox.templates:7001
2163+#: ../checkbox.templates:5001
2164 msgid "HTTP proxy to use instead of the one specified in environment."
2165 msgstr ""
2166
2167 #. Type: string
2168 #. Description
2169-#: ../checkbox.templates:8001
2170+#: ../checkbox.templates:6001
2171 msgid "HTTPS Proxy:"
2172 msgstr ""
2173
2174 #. Type: string
2175 #. Description
2176-#: ../checkbox.templates:8001
2177+#: ../checkbox.templates:6001
2178 msgid "HTTPS proxy to use instead of the one specified in environment."
2179 msgstr ""
2180
2181=== modified file 'debian/po/pt_BR.po'
2182--- debian/po/pt_BR.po 2012-07-12 18:21:13 +0000
2183+++ debian/po/pt_BR.po 2012-07-12 20:20:27 +0000
2184@@ -7,7 +7,7 @@
2185 msgstr ""
2186 "Project-Id-Version: checkbox\n"
2187 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
2188-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
2189+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
2190 "PO-Revision-Date: 2012-05-12 03:33+0000\n"
2191 "Last-Translator: eniomarconcini <Unknown>\n"
2192 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
2193@@ -18,48 +18,15 @@
2194 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
2195 "X-Generator: Launchpad (build 15531)\n"
2196
2197-#. Type: boolean
2198-#. Description
2199-#: ../checkbox.templates:1001
2200-msgid "Enable bug reporting by default? "
2201-msgstr "Habilitar o relatório de erro por padrão? "
2202-
2203-#. Type: boolean
2204-#. Description
2205-#: ../checkbox.templates:1001
2206-msgid ""
2207-"If this option is set to Yes, then checkbox will ask if the user wants to "
2208-"file a bug for failing tests, even if apport is not enabled."
2209-msgstr ""
2210-"Se esta opção for definida como Sim, então o Checkbox irá perguntar se o "
2211-"usuário quer relatar o erro dos testes que falharam, mesmo que o Apport não "
2212-"esteja habilitado."
2213-
2214-#. Type: string
2215-#. Description
2216-#: ../checkbox.templates:2001
2217-msgid "Default package to report bugs against:"
2218-msgstr "Pacote padrão para relatar erros:"
2219-
2220-#. Type: string
2221-#. Description
2222-#: ../checkbox.templates:2001
2223-msgid ""
2224-"When filing a new bug through checkbox, if it does not guess the package, "
2225-"the default package that the bug will be file against."
2226-msgstr ""
2227-"Quando estiver registrando um novo erro através do Checkbox, se ele não "
2228-"adivinhar o pacote, o pacote padrão do qual o erro será relatado."
2229-
2230-#. Type: string
2231-#. Description
2232-#: ../checkbox.templates:3001
2233+#. Type: string
2234+#. Description
2235+#: ../checkbox.templates:1001
2236 msgid "Test suite blacklist:"
2237 msgstr "Lista negra da suíte de testes:"
2238
2239 #. Type: string
2240 #. Description
2241-#: ../checkbox.templates:3001
2242+#: ../checkbox.templates:1001
2243 msgid "List of job files to never run when testing with checkbox."
2244 msgstr ""
2245 "Lista de arquivos de trabalho para nunca serem executados quando estiver "
2246@@ -67,13 +34,13 @@
2247
2248 #. Type: string
2249 #. Description
2250-#: ../checkbox.templates:4001
2251+#: ../checkbox.templates:2001
2252 msgid "Test suite whitelist:"
2253 msgstr "Lista branca da suíte de testes:"
2254
2255 #. Type: string
2256 #. Description
2257-#: ../checkbox.templates:4001
2258+#: ../checkbox.templates:2001
2259 msgid "List of jobs to run when testing with checkbox."
2260 msgstr ""
2261 "Lista de arquivos de trabalho para executar enquanto estiver testando com "
2262@@ -81,48 +48,69 @@
2263
2264 #. Type: string
2265 #. Description
2266-#: ../checkbox.templates:5001
2267+#: ../checkbox.templates:3001
2268 msgid "Transport URL:"
2269 msgstr "Transportar URL:"
2270
2271 #. Type: string
2272 #. Description
2273-#: ../checkbox.templates:5001
2274+#: ../checkbox.templates:3001
2275 msgid "URL where to send submissions."
2276 msgstr "URL para enviar relatórios."
2277
2278 #. Type: string
2279 #. Description
2280-#: ../checkbox.templates:6001
2281+#: ../checkbox.templates:4001
2282 msgid "Launchpad E-mail:"
2283 msgstr "E-mail do Launchpad:"
2284
2285 #. Type: string
2286 #. Description
2287-#: ../checkbox.templates:6001
2288+#: ../checkbox.templates:4001
2289 msgid "E-mail address used to sign in to Launchpad."
2290 msgstr "Endereço de e-mail usado para entrar no Launchpad."
2291
2292 #. Type: string
2293 #. Description
2294-#: ../checkbox.templates:7001
2295+#: ../checkbox.templates:5001
2296 msgid "HTTP Proxy:"
2297 msgstr "Proxy HTTP:"
2298
2299 #. Type: string
2300 #. Description
2301-#: ../checkbox.templates:7001
2302+#: ../checkbox.templates:5001
2303 msgid "HTTP proxy to use instead of the one specified in environment."
2304 msgstr "Proxy HTTP para usar em vez do especificado pelo ambiente."
2305
2306 #. Type: string
2307 #. Description
2308-#: ../checkbox.templates:8001
2309+#: ../checkbox.templates:6001
2310 msgid "HTTPS Proxy:"
2311 msgstr "Proxy HTTPS:"
2312
2313 #. Type: string
2314 #. Description
2315-#: ../checkbox.templates:8001
2316+#: ../checkbox.templates:6001
2317 msgid "HTTPS proxy to use instead of the one specified in environment."
2318 msgstr "Proxy HTTPS para usar em vez do especificado pelo ambiente."
2319+
2320+#~ msgid "Enable bug reporting by default? "
2321+#~ msgstr "Habilitar o relatório de erro por padrão? "
2322+
2323+#~ msgid ""
2324+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
2325+#~ "file a bug for failing tests, even if apport is not enabled."
2326+#~ msgstr ""
2327+#~ "Se esta opção for definida como Sim, então o Checkbox irá perguntar se o "
2328+#~ "usuário quer relatar o erro dos testes que falharam, mesmo que o Apport "
2329+#~ "não esteja habilitado."
2330+
2331+#~ msgid "Default package to report bugs against:"
2332+#~ msgstr "Pacote padrão para relatar erros:"
2333+
2334+#~ msgid ""
2335+#~ "When filing a new bug through checkbox, if it does not guess the "
2336+#~ "package, the default package that the bug will be file against."
2337+#~ msgstr ""
2338+#~ "Quando estiver registrando um novo erro através do Checkbox, se ele não "
2339+#~ "adivinhar o pacote, o pacote padrão do qual o erro será relatado."
2340
2341=== modified file 'debian/po/ro.po'
2342--- debian/po/ro.po 2012-07-12 18:21:13 +0000
2343+++ debian/po/ro.po 2012-07-12 20:20:27 +0000
2344@@ -7,7 +7,7 @@
2345 msgstr ""
2346 "Project-Id-Version: checkbox\n"
2347 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
2348-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
2349+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
2350 "PO-Revision-Date: 2011-10-27 20:38+0000\n"
2351 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2352 "Language-Team: Romanian <ro@li.org>\n"
2353@@ -18,102 +18,74 @@
2354 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
2355 "X-Generator: Launchpad (build 15531)\n"
2356
2357-#. Type: boolean
2358-#. Description
2359-#: ../checkbox.templates:1001
2360-msgid "Enable bug reporting by default? "
2361-msgstr ""
2362-
2363-#. Type: boolean
2364-#. Description
2365-#: ../checkbox.templates:1001
2366-msgid ""
2367-"If this option is set to Yes, then checkbox will ask if the user wants to "
2368-"file a bug for failing tests, even if apport is not enabled."
2369-msgstr ""
2370-
2371-#. Type: string
2372-#. Description
2373-#: ../checkbox.templates:2001
2374-msgid "Default package to report bugs against:"
2375-msgstr ""
2376-
2377-#. Type: string
2378-#. Description
2379-#: ../checkbox.templates:2001
2380-msgid ""
2381-"When filing a new bug through checkbox, if it does not guess the package, "
2382-"the default package that the bug will be file against."
2383-msgstr ""
2384-
2385-#. Type: string
2386-#. Description
2387-#: ../checkbox.templates:3001
2388+#. Type: string
2389+#. Description
2390+#: ../checkbox.templates:1001
2391 msgid "Test suite blacklist:"
2392 msgstr ""
2393
2394 #. Type: string
2395 #. Description
2396-#: ../checkbox.templates:3001
2397+#: ../checkbox.templates:1001
2398 msgid "List of job files to never run when testing with checkbox."
2399 msgstr ""
2400
2401 #. Type: string
2402 #. Description
2403-#: ../checkbox.templates:4001
2404+#: ../checkbox.templates:2001
2405 msgid "Test suite whitelist:"
2406 msgstr ""
2407
2408 #. Type: string
2409 #. Description
2410-#: ../checkbox.templates:4001
2411+#: ../checkbox.templates:2001
2412 msgid "List of jobs to run when testing with checkbox."
2413 msgstr ""
2414
2415 #. Type: string
2416 #. Description
2417-#: ../checkbox.templates:5001
2418+#: ../checkbox.templates:3001
2419 msgid "Transport URL:"
2420 msgstr ""
2421
2422 #. Type: string
2423 #. Description
2424-#: ../checkbox.templates:5001
2425+#: ../checkbox.templates:3001
2426 msgid "URL where to send submissions."
2427 msgstr ""
2428
2429 #. Type: string
2430 #. Description
2431-#: ../checkbox.templates:6001
2432+#: ../checkbox.templates:4001
2433 msgid "Launchpad E-mail:"
2434 msgstr ""
2435
2436 #. Type: string
2437 #. Description
2438-#: ../checkbox.templates:6001
2439+#: ../checkbox.templates:4001
2440 msgid "E-mail address used to sign in to Launchpad."
2441 msgstr ""
2442
2443 #. Type: string
2444 #. Description
2445-#: ../checkbox.templates:7001
2446+#: ../checkbox.templates:5001
2447 msgid "HTTP Proxy:"
2448 msgstr ""
2449
2450 #. Type: string
2451 #. Description
2452-#: ../checkbox.templates:7001
2453+#: ../checkbox.templates:5001
2454 msgid "HTTP proxy to use instead of the one specified in environment."
2455 msgstr ""
2456
2457 #. Type: string
2458 #. Description
2459-#: ../checkbox.templates:8001
2460+#: ../checkbox.templates:6001
2461 msgid "HTTPS Proxy:"
2462 msgstr ""
2463
2464 #. Type: string
2465 #. Description
2466-#: ../checkbox.templates:8001
2467+#: ../checkbox.templates:6001
2468 msgid "HTTPS proxy to use instead of the one specified in environment."
2469 msgstr ""
2470
2471=== modified file 'debian/po/ru.po'
2472--- debian/po/ru.po 2012-07-12 18:21:13 +0000
2473+++ debian/po/ru.po 2012-07-12 20:20:27 +0000
2474@@ -7,7 +7,7 @@
2475 msgstr ""
2476 "Project-Id-Version: checkbox\n"
2477 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
2478-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
2479+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
2480 "PO-Revision-Date: 2011-07-18 12:09+0000\n"
2481 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2482 "Language-Team: Russian <ru@li.org>\n"
2483@@ -18,102 +18,74 @@
2484 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
2485 "X-Generator: Launchpad (build 15531)\n"
2486
2487-#. Type: boolean
2488-#. Description
2489-#: ../checkbox.templates:1001
2490-msgid "Enable bug reporting by default? "
2491-msgstr ""
2492-
2493-#. Type: boolean
2494-#. Description
2495-#: ../checkbox.templates:1001
2496-msgid ""
2497-"If this option is set to Yes, then checkbox will ask if the user wants to "
2498-"file a bug for failing tests, even if apport is not enabled."
2499-msgstr ""
2500-
2501-#. Type: string
2502-#. Description
2503-#: ../checkbox.templates:2001
2504-msgid "Default package to report bugs against:"
2505-msgstr ""
2506-
2507-#. Type: string
2508-#. Description
2509-#: ../checkbox.templates:2001
2510-msgid ""
2511-"When filing a new bug through checkbox, if it does not guess the package, "
2512-"the default package that the bug will be file against."
2513-msgstr ""
2514-
2515-#. Type: string
2516-#. Description
2517-#: ../checkbox.templates:3001
2518+#. Type: string
2519+#. Description
2520+#: ../checkbox.templates:1001
2521 msgid "Test suite blacklist:"
2522 msgstr ""
2523
2524 #. Type: string
2525 #. Description
2526-#: ../checkbox.templates:3001
2527+#: ../checkbox.templates:1001
2528 msgid "List of job files to never run when testing with checkbox."
2529 msgstr ""
2530
2531 #. Type: string
2532 #. Description
2533-#: ../checkbox.templates:4001
2534+#: ../checkbox.templates:2001
2535 msgid "Test suite whitelist:"
2536 msgstr ""
2537
2538 #. Type: string
2539 #. Description
2540-#: ../checkbox.templates:4001
2541+#: ../checkbox.templates:2001
2542 msgid "List of jobs to run when testing with checkbox."
2543 msgstr ""
2544
2545 #. Type: string
2546 #. Description
2547-#: ../checkbox.templates:5001
2548+#: ../checkbox.templates:3001
2549 msgid "Transport URL:"
2550 msgstr ""
2551
2552 #. Type: string
2553 #. Description
2554-#: ../checkbox.templates:5001
2555+#: ../checkbox.templates:3001
2556 msgid "URL where to send submissions."
2557 msgstr ""
2558
2559 #. Type: string
2560 #. Description
2561-#: ../checkbox.templates:6001
2562+#: ../checkbox.templates:4001
2563 msgid "Launchpad E-mail:"
2564 msgstr ""
2565
2566 #. Type: string
2567 #. Description
2568-#: ../checkbox.templates:6001
2569+#: ../checkbox.templates:4001
2570 msgid "E-mail address used to sign in to Launchpad."
2571 msgstr ""
2572
2573 #. Type: string
2574 #. Description
2575-#: ../checkbox.templates:7001
2576+#: ../checkbox.templates:5001
2577 msgid "HTTP Proxy:"
2578 msgstr ""
2579
2580 #. Type: string
2581 #. Description
2582-#: ../checkbox.templates:7001
2583+#: ../checkbox.templates:5001
2584 msgid "HTTP proxy to use instead of the one specified in environment."
2585 msgstr ""
2586
2587 #. Type: string
2588 #. Description
2589-#: ../checkbox.templates:8001
2590+#: ../checkbox.templates:6001
2591 msgid "HTTPS Proxy:"
2592 msgstr ""
2593
2594 #. Type: string
2595 #. Description
2596-#: ../checkbox.templates:8001
2597+#: ../checkbox.templates:6001
2598 msgid "HTTPS proxy to use instead of the one specified in environment."
2599 msgstr ""
2600
2601=== modified file 'debian/po/templates.pot'
2602--- debian/po/templates.pot 2011-03-29 13:28:41 +0000
2603+++ debian/po/templates.pot 2012-07-12 20:20:27 +0000
2604@@ -6,9 +6,9 @@
2605 #, fuzzy
2606 msgid ""
2607 msgstr ""
2608-"Project-Id-Version: PACKAGE VERSION\n"
2609+"Project-Id-Version: checkbox\n"
2610 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
2611-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
2612+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
2613 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
2614 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2615 "Language-Team: LANGUAGE <LL@li.org>\n"
2616@@ -17,102 +17,74 @@
2617 "Content-Type: text/plain; charset=CHARSET\n"
2618 "Content-Transfer-Encoding: 8bit\n"
2619
2620-#. Type: boolean
2621-#. Description
2622-#: ../checkbox.templates:1001
2623-msgid "Enable bug reporting by default? "
2624-msgstr ""
2625-
2626-#. Type: boolean
2627-#. Description
2628-#: ../checkbox.templates:1001
2629-msgid ""
2630-"If this option is set to Yes, then checkbox will ask if the user wants to "
2631-"file a bug for failing tests, even if apport is not enabled."
2632-msgstr ""
2633-
2634-#. Type: string
2635-#. Description
2636-#: ../checkbox.templates:2001
2637-msgid "Default package to report bugs against:"
2638-msgstr ""
2639-
2640-#. Type: string
2641-#. Description
2642-#: ../checkbox.templates:2001
2643-msgid ""
2644-"When filing a new bug through checkbox, if it does not guess the package, "
2645-"the default package that the bug will be file against."
2646-msgstr ""
2647-
2648-#. Type: string
2649-#. Description
2650-#: ../checkbox.templates:3001
2651+#. Type: string
2652+#. Description
2653+#: ../checkbox.templates:1001
2654 msgid "Test suite blacklist:"
2655 msgstr ""
2656
2657 #. Type: string
2658 #. Description
2659-#: ../checkbox.templates:3001
2660+#: ../checkbox.templates:1001
2661 msgid "List of job files to never run when testing with checkbox."
2662 msgstr ""
2663
2664 #. Type: string
2665 #. Description
2666-#: ../checkbox.templates:4001
2667+#: ../checkbox.templates:2001
2668 msgid "Test suite whitelist:"
2669 msgstr ""
2670
2671 #. Type: string
2672 #. Description
2673-#: ../checkbox.templates:4001
2674+#: ../checkbox.templates:2001
2675 msgid "List of jobs to run when testing with checkbox."
2676 msgstr ""
2677
2678 #. Type: string
2679 #. Description
2680-#: ../checkbox.templates:5001
2681+#: ../checkbox.templates:3001
2682 msgid "Transport URL:"
2683 msgstr ""
2684
2685 #. Type: string
2686 #. Description
2687-#: ../checkbox.templates:5001
2688+#: ../checkbox.templates:3001
2689 msgid "URL where to send submissions."
2690 msgstr ""
2691
2692 #. Type: string
2693 #. Description
2694-#: ../checkbox.templates:6001
2695+#: ../checkbox.templates:4001
2696 msgid "Launchpad E-mail:"
2697 msgstr ""
2698
2699 #. Type: string
2700 #. Description
2701-#: ../checkbox.templates:6001
2702+#: ../checkbox.templates:4001
2703 msgid "E-mail address used to sign in to Launchpad."
2704 msgstr ""
2705
2706 #. Type: string
2707 #. Description
2708-#: ../checkbox.templates:7001
2709+#: ../checkbox.templates:5001
2710 msgid "HTTP Proxy:"
2711 msgstr ""
2712
2713 #. Type: string
2714 #. Description
2715-#: ../checkbox.templates:7001
2716+#: ../checkbox.templates:5001
2717 msgid "HTTP proxy to use instead of the one specified in environment."
2718 msgstr ""
2719
2720 #. Type: string
2721 #. Description
2722-#: ../checkbox.templates:8001
2723+#: ../checkbox.templates:6001
2724 msgid "HTTPS Proxy:"
2725 msgstr ""
2726
2727 #. Type: string
2728 #. Description
2729-#: ../checkbox.templates:8001
2730+#: ../checkbox.templates:6001
2731 msgid "HTTPS proxy to use instead of the one specified in environment."
2732 msgstr ""
2733
2734=== modified file 'debian/po/tr.po'
2735--- debian/po/tr.po 2012-07-12 18:21:13 +0000
2736+++ debian/po/tr.po 2012-07-12 20:20:27 +0000
2737@@ -7,7 +7,7 @@
2738 msgstr ""
2739 "Project-Id-Version: checkbox\n"
2740 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
2741-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
2742+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
2743 "PO-Revision-Date: 2012-05-18 12:51+0000\n"
2744 "Last-Translator: Hasan Yılmaz <iletisim@hasanyilmaz.net>\n"
2745 "Language-Team: Turkish <tr@li.org>\n"
2746@@ -18,102 +18,74 @@
2747 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
2748 "X-Generator: Launchpad (build 15531)\n"
2749
2750-#. Type: boolean
2751-#. Description
2752-#: ../checkbox.templates:1001
2753-msgid "Enable bug reporting by default? "
2754-msgstr ""
2755-
2756-#. Type: boolean
2757-#. Description
2758-#: ../checkbox.templates:1001
2759-msgid ""
2760-"If this option is set to Yes, then checkbox will ask if the user wants to "
2761-"file a bug for failing tests, even if apport is not enabled."
2762-msgstr ""
2763-
2764-#. Type: string
2765-#. Description
2766-#: ../checkbox.templates:2001
2767-msgid "Default package to report bugs against:"
2768-msgstr ""
2769-
2770-#. Type: string
2771-#. Description
2772-#: ../checkbox.templates:2001
2773-msgid ""
2774-"When filing a new bug through checkbox, if it does not guess the package, "
2775-"the default package that the bug will be file against."
2776-msgstr ""
2777-
2778-#. Type: string
2779-#. Description
2780-#: ../checkbox.templates:3001
2781+#. Type: string
2782+#. Description
2783+#: ../checkbox.templates:1001
2784 msgid "Test suite blacklist:"
2785 msgstr ""
2786
2787 #. Type: string
2788 #. Description
2789-#: ../checkbox.templates:3001
2790+#: ../checkbox.templates:1001
2791 msgid "List of job files to never run when testing with checkbox."
2792 msgstr ""
2793
2794 #. Type: string
2795 #. Description
2796-#: ../checkbox.templates:4001
2797+#: ../checkbox.templates:2001
2798 msgid "Test suite whitelist:"
2799 msgstr ""
2800
2801 #. Type: string
2802 #. Description
2803-#: ../checkbox.templates:4001
2804+#: ../checkbox.templates:2001
2805 msgid "List of jobs to run when testing with checkbox."
2806 msgstr ""
2807
2808 #. Type: string
2809 #. Description
2810-#: ../checkbox.templates:5001
2811+#: ../checkbox.templates:3001
2812 msgid "Transport URL:"
2813 msgstr ""
2814
2815 #. Type: string
2816 #. Description
2817-#: ../checkbox.templates:5001
2818+#: ../checkbox.templates:3001
2819 msgid "URL where to send submissions."
2820 msgstr ""
2821
2822 #. Type: string
2823 #. Description
2824-#: ../checkbox.templates:6001
2825+#: ../checkbox.templates:4001
2826 msgid "Launchpad E-mail:"
2827 msgstr "Launchpad E-posta:"
2828
2829 #. Type: string
2830 #. Description
2831-#: ../checkbox.templates:6001
2832+#: ../checkbox.templates:4001
2833 msgid "E-mail address used to sign in to Launchpad."
2834 msgstr ""
2835
2836 #. Type: string
2837 #. Description
2838-#: ../checkbox.templates:7001
2839+#: ../checkbox.templates:5001
2840 msgid "HTTP Proxy:"
2841 msgstr ""
2842
2843 #. Type: string
2844 #. Description
2845-#: ../checkbox.templates:7001
2846+#: ../checkbox.templates:5001
2847 msgid "HTTP proxy to use instead of the one specified in environment."
2848 msgstr ""
2849
2850 #. Type: string
2851 #. Description
2852-#: ../checkbox.templates:8001
2853+#: ../checkbox.templates:6001
2854 msgid "HTTPS Proxy:"
2855 msgstr ""
2856
2857 #. Type: string
2858 #. Description
2859-#: ../checkbox.templates:8001
2860+#: ../checkbox.templates:6001
2861 msgid "HTTPS proxy to use instead of the one specified in environment."
2862 msgstr ""
2863
2864=== modified file 'debian/po/uk.po'
2865--- debian/po/uk.po 2012-07-12 18:21:13 +0000
2866+++ debian/po/uk.po 2012-07-12 20:20:27 +0000
2867@@ -7,7 +7,7 @@
2868 msgstr ""
2869 "Project-Id-Version: checkbox\n"
2870 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
2871-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
2872+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
2873 "PO-Revision-Date: 2012-01-21 07:24+0000\n"
2874 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2875 "Language-Team: Ukrainian <uk@li.org>\n"
2876@@ -18,102 +18,74 @@
2877 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
2878 "X-Generator: Launchpad (build 15531)\n"
2879
2880-#. Type: boolean
2881-#. Description
2882-#: ../checkbox.templates:1001
2883-msgid "Enable bug reporting by default? "
2884-msgstr ""
2885-
2886-#. Type: boolean
2887-#. Description
2888-#: ../checkbox.templates:1001
2889-msgid ""
2890-"If this option is set to Yes, then checkbox will ask if the user wants to "
2891-"file a bug for failing tests, even if apport is not enabled."
2892-msgstr ""
2893-
2894-#. Type: string
2895-#. Description
2896-#: ../checkbox.templates:2001
2897-msgid "Default package to report bugs against:"
2898-msgstr ""
2899-
2900-#. Type: string
2901-#. Description
2902-#: ../checkbox.templates:2001
2903-msgid ""
2904-"When filing a new bug through checkbox, if it does not guess the package, "
2905-"the default package that the bug will be file against."
2906-msgstr ""
2907-
2908-#. Type: string
2909-#. Description
2910-#: ../checkbox.templates:3001
2911+#. Type: string
2912+#. Description
2913+#: ../checkbox.templates:1001
2914 msgid "Test suite blacklist:"
2915 msgstr ""
2916
2917 #. Type: string
2918 #. Description
2919-#: ../checkbox.templates:3001
2920+#: ../checkbox.templates:1001
2921 msgid "List of job files to never run when testing with checkbox."
2922 msgstr ""
2923
2924 #. Type: string
2925 #. Description
2926-#: ../checkbox.templates:4001
2927+#: ../checkbox.templates:2001
2928 msgid "Test suite whitelist:"
2929 msgstr ""
2930
2931 #. Type: string
2932 #. Description
2933-#: ../checkbox.templates:4001
2934+#: ../checkbox.templates:2001
2935 msgid "List of jobs to run when testing with checkbox."
2936 msgstr ""
2937
2938 #. Type: string
2939 #. Description
2940-#: ../checkbox.templates:5001
2941+#: ../checkbox.templates:3001
2942 msgid "Transport URL:"
2943 msgstr ""
2944
2945 #. Type: string
2946 #. Description
2947-#: ../checkbox.templates:5001
2948+#: ../checkbox.templates:3001
2949 msgid "URL where to send submissions."
2950 msgstr ""
2951
2952 #. Type: string
2953 #. Description
2954-#: ../checkbox.templates:6001
2955+#: ../checkbox.templates:4001
2956 msgid "Launchpad E-mail:"
2957 msgstr ""
2958
2959 #. Type: string
2960 #. Description
2961-#: ../checkbox.templates:6001
2962+#: ../checkbox.templates:4001
2963 msgid "E-mail address used to sign in to Launchpad."
2964 msgstr ""
2965
2966 #. Type: string
2967 #. Description
2968-#: ../checkbox.templates:7001
2969+#: ../checkbox.templates:5001
2970 msgid "HTTP Proxy:"
2971 msgstr ""
2972
2973 #. Type: string
2974 #. Description
2975-#: ../checkbox.templates:7001
2976+#: ../checkbox.templates:5001
2977 msgid "HTTP proxy to use instead of the one specified in environment."
2978 msgstr ""
2979
2980 #. Type: string
2981 #. Description
2982-#: ../checkbox.templates:8001
2983+#: ../checkbox.templates:6001
2984 msgid "HTTPS Proxy:"
2985 msgstr ""
2986
2987 #. Type: string
2988 #. Description
2989-#: ../checkbox.templates:8001
2990+#: ../checkbox.templates:6001
2991 msgid "HTTPS proxy to use instead of the one specified in environment."
2992 msgstr ""
2993
2994=== modified file 'debian/po/zh_CN.po'
2995--- debian/po/zh_CN.po 2012-07-12 18:21:13 +0000
2996+++ debian/po/zh_CN.po 2012-07-12 20:20:27 +0000
2997@@ -7,7 +7,7 @@
2998 msgstr ""
2999 "Project-Id-Version: checkbox\n"
3000 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
3001-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
3002+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
3003 "PO-Revision-Date: 2012-05-09 02:09+0000\n"
3004 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3005 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
3006@@ -18,102 +18,74 @@
3007 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
3008 "X-Generator: Launchpad (build 15531)\n"
3009
3010-#. Type: boolean
3011-#. Description
3012-#: ../checkbox.templates:1001
3013-msgid "Enable bug reporting by default? "
3014-msgstr ""
3015-
3016-#. Type: boolean
3017-#. Description
3018-#: ../checkbox.templates:1001
3019-msgid ""
3020-"If this option is set to Yes, then checkbox will ask if the user wants to "
3021-"file a bug for failing tests, even if apport is not enabled."
3022-msgstr ""
3023-
3024-#. Type: string
3025-#. Description
3026-#: ../checkbox.templates:2001
3027-msgid "Default package to report bugs against:"
3028-msgstr ""
3029-
3030-#. Type: string
3031-#. Description
3032-#: ../checkbox.templates:2001
3033-msgid ""
3034-"When filing a new bug through checkbox, if it does not guess the package, "
3035-"the default package that the bug will be file against."
3036-msgstr ""
3037-
3038-#. Type: string
3039-#. Description
3040-#: ../checkbox.templates:3001
3041+#. Type: string
3042+#. Description
3043+#: ../checkbox.templates:1001
3044 msgid "Test suite blacklist:"
3045 msgstr ""
3046
3047 #. Type: string
3048 #. Description
3049-#: ../checkbox.templates:3001
3050+#: ../checkbox.templates:1001
3051 msgid "List of job files to never run when testing with checkbox."
3052 msgstr ""
3053
3054 #. Type: string
3055 #. Description
3056-#: ../checkbox.templates:4001
3057+#: ../checkbox.templates:2001
3058 msgid "Test suite whitelist:"
3059 msgstr ""
3060
3061 #. Type: string
3062 #. Description
3063-#: ../checkbox.templates:4001
3064+#: ../checkbox.templates:2001
3065 msgid "List of jobs to run when testing with checkbox."
3066 msgstr ""
3067
3068 #. Type: string
3069 #. Description
3070-#: ../checkbox.templates:5001
3071+#: ../checkbox.templates:3001
3072 msgid "Transport URL:"
3073 msgstr ""
3074
3075 #. Type: string
3076 #. Description
3077-#: ../checkbox.templates:5001
3078+#: ../checkbox.templates:3001
3079 msgid "URL where to send submissions."
3080 msgstr ""
3081
3082 #. Type: string
3083 #. Description
3084-#: ../checkbox.templates:6001
3085+#: ../checkbox.templates:4001
3086 msgid "Launchpad E-mail:"
3087 msgstr ""
3088
3089 #. Type: string
3090 #. Description
3091-#: ../checkbox.templates:6001
3092+#: ../checkbox.templates:4001
3093 msgid "E-mail address used to sign in to Launchpad."
3094 msgstr ""
3095
3096 #. Type: string
3097 #. Description
3098-#: ../checkbox.templates:7001
3099+#: ../checkbox.templates:5001
3100 msgid "HTTP Proxy:"
3101 msgstr ""
3102
3103 #. Type: string
3104 #. Description
3105-#: ../checkbox.templates:7001
3106+#: ../checkbox.templates:5001
3107 msgid "HTTP proxy to use instead of the one specified in environment."
3108 msgstr ""
3109
3110 #. Type: string
3111 #. Description
3112-#: ../checkbox.templates:8001
3113+#: ../checkbox.templates:6001
3114 msgid "HTTPS Proxy:"
3115 msgstr ""
3116
3117 #. Type: string
3118 #. Description
3119-#: ../checkbox.templates:8001
3120+#: ../checkbox.templates:6001
3121 msgid "HTTPS proxy to use instead of the one specified in environment."
3122 msgstr ""
3123
3124=== modified file 'debian/po/zh_TW.po'
3125--- debian/po/zh_TW.po 2012-07-12 18:21:13 +0000
3126+++ debian/po/zh_TW.po 2012-07-12 20:20:27 +0000
3127@@ -7,7 +7,7 @@
3128 msgstr ""
3129 "Project-Id-Version: checkbox\n"
3130 "Report-Msgid-Bugs-To: checkbox@packages.debian.org\n"
3131-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
3132+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
3133 "PO-Revision-Date: 2011-07-26 15:03+0000\n"
3134 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
3135 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
3136@@ -18,104 +18,87 @@
3137 "X-Launchpad-Export-Date: 2012-07-03 05:13+0000\n"
3138 "X-Generator: Launchpad (build 15531)\n"
3139
3140-#. Type: boolean
3141-#. Description
3142-#: ../checkbox.templates:1001
3143-msgid "Enable bug reporting by default? "
3144-msgstr "預設啟用臭蟲回報？ "
3145-
3146-#. Type: boolean
3147-#. Description
3148-#: ../checkbox.templates:1001
3149-msgid ""
3150-"If this option is set to Yes, then checkbox will ask if the user wants to "
3151-"file a bug for failing tests, even if apport is not enabled."
3152-msgstr ""
3153-"若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提"
3154-"交失敗測試的臭蟲回報。"
3155-
3156-#. Type: string
3157-#. Description
3158-#: ../checkbox.templates:2001
3159-msgid "Default package to report bugs against:"
3160-msgstr "回報臭蟲的預設套件："
3161-
3162-#. Type: string
3163-#. Description
3164-#: ../checkbox.templates:2001
3165-msgid ""
3166-"When filing a new bug through checkbox, if it does not guess the package, "
3167-"the default package that the bug will be file against."
3168-msgstr ""
3169-
3170-#. Type: string
3171-#. Description
3172-#: ../checkbox.templates:3001
3173+#. Type: string
3174+#. Description
3175+#: ../checkbox.templates:1001
3176 msgid "Test suite blacklist:"
3177 msgstr "測試套組黑名單："
3178
3179 #. Type: string
3180 #. Description
3181-#: ../checkbox.templates:3001
3182+#: ../checkbox.templates:1001
3183 msgid "List of job files to never run when testing with checkbox."
3184 msgstr "checkbox 測試時永不執行的工作清單。"
3185
3186 #. Type: string
3187 #. Description
3188-#: ../checkbox.templates:4001
3189+#: ../checkbox.templates:2001
3190 msgid "Test suite whitelist:"
3191 msgstr "測試套組白名單："
3192
3193 #. Type: string
3194 #. Description
3195-#: ../checkbox.templates:4001
3196+#: ../checkbox.templates:2001
3197 msgid "List of jobs to run when testing with checkbox."
3198 msgstr "checkbox 測試時要執行的工作清單。"
3199
3200 #. Type: string
3201 #. Description
3202-#: ../checkbox.templates:5001
3203+#: ../checkbox.templates:3001
3204 msgid "Transport URL:"
3205 msgstr "傳輸網址："
3206
3207 #. Type: string
3208 #. Description
3209-#: ../checkbox.templates:5001
3210+#: ../checkbox.templates:3001
3211 msgid "URL where to send submissions."
3212 msgstr "傳送報告提交的所在網址。"
3213
3214 #. Type: string
3215 #. Description
3216-#: ../checkbox.templates:6001
3217+#: ../checkbox.templates:4001
3218 msgid "Launchpad E-mail:"
3219 msgstr "Launchpad 電子郵件："
3220
3221 #. Type: string
3222 #. Description
3223-#: ../checkbox.templates:6001
3224+#: ../checkbox.templates:4001
3225 msgid "E-mail address used to sign in to Launchpad."
3226 msgstr "用來登入 Launchpad 的電子郵件位址。"
3227
3228 #. Type: string
3229 #. Description
3230-#: ../checkbox.templates:7001
3231+#: ../checkbox.templates:5001
3232 msgid "HTTP Proxy:"
3233 msgstr "HTTP 代理："
3234
3235 #. Type: string
3236 #. Description
3237-#: ../checkbox.templates:7001
3238+#: ../checkbox.templates:5001
3239 msgid "HTTP proxy to use instead of the one specified in environment."
3240 msgstr "要使用的 HTTP 代理，而不是使用環境內所指定的。"
3241
3242 #. Type: string
3243 #. Description
3244-#: ../checkbox.templates:8001
3245+#: ../checkbox.templates:6001
3246 msgid "HTTPS Proxy:"
3247 msgstr "HTTPS 代理："
3248
3249 #. Type: string
3250 #. Description
3251-#: ../checkbox.templates:8001
3252+#: ../checkbox.templates:6001
3253 msgid "HTTPS proxy to use instead of the one specified in environment."
3254 msgstr "要使用的 HTTPS 代理，而不是使用環境內所指定的。"
3255+
3256+#~ msgid "Enable bug reporting by default? "
3257+#~ msgstr "預設啟用臭蟲回報？ "
3258+
3259+#~ msgid ""
3260+#~ "If this option is set to Yes, then checkbox will ask if the user wants to "
3261+#~ "file a bug for failing tests, even if apport is not enabled."
3262+#~ msgstr ""
3263+#~ "若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，"
3264+#~ "都提交失敗測試的臭蟲回報。"
3265+
3266+#~ msgid "Default package to report bugs against:"
3267+#~ msgstr "回報臭蟲的預設套件："
3268
3269=== removed file 'debian/pycompat'
3270--- debian/pycompat 2008-01-22 18:57:58 +0000
3271+++ debian/pycompat 1970-01-01 00:00:00 +0000
3272@@ -1,1 +0,0 @@
3273-2
3274
3275=== modified file 'debian/rules'
3276--- debian/rules 2012-06-05 14:52:05 +0000
3277+++ debian/rules 2012-07-12 20:20:27 +0000
3278@@ -1,7 +1,7 @@
3279 #!/usr/bin/make -f
3280
3281 %:
3282- dh "$@" --with translations,python3
3283+ dh "$@" --with python2,python3,translations
3284
3285 override_dh_auto_build:
3286 (cd qt/frontend; qmake-qt4; make)
3287@@ -13,6 +13,8 @@
3288 set -ex; for python in $(shell py3versions -r); do \
3289 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
3290 done;
3291+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/checkbox
3292+ mv $(CURDIR)/debian/tmp/usr/share/checkbox/scripts $(CURDIR)/debian/tmp/usr/lib/checkbox/bin
3293
3294 override_dh_installdeb:
3295 cp debian/checkbox.postrm debian/checkbox-cli.postrm
3296
3297=== removed file 'debian/watch'
3298--- debian/watch 2008-12-23 18:41:35 +0000
3299+++ debian/watch 1970-01-01 00:00:00 +0000
3300@@ -1,3 +0,0 @@
3301-version=3
3302-https://launchpad.net/checkbox/+download
3303-https://launchpad.net/checkbox/.*/checkbox_(.+).tar.gz
3304
3305=== modified file 'patches/0.4'
3306--- patches/0.4 2009-02-17 02:19:00 +0000
3307+++ patches/0.4 2012-07-12 20:20:27 +0000
3308@@ -1,15 +1,15 @@
3309-#!/usr/bin/python
3310+#!/usr/bin/env python3
3311
3312 import re
3313 import sys
3314
3315-from StringIO import StringIO
3316+from io import StringIO
3317
3318
3319 def Config(filename):
3320 globals = {}
3321 module = "/usr/share/checkbox/install/config"
3322- exec open(module) in globals
3323+ exec(open(module), globals)
3324 config = globals["Config"]()
3325 config.read(filename)
3326
3327
3328=== modified file 'patches/0.5'
3329--- patches/0.5 2009-02-19 05:10:37 +0000
3330+++ patches/0.5 2012-07-12 20:20:27 +0000
3331@@ -1,14 +1,14 @@
3332-#!/usr/bin/python
3333+#!/usr/bin/env python3
3334
3335 import sys
3336
3337-from StringIO import StringIO
3338+from io import StringIO
3339
3340
3341 def Config(filename):
3342 globals = {}
3343 module = "/usr/share/checkbox/install/config"
3344- exec open(module) in globals
3345+ exec(open(module), globals)
3346 config = globals["Config"]()
3347 config.read(filename)
3348
3349
3350=== modified file 'patches/0.8'
3351--- patches/0.8 2009-04-15 00:25:02 +0000
3352+++ patches/0.8 2012-07-12 20:20:27 +0000
3353@@ -1,14 +1,14 @@
3354-#!/usr/bin/python
3355+#!/usr/bin/env python3
3356
3357 import sys
3358
3359-from StringIO import StringIO
3360+from io import StringIO
3361
3362
3363 def Config(filename):
3364 globals = {}
3365 module = "/usr/share/checkbox/install/config"
3366- exec open(module) in globals
3367+ exec(open(module), globals)
3368 config = globals["Config"]()
3369 config.read(filename)
3370
3371
3372=== modified file 'patches/0.9'
3373--- patches/0.9 2010-01-21 22:03:53 +0000
3374+++ patches/0.9 2012-07-12 20:20:27 +0000
3375@@ -1,15 +1,15 @@
3376-#!/usr/bin/python
3377+#!/usr/bin/env python3
3378
3379 import re
3380 import sys
3381
3382-from StringIO import StringIO
3383+from io import StringIO
3384
3385
3386 def Config(filename):
3387 globals = {}
3388 module = "/usr/share/checkbox/install/config"
3389- exec open(module) in globals
3390+ exec(open(module), globals)
3391 config = globals["Config"]()
3392 config.read(filename)
3393
3394
3395=== modified file 'po/checkbox.pot'
3396--- po/checkbox.pot 2012-07-12 18:21:13 +0000
3397+++ po/checkbox.pot 2012-07-12 20:20:27 +0000
3398@@ -8,7 +8,7 @@
3399 msgstr ""
3400 "Project-Id-Version: PACKAGE VERSION\n"
3401 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/checkbox/+filebug\n"
3402-"POT-Creation-Date: 2012-07-12 14:19-0400\n"
3403+"POT-Creation-Date: 2012-07-12 16:08-0400\n"
3404 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
3405 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3406 "Language-Team: LANGUAGE <LL@li.org>\n"
3407
3408=== modified file 'qt/checkbox-qt.desktop.in'
3409--- qt/checkbox-qt.desktop.in 2011-12-05 15:25:22 +0000
3410+++ qt/checkbox-qt.desktop.in 2012-07-12 20:20:27 +0000
3411@@ -7,5 +7,5 @@
3412 Type=Application
3413 Icon=checkbox
3414 StartupNotify=true
3415-Categories=QT;Application;System;Settings;
3416+Categories=Qt;Application;System;Settings;
3417 X-Ubuntu-Gettext-Domain=checkbox
3418
3419=== modified file 'qt/com.canonical.QtCheckbox.service'
3420--- qt/com.canonical.QtCheckbox.service 2012-02-07 22:33:29 +0000
3421+++ qt/com.canonical.QtCheckbox.service 2012-07-12 20:20:27 +0000
3422@@ -1,3 +1,3 @@
3423 [D-BUS Service]
3424 Name=com.canonical.QtCheckbox
3425-Exec=/usr/share/checkbox/qt/checkbox-qt-service
3426+Exec=/usr/lib/checkbox/qt/checkbox-qt-service
3427
3428=== modified file 'scripts/ipmi_test'
3429--- scripts/ipmi_test 2012-07-10 16:59:26 +0000
3430+++ scripts/ipmi_test 2012-07-12 20:20:27 +0000
3431@@ -17,7 +17,7 @@
3432 echo "ERROR: Unable to load module $module" >&2
3433 echo "Aborting IPMI test run." >&2
3434 exit 1
3435- else;
3436+ else
3437 echo "Successfully loaded module $module"
3438 fi
3439 fi
3440
3441=== modified file 'scripts/process_wait'
3442--- scripts/process_wait 2012-05-22 18:01:21 +0000
3443+++ scripts/process_wait 2012-07-12 20:20:27 +0000
3444@@ -1,4 +1,4 @@
3445-#!/usr/bin/python
3446+#!/usr/bin/env python3
3447
3448 import os
3449 import sys
3450@@ -16,7 +16,8 @@
3451 command = COMMAND_FORMAT % {"options": options_string, "process": process}
3452
3453 # Exclude this process and the pgrep process
3454- subprocess = Popen(command, stdout=PIPE, shell=True)
3455+ subprocess = Popen(
3456+ command, stdout=PIPE, shell=True, universal_newlines=True)
3457 exclude_pids = [os.getpid(), os.getppid(), subprocess.pid]
3458
3459 pids_string = subprocess.communicate()[0]
3460
3461=== modified file 'setup.py'
3462--- setup.py 2012-06-04 19:36:03 +0000
3463+++ setup.py 2012-07-12 20:20:27 +0000
3464@@ -212,6 +212,7 @@
3465 This project provides an extensible interface for system testing.
3466 """,
3467 data_files = [
3468+ ("lib/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png", "qt/frontend/checkbox-qt-service"]),
3469 ("share/checkbox/", ["backend", "run"]),
3470 ("share/checkbox/data/audio/", ["data/audio/*"]),
3471 ("share/checkbox/data/documents/", ["data/documents/*"]),
3472@@ -228,7 +229,6 @@
3473 ("share/checkbox/report/images/", ["report/images/*"]),
3474 ("share/checkbox/scripts/", ["scripts/*"]),
3475 ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
3476- ("share/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png", "qt/frontend/checkbox-qt-service"]),
3477 ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
3478 ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
3479 ("share/apport/general-hooks/", ["apport/checkbox.py"])],

Subscribers

People subscribed via source and target branches