git.iko.soy/unity8
on xenial help sign in
Merge lp:unity8
commit04cdb334db1b1a3bdd2bb23a879b9c85efad7771 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 10 Jul 2015, 09:47 (11 years ago) parentb91508df1e039a
12 files changed+157−122
compare with xenial
unifiedsplit
debian/changelog+7 po/cs.po+25−22 po/da.po+22−22 po/nl.po+22−22 po/ro.po+24−21 po/ru.po+1−1 po/sl.po+21−15 qml/Dash/CardTool.qml+15−6 qml/Dash/GenericScopeView.qml+7 tests/qmltests/Dash/tst_Card.qml+4−4 tests/qmltests/Dash/tst_CardTool.qml+8−8 tests/qmltests/Dash/tst_GenericScopeView.qml+1−1
debian/changelog+7
@@ -1,3 +1,10 @@
1+unity8 (8.10+15.10.20150708.2-0ubuntu1) wily; urgency=medium
2+
3+ [ Albert Astals Cid ]
4+ * Make the card sizes a bit dependant on the total of gu of the dash
5+
6+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 08 Jul 2015 15:01:41 +0000
7+
18unity8 (8.10+15.10.20150702.2-0ubuntu1) wily; urgency=medium
29
310 [ Albert Astals Cid ]
po/cs.po+25−22
@@ -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-06-22 12:00+0200\n"
11−"PO-Revision-Date: 2015-05-11 20:42+0000\n"
12−"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
11+"PO-Revision-Date: 2015-07-07 10:44+0000\n"
12+"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"
1313"Language-Team: Czech <cs@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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
18+"X-Launchpad-Export-Date: 2015-07-08 05:46+0000\n"
19+"X-Generator: Launchpad (build 17608)\n"
2020"Language: cs\n"
2121
2222#: plugins/LightDM/Greeter.cpp:112
@@ -38,14 +38,14 @@ msgstr "Odpíchnout zkratku"
3838#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
3939#: plugins/Utils/relativetimeformatter.cpp:157
4040msgid "Yesterday %l:%M %p"
41−msgstr ""
41+msgstr "Včera %l:%M %p"
4242
4343#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
4444#. This format string is used for showing, on a 12-hour clock, times that happened today.
4545#. en_US example: "%l:%M %p" --> "1:00 PM"
4646#: plugins/Utils/relativetimeformatter.cpp:164
4747msgid "%l:%M %p"
48−msgstr ""
48+msgstr "%l:%M %p"
4949
5050#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5151#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -53,7 +53,7 @@ msgstr ""
5353#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
5454#: plugins/Utils/relativetimeformatter.cpp:172
5555msgid "Tomorrow %l:%M %p"
56−msgstr ""
56+msgstr "Zítra %l:%M %p"
5757
5858#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5959#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -61,7 +61,7 @@ msgstr ""
6161#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
6262#: plugins/Utils/relativetimeformatter.cpp:181
6363msgid "%a %l:%M %p"
64−msgstr ""
64+msgstr "%a %l:%M %p"
6565
6666#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6767#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -70,7 +70,7 @@ msgstr ""
7070#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7171#: plugins/Utils/relativetimeformatter.cpp:190
7272msgid "%a %d %b %l:%M %p"
73−msgstr ""
73+msgstr "%a %b. %d %l:%M %p"
7474
7575#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7676#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -78,14 +78,14 @@ msgstr ""
7878#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
7979#: plugins/Utils/relativetimeformatter.cpp:201
8080msgid "Yesterday %H:%M"
81−msgstr ""
81+msgstr "Včera %H:%M"
8282
8383#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
8484#. This format string is used for showing, on a 24-hour clock, times that happened today.
8585#. en_US example: "%H:%M" --> "13:00"
8686#: plugins/Utils/relativetimeformatter.cpp:208
8787msgid "%H:%M"
88−msgstr ""
88+msgstr "%H:%M"
8989
9090#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9191#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -93,7 +93,7 @@ msgstr ""
9393#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9494#: plugins/Utils/relativetimeformatter.cpp:216
9595msgid "Tomorrow %H:%M"
96−msgstr ""
96+msgstr "Zítra %H:%M"
9797
9898#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9999#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -101,7 +101,7 @@ msgstr ""
101101#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
102102#: plugins/Utils/relativetimeformatter.cpp:225
103103msgid "%a %H:%M"
104−msgstr ""
104+msgstr "%a %H:%M"
105105
106106#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
107107#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -110,7 +110,7 @@ msgstr ""
110110#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
111111#: plugins/Utils/relativetimeformatter.cpp:234
112112msgid "%a %d %b %H:%M"
113−msgstr ""
113+msgstr "%a %b. %d %H:%M"
114114
115115#: qml/Components/DelayedLockscreen.qml:49
116116msgid "Device Locked"
@@ -399,32 +399,35 @@ msgstr "Nic se nepřehrává"
399399#, qt-format
400400msgid "%1 hour"
401401msgid_plural "%1 hours"
402−msgstr[0] ""
403−msgstr[1] ""
402+msgstr[0] "%1 hodina"
403+msgstr[1] "%1 hodiny"
404+msgstr[2] "%1 hodin"
404405
405406#: qml/Panel/Indicators/MenuItemFactory.qml:772
406407#, qt-format
407408msgid "%1 minute"
408409msgid_plural "%1 minutes"
409−msgstr[0] ""
410−msgstr[1] ""
410+msgstr[0] "%1 minuta"
411+msgstr[1] "%1 minuty"
412+msgstr[2] "%1 minut"
411413
412414#: qml/Panel/Indicators/MenuItemFactory.qml:777
413415#, qt-format
414416msgid "%1 second"
415417msgid_plural "%1 seconds"
416−msgstr[0] ""
417−msgstr[1] ""
418+msgstr[0] "%1 sekunda"
419+msgstr[1] "%1 sekundy"
420+msgstr[2] "%1 sekund"
418421
419422#: qml/Panel/Indicators/MenuItemFactory.qml:780
420423msgid "0 seconds"
421−msgstr ""
424+msgstr "0 sekund"
422425
423426#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
424427#: qml/Panel/Indicators/MenuItemFactory.qml:782
425428#, qt-format
426429msgid "%1 remaining"
427−msgstr ""
430+msgstr "Zbývá %1"
428431
429432#: qml/Panel/Indicators/MenuItemFactory.qml:788
430433msgid "In queue…"
po/da.po+22−22
@@ -9,14 +9,14 @@ msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1111"POT-Creation-Date: 2015-06-22 12:00+0200\n"
12−"PO-Revision-Date: 2015-04-28 19:14+0000\n"
13−"Last-Translator: Thomas Lundsgaard Hansen <thomaslhansen@live.dk>\n"
12+"PO-Revision-Date: 2015-07-06 12:05+0000\n"
13+"Last-Translator: Folmer Fredslund <Unknown>\n"
1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
1515"MIME-Version: 1.0\n"
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-07-04 05:37+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
2020"X-Generator: Launchpad (build 17597)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:112
@@ -38,14 +38,14 @@ msgstr "Gør genvej flytbar"
3838#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
3939#: plugins/Utils/relativetimeformatter.cpp:157
4040msgid "Yesterday %l:%M %p"
41−msgstr ""
41+msgstr "Igår %l:%M %p"
4242
4343#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
4444#. This format string is used for showing, on a 12-hour clock, times that happened today.
4545#. en_US example: "%l:%M %p" --> "1:00 PM"
4646#: plugins/Utils/relativetimeformatter.cpp:164
4747msgid "%l:%M %p"
48−msgstr ""
48+msgstr "%l:%M %p"
4949
5050#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5151#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -53,7 +53,7 @@ msgstr ""
5353#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
5454#: plugins/Utils/relativetimeformatter.cpp:172
5555msgid "Tomorrow %l:%M %p"
56−msgstr ""
56+msgstr "I morgen %l:%M %p"
5757
5858#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5959#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -61,7 +61,7 @@ msgstr ""
6161#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
6262#: plugins/Utils/relativetimeformatter.cpp:181
6363msgid "%a %l:%M %p"
64−msgstr ""
64+msgstr "%a %l:%M %p"
6565
6666#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6767#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -70,7 +70,7 @@ msgstr ""
7070#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7171#: plugins/Utils/relativetimeformatter.cpp:190
7272msgid "%a %d %b %l:%M %p"
73−msgstr ""
73+msgstr "%a %b. %d %l:%M %p"
7474
7575#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7676#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -78,14 +78,14 @@ msgstr ""
7878#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
7979#: plugins/Utils/relativetimeformatter.cpp:201
8080msgid "Yesterday %H:%M"
81−msgstr ""
81+msgstr "Igår %H:%M"
8282
8383#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
8484#. This format string is used for showing, on a 24-hour clock, times that happened today.
8585#. en_US example: "%H:%M" --> "13:00"
8686#: plugins/Utils/relativetimeformatter.cpp:208
8787msgid "%H:%M"
88−msgstr ""
88+msgstr "%H:%M"
8989
9090#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9191#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -93,7 +93,7 @@ msgstr ""
9393#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9494#: plugins/Utils/relativetimeformatter.cpp:216
9595msgid "Tomorrow %H:%M"
96−msgstr ""
96+msgstr "I morgen %H:%M"
9797
9898#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9999#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -101,7 +101,7 @@ msgstr ""
101101#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
102102#: plugins/Utils/relativetimeformatter.cpp:225
103103msgid "%a %H:%M"
104−msgstr ""
104+msgstr "%a %H:%M"
105105
106106#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
107107#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -110,7 +110,7 @@ msgstr ""
110110#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
111111#: plugins/Utils/relativetimeformatter.cpp:234
112112msgid "%a %d %b %H:%M"
113−msgstr ""
113+msgstr "%a %b. %d %H:%M"
114114
115115#: qml/Components/DelayedLockscreen.qml:49
116116msgid "Device Locked"
@@ -198,7 +198,7 @@ msgstr "Ja"
198198#: qml/Components/Dialogs.qml:152
199199msgctxt "Title: Power off/Restart dialog"
200200msgid "Power"
201−msgstr ""
201+msgstr "Sluk/genstart"
202202
203203#: qml/Components/Dialogs.qml:153
204204msgid ""
@@ -400,32 +400,32 @@ msgstr "Intet afspilles"
400400#, qt-format
401401msgid "%1 hour"
402402msgid_plural "%1 hours"
403−msgstr[0] ""
404−msgstr[1] ""
403+msgstr[0] "%1 time"
404+msgstr[1] "%1 timer"
405405
406406#: qml/Panel/Indicators/MenuItemFactory.qml:772
407407#, qt-format
408408msgid "%1 minute"
409409msgid_plural "%1 minutes"
410−msgstr[0] ""
411−msgstr[1] ""
410+msgstr[0] "%1 minut"
411+msgstr[1] "%1 minutter"
412412
413413#: qml/Panel/Indicators/MenuItemFactory.qml:777
414414#, qt-format
415415msgid "%1 second"
416416msgid_plural "%1 seconds"
417−msgstr[0] ""
418−msgstr[1] ""
417+msgstr[0] "%1 sekund"
418+msgstr[1] "%1 sekunder"
419419
420420#: qml/Panel/Indicators/MenuItemFactory.qml:780
421421msgid "0 seconds"
422−msgstr ""
422+msgstr "0 sekunder"
423423
424424#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
425425#: qml/Panel/Indicators/MenuItemFactory.qml:782
426426#, qt-format
427427msgid "%1 remaining"
428−msgstr ""
428+msgstr "%1 tilbage"
429429
430430#: qml/Panel/Indicators/MenuItemFactory.qml:788
431431msgid "In queue…"
po/nl.po+22−22
@@ -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-06-22 12:00+0200\n"
11−"PO-Revision-Date: 2015-04-25 13:27+0000\n"
12−"Last-Translator: rob <linuxned@gmail.com>\n"
11+"PO-Revision-Date: 2015-07-07 07:14+0000\n"
12+"Last-Translator: Hannie Dumoleyn <Unknown>\n"
1313"Language-Team: Dutch <nl@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-07-04 05:37+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
18+"X-Launchpad-Export-Date: 2015-07-08 05:46+0000\n"
19+"X-Generator: Launchpad (build 17608)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -37,14 +37,14 @@ msgstr "Snelkoppeling losmaken"
3737#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
3838#: plugins/Utils/relativetimeformatter.cpp:157
3939msgid "Yesterday %l:%M %p"
40−msgstr ""
40+msgstr "Gisteren %l:%M %p"
4141
4242#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
4343#. This format string is used for showing, on a 12-hour clock, times that happened today.
4444#. en_US example: "%l:%M %p" --> "1:00 PM"
4545#: plugins/Utils/relativetimeformatter.cpp:164
4646msgid "%l:%M %p"
47−msgstr ""
47+msgstr "%l:%M %p"
4848
4949#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5050#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -52,7 +52,7 @@ msgstr ""
5252#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
5353#: plugins/Utils/relativetimeformatter.cpp:172
5454msgid "Tomorrow %l:%M %p"
55−msgstr ""
55+msgstr "Morgen %l:%M %p"
5656
5757#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5858#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -60,7 +60,7 @@ msgstr ""
6060#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
6161#: plugins/Utils/relativetimeformatter.cpp:181
6262msgid "%a %l:%M %p"
63−msgstr ""
63+msgstr "%a %l:%M %p"
6464
6565#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6666#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -69,7 +69,7 @@ msgstr ""
6969#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7070#: plugins/Utils/relativetimeformatter.cpp:190
7171msgid "%a %d %b %l:%M %p"
72−msgstr ""
72+msgstr "%a %d %b %l:%M %p"
7373
7474#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7575#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -77,14 +77,14 @@ msgstr ""
7777#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
7878#: plugins/Utils/relativetimeformatter.cpp:201
7979msgid "Yesterday %H:%M"
80−msgstr ""
80+msgstr "Gisteren %H:%M"
8181
8282#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
8383#. This format string is used for showing, on a 24-hour clock, times that happened today.
8484#. en_US example: "%H:%M" --> "13:00"
8585#: plugins/Utils/relativetimeformatter.cpp:208
8686msgid "%H:%M"
87−msgstr ""
87+msgstr "%H:%M"
8888
8989#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9090#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -92,7 +92,7 @@ msgstr ""
9292#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9393#: plugins/Utils/relativetimeformatter.cpp:216
9494msgid "Tomorrow %H:%M"
95−msgstr ""
95+msgstr "Morgen %H:%M"
9696
9797#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9898#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -100,7 +100,7 @@ msgstr ""
100100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
101101#: plugins/Utils/relativetimeformatter.cpp:225
102102msgid "%a %H:%M"
103−msgstr ""
103+msgstr "%a %H:%M"
104104
105105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
106106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -109,7 +109,7 @@ msgstr ""
109109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
110110#: plugins/Utils/relativetimeformatter.cpp:234
111111msgid "%a %d %b %H:%M"
112−msgstr ""
112+msgstr "%a %d %b %H:%M"
113113
114114#: qml/Components/DelayedLockscreen.qml:49
115115msgid "Device Locked"
@@ -399,32 +399,32 @@ msgstr "Er wordt niets afgespeeld"
399399#, qt-format
400400msgid "%1 hour"
401401msgid_plural "%1 hours"
402−msgstr[0] ""
403−msgstr[1] ""
402+msgstr[0] "%1 uur"
403+msgstr[1] "%1 uren"
404404
405405#: qml/Panel/Indicators/MenuItemFactory.qml:772
406406#, qt-format
407407msgid "%1 minute"
408408msgid_plural "%1 minutes"
409−msgstr[0] ""
410−msgstr[1] ""
409+msgstr[0] "%1 minuut"
410+msgstr[1] "%1 minuten"
411411
412412#: qml/Panel/Indicators/MenuItemFactory.qml:777
413413#, qt-format
414414msgid "%1 second"
415415msgid_plural "%1 seconds"
416−msgstr[0] ""
417−msgstr[1] ""
416+msgstr[0] "%1 seconde"
417+msgstr[1] "%1 seconden"
418418
419419#: qml/Panel/Indicators/MenuItemFactory.qml:780
420420msgid "0 seconds"
421−msgstr ""
421+msgstr "0 seconden"
422422
423423#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
424424#: qml/Panel/Indicators/MenuItemFactory.qml:782
425425#, qt-format
426426msgid "%1 remaining"
427−msgstr ""
427+msgstr "%1 resterend"
428428
429429#: qml/Panel/Indicators/MenuItemFactory.qml:788
430430msgid "In queue…"
po/ro.po+24−21
@@ -8,7 +8,7 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-06-22 12:00+0200\n"
11−"PO-Revision-Date: 2015-04-18 19:13+0000\n"
11+"PO-Revision-Date: 2015-07-06 17:47+0000\n"
1212"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"
1313"Language-Team: Romanian <ro@li.org>\n"
1414"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
1818"== 0) && (n != 0))) ? 2: 1));\n"
19−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
2020"X-Generator: Launchpad (build 17597)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:112
@@ -38,14 +38,14 @@ msgstr "Eliberează scurtătura"
3838#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
3939#: plugins/Utils/relativetimeformatter.cpp:157
4040msgid "Yesterday %l:%M %p"
41−msgstr ""
41+msgstr "ieri %l:%M %p"
4242
4343#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
4444#. This format string is used for showing, on a 12-hour clock, times that happened today.
4545#. en_US example: "%l:%M %p" --> "1:00 PM"
4646#: plugins/Utils/relativetimeformatter.cpp:164
4747msgid "%l:%M %p"
48−msgstr ""
48+msgstr "%l:%M %p"
4949
5050#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5151#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -53,7 +53,7 @@ msgstr ""
5353#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
5454#: plugins/Utils/relativetimeformatter.cpp:172
5555msgid "Tomorrow %l:%M %p"
56−msgstr ""
56+msgstr "Mâine %l:%M %p"
5757
5858#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
5959#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -61,7 +61,7 @@ msgstr ""
6161#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
6262#: plugins/Utils/relativetimeformatter.cpp:181
6363msgid "%a %l:%M %p"
64−msgstr ""
64+msgstr "%a %l:%M %p"
6565
6666#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6767#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -70,7 +70,7 @@ msgstr ""
7070#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7171#: plugins/Utils/relativetimeformatter.cpp:190
7272msgid "%a %d %b %l:%M %p"
73−msgstr ""
73+msgstr "%a %d %b %l:%M %p"
7474
7575#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
7676#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -78,14 +78,14 @@ msgstr ""
7878#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
7979#: plugins/Utils/relativetimeformatter.cpp:201
8080msgid "Yesterday %H:%M"
81−msgstr ""
81+msgstr "Ieri %H:%M"
8282
8383#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
8484#. This format string is used for showing, on a 24-hour clock, times that happened today.
8585#. en_US example: "%H:%M" --> "13:00"
8686#: plugins/Utils/relativetimeformatter.cpp:208
8787msgid "%H:%M"
88−msgstr ""
88+msgstr "%H:%M"
8989
9090#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9191#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -93,7 +93,7 @@ msgstr ""
9393#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
9494#: plugins/Utils/relativetimeformatter.cpp:216
9595msgid "Tomorrow %H:%M"
96−msgstr ""
96+msgstr "Mâine %H:%M"
9797
9898#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
9999#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -101,7 +101,7 @@ msgstr ""
101101#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
102102#: plugins/Utils/relativetimeformatter.cpp:225
103103msgid "%a %H:%M"
104−msgstr ""
104+msgstr "%a %H:%M"
105105
106106#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
107107#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -110,7 +110,7 @@ msgstr ""
110110#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
111111#: plugins/Utils/relativetimeformatter.cpp:234
112112msgid "%a %d %b %H:%M"
113−msgstr ""
113+msgstr "%a %d %b %H:%M"
114114
115115#: qml/Components/DelayedLockscreen.qml:49
116116msgid "Device Locked"
@@ -402,32 +402,35 @@ msgstr "Nu se redă nimic"
402402#, qt-format
403403msgid "%1 hour"
404404msgid_plural "%1 hours"
405−msgstr[0] ""
406−msgstr[1] ""
405+msgstr[0] "%1 oră"
406+msgstr[1] "%1 ore"
407+msgstr[2] "%1 de ore"
407408
408409#: qml/Panel/Indicators/MenuItemFactory.qml:772
409410#, qt-format
410411msgid "%1 minute"
411412msgid_plural "%1 minutes"
412−msgstr[0] ""
413−msgstr[1] ""
413+msgstr[0] "%1 minut"
414+msgstr[1] "%1 minute"
415+msgstr[2] "%1 de minute"
414416
415417#: qml/Panel/Indicators/MenuItemFactory.qml:777
416418#, qt-format
417419msgid "%1 second"
418420msgid_plural "%1 seconds"
419−msgstr[0] ""
420−msgstr[1] ""
421+msgstr[0] "%1 secundă"
422+msgstr[1] "%1 secunde"
423+msgstr[2] "%1 de secunde"
421424
422425#: qml/Panel/Indicators/MenuItemFactory.qml:780
423426msgid "0 seconds"
424−msgstr ""
427+msgstr "0 secunde"
425428
426429#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
427430#: qml/Panel/Indicators/MenuItemFactory.qml:782
428431#, qt-format
429432msgid "%1 remaining"
430−msgstr ""
433+msgstr "%1 rămase"
431434
432435#: qml/Panel/Indicators/MenuItemFactory.qml:788
433436msgid "In queue…"
@@ -489,7 +492,7 @@ msgstr "Apăsaţi aici pentru a continua."
489492
490493#: qml/Tutorial/TutorialContent.qml:81
491494msgid "Click here to finish."
492−msgstr ""
495+msgstr "Apăsați aici pentru a termina."
493496
494497#: qml/Tutorial/TutorialLeftFinish.qml:24
495498msgid "These are the shortcuts to favorite apps"
po/ru.po+1−1
@@ -16,7 +16,7 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2015-07-06 05:36+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
2020"X-Generator: Launchpad (build 17597)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:112
po/sl.po+21−15
@@ -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-06-22 12:00+0200\n"
11−"PO-Revision-Date: 2015-06-05 06:39+0000\n"
12−"Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
11+"PO-Revision-Date: 2015-07-06 21:10+0000\n"
12+"Last-Translator: Sasa Batistic <Unknown>\n"
1313"Language-Team: Slovenian <sl@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=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
1818"n%100==4 ? 3 : 0);\n"
19−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
2020"X-Generator: Launchpad (build 17597)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:112
@@ -118,7 +118,7 @@ msgstr "Naprava je zaklenjena"
118118
119119#: qml/Components/DelayedLockscreen.qml:64
120120msgid "You have been locked out due to too many failed passphrase attempts."
121−msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov šifrirnih rekel."
121+msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov gesla."
122122
123123#: qml/Components/DelayedLockscreen.qml:65
124124msgid "You have been locked out due to too many failed passcode attempts."
@@ -398,32 +398,38 @@ msgstr "Nič se ne predvaja"
398398#, qt-format
399399msgid "%1 hour"
400400msgid_plural "%1 hours"
401−msgstr[0] ""
402−msgstr[1] ""
401+msgstr[0] "%1 ur"
402+msgstr[1] "%1 ura"
403+msgstr[2] "%1 uri"
404+msgstr[3] "%1 ure"
403405
404406#: qml/Panel/Indicators/MenuItemFactory.qml:772
405407#, qt-format
406408msgid "%1 minute"
407409msgid_plural "%1 minutes"
408−msgstr[0] ""
409−msgstr[1] ""
410+msgstr[0] "%1 minut"
411+msgstr[1] "%1 minuta"
412+msgstr[2] "%1 minuti"
413+msgstr[3] "%1 minute"
410414
411415#: qml/Panel/Indicators/MenuItemFactory.qml:777
412416#, qt-format
413417msgid "%1 second"
414418msgid_plural "%1 seconds"
415−msgstr[0] ""
416−msgstr[1] ""
419+msgstr[0] "%1 sekund"
420+msgstr[1] "%1 sekunda"
421+msgstr[2] "%1 sekundi"
422+msgstr[3] "%1 sekunde"
417423
418424#: qml/Panel/Indicators/MenuItemFactory.qml:780
419425msgid "0 seconds"
420−msgstr ""
426+msgstr "0 sekund"
421427
422428#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
423429#: qml/Panel/Indicators/MenuItemFactory.qml:782
424430#, qt-format
425431msgid "%1 remaining"
426−msgstr ""
432+msgstr "Preostalo %1"
427433
428434#: qml/Panel/Indicators/MenuItemFactory.qml:788
429435msgid "In queue…"
@@ -530,7 +536,7 @@ msgstr "Pogoji uporabe"
530536
531537#: qml/Wizard/Pages/passwd-confirm.qml:49
532538msgid "Confirm passphrase"
533−msgstr "Potrdite šifrirno reklo"
539+msgstr "Potrdite geslo"
534540
535541#: qml/Wizard/Pages/passwd-confirm.qml:50
536542msgid "Confirm passcode"
@@ -554,7 +560,7 @@ msgstr "Izberite svoje geslo"
554560
555561#: qml/Wizard/Pages/passwd-set.qml:68
556562msgid "Passphrase must be 4 characters long"
557−msgstr "Šifrirno reklo mora biti dolgo vsaj 4 znake"
563+msgstr "Geslo mora biti dolgo vsaj 4 znake"
558564
559565#: qml/Wizard/Pages/10-welcome.qml:27
560566msgid "Hi!"
@@ -611,7 +617,7 @@ msgstr "Samo 4 številke"
611617#: qml/Wizard/Pages/30-passwd-type.qml:103
612618msgctxt "Label: Type of security method"
613619msgid "Passphrase"
614−msgstr "Šifrirno reklo"
620+msgstr "Geslo"
615621
616622#: qml/Wizard/Pages/30-passwd-type.qml:104
617623msgctxt "Label: Description of security method"
qml/Dash/CardTool.qml+15−6
@@ -80,16 +80,25 @@ Item {
8080
8181 If undefined, should use implicit width of the actual card.
8282 */
83− readonly property var cardWidth: {
83+ property var cardWidth: {
8484 switch (categoryLayout) {
8585 case "grid":
8686 case "vertical-journal":
87− if (template["card-layout"] === "horizontal") return units.gu(38);
88− switch (template["card-size"]) {
89− case "small": return units.gu(12);
90− case "large": return units.gu(38);
87+ var size = template["card-size"];
88+ if (template["card-layout"] === "horizontal") size = "large";
89+ switch (size) {
90+ case "small": {
91+ if (viewWidth <= units.gu(45)) return units.gu(12);
92+ else return units.gu(14);
93+ }
94+ case "large": {
95+ if (viewWidth >= units.gu(70)) return units.gu(42);
96+ else return viewWidth - units.gu(2);
97+ }
9198 }
92− return units.gu(18.5);
99+ if (viewWidth <= units.gu(45)) return units.gu(18);
100+ else if (viewWidth >= units.gu(70)) return units.gu(20);
101+ else return units.gu(23);
93102 case "carousel":
94103 case "horizontal-list":
95104 return carouselTool.minimumTileWidth;
qml/Dash/GenericScopeView.qml+7
@@ -332,6 +332,13 @@ FocusScope {
332332 updateRanges();
333333 if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
334334 // Yeah, hackish :/
335+ if (scopeView.width > units.gu(45)) {
336+ if (scopeView.width >= units.gu(70)) {
337+ cardTool.cardWidth = units.gu(9);
338+ } else {
339+ cardTool.cardWidth = units.gu(10);
340+ }
341+ }
335342 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
336343 }
337344 item.cardTool = cardTool;
tests/qmltests/Dash/tst_Card.qml+4−4
@@ -112,7 +112,7 @@ Rectangle {
112112 id: cardTool
113113 template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];
114114 components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];
115− viewWidth: units.gu(48)
115+ viewWidth: units.gu(40)
116116 }
117117
118118 readonly property var card: loader.item
@@ -261,10 +261,10 @@ Rectangle {
261261
262262 function test_card_size_data() {
263263 return [
264− { tag: "Medium", width: units.gu(18.5), index: 0 },
264+ { tag: "Medium", width: units.gu(18), index: 0 },
265265 { tag: "Small", width: units.gu(12), index: 1 },
266266 { tag: "Large", width: units.gu(38), index: 2 },
267− { tag: "Wide", width: units.gu(18.5), index: 0 },
267+ { tag: "Wide", width: units.gu(18), index: 0 },
268268 { tag: "Horizontal", width: units.gu(38), index: 5 },
269269 // Make sure card ends with header when there's no summary
270270 { tag: "NoSummary", height: function() { var cardToolRow = findChild(cardTool, "outerRow");
@@ -296,7 +296,7 @@ Rectangle {
296296
297297 function test_art_size_data() {
298298 return [
299− { tag: "Medium", width: units.gu(18.5), fill: Image.PreserveAspectCrop, index: 0 },
299+ { tag: "Medium", width: units.gu(18), fill: Image.PreserveAspectCrop, index: 0 },
300300 { tag: "Small", width: units.gu(12), index: 1 },
301301 { tag: "Large", width: units.gu(38), index: 2 },
302302 { tag: "Wide", height: units.gu(19), size: "large", index: 3 },
tests/qmltests/Dash/tst_CardTool.qml+8−8
@@ -255,20 +255,20 @@ Rectangle {
255255
256256 function test_card_size_data() {
257257 return [
258− { tag: "Medium", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 0 },
259− { tag: "No art", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 1 },
260− { tag: "No summary", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 2 },
261− { tag: "Just header", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 3 },
262− { tag: "Just title", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 4 },
263− { tag: "Title and subtitle", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 5 },
264− { tag: "Title and mascot", width: units.gu(18.5), height: function() { return internalCard ? internalCard.height : 0 }, index: 6 },
258+ { tag: "Medium", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 0 },
259+ { tag: "No art", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 1 },
260+ { tag: "No summary", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 2 },
261+ { tag: "Just header", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 3 },
262+ { tag: "Just title", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 4 },
263+ { tag: "Title and subtitle", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 5 },
264+ { tag: "Title and mascot", width: units.gu(18), height: function() { return internalCard ? internalCard.height : 0 }, index: 6 },
265265 { tag: "Small", width: units.gu(12), height: function() { return internalCard ? internalCard.height : 0 }, index: 7 },
266266 { tag: "Large", width: units.gu(38), height: function() { return internalCard ? internalCard.height : 0 }, index: 8 },
267267 { tag: "Horizontal", width: units.gu(38), height: function() { return internalCard ? internalCard.height : 0 }, index: 9 },
268268 { tag: "OrganicGrid", width: undefined, height: undefined, index: 0, layout_index: 1},
269269 { tag: "Journal", width: undefined, height: units.gu(20), size: 20, index: 0, layout_index: 2 },
270270 { tag: "OversizedJournal", width: undefined, height: units.gu(18.5), size: 40, index: 0, layout_index: 2 },
271− { tag: "VerticalJournal", width: units.gu(18.5), height: undefined, index: 0, layout_index: 3 },
271+ { tag: "VerticalJournal", width: units.gu(18), height: undefined, index: 0, layout_index: 3 },
272272 { tag: "SmallCarousel", width: units.gu(18), height: units.gu(18), viewWidth: 30, index: 0, layout_index: 4},
273273 { tag: "MediumCarousel", width: units.gu(22), height: units.gu(22), viewWidth: 84, index: 0, layout_index: 4},
274274 { tag: "LargeCarousel", width: units.gu(26), height: units.gu(26), viewWidth: 140, index: 0, layout_index: 4},
tests/qmltests/Dash/tst_GenericScopeView.qml+1−1
@@ -88,7 +88,7 @@ Item {
8888 tryCompareFunction(function() {
8989 var category = findChild(genericScopeView, categoryName);
9090 if (category && category.y > 0 && category.y < genericScopeView.height) return true;
91− mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
91+ touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),
9292 genericScopeView.width/2, genericScopeView.y)
9393 tryCompare(categoryListView, "moving", false);
9494 return false;