unity-scope-click

Merge lp:~dobey/unity-scope-click/depts-all into lp:unity-scope-click/devel

  1. depts-all
  2. Merge into devel
Proposed by dobey
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 411
Merged at revision: 411
Proposed branch: lp:~dobey/unity-scope-click/depts-all
Merge into: lp:unity-scope-click/devel
Diff against target: 280 lines (+52/-46)
3 files modified
po/unity-scope-click.pot (+48/-42)
scope/clickapps/apps-query.cpp (+1/-1)
scope/clickstore/store-query.cpp (+3/-3)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/depts-all
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alejandro J. Cura (community) Approve
Review via email: mp+231458@code.launchpad.net

Commit message

Change instances of "All departments" to just be "All" instead.
Also localize the extra department title in the store.

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/unity-scope-click.pot'
2--- po/unity-scope-click.pot 2014-07-28 21:25:46 +0000
3+++ po/unity-scope-click.pot 2014-08-19 21:26:20 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: PACKAGE VERSION\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-07-28 17:25-0400\n"
9+"POT-Creation-Date: 2014-08-19 17:19-0400\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -19,7 +19,7 @@
14 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
15
16 #: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
17-#: ../scope/clickapps/apps-query.cpp:259
18+#: ../scope/clickapps/apps-query.cpp:261
19 msgid "Ubuntu Store"
20 msgstr ""
21
22@@ -31,7 +31,8 @@
23 msgid "Search store"
24 msgstr ""
25
26-#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:157
27+#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
28+#: ../scope/clickapps/apps-query.cpp:159
29 msgid "Apps"
30 msgstr ""
31
32@@ -43,6 +44,10 @@
33 msgid "Search apps"
34 msgstr ""
35
36+#: ../libclickscope/click/highlights.cpp:119
37+msgid "Scopes"
38+msgstr ""
39+
40 #: ../libclickscope/click/preview.cpp:58
41 msgid "Info"
42 msgstr ""
43@@ -55,104 +60,104 @@
44 msgid "What's new"
45 msgstr ""
46
47-#: ../libclickscope/click/preview.cpp:210
48+#: ../libclickscope/click/preview.cpp:229
49 msgid "Publisher/Creator"
50 msgstr ""
51
52-#: ../libclickscope/click/preview.cpp:211
53+#: ../libclickscope/click/preview.cpp:230
54 msgid "Seller"
55 msgstr ""
56
57-#: ../libclickscope/click/preview.cpp:212
58+#: ../libclickscope/click/preview.cpp:231
59 msgid "Website"
60 msgstr ""
61
62-#: ../libclickscope/click/preview.cpp:213
63+#: ../libclickscope/click/preview.cpp:232
64 msgid "Contact"
65 msgstr ""
66
67-#: ../libclickscope/click/preview.cpp:214
68+#: ../libclickscope/click/preview.cpp:233
69 msgid "License"
70 msgstr ""
71
72-#: ../libclickscope/click/preview.cpp:222
73+#: ../libclickscope/click/preview.cpp:241
74 msgid "Version number"
75 msgstr ""
76
77-#: ../libclickscope/click/preview.cpp:223
78+#: ../libclickscope/click/preview.cpp:242
79 msgid "Last updated"
80 msgstr ""
81
82-#: ../libclickscope/click/preview.cpp:224
83+#: ../libclickscope/click/preview.cpp:243
84 msgid "First released"
85 msgstr ""
86
87-#: ../libclickscope/click/preview.cpp:225
88+#: ../libclickscope/click/preview.cpp:244
89 msgid "Size"
90 msgstr ""
91
92-#: ../libclickscope/click/preview.cpp:233
93+#: ../libclickscope/click/preview.cpp:252
94 msgid "Version"
95 msgstr ""
96
97-#: ../libclickscope/click/preview.cpp:364
98+#: ../libclickscope/click/preview.cpp:383
99 msgid "Reviews"
100 msgstr ""
101
102-#: ../libclickscope/click/preview.cpp:383
103+#: ../libclickscope/click/preview.cpp:402
104 msgid "Download Error"
105 msgstr ""
106
107-#: ../libclickscope/click/preview.cpp:384
108+#: ../libclickscope/click/preview.cpp:403
109 msgid "Download or install failed. Please try again."
110 msgstr ""
111
112 #. TODO see bug LP: #1289434
113-#: ../libclickscope/click/preview.cpp:386
114+#: ../libclickscope/click/preview.cpp:405
115 msgid "Close"
116 msgstr ""
117
118-#: ../libclickscope/click/preview.cpp:391
119+#: ../libclickscope/click/preview.cpp:410
120 msgid "Login Error"
121 msgstr ""
122
123-#: ../libclickscope/click/preview.cpp:392
124+#: ../libclickscope/click/preview.cpp:411
125 msgid "Please log in to your Ubuntu One account."
126 msgstr ""
127
128-#: ../libclickscope/click/preview.cpp:394
129+#: ../libclickscope/click/preview.cpp:413
130 msgid "Go to Accounts"
131 msgstr ""
132
133-#: ../libclickscope/click/preview.cpp:624
134+#: ../libclickscope/click/preview.cpp:646
135 msgid "Open"
136 msgstr ""
137
138-#: ../libclickscope/click/preview.cpp:627
139-#: ../libclickscope/click/preview.cpp:711
140+#: ../libclickscope/click/preview.cpp:649
141+#: ../libclickscope/click/preview.cpp:733
142 msgid "Search"
143 msgstr ""
144
145-#: ../libclickscope/click/preview.cpp:645
146-#: ../libclickscope/click/preview.cpp:782
147+#: ../libclickscope/click/preview.cpp:667
148+#: ../libclickscope/click/preview.cpp:804
149 msgid "Uninstall"
150 msgstr ""
151
152-#: ../libclickscope/click/preview.cpp:766
153+#: ../libclickscope/click/preview.cpp:788
154 msgid "Confirmation"
155 msgstr ""
156
157 #. TRANSLATORS: Do NOT translate ${title} here.
158-#: ../libclickscope/click/preview.cpp:769
159+#: ../libclickscope/click/preview.cpp:791
160 msgid "Uninstall ${title}?"
161 msgstr ""
162
163 #. TODO: see bug LP: #1289434
164-#: ../libclickscope/click/preview.cpp:778
165+#: ../libclickscope/click/preview.cpp:800
166 msgid "Cancel"
167 msgstr ""
168
169-#: ../libclickscope/click/preview.cpp:843
170+#: ../libclickscope/click/preview.cpp:866
171 msgid "Install"
172 msgstr ""
173
174@@ -162,48 +167,49 @@
175 msgstr[0] ""
176 msgstr[1] ""
177
178-#: ../scope/clickapps/apps-query.cpp:260
179+#: ../scope/clickapps/apps-query.cpp:262
180 msgid "Get more apps from the store"
181 msgstr ""
182
183-#: ../scope/clickapps/apps-query.cpp:266
184+#: ../scope/clickapps/apps-query.cpp:268
185 #, c-format
186 msgid "Search for '%s' in the store"
187 msgstr ""
188
189-#: ../scope/clickapps/apps-query.cpp:273
190+#: ../scope/clickapps/apps-query.cpp:275
191 msgid "Get more apps like this from the Store"
192 msgstr ""
193
194-#: ../scope/clickapps/apps-query.cpp:302
195-#: ../scope/clickstore/store-query.cpp:236
196-#: ../scope/clickstore/store-query.cpp:247
197-msgid "All departments"
198+#: ../scope/clickapps/apps-query.cpp:315
199+#: ../scope/clickstore/store-query.cpp:244
200+#: ../scope/clickstore/store-query.cpp:255
201+#: ../scope/clickstore/store-query.cpp:467
202+msgid "All"
203 msgstr ""
204
205-#: ../scope/clickstore/store-query.cpp:285
206+#: ../scope/clickstore/store-query.cpp:297
207 msgid "✔ INSTALLED"
208 msgstr ""
209
210-#: ../scope/clickstore/store-query.cpp:290
211+#: ../scope/clickstore/store-query.cpp:302
212 msgid "✔ PURCHASED"
213 msgstr ""
214
215-#: ../scope/clickstore/store-query.cpp:298
216+#: ../scope/clickstore/store-query.cpp:310
217 msgid "FREE"
218 msgstr ""
219
220-#: ../scope/clickstore/store-query.cpp:415
221+#: ../scope/clickstore/store-query.cpp:427
222 msgid "Available"
223 msgstr ""
224
225-#: ../scope/clickstore/store-query.cpp:421
226+#: ../scope/clickstore/store-query.cpp:433
227 #, c-format
228 msgid "%u result in Ubuntu Store"
229 msgid_plural "%u results in Ubuntu Store"
230 msgstr[0] ""
231 msgstr[1] ""
232
233-#: ../scope/clickstore/store-query.cpp:431
234+#: ../scope/clickstore/store-query.cpp:443
235 msgid "Recommended"
236 msgstr ""
237
238=== modified file 'scope/clickapps/apps-query.cpp'
239--- scope/clickapps/apps-query.cpp 2014-08-18 13:44:24 +0000
240+++ scope/clickapps/apps-query.cpp 2014-08-19 21:26:20 +0000
241@@ -312,7 +312,7 @@
242
243 try
244 {
245- static const std::string all_dept_name = _("All departments");
246+ static const std::string all_dept_name = _("All");
247
248 // create node for current department
249 auto name = current_dep_id == "" ? all_dept_name : impl->depts_db->get_department_name(current_dep_id, locales);
250
251=== modified file 'scope/clickstore/store-query.cpp'
252--- scope/clickstore/store-query.cpp 2014-08-08 16:43:15 +0000
253+++ scope/clickstore/store-query.cpp 2014-08-19 21:26:20 +0000
254@@ -241,7 +241,7 @@
255 }
256 else
257 {
258- root = unity::scopes::Department::create("", query(), _("All departments"));
259+ root = unity::scopes::Department::create("", query(), _("All"));
260 root->set_subdepartments({current});
261 return;
262 }
263@@ -252,7 +252,7 @@
264 }
265 }
266
267- root = unity::scopes::Department::create("", query(), _("All departments"));
268+ root = unity::scopes::Department::create("", query(), _("All"));
269 root->set_subdepartments(departments);
270 }
271
272@@ -464,7 +464,7 @@
273 if (error == click::Index::Error::NoError)
274 {
275 qDebug() << "bootstrap request completed";
276- auto root = std::make_shared<click::Department>("", "All Departments", "", true);
277+ auto root = std::make_shared<click::Department>("", _("All"), "", true);
278 root->set_subdepartments(deps);
279 DepartmentList rdeps { root };
280 impl->department_lookup.rebuild(rdeps);

Subscribers

People subscribed via source and target branches

to all changes: