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
=== modified file 'po/unity-scope-click.pot'
--- po/unity-scope-click.pot 2014-07-28 21:25:46 +0000
+++ po/unity-scope-click.pot 2014-08-19 21:26:20 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-07-28 17:25-0400\n"11"POT-Creation-Date: 2014-08-19 17:19-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../data/com.canonical.scopes.clickstore.ini.in.in.h:121#: ../data/com.canonical.scopes.clickstore.ini.in.in.h:1
22#: ../scope/clickapps/apps-query.cpp:25922#: ../scope/clickapps/apps-query.cpp:261
23msgid "Ubuntu Store"23msgid "Ubuntu Store"
24msgstr ""24msgstr ""
2525
@@ -31,7 +31,8 @@
31msgid "Search store"31msgid "Search store"
32msgstr ""32msgstr ""
3333
34#: ../data/clickscope.ini.in.in.h:1 ../scope/clickapps/apps-query.cpp:15734#: ../data/clickscope.ini.in.in.h:1 ../libclickscope/click/highlights.cpp:116
35#: ../scope/clickapps/apps-query.cpp:159
35msgid "Apps"36msgid "Apps"
36msgstr ""37msgstr ""
3738
@@ -43,6 +44,10 @@
43msgid "Search apps"44msgid "Search apps"
44msgstr ""45msgstr ""
4546
47#: ../libclickscope/click/highlights.cpp:119
48msgid "Scopes"
49msgstr ""
50
46#: ../libclickscope/click/preview.cpp:5851#: ../libclickscope/click/preview.cpp:58
47msgid "Info"52msgid "Info"
48msgstr ""53msgstr ""
@@ -55,104 +60,104 @@
55msgid "What's new"60msgid "What's new"
56msgstr ""61msgstr ""
5762
58#: ../libclickscope/click/preview.cpp:21063#: ../libclickscope/click/preview.cpp:229
59msgid "Publisher/Creator"64msgid "Publisher/Creator"
60msgstr ""65msgstr ""
6166
62#: ../libclickscope/click/preview.cpp:21167#: ../libclickscope/click/preview.cpp:230
63msgid "Seller"68msgid "Seller"
64msgstr ""69msgstr ""
6570
66#: ../libclickscope/click/preview.cpp:21271#: ../libclickscope/click/preview.cpp:231
67msgid "Website"72msgid "Website"
68msgstr ""73msgstr ""
6974
70#: ../libclickscope/click/preview.cpp:21375#: ../libclickscope/click/preview.cpp:232
71msgid "Contact"76msgid "Contact"
72msgstr ""77msgstr ""
7378
74#: ../libclickscope/click/preview.cpp:21479#: ../libclickscope/click/preview.cpp:233
75msgid "License"80msgid "License"
76msgstr ""81msgstr ""
7782
78#: ../libclickscope/click/preview.cpp:22283#: ../libclickscope/click/preview.cpp:241
79msgid "Version number"84msgid "Version number"
80msgstr ""85msgstr ""
8186
82#: ../libclickscope/click/preview.cpp:22387#: ../libclickscope/click/preview.cpp:242
83msgid "Last updated"88msgid "Last updated"
84msgstr ""89msgstr ""
8590
86#: ../libclickscope/click/preview.cpp:22491#: ../libclickscope/click/preview.cpp:243
87msgid "First released"92msgid "First released"
88msgstr ""93msgstr ""
8994
90#: ../libclickscope/click/preview.cpp:22595#: ../libclickscope/click/preview.cpp:244
91msgid "Size"96msgid "Size"
92msgstr ""97msgstr ""
9398
94#: ../libclickscope/click/preview.cpp:23399#: ../libclickscope/click/preview.cpp:252
95msgid "Version"100msgid "Version"
96msgstr ""101msgstr ""
97102
98#: ../libclickscope/click/preview.cpp:364103#: ../libclickscope/click/preview.cpp:383
99msgid "Reviews"104msgid "Reviews"
100msgstr ""105msgstr ""
101106
102#: ../libclickscope/click/preview.cpp:383107#: ../libclickscope/click/preview.cpp:402
103msgid "Download Error"108msgid "Download Error"
104msgstr ""109msgstr ""
105110
106#: ../libclickscope/click/preview.cpp:384111#: ../libclickscope/click/preview.cpp:403
107msgid "Download or install failed. Please try again."112msgid "Download or install failed. Please try again."
108msgstr ""113msgstr ""
109114
110#. TODO see bug LP: #1289434115#. TODO see bug LP: #1289434
111#: ../libclickscope/click/preview.cpp:386116#: ../libclickscope/click/preview.cpp:405
112msgid "Close"117msgid "Close"
113msgstr ""118msgstr ""
114119
115#: ../libclickscope/click/preview.cpp:391120#: ../libclickscope/click/preview.cpp:410
116msgid "Login Error"121msgid "Login Error"
117msgstr ""122msgstr ""
118123
119#: ../libclickscope/click/preview.cpp:392124#: ../libclickscope/click/preview.cpp:411
120msgid "Please log in to your Ubuntu One account."125msgid "Please log in to your Ubuntu One account."
121msgstr ""126msgstr ""
122127
123#: ../libclickscope/click/preview.cpp:394128#: ../libclickscope/click/preview.cpp:413
124msgid "Go to Accounts"129msgid "Go to Accounts"
125msgstr ""130msgstr ""
126131
127#: ../libclickscope/click/preview.cpp:624132#: ../libclickscope/click/preview.cpp:646
128msgid "Open"133msgid "Open"
129msgstr ""134msgstr ""
130135
131#: ../libclickscope/click/preview.cpp:627136#: ../libclickscope/click/preview.cpp:649
132#: ../libclickscope/click/preview.cpp:711137#: ../libclickscope/click/preview.cpp:733
133msgid "Search"138msgid "Search"
134msgstr ""139msgstr ""
135140
136#: ../libclickscope/click/preview.cpp:645141#: ../libclickscope/click/preview.cpp:667
137#: ../libclickscope/click/preview.cpp:782142#: ../libclickscope/click/preview.cpp:804
138msgid "Uninstall"143msgid "Uninstall"
139msgstr ""144msgstr ""
140145
141#: ../libclickscope/click/preview.cpp:766146#: ../libclickscope/click/preview.cpp:788
142msgid "Confirmation"147msgid "Confirmation"
143msgstr ""148msgstr ""
144149
145#. TRANSLATORS: Do NOT translate ${title} here.150#. TRANSLATORS: Do NOT translate ${title} here.
146#: ../libclickscope/click/preview.cpp:769151#: ../libclickscope/click/preview.cpp:791
147msgid "Uninstall ${title}?"152msgid "Uninstall ${title}?"
148msgstr ""153msgstr ""
149154
150#. TODO: see bug LP: #1289434155#. TODO: see bug LP: #1289434
151#: ../libclickscope/click/preview.cpp:778156#: ../libclickscope/click/preview.cpp:800
152msgid "Cancel"157msgid "Cancel"
153msgstr ""158msgstr ""
154159
155#: ../libclickscope/click/preview.cpp:843160#: ../libclickscope/click/preview.cpp:866
156msgid "Install"161msgid "Install"
157msgstr ""162msgstr ""
158163
@@ -162,48 +167,49 @@
162msgstr[0] ""167msgstr[0] ""
163msgstr[1] ""168msgstr[1] ""
164169
165#: ../scope/clickapps/apps-query.cpp:260170#: ../scope/clickapps/apps-query.cpp:262
166msgid "Get more apps from the store"171msgid "Get more apps from the store"
167msgstr ""172msgstr ""
168173
169#: ../scope/clickapps/apps-query.cpp:266174#: ../scope/clickapps/apps-query.cpp:268
170#, c-format175#, c-format
171msgid "Search for '%s' in the store"176msgid "Search for '%s' in the store"
172msgstr ""177msgstr ""
173178
174#: ../scope/clickapps/apps-query.cpp:273179#: ../scope/clickapps/apps-query.cpp:275
175msgid "Get more apps like this from the Store"180msgid "Get more apps like this from the Store"
176msgstr ""181msgstr ""
177182
178#: ../scope/clickapps/apps-query.cpp:302183#: ../scope/clickapps/apps-query.cpp:315
179#: ../scope/clickstore/store-query.cpp:236184#: ../scope/clickstore/store-query.cpp:244
180#: ../scope/clickstore/store-query.cpp:247185#: ../scope/clickstore/store-query.cpp:255
181msgid "All departments"186#: ../scope/clickstore/store-query.cpp:467
187msgid "All"
182msgstr ""188msgstr ""
183189
184#: ../scope/clickstore/store-query.cpp:285190#: ../scope/clickstore/store-query.cpp:297
185msgid "✔ INSTALLED"191msgid "✔ INSTALLED"
186msgstr ""192msgstr ""
187193
188#: ../scope/clickstore/store-query.cpp:290194#: ../scope/clickstore/store-query.cpp:302
189msgid "✔ PURCHASED"195msgid "✔ PURCHASED"
190msgstr ""196msgstr ""
191197
192#: ../scope/clickstore/store-query.cpp:298198#: ../scope/clickstore/store-query.cpp:310
193msgid "FREE"199msgid "FREE"
194msgstr ""200msgstr ""
195201
196#: ../scope/clickstore/store-query.cpp:415202#: ../scope/clickstore/store-query.cpp:427
197msgid "Available"203msgid "Available"
198msgstr ""204msgstr ""
199205
200#: ../scope/clickstore/store-query.cpp:421206#: ../scope/clickstore/store-query.cpp:433
201#, c-format207#, c-format
202msgid "%u result in Ubuntu Store"208msgid "%u result in Ubuntu Store"
203msgid_plural "%u results in Ubuntu Store"209msgid_plural "%u results in Ubuntu Store"
204msgstr[0] ""210msgstr[0] ""
205msgstr[1] ""211msgstr[1] ""
206212
207#: ../scope/clickstore/store-query.cpp:431213#: ../scope/clickstore/store-query.cpp:443
208msgid "Recommended"214msgid "Recommended"
209msgstr ""215msgstr ""
210216
=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp 2014-08-18 13:44:24 +0000
+++ scope/clickapps/apps-query.cpp 2014-08-19 21:26:20 +0000
@@ -312,7 +312,7 @@
312312
313 try313 try
314 {314 {
315 static const std::string all_dept_name = _("All departments");315 static const std::string all_dept_name = _("All");
316316
317 // create node for current department317 // create node for current department
318 auto name = current_dep_id == "" ? all_dept_name : impl->depts_db->get_department_name(current_dep_id, locales);318 auto name = current_dep_id == "" ? all_dept_name : impl->depts_db->get_department_name(current_dep_id, locales);
319319
=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp 2014-08-08 16:43:15 +0000
+++ scope/clickstore/store-query.cpp 2014-08-19 21:26:20 +0000
@@ -241,7 +241,7 @@
241 }241 }
242 else242 else
243 {243 {
244 root = unity::scopes::Department::create("", query(), _("All departments"));244 root = unity::scopes::Department::create("", query(), _("All"));
245 root->set_subdepartments({current});245 root->set_subdepartments({current});
246 return;246 return;
247 }247 }
@@ -252,7 +252,7 @@
252 }252 }
253 }253 }
254254
255 root = unity::scopes::Department::create("", query(), _("All departments"));255 root = unity::scopes::Department::create("", query(), _("All"));
256 root->set_subdepartments(departments);256 root->set_subdepartments(departments);
257}257}
258258
@@ -464,7 +464,7 @@
464 if (error == click::Index::Error::NoError)464 if (error == click::Index::Error::NoError)
465 {465 {
466 qDebug() << "bootstrap request completed";466 qDebug() << "bootstrap request completed";
467 auto root = std::make_shared<click::Department>("", "All Departments", "", true);467 auto root = std::make_shared<click::Department>("", _("All"), "", true);
468 root->set_subdepartments(deps);468 root->set_subdepartments(deps);
469 DepartmentList rdeps { root };469 DepartmentList rdeps { root };
470 impl->department_lookup.rebuild(rdeps);470 impl->department_lookup.rebuild(rdeps);

Subscribers

People subscribed via source and target branches

to all changes: