git.iko.soy/unity8
on xenial help sign in
fix PO files extraction
5135145Lukáš Tinkl
plugins/Dash/CardCreator.js+1−1
compare with xenial
unifiedsplit
@@ -245,7 +245,7 @@ var kEmblemIconCode = 'Icon { \n\
245 anchors { \n\
245 anchors { \n\
246 bottom: titleLabel.baseline; \n\
246 bottom: titleLabel.baseline; \n\
247 right: parent.right; \n\
247 right: parent.right; \n\
248− %1
248+ %1 \n\
249 } \n\
249 } \n\
250 source: cardData && cardData["emblem"] || ""; \n\
250 source: cardData && cardData["emblem"] || ""; \n\
251 color: %2; \n\
251 color: %2; \n\
po/unity8.pot+158−46
@@ -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-04-14 16:13+0200\n"
11+"POT-Creation-Date: 2015-06-13 13:25+0200\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"
@@ -31,6 +31,86 @@ msgstr ""
31msgid "Unpin shortcut"
31msgid "Unpin shortcut"
32msgstr ""
32msgstr ""
33
33
34+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
35+#. This format string is used for showing, on a 12-hour clock, times that happen yesterday.
36+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
37+#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
38+#: plugins/Utils/relativetimeformatter.cpp:157
39+msgid "Yesterday %l:%M %p"
40+msgstr ""
41+
42+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
43+#. This format string is used for showing, on a 12-hour clock, times that happened today.
44+#. en_US example: "%l:%M %p" --> "1:00 PM"
45+#: plugins/Utils/relativetimeformatter.cpp:164
46+msgid "%l:%M %p"
47+msgstr ""
48+
49+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
50+#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
51+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
52+#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
53+#: plugins/Utils/relativetimeformatter.cpp:172
54+msgid "Tomorrow %l:%M %p"
55+msgstr ""
56+
57+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
58+#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
59+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
60+#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
61+#: plugins/Utils/relativetimeformatter.cpp:181
62+msgid "%a %l:%M %p"
63+msgstr ""
64+
65+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
66+#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
67+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
68+#. en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
69+#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
70+#: plugins/Utils/relativetimeformatter.cpp:190
71+msgid "%a %d %b %l:%M %p"
72+msgstr ""
73+
74+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
75+#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
76+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
77+#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
78+#: plugins/Utils/relativetimeformatter.cpp:201
79+msgid "Yesterday %H:%M"
80+msgstr ""
81+
82+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
83+#. This format string is used for showing, on a 24-hour clock, times that happened today.
84+#. en_US example: "%H:%M" --> "13:00"
85+#: plugins/Utils/relativetimeformatter.cpp:208
86+msgid "%H:%M"
87+msgstr ""
88+
89+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
90+#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
91+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
92+#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
93+#: plugins/Utils/relativetimeformatter.cpp:216
94+msgid "Tomorrow %H:%M"
95+msgstr ""
96+
97+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
98+#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
99+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
100+#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
101+#: plugins/Utils/relativetimeformatter.cpp:225
102+msgid "%a %H:%M"
103+msgstr ""
104+
105+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
106+#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
107+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
108+#. en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"
109+#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
110+#: plugins/Utils/relativetimeformatter.cpp:234
111+msgid "%a %d %b %H:%M"
112+msgstr ""
113+
34#: qml/Components/DelayedLockscreen.qml:49
114#: qml/Components/DelayedLockscreen.qml:49
35msgid "Device Locked"
115msgid "Device Locked"
36msgstr ""
116msgstr ""
@@ -187,15 +267,15 @@ msgstr ""
187msgid "Less..."
267msgid "Less..."
188msgstr ""
268msgstr ""
189
269
190−#: qml/Dash/Previews/PreviewRatingInput.qml:81
270+#: qml/Dash/Previews/PreviewRatingInput.qml:84
191msgid "Rate this"
271msgid "Rate this"
192msgstr ""
272msgstr ""
193
273
194−#: qml/Dash/Previews/PreviewRatingInput.qml:126
274+#: qml/Dash/Previews/PreviewRatingInput.qml:129
195msgid "Add a review"
275msgid "Add a review"
196msgstr ""
276msgstr ""
197
277
198−#: qml/Dash/Previews/PreviewRatingInput.qml:166
278+#: qml/Dash/Previews/PreviewRatingInput.qml:169
199msgid "Send"
279msgid "Send"
200msgstr ""
280msgstr ""
201
281
@@ -211,15 +291,15 @@ msgstr ""
211msgid "Enable location data"
291msgid "Enable location data"
212msgstr ""
292msgstr ""
213
293
214−#: qml/Dash/ScopesList.qml:66
294+#: qml/Dash/ScopesList.qml:67
215msgid "Manage"
295msgid "Manage"
216msgstr ""
296msgstr ""
217
297
218−#: qml/Dash/ScopesList.qml:112
298+#: qml/Dash/ScopesList.qml:113
219msgid "Home"
299msgid "Home"
220msgstr ""
300msgstr ""
221
301
222−#: qml/Dash/ScopesList.qml:113
302+#: qml/Dash/ScopesList.qml:114
223msgid "Also installed"
303msgid "Also installed"
224msgstr ""
304msgstr ""
225
305
@@ -305,27 +385,58 @@ msgstr ""
305msgid "Nothing is playing"
385msgid "Nothing is playing"
306msgstr ""
386msgstr ""
307
387
308−#: qml/Panel/Indicators/MenuItemFactory.qml:787
388+#: qml/Panel/Indicators/MenuItemFactory.qml:768
389+#, qt-format
390+msgid "%1 hour"
391+msgid_plural "%1 hours"
392+msgstr[0] ""
393+msgstr[1] ""
394+
395+#: qml/Panel/Indicators/MenuItemFactory.qml:772
396+#, qt-format
397+msgid "%1 minute"
398+msgid_plural "%1 minutes"
399+msgstr[0] ""
400+msgstr[1] ""
401+
402+#: qml/Panel/Indicators/MenuItemFactory.qml:777
403+#, qt-format
404+msgid "%1 second"
405+msgid_plural "%1 seconds"
406+msgstr[0] ""
407+msgstr[1] ""
408+
409+#: qml/Panel/Indicators/MenuItemFactory.qml:780
410+msgid "0 seconds"
411+msgstr ""
412+
413+#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
414+#: qml/Panel/Indicators/MenuItemFactory.qml:782
415+#, qt-format
416+msgid "%1 remaining"
417+msgstr ""
418+
419+#: qml/Panel/Indicators/MenuItemFactory.qml:788
309msgid "In queue…"
420msgid "In queue…"
310msgstr ""
421msgstr ""
311
422
312−#: qml/Panel/Indicators/MenuItemFactory.qml:791
423+#: qml/Panel/Indicators/MenuItemFactory.qml:792
313msgid "Downloading"
424msgid "Downloading"
314msgstr ""
425msgstr ""
315
426
316−#: qml/Panel/Indicators/MenuItemFactory.qml:793
427+#: qml/Panel/Indicators/MenuItemFactory.qml:794
317msgid "Paused, tap to resume"
428msgid "Paused, tap to resume"
318msgstr ""
429msgstr ""
319
430
320−#: qml/Panel/Indicators/MenuItemFactory.qml:795
431+#: qml/Panel/Indicators/MenuItemFactory.qml:796
321msgid "Canceled"
432msgid "Canceled"
322msgstr ""
433msgstr ""
323
434
324−#: qml/Panel/Indicators/MenuItemFactory.qml:797
435+#: qml/Panel/Indicators/MenuItemFactory.qml:798
325msgid "Finished"
436msgid "Finished"
326msgstr ""
437msgstr ""
327
438
328−#: qml/Panel/Indicators/MenuItemFactory.qml:799
439+#: qml/Panel/Indicators/MenuItemFactory.qml:800
329msgid "Failed, tap to retry"
440msgid "Failed, tap to retry"
330msgstr ""
441msgstr ""
331
442
@@ -404,6 +515,38 @@ msgctxt "Button: Go back one page in the Wizard"
404msgid "Back"
515msgid "Back"
405msgstr ""
516msgstr ""
406
517
518+#: qml/Wizard/Pages/here-terms.qml:27
519+msgid "Terms & Conditions"
520+msgstr ""
521+
522+#: qml/Wizard/Pages/passwd-confirm.qml:49
523+msgid "Confirm passphrase"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/passwd-confirm.qml:50
527+msgid "Confirm passcode"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/passwd-confirm.qml:53
531+#: qml/Wizard/Pages/passwd-confirm.qml:54
532+msgid "Please try again."
533+msgstr ""
534+
535+#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538+#: qml/Wizard/Pages/60-reporting.qml:50
539+msgid "Continue"
540+msgstr ""
541+
542+#: qml/Wizard/Pages/passwd-set.qml:61
543+msgid "Choose your passcode"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/passwd-set.qml:68
547+msgid "Passphrase must be 4 characters long"
548+msgstr ""
549+
407#: qml/Wizard/Pages/10-welcome.qml:27
550#: qml/Wizard/Pages/10-welcome.qml:27
408msgid "Hi!"
551msgid "Hi!"
409msgstr ""
552msgstr ""
@@ -416,13 +559,6 @@ msgstr ""
416msgid "Let’s get started."
559msgid "Let’s get started."
417msgstr ""
560msgstr ""
418
561
419−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
420−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
421−#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
422−#: qml/Wizard/Pages/passwd-set.qml:90
423−msgid "Continue"
424−msgstr ""
425−
426#: qml/Wizard/Pages/20-sim.qml:25
562#: qml/Wizard/Pages/20-sim.qml:25
427msgid "Add a SIM card and restart your device"
563msgid "Add a SIM card and restart your device"
428msgstr ""
564msgstr ""
@@ -501,7 +637,6 @@ msgstr ""
501msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
637msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
502msgstr ""
638msgstr ""
503
639
504−#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
505#: qml/Wizard/Pages/50-location.qml:103
640#: qml/Wizard/Pages/50-location.qml:103
506msgid ""
641msgid ""
507"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
642"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
@@ -548,36 +683,13 @@ msgstr ""
548msgid "Finish"
683msgid "Finish"
549msgstr ""
684msgstr ""
550
685
551−#: qml/Wizard/Pages/here-terms.qml:27
686+#. Translators: This is the arrow for "Back" buttons
552−msgid "Terms & Conditions"
553−msgstr ""
554−
555−#: qml/Wizard/Pages/passwd-confirm.qml:49
556−msgid "Confirm passphrase"
557−msgstr ""
558−
559−#: qml/Wizard/Pages/passwd-confirm.qml:50
560−msgid "Confirm passcode"
561−msgstr ""
562−
563−#: qml/Wizard/Pages/passwd-confirm.qml:53
564−#: qml/Wizard/Pages/passwd-confirm.qml:54
565−msgid "Please try again."
566−msgstr ""
567−
568−#: qml/Wizard/Pages/passwd-set.qml:61
569−msgid "Choose your passcode"
570−msgstr ""
571−
572−#: qml/Wizard/Pages/passwd-set.qml:68
573−msgid "Passphrase must be 4 characters long"
574−msgstr ""
575−
576#: qml/Wizard/StackButton.qml:39
687#: qml/Wizard/StackButton.qml:39
577#, qt-format
688#, qt-format
578msgid "〈 %1"
689msgid "〈 %1"
579msgstr ""
690msgstr ""
580
691
692+#. Translators: This is the arrow for "Forward" buttons
581#: qml/Wizard/StackButton.qml:42
693#: qml/Wizard/StackButton.qml:42
582#, qt-format
694#, qt-format
583msgid "%1 〉"
695msgid "%1 〉"
po/update-unity-pot+10−3
@@ -6,25 +6,32 @@ PO_DIR=$PWD
6PROGNAME=$(basename $0)
6PROGNAME=$(basename $0)
7
7
8# Create a list of files to scan
8# Create a list of files to scan
9−GETTEXT_FILES=$(mktemp --tmpdir uitk-unity.lst.XXXXX)
9+GETTEXT_FILES=$(mktemp --tmpdir unity8.lst.XXXXX)
10trap 'rm -f "$GETTEXT_FILES"' EXIT
10trap 'rm -f "$GETTEXT_FILES"' EXIT
11cd ..
11cd ..
12find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' -o -name '*.js' \) \
12find \( -name '*.h' -o -name '*.cpp' -o -name '*.qml' -o -name '*.js' \) \
13− -a ! \( -path './debian/*' -o -path './builddir/*' -o -path './build/*' -o -path './.bzr/*' \) | sort \
13+ -a ! \( -path './debian/*' -o -path './builddir/*' -o -path './build/*' -o -path './tests/*' -o -path './.bzr/*' \) | sort \
14> $GETTEXT_FILES
14> $GETTEXT_FILES
15
15
16# Generate pot from our list
16# Generate pot from our list
17xgettext \
17xgettext \
18 --output $PO_DIR/unity8.pot \
18 --output $PO_DIR/unity8.pot \
19+ --from-code=UTF-8 \
19 --files-from $GETTEXT_FILES \
20 --files-from $GETTEXT_FILES \
20 --qt --c++ \
21 --qt --c++ \
21 --add-comments=TRANSLATORS \
22 --add-comments=TRANSLATORS \
23+ --add-comments=Translators \
22 --keyword=tr \
24 --keyword=tr \
23 --keyword=tr:1,2 \
25 --keyword=tr:1,2 \
24 --keyword=dtr:2 \
26 --keyword=dtr:2 \
27+ --keyword=dtr:2,3 \
25 --keyword=ctr:1c,2 \
28 --keyword=ctr:1c,2 \
29+ --keyword=dctr:2c,3 \
30+ --keyword=tag \
31+ --keyword=tag:1c,2 \
32+ --keyword=dgettext_datetime \
26 --package-name="unity8" \
33 --package-name="unity8" \
27 --copyright-holder="Canonical Ltd." \
34 --copyright-holder="Canonical Ltd." \
28 --from-code="UTF-8"
35 --from-code="UTF-8"
29
36
30−echo "$PROGNAME: $PO_DIR/auto-generated.pot updated"
37+echo "$PROGNAME: $PO_DIR/unity8.pot updated"
qml/Panel/Indicators/MenuItemFactory.qml+7−6
@@ -102,7 +102,7 @@ Item {
102 maximumValue: {
102 maximumValue: {
103 var maximum = getExtendedProperty(extendedData, "maxValue", 1.0);
103 var maximum = getExtendedProperty(extendedData, "maxValue", 1.0);
104 if (maximum <= minimumValue) {
104 if (maximum <= minimumValue) {
105− return minimumValue + 1;
105+ return minimumValue + 1;
106 }
106 }
107 return maximum;
107 return maximum;
108 }
108 }
@@ -765,20 +765,21 @@ Item {
765 var minutes = Math.floor(secondsLeft / 60) % 60;
765 var minutes = Math.floor(secondsLeft / 60) % 60;
766 var seconds = secondsLeft % 60;
766 var seconds = secondsLeft % 60;
767 if (hours > 0) {
767 if (hours > 0) {
768− remaining += hours + (hours == 1 ? " hour" : " hours");
768+ remaining += i18n.tr("%1 hour", "%1 hours", hours).arg(hours)
769 }
769 }
770 if (minutes > 0) {
770 if (minutes > 0) {
771 if (remaining != "") remaining += ", ";
771 if (remaining != "") remaining += ", ";
772− remaining += minutes + (minutes == 1 ? " minute" : " minutes");
772+ remaining += i18n.tr("%1 minute", "%1 minutes", minutes).arg(minutes)
773 }
773 }
774 // don't include seconds if hours > 0
774 // don't include seconds if hours > 0
775 if (hours == 0 && minutes < 5 && seconds > 0) {
775 if (hours == 0 && minutes < 5 && seconds > 0) {
776 if (remaining != "") remaining += ", ";
776 if (remaining != "") remaining += ", ";
777− remaining += seconds + (seconds == 1 ? " second" : " seconds");
777+ remaining += i18n.tr("%1 second", "%1 seconds", seconds).arg(seconds)
778 }
778 }
779 if (remaining == "")
779 if (remaining == "")
780− remaining = "0 seconds";
780+ remaining = i18n.tr("0 seconds");
781+ // Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
781− return remaining + " remaining";
782+ return i18n.tr("%1 remaining").arg(remaining);
782 }
783 }
783
784
784 stateText: {
785 stateText: {