git.iko.soy/unity8
on xenial help sign in
[ Lukáš Tinkl ]

Revert to using plaintext instead of HTML-like markup for the notifications (LP: #1504256)

commit80d0adf1501936ddf647da3fc02651f5ddb1c286 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 14 Oct 2015, 12:48 (11 years ago) parent2a92b4008f6f81
5 files changed+72−67
compare with xenial
unifiedsplit
debian/changelog+8 po/ast.po+26−26 po/br.po+32−35 po/ja.po+4−4 qml/Notifications/Notification.qml+2−2
debian/changelog+8
@@ -4,6 +4,14 @@ unity8 (8.13+15.04.20150914-0ubuntu1) UNRELEASED; urgency=medium
44
55 -- Lukas Tinkl <ltinkl@canonical.com> Mon, 14 Sep 2015 19:19:23 +0200
66
7+unity8 (8.11+15.10.20151008-0ubuntu1) wily; urgency=medium
8+
9+ [ Lukáš Tinkl ]
10+ * Revert to using plaintext instead of HTML-like markup for the
11+ notifications (LP: #1504256)
12+
13+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 08 Oct 2015 20:46:26 +0000
14+
715unity8 (8.11+15.10.20151002-0ubuntu1) wily; urgency=medium
816
917 [ CI Train Bot ]
po/ast.po+26−26
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-09-16 00:49+0200\n"
11−"PO-Revision-Date: 2015-06-11 23:39+0000\n"
12−"Last-Translator: enolp <enolp@softastur.org>\n"
11+"PO-Revision-Date: 2015-10-06 12:07+0000\n"
12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:42+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
18+"X-Launchpad-Export-Date: 2015-10-07 06:06+0000\n"
19+"X-Generator: Launchpad (build 17802)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -29,7 +29,7 @@ msgstr "Anclar atayu"
2929
3030#: plugins/Unity/Launcher/launcheritem.cpp:52
3131msgid "Quit"
32−msgstr ""
32+msgstr "Colar"
3333
3434#: plugins/Unity/Launcher/launcheritem.cpp:106
3535msgid "Unpin shortcut"
@@ -41,14 +41,14 @@ msgstr "Desanclar atayu"
4141#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
4242#: plugins/Utils/relativetimeformatter.cpp:157
4343msgid "Yesterday %l:%M %p"
44−msgstr ""
44+msgstr "Ayeri %l:%M %p"
4545
4646#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
4747#. This format string is used for showing, on a 12-hour clock, times that happened today.
4848#. en_US example: "%l:%M %p" --> "1:00 PM"
4949#: plugins/Utils/relativetimeformatter.cpp:164
5050msgid "%l:%M %p"
51−msgstr ""
51+msgstr "%l:%M %p"
5252
5353#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5454#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -56,7 +56,7 @@ msgstr ""
5656#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
5757#: plugins/Utils/relativetimeformatter.cpp:172
5858msgid "Tomorrow %l:%M %p"
59−msgstr ""
59+msgstr "Mañana %l:%M %p"
6060
6161#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6262#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -64,7 +64,7 @@ msgstr ""
6464#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
6565#: plugins/Utils/relativetimeformatter.cpp:181
6666msgid "%a %l:%M %p"
67−msgstr ""
67+msgstr "%a %l:%M %p"
6868
6969#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7070#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -73,7 +73,7 @@ msgstr ""
7373#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7474#: plugins/Utils/relativetimeformatter.cpp:190
7575msgid "%a %d %b %l:%M %p"
76−msgstr ""
76+msgstr "%a %b %d %l:%M %p"
7777
7878#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7979#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -81,14 +81,14 @@ msgstr ""
8181#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
8282#: plugins/Utils/relativetimeformatter.cpp:201
8383msgid "Yesterday %H:%M"
84−msgstr ""
84+msgstr "Ayeri %H:%M"
8585
8686#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
8787#. This format string is used for showing, on a 24-hour clock, times that happened today.
8888#. en_US example: "%H:%M" --> "13:00"
8989#: plugins/Utils/relativetimeformatter.cpp:208
9090msgid "%H:%M"
91−msgstr ""
91+msgstr "%H:%M"
9292
9393#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9494#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -96,7 +96,7 @@ msgstr ""
9696#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9797#: plugins/Utils/relativetimeformatter.cpp:216
9898msgid "Tomorrow %H:%M"
99−msgstr ""
99+msgstr "Mañana %H:%M"
100100
101101#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
102102#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -104,7 +104,7 @@ msgstr ""
104104#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
105105#: plugins/Utils/relativetimeformatter.cpp:225
106106msgid "%a %H:%M"
107−msgstr ""
107+msgstr "%a %H:%M"
108108
109109#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
110110#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -113,7 +113,7 @@ msgstr ""
113113#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
114114#: plugins/Utils/relativetimeformatter.cpp:234
115115msgid "%a %d %b %H:%M"
116−msgstr ""
116+msgstr "%a %b %d %H:%M"
117117
118118#: qml/Components/DelayedLockscreen.qml:49
119119msgid "Device Locked"
@@ -198,7 +198,7 @@ msgstr "Sí"
198198#: qml/Components/Dialogs.qml:203
199199msgctxt "Title: Power off/Restart dialog"
200200msgid "Power"
201−msgstr ""
201+msgstr "Apagáu"
202202
203203#: qml/Components/Dialogs.qml:204
204204msgid ""
@@ -378,7 +378,7 @@ msgstr "Sentímoslo, contraseña incorreuta"
378378#: qml/Greeter/NarrowView.qml:121
379379msgctxt "passphrase"
380380msgid "Please re-enter"
381−msgstr ""
381+msgstr "Vuelve a escribila"
382382
383383#: qml/Greeter/NarrowView.qml:122
384384msgid "Sorry, incorrect passcode"
@@ -404,32 +404,32 @@ msgstr "Nun ta reproduciéndose nada"
404404#, qt-format
405405msgid "%1 hour"
406406msgid_plural "%1 hours"
407−msgstr[0] ""
408−msgstr[1] ""
407+msgstr[0] "%1 hora"
408+msgstr[1] "%1 hores"
409409
410410#: qml/Panel/Indicators/MenuItemFactory.qml:851
411411#, qt-format
412412msgid "%1 minute"
413413msgid_plural "%1 minutes"
414−msgstr[0] ""
415−msgstr[1] ""
414+msgstr[0] "%1 minutu"
415+msgstr[1] "%1 minutos"
416416
417417#: qml/Panel/Indicators/MenuItemFactory.qml:856
418418#, qt-format
419419msgid "%1 second"
420420msgid_plural "%1 seconds"
421−msgstr[0] ""
422−msgstr[1] ""
421+msgstr[0] "%1 segundu"
422+msgstr[1] "%1 segundos"
423423
424424#: qml/Panel/Indicators/MenuItemFactory.qml:859
425425msgid "0 seconds"
426−msgstr ""
426+msgstr "0 segundos"
427427
428428#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
429429#: qml/Panel/Indicators/MenuItemFactory.qml:861
430430#, qt-format
431431msgid "%1 remaining"
432−msgstr ""
432+msgstr "Queden %1"
433433
434434#: qml/Panel/Indicators/MenuItemFactory.qml:867
435435msgid "In queue…"
@@ -462,7 +462,7 @@ msgstr "Responder"
462462
463463#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204
464464msgid "Call back"
465−msgstr ""
465+msgstr "Devolver llamada"
466466
467467#: qml/Panel/Indicators/ModemInfoItem.qml:105
468468msgid "Unlock SIM"
po/br.po+32−35
@@ -7,8 +7,8 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: \n"
10−"POT-Creation-Date: 2015-09-22 04:33+0200\n"
11−"PO-Revision-Date: 2015-08-25 14:12+0000\n"
10+"POT-Creation-Date: 2015-10-02 00:07+0200\n"
11+"PO-Revision-Date: 2015-10-05 06:47+0000\n"
1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1313"Language-Team: Breton <br@li.org>\n"
1414"Language: br\n"
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
1818"Plural-Forms: nplurals=2; plural=n > 1;\n"
19−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"
20−"X-Generator: Launchpad (build 17768)\n"
19+"X-Launchpad-Export-Date: 2015-10-06 05:47+0000\n"
20+"X-Generator: Launchpad (build 17796)\n"
2121
2222#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
@@ -30,7 +30,7 @@ msgstr "Spilhennañ ar verradenn"
3030
3131#: plugins/Unity/Launcher/launcheritem.cpp:52
3232msgid "Quit"
33−msgstr ""
33+msgstr "Mont kuit"
3434
3535#: plugins/Unity/Launcher/launcheritem.cpp:106
3636msgid "Unpin shortcut"
@@ -70,8 +70,8 @@ msgstr "%a %l:%M %p"
7070#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7171#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
7272#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
73−#. en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
74−#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
73+#. en_US example: "%a %b %d\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
74+#. en_GB example: "%a %d %b\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7575#: plugins/Utils/relativetimeformatter.cpp:190
7676msgid "%a %d %b %l:%M %p"
7777msgstr "%a %b %d %l:%M %p"
@@ -110,8 +110,8 @@ msgstr "%a %H:%M"
110110#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
111111#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
112112#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
113−#. en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"
114−#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
113+#. en_US example: "%a %b %d\u2003%H:%M" --> "Fri Oct 31 13:00"
114+#. en_GB example: "%a %d %b\u2003%H:%M" --> "Fri 31 Oct 13:00"
115115#: plugins/Utils/relativetimeformatter.cpp:234
116116msgid "%a %d %b %H:%M"
117117msgstr "%a %b %d %H:%M"
@@ -1154,7 +1154,7 @@ msgstr "Digevreañ"
11541154#: qml/Components/Dialogs.qml:224 qml/Wizard/Pages/passcode-confirm.qml:32
11551155#: qml/Wizard/Pages/passcode-set.qml:32 qml/Wizard/Pages/password-set.qml:137
11561156#: qml/Wizard/Pages/uaccount-signin.qml:26
1157−#: qml/Wizard/Pages/60-uaccount-signup.qml:29
1157+#: qml/Wizard/Pages/60-uaccount-signup.qml:151
11581158msgid "Cancel"
11591159msgstr "Nullañ"
11601160
@@ -1275,6 +1275,7 @@ msgstr "Nebeutoc'h..."
12751275
12761276#: qml/Dash/Previews/PreviewCommentInput.qml:68
12771277#: qml/Dash/Previews/PreviewRatingInput.qml:174
1278+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:148
12781279#: qml/Panel/Indicators/MessageMenuItemFactory.qml:205
12791280msgid "Send"
12801281msgstr "Kas"
@@ -1394,62 +1395,62 @@ msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
13941395msgid "Conference"
13951396msgstr "Kendiviz"
13961397
1397−#: qml/Panel/Indicators/MenuItemFactory.qml:639
1398+#: qml/Panel/Indicators/MenuItemFactory.qml:727
13981399msgid "Nothing is playing"
13991400msgstr "Ne lenner netra bremañ"
14001401
1401−#: qml/Panel/Indicators/MenuItemFactory.qml:768
1402+#: qml/Panel/Indicators/MenuItemFactory.qml:856
14021403#, qt-format
14031404msgid "%1 hour"
14041405msgid_plural "%1 hours"
14051406msgstr[0] "%1 eur"
14061407msgstr[1] "%1 eur"
14071408
1408−#: qml/Panel/Indicators/MenuItemFactory.qml:772
1409+#: qml/Panel/Indicators/MenuItemFactory.qml:860
14091410#, qt-format
14101411msgid "%1 minute"
14111412msgid_plural "%1 minutes"
14121413msgstr[0] "%1 vunutenn"
14131414msgstr[1] "%1 vunutenn"
14141415
1415−#: qml/Panel/Indicators/MenuItemFactory.qml:777
1416+#: qml/Panel/Indicators/MenuItemFactory.qml:865
14161417#, qt-format
14171418msgid "%1 second"
14181419msgid_plural "%1 seconds"
14191420msgstr[0] "%1 eilenn"
14201421msgstr[1] "%1 eilenn"
14211422
1422−#: qml/Panel/Indicators/MenuItemFactory.qml:780
1423+#: qml/Panel/Indicators/MenuItemFactory.qml:868
14231424msgid "0 seconds"
14241425msgstr "0 eilenn"
14251426
14261427#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
1427−#: qml/Panel/Indicators/MenuItemFactory.qml:782
1428+#: qml/Panel/Indicators/MenuItemFactory.qml:870
14281429#, qt-format
14291430msgid "%1 remaining"
14301431msgstr "%1 o chom"
14311432
1432−#: qml/Panel/Indicators/MenuItemFactory.qml:788
1433+#: qml/Panel/Indicators/MenuItemFactory.qml:876
14331434msgid "In queue…"
14341435msgstr "El lostennad..."
14351436
1436−#: qml/Panel/Indicators/MenuItemFactory.qml:792
1437+#: qml/Panel/Indicators/MenuItemFactory.qml:880
14371438msgid "Downloading"
14381439msgstr "O pellgargañ"
14391440
1440−#: qml/Panel/Indicators/MenuItemFactory.qml:794
1441+#: qml/Panel/Indicators/MenuItemFactory.qml:882
14411442msgid "Paused, tap to resume"
14421443msgstr "Ehanet, touchit evit adkregiñ"
14431444
1444−#: qml/Panel/Indicators/MenuItemFactory.qml:796
1445+#: qml/Panel/Indicators/MenuItemFactory.qml:884
14451446msgid "Canceled"
14461447msgstr "Nullet"
14471448
1448−#: qml/Panel/Indicators/MenuItemFactory.qml:798
1449+#: qml/Panel/Indicators/MenuItemFactory.qml:886
14491450msgid "Finished"
14501451msgstr "Echu"
14511452
1452−#: qml/Panel/Indicators/MenuItemFactory.qml:800
1453+#: qml/Panel/Indicators/MenuItemFactory.qml:888
14531454msgid "Failed, tap to retry"
14541455msgstr "C'hwitet, touchit evit adkregiñ"
14551456
@@ -1460,7 +1461,7 @@ msgstr "Respont"
14601461
14611462#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204
14621463msgid "Call back"
1463−msgstr ""
1464+msgstr "Gervel en-dro"
14641465
14651466#: qml/Panel/Indicators/ModemInfoItem.qml:105
14661467msgid "Unlock SIM"
@@ -1636,7 +1637,7 @@ msgstr ""
16361637msgid "Sign In"
16371638msgstr ""
16381639
1639−#: qml/Wizard/Pages/uaccount.qml:67 qml/Wizard/Pages/60-uaccount-signup.qml:26
1640+#: qml/Wizard/Pages/uaccount.qml:67
16401641msgid "Create Account"
16411642msgstr ""
16421643
@@ -1649,12 +1650,12 @@ msgid "Privacy policy"
16491650msgstr ""
16501651
16511652#: qml/Wizard/Pages/uaccount-signin.qml:42
1652−#: qml/Wizard/Pages/60-uaccount-signup.qml:55
1653+#: qml/Wizard/Pages/60-uaccount-signup.qml:45
16531654msgid "Email:"
16541655msgstr ""
16551656
16561657#: qml/Wizard/Pages/uaccount-signin.qml:67
1657−#: qml/Wizard/Pages/60-uaccount-signup.qml:103
1658+#: qml/Wizard/Pages/60-uaccount-signup.qml:93
16581659msgid "Password:"
16591660msgstr ""
16601661
@@ -1723,7 +1724,7 @@ msgid "Don't use my location"
17231724msgstr ""
17241725
17251726#: qml/Wizard/Pages/40-location.qml:237
1726−msgid "You can change it later in <em>System Settings</em>."
1727+msgid "You can change it later in System Settings."
17271728msgstr ""
17281729
17291730#: qml/Wizard/Pages/50-timezone.qml:27
@@ -1735,22 +1736,18 @@ msgid "Enter your city"
17351736msgstr ""
17361737
17371738#: qml/Wizard/Pages/60-uaccount-signup.qml:26
1738−msgid "Terms And Conditions"
1739−msgstr ""
1740−
1741−#: qml/Wizard/Pages/60-uaccount-signup.qml:29
1742−msgid "Back"
1739+msgid "Create Device Account"
17431740msgstr ""
17441741
1745−#: qml/Wizard/Pages/60-uaccount-signup.qml:81
1742+#: qml/Wizard/Pages/60-uaccount-signup.qml:71
17461743msgid "Your name:"
17471744msgstr ""
17481745
1749−#: qml/Wizard/Pages/60-uaccount-signup.qml:136
1746+#: qml/Wizard/Pages/60-uaccount-signup.qml:126
17501747msgid "Repeat password:"
17511748msgstr ""
17521749
1753−#: qml/Wizard/Pages/60-uaccount-signup.qml:204
1750+#: qml/Wizard/Pages/60-uaccount-signup.qml:164
17541751msgid "Sign Up"
17551752msgstr ""
17561753
po/ja.po+4−4
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-09-16 00:49+0200\n"
11−"PO-Revision-Date: 2014-11-20 05:08+0000\n"
11+"PO-Revision-Date: 2015-10-05 10:05+0000\n"
1212"Last-Translator: Kentaro Kazuhama <Unknown>\n"
1313"Language-Team: Japanese <ja@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-09-30 05:43+0000\n"
19−"X-Generator: Launchpad (build 17768)\n"
18+"X-Launchpad-Export-Date: 2015-10-06 05:47+0000\n"
19+"X-Generator: Launchpad (build 17796)\n"
2020
2121#: plugins/IntegratedLightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -390,7 +390,7 @@ msgstr "グループ通話"
390390
391391#: qml/Panel/Indicators/MenuItemFactory.qml:718
392392msgid "Nothing is playing"
393−msgstr ""
393+msgstr "再生するものがありません"
394394
395395#: qml/Panel/Indicators/MenuItemFactory.qml:847
396396#, qt-format
qml/Notifications/Notification.qml+2−2
@@ -283,7 +283,7 @@ Item {
283283 fontSize: "medium"
284284 color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
285285 elide: Text.ElideRight
286− textFormat: Text.StyledText
286+ textFormat: Text.PlainText
287287 }
288288
289289 Label {
@@ -300,7 +300,7 @@ Item {
300300 wrapMode: Text.WordWrap
301301 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
302302 elide: Text.ElideRight
303− textFormat: Text.StyledText
303+ textFormat: Text.PlainText
304304 }
305305 }
306306