git.iko.soy/unity8
on xenial help sign in
Add some context to tr calls
commit45598cdc4585c5da02777abc84fd09416eeb1760 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 13 Mar 2015, 10:35 (12 years ago) parentedd4d67187c223
9 files changed+67−40
compare with xenial
unifiedsplit
po/unity8.pot+52−26 po/update-unity-pot+1 qml/Components/Dialogs.qml+2−2 qml/Dash/GenericScopeView.qml+1−1 qml/Dash/PageHeader.qml+2−2 qml/Panel/Indicators/MessageMenuItemFactory.qml+1−1 qml/Panel/SearchIndicator.qml+1−1 qml/Wizard/Page.qml+1−1 qml/Wizard/Pages/30-passwd-type.qml+6−6
po/unity8.pot+52−26
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"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"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,70 +50,73 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:87
53+#: qml/Components/Dialogs.qml:67
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:88
57+#: qml/Components/Dialogs.qml:68
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:90
61+#: qml/Components/Dialogs.qml:70
62+msgctxt "Lock the system"
6263msgid "Lock"
6364msgstr ""
6465
65−#: qml/Components/Dialogs.qml:97
66+#: qml/Components/Dialogs.qml:77
6667msgid "Log Out"
6768msgstr ""
6869
69−#: qml/Components/Dialogs.qml:104 qml/Components/Dialogs.qml:135
70−#: qml/Components/Dialogs.qml:191
70+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:115
71+#: qml/Components/Dialogs.qml:171
7172msgid "Cancel"
7273msgstr ""
7374
74−#: qml/Components/Dialogs.qml:116
75+#: qml/Components/Dialogs.qml:96
7576msgid "Shut down"
7677msgstr ""
7778
78−#: qml/Components/Dialogs.qml:117
79+#: qml/Components/Dialogs.qml:97
7980msgid "Are you sure you want to shut down?"
8081msgstr ""
8182
82−#: qml/Components/Dialogs.qml:119 qml/Components/Dialogs.qml:147
83+#: qml/Components/Dialogs.qml:99 qml/Components/Dialogs.qml:127
8384msgid "Reboot"
8485msgstr ""
8586
86−#: qml/Components/Dialogs.qml:127
87−msgid "Shutdown"
88−msgstr ""
87+#: qml/Components/Dialogs.qml:107
88+msgid "Shutdown the system"
89+msgid_plural "Shutdown"
90+msgstr[0] ""
91+msgstr[1] ""
8992
90−#: qml/Components/Dialogs.qml:148
93+#: qml/Components/Dialogs.qml:128
9194msgid "Are you sure you want to reboot?"
9295msgstr ""
9396
94−#: qml/Components/Dialogs.qml:150
97+#: qml/Components/Dialogs.qml:130
9598msgid "No"
9699msgstr ""
97100
98−#: qml/Components/Dialogs.qml:156
101+#: qml/Components/Dialogs.qml:136
99102msgid "Yes"
100103msgstr ""
101104
102−#: qml/Components/Dialogs.qml:170
105+#: qml/Components/Dialogs.qml:150
103106msgid "Power"
104107msgstr ""
105108
106−#: qml/Components/Dialogs.qml:171
109+#: qml/Components/Dialogs.qml:151
107110msgid ""
108111"Are you sure you would like\n"
109112"to power off?"
110113msgstr ""
111114
112−#: qml/Components/Dialogs.qml:173
115+#: qml/Components/Dialogs.qml:153
113116msgid "Power off"
114117msgstr ""
115118
116−#: qml/Components/Dialogs.qml:182
119+#: qml/Components/Dialogs.qml:162
117120msgid "Restart"
118121msgstr ""
119122
@@ -129,23 +132,31 @@ msgstr ""
129132msgid "OK"
130133msgstr ""
131134
132−#: qml/Dash/GenericScopeView.qml:528 qml/Dash/GenericScopeView.qml:686
135+#: qml/Dash/GenericScopeView.qml:533 qml/Dash/GenericScopeView.qml:691
133136msgid "See less"
134137msgstr ""
135138
136−#: qml/Dash/GenericScopeView.qml:528
139+#: qml/Dash/GenericScopeView.qml:533
137140msgid "See all"
138141msgstr ""
139142
140−#: qml/Dash/GenericScopeView.qml:590 qml/Dash/PageHeader.qml:276
141−#: qml/Panel/SearchIndicator.qml:27
142−msgid "Search"
143−msgstr ""
143+#: qml/Dash/GenericScopeView.qml:595
144+msgid "Hint for search line edit"
145+msgid_plural "Search"
146+msgstr[0] ""
147+msgstr[1] ""
144148
145149#: qml/Dash/PageHeader.qml:269
150+msgctxt "The Ubuntu Store"
146151msgid "Store"
147152msgstr ""
148153
154+#: qml/Dash/PageHeader.qml:276
155+msgid "Shown in Page Header Menu"
156+msgid_plural "Search"
157+msgstr[0] ""
158+msgstr[1] ""
159+
149160#: qml/Dash/PageHeader.qml:286
150161msgid "Settings"
151162msgstr ""
@@ -309,6 +320,9 @@ msgid "Failed, tap to retry"
309320msgstr ""
310321
311322#: 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"
312326msgid "Reply"
313327msgstr ""
314328
@@ -320,6 +334,11 @@ msgstr ""
320334msgid "Roaming"
321335msgstr ""
322336
337+#: qml/Panel/SearchIndicator.qml:27
338+msgctxt "Indicator Header"
339+msgid "Search"
340+msgstr ""
341+
323342#: qml/Tutorial/TutorialBottomFinish.qml:24
324343msgid "This action does different things for different apps"
325344msgstr ""
@@ -373,6 +392,7 @@ msgid "View all your running tasks."
373392msgstr ""
374393
375394#: qml/Wizard/Page.qml:89
395+msgctxt "Goes one page back in the Wizard"
376396msgid "Back"
377397msgstr ""
378398
@@ -416,26 +436,32 @@ msgid "Please select how you’d like to unlock your phone."
416436msgstr ""
417437
418438#: qml/Wizard/Pages/30-passwd-type.qml:97
439+msgctxt "Type of security method"
419440msgid "Swipe"
420441msgstr ""
421442
422443#: qml/Wizard/Pages/30-passwd-type.qml:98
444+msgctxt "Description of security method"
423445msgid "No security"
424446msgstr ""
425447
426448#: qml/Wizard/Pages/30-passwd-type.qml:100
449+msgctxt "Type of security method"
427450msgid "Passcode"
428451msgstr ""
429452
430453#: qml/Wizard/Pages/30-passwd-type.qml:101
454+msgctxt "Description of security method"
431455msgid "4 digits only"
432456msgstr ""
433457
434458#: qml/Wizard/Pages/30-passwd-type.qml:103
459+msgctxt "Type of security method"
435460msgid "Passphrase"
436461msgstr ""
437462
438463#: qml/Wizard/Pages/30-passwd-type.qml:104
464+msgctxt "Description of security method"
439465msgid "Numbers and letters"
440466msgstr ""
441467
po/update-unity-pot+1
@@ -22,6 +22,7 @@ xgettext \
2222 --keyword=tr \
2323 --keyword=tr:1,2 \
2424 --keyword=dtr:2 \
25+ --keyword=ctr:1c,2 \
2526 --package-name="unity8" \
2627 --copyright-holder="Canonical Ltd." \
2728 --from-code="UTF-8"
qml/Components/Dialogs.qml+2−2
@@ -67,7 +67,7 @@ Item {
6767 title: i18n.tr("Log out")
6868 text: i18n.tr("Are you sure you want to log out?")
6969 Button {
70− text: i18n.tr("Lock")
70+ text: i18n.ctr("Lock the system", "Lock")
7171 onClicked: {
7272 LightDM.Greeter.showGreeter()
7373 logoutDialog.hide();
@@ -104,7 +104,7 @@ Item {
104104 }
105105 }
106106 Button {
107− text: i18n.tr("Shutdown")
107+ text: i18n.tr("Shutdown the system", "Shutdown")
108108 onClicked: {
109109 root.closeAllApps();
110110 unitySessionService.shutdown();
qml/Dash/GenericScopeView.qml+1−1
@@ -592,7 +592,7 @@ FocusScope {
592592 objectName: "scopePageHeader"
593593 width: parent.width
594594 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")
596596 showBackButton: scopeView.hasBackAction
597597 searchEntryEnabled: true
598598 settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
qml/Dash/PageHeader.qml+2−2
@@ -266,14 +266,14 @@ Item {
266266 actions: [
267267 Action {
268268 objectName: "store"
269− text: i18n.tr("Store")
269+ text: i18n.ctr("The Ubuntu Store", "Store")
270270 iconName: "ubuntu-store-symbolic"
271271 visible: root.storeEntryEnabled
272272 onTriggered: root.storeClicked();
273273 },
274274 Action {
275275 objectName: "search"
276− text: i18n.tr("Search")
276+ text: i18n.tr("Shown in Page Header Menu", "Search")
277277 iconName: "search"
278278 visible: root.searchEntryEnabled
279279 onTriggered: {
qml/Panel/Indicators/MessageMenuItemFactory.qml+1−1
@@ -146,7 +146,7 @@ Loader {
146146 time: timeFormatter.timeString
147147 body: getExtendedProperty(extendedData, "xCanonicalText", "")
148148 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")
150150 // icons
151151 avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
152152 icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")
qml/Panel/SearchIndicator.qml+1−1
@@ -24,7 +24,7 @@ Item {
2424 width: container.width + units.gu(2)
2525 height: units.gu(3)
2626
27− property string headerText: i18n.tr("Search")
27+ property string headerText: i18n.ctr("Indicator Header", "Search")
2828
2929 signal clicked
3030
qml/Wizard/Page.qml+1−1
@@ -86,7 +86,7 @@ Item {
8686 bottomMargin: buttonMargin
8787 }
8888 z: 1
89− text: i18n.tr("Back")
89+ text: i18n.ctr("Goes one page back in the Wizard", "Back")
9090 visible: pageStack.depth > 1 && hasBackButton
9191 backArrow: true
9292
qml/Wizard/Pages/30-passwd-type.qml+6−6
@@ -94,14 +94,14 @@ LocalComponents.Page {
9494 var name = ""
9595 var desc = ""
9696 if (method === UbuntuSecurityPrivacyPanel.Swipe) {
97− name = i18n.tr("Swipe")
98− desc = i18n.tr("No security")
97+ name = i18n.ctr("Type of security method", "Swipe")
98+ desc = i18n.ctr("Description of security method", "No security")
9999 } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
100− name = i18n.tr("Passcode")
101− desc = i18n.tr("4 digits only")
100+ name = i18n.ctr("Type of security method", "Passcode")
101+ desc = i18n.ctr("Description of security method", "4 digits only")
102102 } else {
103− name = i18n.tr("Passphrase")
104− desc = i18n.tr("Numbers and letters")
103+ name = i18n.ctr("Type of security method", "Passphrase")
104+ desc = i18n.ctr("Description of security method", "Numbers and letters")
105105 }
106106 return "<b>%1</b> (%2)".arg(name).arg(desc)
107107 }