Checkbox

Merge lp:~roadmr/checkbox/1073359-key_test-i18n into lp:checkbox

  1. 1073359-key_test-i18n
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Approved by: Daniel Manrique
Approved revision: 1827
Merged at revision: 1850
Proposed branch: lp:~roadmr/checkbox/1073359-key_test-i18n
Merge into: lp:checkbox
Diff against target: 23 lines (+2/-0)
2 files modified
debian/changelog (+1/-0)
po/POTFILES.in (+1/-0)
To merge this branch: bzr merge lp:~roadmr/checkbox/1073359-key_test-i18n
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Zygmunt Krynicki (community) Approve
Review via email: mp+134555@code.launchpad.net

Commit message

Added the key_test script to po/POTFILES.in, so that it gets included in translations catalogs and it can be properly translated.

Description of the change

Added the key_test script to po/POTFILES.in, so that it gets included in translations catalogs and it can be properly translated.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Thanks a lot, +1

review: Approve
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in debian/changelog

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

Fixed the changelog conflict, flipping to approved for tarmac to do its thing.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

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

OK, the additional revision is mine and "I approve".

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-12-12 17:23:36 +0000
3+++ debian/changelog 2012-12-12 17:29:22 +0000
4@@ -8,6 +8,7 @@
5 expected location (LP: #1085833)
6 * scripts/memory_compare: Fixed accumulator expression to give good results
7 (LP: #1089046)
8+ * added scripts/key_test to the list of translatable files (LP: #1073359)
9
10 [ Brendan Donegan ]
11 * Change forward-slashes to asterisks in the filename of a connection, since
12
13=== modified file 'po/POTFILES.in'
14--- po/POTFILES.in 2012-11-16 17:17:46 +0000
15+++ po/POTFILES.in 2012-12-12 17:29:22 +0000
16@@ -66,6 +66,7 @@
17 plugins/suites_prompt.py
18 plugins/user_interface.py
19 scripts/keyboard_test
20+scripts/key_test
21 scripts/internet_test
22 checkbox_qt/qt_interface.py
23 qt/frontend/checkboxtr.cpp

Subscribers

People subscribed via source and target branches