ubiquity

Merge lp:~cjwatson/ubiquity/translate-usb-cd-958249 into lp:ubiquity

  1. translate-usb-cd-958249
  2. Merge into trunk
Proposed by Colin Watson
Status: Merged
Merged at revision: 5291
Proposed branch: lp:~cjwatson/ubiquity/translate-usb-cd-958249
Merge into: lp:ubiquity
Diff against target: 50 lines (+14/-0) (has conflicts)
3 files modified
debian/changelog (+10/-0)
ubiquity/frontend/gtk_ui.py (+2/-0)
ubiquity/frontend/kde_ui.py (+2/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~cjwatson/ubiquity/translate-usb-cd-958249
Reviewer Review Type Date Requested Status
Stéphane Graber (community) Approve
Review via email: mp+98553@code.launchpad.net

Description of the change

Make sure to load translations for "USB" and "CD" on the language page (LP: #958249).

Template names for strings used on the language page are termed "core names" in ubiquity, and must be loaded specially. (It'd be nice to have a more elegant way of tagging such strings, but for now, this is the mechanism we have.)

To post a comment you must log in.
Revision history for this message
Stéphane Graber (stgraber) wrote :

Looks good.

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-03-20 23:28:15 +0000
3+++ debian/changelog 2012-03-21 01:45:25 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 ubiquity (2.9.32) precise; urgency=low
7
8 * panel: Fix the gtk3 css code so that it actually applies and add
9@@ -6,6 +7,15 @@
10
11 -- Stéphane Graber <stgraber@ubuntu.com> Tue, 20 Mar 2012 19:26:14 -0400
12
13+=======
14+ubiquity (2.9.32) UNRELEASED; urgency=low
15+
16+ * Make sure to load translations for "USB" and "CD" on the language page
17+ (LP: #958249).
18+
19+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 21 Mar 2012 01:35:18 +0000
20+
21+>>>>>>> MERGE-SOURCE
22 ubiquity (2.9.31) precise; urgency=low
23
24 [ Colin Watson ]
25
26=== modified file 'ubiquity/frontend/gtk_ui.py'
27--- ubiquity/frontend/gtk_ui.py 2012-03-20 19:18:34 +0000
28+++ ubiquity/frontend/gtk_ui.py 2012-03-21 01:45:25 +0000
29@@ -967,6 +967,8 @@
30 core_names.append('ubiquity/imported/default-ltr')
31 core_names.append('ubiquity/text/release_notes_only')
32 core_names.append('ubiquity/text/update_installer_only')
33+ core_names.append('ubiquity/text/USB')
34+ core_names.append('ubiquity/text/CD')
35 for stock_item in ('cancel', 'close', 'go-back', 'go-forward',
36 'ok', 'quit'):
37 core_names.append('ubiquity/imported/%s' % stock_item)
38
39=== modified file 'ubiquity/frontend/kde_ui.py'
40--- ubiquity/frontend/kde_ui.py 2012-03-19 16:31:05 +0000
41+++ ubiquity/frontend/kde_ui.py 2012-03-21 01:45:25 +0000
42@@ -647,6 +647,8 @@
43 core_names.append('ubiquity/text/breadcrumb_install')
44 core_names.append('ubiquity/text/release_notes_only')
45 core_names.append('ubiquity/text/update_installer_only')
46+ core_names.append('ubiquity/text/USB')
47+ core_names.append('ubiquity/text/CD')
48 for stock_item in ('cancel', 'close', 'go-back', 'go-forward',
49 'ok', 'quit', 'yes', 'no'):
50 core_names.append('ubiquity/imported/%s' % stock_item)

Subscribers

People subscribed via source and target branches

to status/vote changes: