git.iko.soy/unity8
on xenial help sign in
Add some context to tr calls
187c223Albert Astals Cid
po/unity8.pot+52−26
compare with xenial
unifiedsplit
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2015-02-25 08:57-0500\n"
11+"POT-Creation-Date: 2015-03-13 09:52+0100\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"
@@ -50,70 +50,73 @@ msgid_plural "Please wait %1 minutes and then try again…"
50msgstr[0] ""
50msgstr[0] ""
51msgstr[1] ""
51msgstr[1] ""
52
52
53−#: qml/Components/Dialogs.qml:87
53+#: qml/Components/Dialogs.qml:67
54msgid "Log out"
54msgid "Log out"
55msgstr ""
55msgstr ""
56
56
57−#: qml/Components/Dialogs.qml:88
57+#: qml/Components/Dialogs.qml:68
58msgid "Are you sure you want to log out?"
58msgid "Are you sure you want to log out?"
59msgstr ""
59msgstr ""
60
60
61−#: qml/Components/Dialogs.qml:90
61+#: qml/Components/Dialogs.qml:70
62+msgctxt "Lock the system"
62msgid "Lock"
63msgid "Lock"
63msgstr ""
64msgstr ""
64
65
65−#: qml/Components/Dialogs.qml:97
66+#: qml/Components/Dialogs.qml:77
66msgid "Log Out"
67msgid "Log Out"
67msgstr ""
68msgstr ""
68
69
69−#: qml/Components/Dialogs.qml:104 qml/Components/Dialogs.qml:135
70+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
70−#: qml/Components/Dialogs.qml:191
71+#: qml/Components/Dialogs.qml:171
71msgid "Cancel"
72msgid "Cancel"
72msgstr ""
73msgstr ""
73
74
74−#: qml/Components/Dialogs.qml:116
75+#: qml/Components/Dialogs.qml:96
75msgid "Shut down"
76msgid "Shut down"
76msgstr ""
77msgstr ""
77
78
78−#: qml/Components/Dialogs.qml:117
79+#: qml/Components/Dialogs.qml:97
79msgid "Are you sure you want to shut down?"
80msgid "Are you sure you want to shut down?"
80msgstr ""
81msgstr ""
81
82
82−#: qml/Components/Dialogs.qml:119 qml/Components/Dialogs.qml:147
83+#: qml/Components/Dialogs.qml:99 qml/Components/Dialogs.qml:127
83msgid "Reboot"
84msgid "Reboot"
84msgstr ""
85msgstr ""
85
86
86−#: qml/Components/Dialogs.qml:127
87+#: qml/Components/Dialogs.qml:107
87−msgid "Shutdown"
88+msgid "Shutdown the system"
89+msgid_plural "Shutdown"
88−msgstr ""
90+msgstr[0] ""
91+msgstr[1] ""
89
92
90−#: qml/Components/Dialogs.qml:148
93+#: qml/Components/Dialogs.qml:128
91msgid "Are you sure you want to reboot?"
94msgid "Are you sure you want to reboot?"
92msgstr ""
95msgstr ""
93
96
94−#: qml/Components/Dialogs.qml:150
97+#: qml/Components/Dialogs.qml:130
95msgid "No"
98msgid "No"
96msgstr ""
99msgstr ""
97
100
98−#: qml/Components/Dialogs.qml:156
101+#: qml/Components/Dialogs.qml:136
99msgid "Yes"
102msgid "Yes"
100msgstr ""
103msgstr ""
101
104
102−#: qml/Components/Dialogs.qml:170
105+#: qml/Components/Dialogs.qml:150
103msgid "Power"
106msgid "Power"
104msgstr ""
107msgstr ""
105
108
106−#: qml/Components/Dialogs.qml:171
109+#: qml/Components/Dialogs.qml:151
107msgid ""
110msgid ""
108"Are you sure you would like\n"
111"Are you sure you would like\n"
109"to power off?"
112"to power off?"
110msgstr ""
113msgstr ""
111
114
112−#: qml/Components/Dialogs.qml:173
115+#: qml/Components/Dialogs.qml:153
113msgid "Power off"
116msgid "Power off"
114msgstr ""
117msgstr ""
115
118
116−#: qml/Components/Dialogs.qml:182
119+#: qml/Components/Dialogs.qml:162
117msgid "Restart"
120msgid "Restart"
118msgstr ""
121msgstr ""
119
122
@@ -129,23 +132,31 @@ msgstr ""
129msgid "OK"
132msgid "OK"
130msgstr ""
133msgstr ""
131
134
132−#: qml/Dash/GenericScopeView.qml:528 qml/Dash/GenericScopeView.qml:686
135+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
133msgid "See less"
136msgid "See less"
134msgstr ""
137msgstr ""
135
138
136−#: qml/Dash/GenericScopeView.qml:528
139+#: qml/Dash/GenericScopeView.qml:533
137msgid "See all"
140msgid "See all"
138msgstr ""
141msgstr ""
139
142
140−#: qml/Dash/GenericScopeView.qml:590 qml/Dash/PageHeader.qml:276
143+#: qml/Dash/GenericScopeView.qml:595
141−#: qml/Panel/SearchIndicator.qml:27
144+msgid "Hint for search line edit"
142−msgid "Search"
145+msgid_plural "Search"
143−msgstr ""
146+msgstr[0] ""
147+msgstr[1] ""
144
148
145#: qml/Dash/PageHeader.qml:269
149#: qml/Dash/PageHeader.qml:269
150+msgctxt "The Ubuntu Store"
146msgid "Store"
151msgid "Store"
147msgstr ""
152msgstr ""
148
153
154+#: qml/Dash/PageHeader.qml:276
155+msgid "Shown in Page Header Menu"
156+msgid_plural "Search"
157+msgstr[0] ""
158+msgstr[1] ""
159+
149#: qml/Dash/PageHeader.qml:286
160#: qml/Dash/PageHeader.qml:286
150msgid "Settings"
161msgid "Settings"
151msgstr ""
162msgstr ""
@@ -309,6 +320,9 @@ msgid "Failed, tap to retry"
309msgstr ""
320msgstr ""
310
321
311#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
322#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
323+msgctxt ""
324+"Text that is shown as hint where you have to type the Reply, most probably "
325+"noun works better than verb here"
312msgid "Reply"
326msgid "Reply"
313msgstr ""
327msgstr ""
314
328
@@ -320,6 +334,11 @@ msgstr ""
320msgid "Roaming"
334msgid "Roaming"
321msgstr ""
335msgstr ""
322
336
337+#: qml/Panel/SearchIndicator.qml:27
338+msgctxt "Indicator Header"
339+msgid "Search"
340+msgstr ""
341+
323#: qml/Tutorial/TutorialBottomFinish.qml:24
342#: qml/Tutorial/TutorialBottomFinish.qml:24
324msgid "This action does different things for different apps"
343msgid "This action does different things for different apps"
325msgstr ""
344msgstr ""
@@ -373,6 +392,7 @@ msgid "View all your running tasks."
373msgstr ""
392msgstr ""
374
393
375#: qml/Wizard/Page.qml:89
394#: qml/Wizard/Page.qml:89
395+msgctxt "Goes one page back in the Wizard"
376msgid "Back"
396msgid "Back"
377msgstr ""
397msgstr ""
378
398
@@ -416,26 +436,32 @@ msgid "Please select how you’d like to unlock your phone."
416msgstr ""
436msgstr ""
417
437
418#: qml/Wizard/Pages/30-passwd-type.qml:97
438#: qml/Wizard/Pages/30-passwd-type.qml:97
439+msgctxt "Type of security method"
419msgid "Swipe"
440msgid "Swipe"
420msgstr ""
441msgstr ""
421
442
422#: qml/Wizard/Pages/30-passwd-type.qml:98
443#: qml/Wizard/Pages/30-passwd-type.qml:98
444+msgctxt "Description of security method"
423msgid "No security"
445msgid "No security"
424msgstr ""
446msgstr ""
425
447
426#: qml/Wizard/Pages/30-passwd-type.qml:100
448#: qml/Wizard/Pages/30-passwd-type.qml:100
449+msgctxt "Type of security method"
427msgid "Passcode"
450msgid "Passcode"
428msgstr ""
451msgstr ""
429
452
430#: qml/Wizard/Pages/30-passwd-type.qml:101
453#: qml/Wizard/Pages/30-passwd-type.qml:101
454+msgctxt "Description of security method"
431msgid "4 digits only"
455msgid "4 digits only"
432msgstr ""
456msgstr ""
433
457
434#: qml/Wizard/Pages/30-passwd-type.qml:103
458#: qml/Wizard/Pages/30-passwd-type.qml:103
459+msgctxt "Type of security method"
435msgid "Passphrase"
460msgid "Passphrase"
436msgstr ""
461msgstr ""
437
462
438#: qml/Wizard/Pages/30-passwd-type.qml:104
463#: qml/Wizard/Pages/30-passwd-type.qml:104
464+msgctxt "Description of security method"
439msgid "Numbers and letters"
465msgid "Numbers and letters"
440msgstr ""
466msgstr ""
441
467
po/update-unity-pot+1
@@ -22,6 +22,7 @@ xgettext \
22 --keyword=tr \
22 --keyword=tr \
23 --keyword=tr:1,2 \
23 --keyword=tr:1,2 \
24 --keyword=dtr:2 \
24 --keyword=dtr:2 \
25+ --keyword=ctr:1c,2 \
25 --package-name="unity8" \
26 --package-name="unity8" \
26 --copyright-holder="Canonical Ltd." \
27 --copyright-holder="Canonical Ltd." \
27 --from-code="UTF-8"
28 --from-code="UTF-8"
qml/Components/Dialogs.qml+2−2
@@ -67,7 +67,7 @@ Item {
67 title: i18n.tr("Log out")
67 title: i18n.tr("Log out")
68 text: i18n.tr("Are you sure you want to log out?")
68 text: i18n.tr("Are you sure you want to log out?")
69 Button {
69 Button {
70− text: i18n.tr("Lock")
70+ text: i18n.ctr("Lock the system", "Lock")
71 onClicked: {
71 onClicked: {
72 LightDM.Greeter.showGreeter()
72 LightDM.Greeter.showGreeter()
73 logoutDialog.hide();
73 logoutDialog.hide();
@@ -104,7 +104,7 @@ Item {
104 }
104 }
105 }
105 }
106 Button {
106 Button {
107− text: i18n.tr("Shutdown")
107+ text: i18n.tr("Shutdown the system", "Shutdown")
108 onClicked: {
108 onClicked: {
109 root.closeAllApps();
109 root.closeAllApps();
110 unitySessionService.shutdown();
110 unitySessionService.shutdown();
qml/Dash/GenericScopeView.qml+1−1
@@ -592,7 +592,7 @@ FocusScope {
592 objectName: "scopePageHeader"
592 objectName: "scopePageHeader"
593 width: parent.width
593 width: parent.width
594 title: scopeView.scope ? scopeView.scope.name : ""
594 title: scopeView.scope ? scopeView.scope.name : ""
595− searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.tr("Search")
595+ searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.tr("Hint for search line edit", "Search")
596 showBackButton: scopeView.hasBackAction
596 showBackButton: scopeView.hasBackAction
597 searchEntryEnabled: true
597 searchEntryEnabled: true
598 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
598 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
qml/Dash/PageHeader.qml+2−2
@@ -266,14 +266,14 @@ Item {
266 actions: [
266 actions: [
267 Action {
267 Action {
268 objectName: "store"
268 objectName: "store"
269− text: i18n.tr("Store")
269+ text: i18n.ctr("The Ubuntu Store", "Store")
270 iconName: "ubuntu-store-symbolic"
270 iconName: "ubuntu-store-symbolic"
271 visible: root.storeEntryEnabled
271 visible: root.storeEntryEnabled
272 onTriggered: root.storeClicked();
272 onTriggered: root.storeClicked();
273 },
273 },
274 Action {
274 Action {
275 objectName: "search"
275 objectName: "search"
276− text: i18n.tr("Search")
276+ text: i18n.tr("Shown in Page Header Menu", "Search")
277 iconName: "search"
277 iconName: "search"
278 visible: root.searchEntryEnabled
278 visible: root.searchEntryEnabled
279 onTriggered: {
279 onTriggered: {
qml/Panel/Indicators/MessageMenuItemFactory.qml+1−1
@@ -146,7 +146,7 @@ Loader {
146 time: timeFormatter.timeString
146 time: timeFormatter.timeString
147 body: getExtendedProperty(extendedData, "xCanonicalText", "")
147 body: getExtendedProperty(extendedData, "xCanonicalText", "")
148 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
148 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
149− replyHintText: i18n.tr("Reply")
149+ replyHintText: i18n.ctr("Text that is shown as hint where you have to type the Reply, most probably noun works better than verb here", "Reply")
150 // icons
150 // icons
151 avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
151 avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
152 icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")
152 icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")
qml/Panel/SearchIndicator.qml+1−1
@@ -24,7 +24,7 @@ Item {
24 width: container.width + units.gu(2)
24 width: container.width + units.gu(2)
25 height: units.gu(3)
25 height: units.gu(3)
26
26
27− property string headerText: i18n.tr("Search")
27+ property string headerText: i18n.ctr("Indicator Header", "Search")
28
28
29 signal clicked
29 signal clicked
30
30
qml/Wizard/Page.qml+1−1
@@ -86,7 +86,7 @@ Item {
86 bottomMargin: buttonMargin
86 bottomMargin: buttonMargin
87 }
87 }
88 z: 1
88 z: 1
89− text: i18n.tr("Back")
89+ text: i18n.ctr("Goes one page back in the Wizard", "Back")
90 visible: pageStack.depth > 1 && hasBackButton
90 visible: pageStack.depth > 1 && hasBackButton
91 backArrow: true
91 backArrow: true
92
92
qml/Wizard/Pages/30-passwd-type.qml+6−6
@@ -94,14 +94,14 @@ LocalComponents.Page {
94 var name = ""
94 var name = ""
95 var desc = ""
95 var desc = ""
96 if (method === UbuntuSecurityPrivacyPanel.Swipe) {
96 if (method === UbuntuSecurityPrivacyPanel.Swipe) {
97− name = i18n.tr("Swipe")
97+ name = i18n.ctr("Type of security method", "Swipe")
98− desc = i18n.tr("No security")
98+ desc = i18n.ctr("Description of security method", "No security")
99 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
99 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
100− name = i18n.tr("Passcode")
100+ name = i18n.ctr("Type of security method", "Passcode")
101− desc = i18n.tr("4 digits only")
101+ desc = i18n.ctr("Description of security method", "4 digits only")
102 } else {
102 } else {
103− name = i18n.tr("Passphrase")
103+ name = i18n.ctr("Type of security method", "Passphrase")
104− desc = i18n.tr("Numbers and letters")
104+ desc = i18n.ctr("Description of security method", "Numbers and letters")
105 }
105 }
106 return "<b>%1</b> (%2)".arg(name).arg(desc)
106 return "<b>%1</b> (%2)".arg(name).arg(desc)
107 }
107 }