Merge lp:~mzanetti/unity8/disable-spread-while-locked into lp:unity8/stable
- disable-spread-while-locked
- Merge into stable
Proposed by
Michael Zanetti
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~mzanetti/unity8/disable-spread-while-locked | ||||
Merge into: | lp:unity8/stable | ||||
Diff against target: |
14060 lines (+2889/-1718) (has conflicts) 187 files modified
data/com.canonical.Unity8.gschema.xml (+5/-0) data/unity8-dash.conf (+1/-1) data/unity8-filewatcher.conf (+5/-0) data/unity8-greeter-wrapper (+6/-6) debian/changelog (+55/-0) debian/control (+1/-0) plugins/Dash/CardAttributes.qml (+1/-1) plugins/Dash/CardCreator.js (+9/-8) plugins/Dash/listviewwithpageheader.cpp (+4/-12) plugins/LightDM/SessionsModel.cpp (+8/-0) plugins/Utils/constants.cpp (+6/-1) plugins/Utils/constants.h (+5/-5) po/aa.po (+22/-13) po/am.po (+22/-13) po/ar.po (+22/-13) po/ast.po (+22/-13) po/az.po (+22/-13) po/be.po (+22/-13) po/bg.po (+22/-13) po/bn.po (+22/-13) po/br.po (+22/-13) po/bs.po (+22/-13) po/ca.po (+24/-14) po/ca@valencia.po (+22/-13) po/ce.po (+22/-13) po/ckb.po (+22/-13) po/co.po (+22/-13) po/cs.po (+22/-13) po/cy.po (+22/-13) po/da.po (+22/-13) po/de.po (+22/-13) po/el.po (+22/-13) po/en_AU.po (+22/-13) po/en_GB.po (+22/-13) po/eo.po (+22/-13) po/es.po (+22/-13) po/eu.po (+22/-13) po/fa.po (+22/-13) po/fi.po (+22/-13) po/fo.po (+22/-13) po/fr.po (+22/-13) po/ga.po (+22/-13) po/gd.po (+22/-13) po/gl.po (+22/-13) po/gv.po (+22/-13) po/he.po (+22/-13) po/hi.po (+22/-13) po/hr.po (+22/-13) po/hu.po (+22/-13) po/hy.po (+22/-13) po/ia.po (+22/-13) po/id.po (+22/-13) po/is.po (+22/-13) po/it.po (+22/-13) po/ja.po (+22/-13) po/km.po (+22/-13) po/kn.po (+22/-13) po/ko.po (+22/-13) po/ku.po (+22/-13) po/ky.po (+22/-13) po/lo.po (+22/-13) po/lt.po (+22/-13) po/lv.po (+22/-13) po/ml.po (+22/-13) po/mr.po (+22/-13) po/ms.po (+22/-13) po/my.po (+22/-13) po/nb.po (+22/-13) po/ne.po (+22/-13) po/nl.po (+22/-13) po/nn.po (+22/-13) po/oc.po (+22/-13) po/or.po (+22/-13) po/pa.po (+22/-13) po/pl.po (+22/-13) po/pt.po (+22/-13) po/pt_BR.po (+22/-13) po/ro.po (+22/-13) po/ru.po (+22/-13) po/shn.po (+22/-13) po/si.po (+22/-13) po/sk.po (+22/-13) po/sl.po (+22/-13) po/sq.po (+22/-13) po/sr.po (+22/-13) po/sv.po (+22/-13) po/sw.po (+22/-13) po/ta.po (+22/-13) po/te.po (+22/-13) po/th.po (+22/-13) po/tr.po (+22/-13) po/ug.po (+22/-13) po/uk.po (+22/-13) po/unity8.pot (+17/-13) po/ur.po (+22/-13) po/uz.po (+22/-13) po/vi.po (+22/-13) po/wo.po (+22/-13) po/xh.po (+22/-13) po/zh_CN.po (+22/-13) po/zh_HK.po (+22/-13) po/zh_TW.po (+22/-13) qml/Components/ListItems/ThinDivider.qml (+0/-27) qml/Dash/CardGrid.qml (+4/-4) qml/Dash/CardTool.qml (+60/-16) qml/Dash/Dash.qml (+1/-1) qml/Dash/DashBackground.qml (+2/-11) qml/Dash/DashPageHeader.qml (+23/-56) qml/Dash/DashSectionHeader.qml (+25/-25) qml/Dash/GenericScopeView.qml (+6/-83) qml/Dash/Previews/Preview.qml (+19/-7) qml/Dash/Previews/PreviewActionCombo.qml (+13/-2) qml/Dash/Previews/PreviewActions.qml (+3/-2) qml/Dash/Previews/PreviewAudioPlayback.qml (+10/-9) qml/Dash/Previews/PreviewComment.qml (+3/-0) qml/Dash/Previews/PreviewHeader.qml (+5/-3) qml/Dash/Previews/PreviewIconActions.qml (+1/-0) qml/Dash/Previews/PreviewInlineVideo.qml (+1/-1) qml/Dash/Previews/PreviewRatingInput.qml (+1/-0) qml/Dash/Previews/PreviewRatingSingleDisplay.qml (+12/-9) qml/Dash/Previews/PreviewTable.qml (+8/-2) qml/Dash/Previews/PreviewTextSummary.qml (+7/-2) qml/Dash/Previews/PreviewVideoPlayback.qml (+1/-1) qml/Dash/Previews/PreviewWidget.qml (+2/-2) qml/Dash/Previews/PreviewWidgetFactory.qml (+2/-2) qml/Dash/Previews/PreviewZoomableImage.qml (+1/-1) qml/Dash/ScopesListCategory.qml (+2/-2) qml/Greeter/Infographics.qml (+25/-3) qml/Launcher/LauncherPanel.qml (+2/-2) qml/Notifications/ShapedIcon.qml (+1/-0) qml/Shell.qml (+2/-3) qml/Stage/Stage.qml (+40/-1) src/Dash/main.cpp (+9/-1) src/Panel/Indicators/client/indicatorsclient.cpp (+10/-8) src/Panel/Indicators/client/indicatorsclient.h (+0/-2) src/ShellApplication.cpp (+1/-1) src/main.cpp (+10/-1) tests/mocks/GSettings.1.0/fake_gsettings.cpp (+33/-0) tests/mocks/GSettings.1.0/fake_gsettings.h (+9/-0) tests/mocks/Unity/fake_previewmodel.cpp (+15/-7) tests/mocks/Unity/fake_previewwidgetmodel.cpp (+18/-10) tests/mocks/Utils/constants.cpp (+2/-1) tests/mocks/Utils/constants.h (+5/-5) tests/mocks/libusermetrics/UserMetrics.cpp (+33/-13) tests/mocks/libusermetrics/UserMetrics.h (+2/-0) tests/plugins/Dash/cardcreator/1.res (+5/-5) tests/plugins/Dash/cardcreator/1.res.cardcreator (+4/-4) tests/plugins/Dash/cardcreator/1.tst (+1/-1) tests/plugins/Dash/cardcreator/10.res (+3/-3) tests/plugins/Dash/cardcreator/10.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/11.res (+5/-5) tests/plugins/Dash/cardcreator/11.res.cardcreator (+4/-4) tests/plugins/Dash/cardcreator/12.res (+4/-4) tests/plugins/Dash/cardcreator/12.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/2.res (+3/-3) tests/plugins/Dash/cardcreator/2.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/3.res (+2/-2) tests/plugins/Dash/cardcreator/3.res.cardcreator (+2/-2) tests/plugins/Dash/cardcreator/4.res (+3/-3) tests/plugins/Dash/cardcreator/4.res.cardcreator (+2/-2) tests/plugins/Dash/cardcreator/5.res (+3/-3) tests/plugins/Dash/cardcreator/5.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/6.res (+4/-4) tests/plugins/Dash/cardcreator/6.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/6.tst (+1/-1) tests/plugins/Dash/cardcreator/7.res (+3/-3) tests/plugins/Dash/cardcreator/7.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/8.res (+4/-4) tests/plugins/Dash/cardcreator/8.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/8.tst (+1/-1) tests/plugins/Dash/cardcreator/9.res (+4/-4) tests/plugins/Dash/cardcreator/9.res.cardcreator (+3/-3) tests/plugins/Dash/cardcreator/9.tst (+1/-1) tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp (+3/-3) tests/plugins/Dash/listviewwithpageheadersectiontest.cpp (+54/-54) tests/qmltests/Dash/Previews/tst_Preview.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewActions.qml (+33/-3) tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+1/-1) tests/qmltests/Dash/Previews/tst_PreviewTable.qml (+22/-1) tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml (+2/-2) tests/qmltests/Dash/tst_Card.qml (+0/-15) tests/qmltests/Dash/tst_DashPageHeader.qml (+2/-2) tests/qmltests/Dash/tst_GenericScopeView.qml (+1/-1) tests/qmltests/Greeter/tst_Infographics.qml (+79/-15) tests/qmltests/Launcher/tst_Launcher.qml (+26/-1) tests/qmltests/Stage/tst_DesktopStage.qml (+4/-3) tests/qmltests/tst_Shell.qml (+64/-0) Text conflict in debian/changelog Text conflict in po/aa.po Text conflict in po/am.po Text conflict in po/ar.po Text conflict in po/ast.po Text conflict in po/az.po Text conflict in po/be.po Text conflict in po/bg.po Text conflict in po/bn.po Text conflict in po/br.po Text conflict in po/bs.po Text conflict in po/ca.po Text conflict in po/ca@valencia.po Text conflict in po/ce.po Text conflict in po/ckb.po Text conflict in po/co.po Text conflict in po/cs.po Text conflict in po/cy.po Text conflict in po/da.po Text conflict in po/de.po Text conflict in po/el.po Text conflict in po/en_AU.po Text conflict in po/en_GB.po Text conflict in po/eo.po Text conflict in po/es.po Text conflict in po/eu.po Text conflict in po/fa.po Text conflict in po/fi.po Text conflict in po/fo.po Text conflict in po/fr.po Text conflict in po/ga.po Text conflict in po/gd.po Text conflict in po/gl.po Text conflict in po/gv.po Text conflict in po/he.po Text conflict in po/hi.po Text conflict in po/hr.po Text conflict in po/hu.po Text conflict in po/hy.po Text conflict in po/ia.po Text conflict in po/id.po Text conflict in po/is.po Text conflict in po/it.po Text conflict in po/ja.po Text conflict in po/km.po Text conflict in po/kn.po Text conflict in po/ko.po Text conflict in po/ku.po Text conflict in po/ky.po Text conflict in po/lo.po Text conflict in po/lt.po Text conflict in po/lv.po Text conflict in po/ml.po Text conflict in po/mr.po Text conflict in po/ms.po Text conflict in po/my.po Text conflict in po/nb.po Text conflict in po/ne.po Text conflict in po/nl.po Text conflict in po/nn.po Text conflict in po/oc.po Text conflict in po/or.po Text conflict in po/pa.po Text conflict in po/pl.po Text conflict in po/pt.po Text conflict in po/pt_BR.po Text conflict in po/ro.po Text conflict in po/ru.po Text conflict in po/shn.po Text conflict in po/si.po Text conflict in po/sk.po Text conflict in po/sl.po Text conflict in po/sq.po Text conflict in po/sr.po Text conflict in po/sv.po Text conflict in po/sw.po Text conflict in po/ta.po Text conflict in po/te.po Text conflict in po/th.po Text conflict in po/tr.po Text conflict in po/ug.po Text conflict in po/uk.po Text conflict in po/unity8.pot Text conflict in po/ur.po Text conflict in po/uz.po Text conflict in po/vi.po Text conflict in po/wo.po Text conflict in po/xh.po Text conflict in po/zh_CN.po Text conflict in po/zh_HK.po Text conflict in po/zh_TW.po Text conflict in qml/Stage/Stage.qml |
||||
To merge this branch: | bzr merge lp:~mzanetti/unity8/disable-spread-while-locked | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity Team | Pending | ||
Review via email: mp+310765@code.launchpad.net |
Commit message
Hotfix for now allowing to go to spread when locked
Description of the change
To post a comment you must log in.
- 2700. By Michael Zanetti
-
merge ~bhdouglass/
unity8/ disable- indicator- menu as prereq - 2701. By Michael Zanetti
-
fix bad merge
Unmerged revisions
- 2701. By Michael Zanetti
-
fix bad merge
- 2700. By Michael Zanetti
-
merge ~bhdouglass/
unity8/ disable- indicator- menu as prereq - 2699. By Michael Zanetti
-
also exclude Super+W
- 2698. By Michael Zanetti
-
drop TODO
- 2697. By Michael Zanetti
-
disable spread interaction while locked
- 2696. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2695. By CI Train Bot Account
-
Releasing 8.14+17.
04.20161109- 0ubuntu1 - 2694. By Lukáš Tinkl
-
Fix the pixelated notification icon by setting sourceSize (LP: #1637712)
Approved by: Michael Zanetti, Unity8 CI Bot
- 2693. By Lukáš Tinkl
-
Enable loading the main Qt catalog which in turn allows for using RTL languages
Approved by: Albert Astals Cid
- 2692. By Tomás Tormo
-
Reload Infographics userdata when the day changes (LP: #1378814)
Approved by: Albert Astals Cid
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'data/com.canonical.Unity8.gschema.xml' | |||
2 | --- data/com.canonical.Unity8.gschema.xml 2016-03-21 14:31:41 +0000 | |||
3 | +++ data/com.canonical.Unity8.gschema.xml 2016-11-14 12:06:52 +0000 | |||
4 | @@ -43,6 +43,11 @@ | |||
5 | 43 | <summary>Width of the launcher in grid units.</summary> | 43 | <summary>Width of the launcher in grid units.</summary> |
6 | 44 | <description>Changes the width of the launcher in all usage modes.</description> | 44 | <description>Changes the width of the launcher in all usage modes.</description> |
7 | 45 | </key> | 45 | </key> |
8 | 46 | <key type="b" name="enable-launcher"> | ||
9 | 47 | <default>true</default> | ||
10 | 48 | <summary>Enable or disable the launcher</summary> | ||
11 | 49 | <description>Toggle the availability of the launcher</description> | ||
12 | 50 | </key> | ||
13 | 46 | </schema> | 51 | </schema> |
14 | 47 | 52 | ||
15 | 48 | <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8"> | 53 | <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8"> |
16 | 49 | 54 | ||
17 | === modified file 'data/unity8-dash.conf' | |||
18 | --- data/unity8-dash.conf 2016-03-09 22:02:37 +0000 | |||
19 | +++ data/unity8-dash.conf 2016-11-14 12:06:52 +0000 | |||
20 | @@ -22,4 +22,4 @@ | |||
21 | 22 | initctl emit scope-ui-starting | 22 | initctl emit scope-ui-starting |
22 | 23 | end script | 23 | end script |
23 | 24 | 24 | ||
25 | 25 | exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=/usr/share/applications/unity8-dash.desktop | 25 | exec ${BINARY:-unity8-dash} $ARGS --desktop_file_hint=unity8-dash.desktop |
26 | 26 | 26 | ||
27 | === modified file 'data/unity8-filewatcher.conf' | |||
28 | --- data/unity8-filewatcher.conf 2014-08-22 11:19:51 +0000 | |||
29 | +++ data/unity8-filewatcher.conf 2016-11-14 12:06:52 +0000 | |||
30 | @@ -1,6 +1,11 @@ | |||
31 | 1 | description "File system watcher for unity8" | 1 | description "File system watcher for unity8" |
32 | 2 | author "Michael Zanetti <michael.zanetti@canonical.com>" | 2 | author "Michael Zanetti <michael.zanetti@canonical.com>" |
33 | 3 | 3 | ||
34 | 4 | # This method of updating the launcher will not work in our new snappy world, | ||
35 | 5 | # neither for snaps installed in the system nor if we are running inside a snap. | ||
36 | 6 | # Plus it hardcodes the phablet user... To be replaced once bug 1630997 is | ||
37 | 7 | # fixed in ubuntu-app-launch. | ||
38 | 8 | |||
39 | 4 | # Workaround for bug 1360208. ~ and * in one expression doesn't work currently | 9 | # Workaround for bug 1360208. ~ and * in one expression doesn't work currently |
40 | 5 | start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop) | 10 | start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop) |
41 | 6 | 11 | ||
42 | 7 | 12 | ||
43 | === modified file 'data/unity8-greeter-wrapper' | |||
44 | --- data/unity8-greeter-wrapper 2016-07-19 16:40:19 +0000 | |||
45 | +++ data/unity8-greeter-wrapper 2016-11-14 12:06:52 +0000 | |||
46 | @@ -45,8 +45,8 @@ | |||
47 | 45 | 45 | ||
48 | 46 | # If touch session script (which sets up grid units and mir variables) is available, use it | 46 | # If touch session script (which sets up grid units and mir variables) is available, use it |
49 | 47 | TOUCH_WRAPPER= | 47 | TOUCH_WRAPPER= |
52 | 48 | if [ -x /usr/bin/ubuntu-touch-session ]; then | 48 | if which ubuntu-touch-session >/dev/null; then |
53 | 49 | TOUCH_WRAPPER=/usr/bin/ubuntu-touch-session | 49 | TOUCH_WRAPPER=ubuntu-touch-session |
54 | 50 | fi | 50 | fi |
55 | 51 | 51 | ||
56 | 52 | # Pretend that we're in an ubuntu-touch session, so that indicator-network | 52 | # Pretend that we're in an ubuntu-touch session, so that indicator-network |
57 | @@ -63,7 +63,7 @@ | |||
58 | 63 | # creates for them and don't want to start all the services that a normal | 63 | # creates for them and don't want to start all the services that a normal |
59 | 64 | # session would. So it's inconvenient to live within an upstart session. | 64 | # session would. So it's inconvenient to live within an upstart session. |
60 | 65 | # But... we still want to use Upstart for some services. So launch here. | 65 | # But... we still want to use Upstart for some services. So launch here. |
62 | 66 | MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event & | 66 | MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER upstart --user --no-startup-event & |
63 | 67 | INIT_PID=$! | 67 | INIT_PID=$! |
64 | 68 | while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done | 68 | while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done |
65 | 69 | . "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" | 69 | . "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" |
66 | @@ -72,11 +72,11 @@ | |||
67 | 72 | # Connect upstart to system, but do first command in a loop to avoid any | 72 | # Connect upstart to system, but do first command in a loop to avoid any |
68 | 73 | # race condition between the session file above being written and upstart being | 73 | # race condition between the session file above being written and upstart being |
69 | 74 | # ready to handle requests. | 74 | # ready to handle requests. |
72 | 75 | while ! /sbin/initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done | 75 | while ! initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done |
73 | 76 | /sbin/initctl start notify-cgmanager | 76 | initctl start notify-cgmanager |
74 | 77 | 77 | ||
75 | 78 | # Start any pre-greeter tasks if needed (like wizard) | 78 | # Start any pre-greeter tasks if needed (like wizard) |
77 | 79 | /sbin/initctl emit unity8-greeter-starting | 79 | initctl emit unity8-greeter-starting |
78 | 80 | 80 | ||
79 | 81 | # Define language here for phone if available. When phone user switches their | 81 | # Define language here for phone if available. When phone user switches their |
80 | 82 | # language, they expect that to affect the greeter too. But the user doesn't | 82 | # language, they expect that to affect the greeter too. But the user doesn't |
81 | 83 | 83 | ||
82 | === modified file 'debian/changelog' | |||
83 | --- debian/changelog 2016-11-09 16:31:57 +0000 | |||
84 | +++ debian/changelog 2016-11-14 12:06:52 +0000 | |||
85 | @@ -1,3 +1,4 @@ | |||
86 | 1 | <<<<<<< TREE | ||
87 | 1 | unity8 (8.14+17.04.20161109-0ubuntu1) zesty; urgency=medium | 2 | unity8 (8.14+17.04.20161109-0ubuntu1) zesty; urgency=medium |
88 | 2 | 3 | ||
89 | 3 | [ Michael Zanetti ] | 4 | [ Michael Zanetti ] |
90 | @@ -17,6 +18,60 @@ | |||
91 | 17 | 18 | ||
92 | 18 | -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 27 Oct 2016 12:32:25 +0000 | 19 | -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 27 Oct 2016 12:32:25 +0000 |
93 | 19 | 20 | ||
94 | 21 | ======= | ||
95 | 22 | unity8 (8.14+17.04.20161109-0ubuntu1) zesty; urgency=medium | ||
96 | 23 | |||
97 | 24 | [ Albert Astals Cid ] | ||
98 | 25 | * Make more CardTool properties readonly | ||
99 | 26 | * Make the > in Dash Section Header be after text (LP: #1508905) | ||
100 | 27 | * Rework Dash Preview column margins | ||
101 | 28 | * Improve LVWPH <-> GenericScopeView interaction (LP: #1508905, | ||
102 | 29 | #1622423) | ||
103 | 30 | * Make the PreviewButtons be of the width of the button and not half | ||
104 | 31 | the total width | ||
105 | 32 | * Fix first column of the preview table to be 25% | ||
106 | 33 | |||
107 | 34 | [ Andrea Cimitan ] | ||
108 | 35 | * Remove background under header pagination dots, update dots assets, | ||
109 | 36 | remove dash paper background, update bottom edge asset | ||
110 | 37 | * Few styling changes for cards | ||
111 | 38 | * various tweaks to fonts inside previews | ||
112 | 39 | * More visual tweaks | ||
113 | 40 | |||
114 | 41 | [ Brian Douglass ] | ||
115 | 42 | * Add a new setting to enable/disable the launcher | ||
116 | 43 | |||
117 | 44 | [ Lukáš Tinkl ] | ||
118 | 45 | * Stabilize test_doubleTapToMaximizeWindow() | ||
119 | 46 | * Enable loading the main Qt catalog which in turn allows for using | ||
120 | 47 | RTL languages | ||
121 | 48 | * Fix the pixelated notification icon by setting sourceSize (LP: | ||
122 | 49 | #1637712) | ||
123 | 50 | |||
124 | 51 | [ Michael Terry ] | ||
125 | 52 | * More path lookup fixes for running inside of a snap. (LP: #1629009) | ||
126 | 53 | |||
127 | 54 | [ Michael Zanetti ] | ||
128 | 55 | * Added blur and darkening to wallpaper while in spread | ||
129 | 56 | * Fixes in the spread after design review (LP: #1637502, #1638848) | ||
130 | 57 | * More fixes to the unified stages code (LP: #1637205, #1637249, | ||
131 | 58 | #1637258) | ||
132 | 59 | * Delay alt tab for tiny bit in order to avoid flickering on quick alt- | ||
133 | 60 | tabs | ||
134 | 61 | |||
135 | 62 | [ Tomás Tormo ] | ||
136 | 63 | * Reload Infographics userdata when the day changes (LP: #1378814) | ||
137 | 64 | |||
138 | 65 | -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 09 Nov 2016 15:10:32 +0000 | ||
139 | 66 | |||
140 | 67 | unity8 (8.14+17.04.20161027-0ubuntu1) zesty; urgency=medium | ||
141 | 68 | |||
142 | 69 | * MenuItemFactory: activate item on calendar selection change (LP: | ||
143 | 70 | #1541125) | ||
144 | 71 | |||
145 | 72 | -- Marco Trevisan (Treviño) <mail@3v1n0.net> Thu, 27 Oct 2016 12:32:25 +0000 | ||
146 | 73 | |||
147 | 74 | >>>>>>> MERGE-SOURCE | ||
148 | 20 | unity8 (8.14+17.04.20161024-0ubuntu1) zesty; urgency=medium | 75 | unity8 (8.14+17.04.20161024-0ubuntu1) zesty; urgency=medium |
149 | 21 | 76 | ||
150 | 22 | [ Albert Astals Cid ] | 77 | [ Albert Astals Cid ] |
151 | 23 | 78 | ||
152 | === modified file 'debian/control' | |||
153 | --- debian/control 2016-10-27 12:25:58 +0000 | |||
154 | +++ debian/control 2016-11-14 12:06:52 +0000 | |||
155 | @@ -156,6 +156,7 @@ | |||
156 | 156 | qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl, | 156 | qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl, |
157 | 157 | qtdeclarative5-ubuntu-settings-components (>= 0.7), | 157 | qtdeclarative5-ubuntu-settings-components (>= 0.7), |
158 | 158 | qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl, | 158 | qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl, |
159 | 159 | qttranslations5-l10n, | ||
160 | 159 | ubuntu-thumbnailer-impl-0, | 160 | ubuntu-thumbnailer-impl-0, |
161 | 160 | ubuntu-wallpapers, | 161 | ubuntu-wallpapers, |
162 | 161 | unity-application-impl-22, | 162 | unity-application-impl-22, |
163 | 162 | 163 | ||
164 | === modified file 'plugins/Dash/CardAttributes.qml' | |||
165 | --- plugins/Dash/CardAttributes.qml 2016-05-24 10:44:16 +0000 | |||
166 | +++ plugins/Dash/CardAttributes.qml 2016-11-14 12:06:52 +0000 | |||
167 | @@ -62,7 +62,7 @@ | |||
168 | 62 | elide: Text.ElideRight | 62 | elide: Text.ElideRight |
169 | 63 | maximumLineCount: 1 | 63 | maximumLineCount: 1 |
170 | 64 | font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light | 64 | font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light |
172 | 65 | fontSize: "small" | 65 | fontSize: "x-small" |
173 | 66 | font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale) | 66 | font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale) |
174 | 67 | color: grid.color | 67 | color: grid.color |
175 | 68 | } | 68 | } |
176 | 69 | 69 | ||
177 | === modified file 'plugins/Dash/CardCreator.js' | |||
178 | --- plugins/Dash/CardCreator.js 2016-09-22 10:33:39 +0000 | |||
179 | +++ plugins/Dash/CardCreator.js 2016-11-14 12:06:52 +0000 | |||
180 | @@ -28,7 +28,7 @@ | |||
181 | 28 | visible: status === Loader.Ready; \n\ | 28 | visible: status === Loader.Ready; \n\ |
182 | 29 | sourceComponent: UbuntuShape { \n\ | 29 | sourceComponent: UbuntuShape { \n\ |
183 | 30 | objectName: "background"; \n\ | 30 | objectName: "background"; \n\ |
185 | 31 | radius: "medium"; \n\ | 31 | radius: "small"; \n\ |
186 | 32 | aspect: { \n\ | 32 | aspect: { \n\ |
187 | 33 | switch (root.backgroundShapeStyle) { \n\ | 33 | switch (root.backgroundShapeStyle) { \n\ |
188 | 34 | case "inset": return UbuntuShape.Inset; \n\ | 34 | case "inset": return UbuntuShape.Inset; \n\ |
189 | @@ -64,7 +64,7 @@ | |||
190 | 64 | anchors.fill: parent; \n\ | 64 | anchors.fill: parent; \n\ |
191 | 65 | source: artImage; \n\ | 65 | source: artImage; \n\ |
192 | 66 | sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\ | 66 | sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\ |
194 | 67 | radius: "medium"; \n\ | 67 | radius: "small"; \n\ |
195 | 68 | aspect: %1; \n\ | 68 | aspect: %1; \n\ |
196 | 69 | }'; | 69 | }'; |
197 | 70 | 70 | ||
198 | @@ -166,7 +166,7 @@ | |||
199 | 166 | UbuntuShape { \n\ | 166 | UbuntuShape { \n\ |
200 | 167 | anchors.fill: parent; \n\ | 167 | anchors.fill: parent; \n\ |
201 | 168 | visible: parent.pressed; \n\ | 168 | visible: parent.pressed; \n\ |
203 | 169 | radius: "medium"; \n\ | 169 | radius: "small"; \n\ |
204 | 170 | } \n\ | 170 | } \n\ |
205 | 171 | Rectangle { \n\ | 171 | Rectangle { \n\ |
206 | 172 | color: Qt.rgba(0, 0, 0, 0.5); \n\ | 172 | color: Qt.rgba(0, 0, 0, 0.5); \n\ |
207 | @@ -214,7 +214,7 @@ | |||
208 | 214 | id: overlay; \n\ | 214 | id: overlay; \n\ |
209 | 215 | property real luminance: Style.luminance(overlayColor); \n\ | 215 | property real luminance: Style.luminance(overlayColor); \n\ |
210 | 216 | aspect: UbuntuShape.Flat; \n\ | 216 | aspect: UbuntuShape.Flat; \n\ |
212 | 217 | radius: "medium"; \n\ | 217 | radius: "small"; \n\ |
213 | 218 | overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\ | 218 | overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\ |
214 | 219 | overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\ | 219 | overlayRect: Qt.rect(0, 1 - overlayLoader.overlayHeight / height, 1, 1); \n\ |
215 | 220 | } \n\ | 220 | } \n\ |
216 | @@ -308,7 +308,7 @@ | |||
217 | 308 | visible: showHeader %3; \n\ | 308 | visible: showHeader %3; \n\ |
218 | 309 | width: %4; \n\ | 309 | width: %4; \n\ |
219 | 310 | text: root.title; \n\ | 310 | text: root.title; \n\ |
221 | 311 | font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\ | 311 | font.weight: Font.Normal; \n\ |
222 | 312 | horizontalAlignment: %5; \n\ | 312 | horizontalAlignment: %5; \n\ |
223 | 313 | }\n'; | 313 | }\n'; |
224 | 314 | 314 | ||
225 | @@ -337,7 +337,7 @@ | |||
226 | 337 | sourceComponent: UbuntuShape { \n\ | 337 | sourceComponent: UbuntuShape { \n\ |
227 | 338 | objectName: "touchdown"; \n\ | 338 | objectName: "touchdown"; \n\ |
228 | 339 | anchors.fill: parent; \n\ | 339 | anchors.fill: parent; \n\ |
230 | 340 | radius: "medium"; \n\ | 340 | radius: "small"; \n\ |
231 | 341 | borderSource: "radius_pressed.sci" \n\ | 341 | borderSource: "radius_pressed.sci" \n\ |
232 | 342 | } \n\ | 342 | } \n\ |
233 | 343 | }\n'; | 343 | }\n'; |
234 | @@ -399,7 +399,8 @@ | |||
235 | 399 | elide: Text.ElideRight; \n\ | 399 | elide: Text.ElideRight; \n\ |
236 | 400 | text: cardData && cardData["summary"] || ""; \n\ | 400 | text: cardData && cardData["summary"] || ""; \n\ |
237 | 401 | height: text ? implicitHeight : 0; \n\ | 401 | height: text ? implicitHeight : 0; \n\ |
239 | 402 | fontSize: "small"; \n\ | 402 | fontSize: "x-small"; \n\ |
240 | 403 | font.weight: Font.Light; \n\ | ||
241 | 403 | color: %3; \n\ | 404 | color: %3; \n\ |
242 | 404 | }\n'; | 405 | }\n'; |
243 | 405 | 406 | ||
244 | @@ -439,7 +440,7 @@ | |||
245 | 439 | code = 'AbstractButton { \n\ | 440 | code = 'AbstractButton { \n\ |
246 | 440 | id: root; \n\ | 441 | id: root; \n\ |
247 | 441 | property var cardData; \n\ | 442 | property var cardData; \n\ |
249 | 442 | property string backgroundShapeStyle: "inset"; \n\ | 443 | property string backgroundShapeStyle: "flat"; \n\ |
250 | 443 | property real fontScale: 1.0; \n\ | 444 | property real fontScale: 1.0; \n\ |
251 | 444 | property var scopeStyle: null; \n\ | 445 | property var scopeStyle: null; \n\ |
252 | 445 | readonly property string title: cardData && cardData["title"] || ""; \n\ | 446 | readonly property string title: cardData && cardData["title"] || ""; \n\ |
253 | 446 | 447 | ||
254 | === modified file 'plugins/Dash/listviewwithpageheader.cpp' | |||
255 | --- plugins/Dash/listviewwithpageheader.cpp 2016-09-22 10:33:39 +0000 | |||
256 | +++ plugins/Dash/listviewwithpageheader.cpp 2016-11-14 12:06:52 +0000 | |||
257 | @@ -772,7 +772,7 @@ | |||
258 | 772 | delete nobj; | 772 | delete nobj; |
259 | 773 | } else { | 773 | } else { |
260 | 774 | sectionItem->setProperty("text", sectionText); | 774 | sectionItem->setProperty("text", sectionText); |
262 | 775 | sectionItem->setProperty("delegateIndex", -1); | 775 | sectionItem->setProperty("delegate", QVariant()); |
263 | 776 | sectionItem->setZ(2); | 776 | sectionItem->setZ(2); |
264 | 777 | QQml_setParent_noEvent(sectionItem, m_clipItem); | 777 | QQml_setParent_noEvent(sectionItem, m_clipItem); |
265 | 778 | sectionItem->setParentItem(m_clipItem); | 778 | sectionItem->setParentItem(m_clipItem); |
266 | @@ -929,7 +929,7 @@ | |||
267 | 929 | polish(); | 929 | polish(); |
268 | 930 | } | 930 | } |
269 | 931 | if (listItem->sectionItem()) { | 931 | if (listItem->sectionItem()) { |
271 | 932 | listItem->sectionItem()->setProperty("delegateIndex", modelIndex); | 932 | listItem->sectionItem()->setProperty("delegate", QVariant::fromValue(listItem->m_item)); |
272 | 933 | } | 933 | } |
273 | 934 | adjustMinYExtent(); | 934 | adjustMinYExtent(); |
274 | 935 | m_contentHeightDirty = true; | 935 | m_contentHeightDirty = true; |
275 | @@ -1123,7 +1123,7 @@ | |||
276 | 1123 | for (int i = 0; i < m_visibleItems.count(); ++i) { | 1123 | for (int i = 0; i < m_visibleItems.count(); ++i) { |
277 | 1124 | ListItem *item = m_visibleItems[i]; | 1124 | ListItem *item = m_visibleItems[i]; |
278 | 1125 | if (item->sectionItem()) { | 1125 | if (item->sectionItem()) { |
280 | 1126 | item->sectionItem()->setProperty("delegateIndex", m_firstVisibleIndex + i); | 1126 | item->sectionItem()->setProperty("delegate", QVariant::fromValue(item->m_item)); |
281 | 1127 | } | 1127 | } |
282 | 1128 | } | 1128 | } |
283 | 1129 | 1129 | ||
284 | @@ -1297,15 +1297,7 @@ | |||
285 | 1297 | 1297 | ||
286 | 1298 | QQuickItemPrivate::get(m_topSectionItem)->setCulled(false); | 1298 | QQuickItemPrivate::get(m_topSectionItem)->setCulled(false); |
287 | 1299 | m_topSectionItem->setY(topSectionStickPos); | 1299 | m_topSectionItem->setY(topSectionStickPos); |
297 | 1300 | int delegateIndex = modelIndex; | 1300 | m_topSectionItem->setProperty("delegate", QVariant::fromValue(item->m_item)); |
289 | 1301 | // Look for the first index with this section text | ||
290 | 1302 | while (delegateIndex > 0) { | ||
291 | 1303 | const QString prevSection = m_delegateModel->stringValue(delegateIndex - 1, m_sectionProperty); | ||
292 | 1304 | if (prevSection != section) | ||
293 | 1305 | break; | ||
294 | 1306 | delegateIndex--; | ||
295 | 1307 | } | ||
296 | 1308 | m_topSectionItem->setProperty("delegateIndex", delegateIndex); | ||
298 | 1309 | if (item->sectionItem()) { | 1301 | if (item->sectionItem()) { |
299 | 1310 | QQuickItemPrivate::get(item->sectionItem())->setCulled(true); | 1302 | QQuickItemPrivate::get(item->sectionItem())->setCulled(true); |
300 | 1311 | } | 1303 | } |
301 | 1312 | 1304 | ||
302 | === modified file 'plugins/LightDM/SessionsModel.cpp' | |||
303 | --- plugins/LightDM/SessionsModel.cpp 2016-06-15 20:28:58 +0000 | |||
304 | +++ plugins/LightDM/SessionsModel.cpp 2016-11-14 12:06:52 +0000 | |||
305 | @@ -119,6 +119,14 @@ | |||
306 | 119 | m_roleNames = m_model->roleNames(); | 119 | m_roleNames = m_model->roleNames(); |
307 | 120 | m_roleNames[IconRole] = "icon_url"; | 120 | m_roleNames[IconRole] = "icon_url"; |
308 | 121 | 121 | ||
309 | 122 | // Update search locations to use $SNAP prefix if specified | ||
310 | 123 | auto snapRoot = QFile::decodeName(qgetenv("SNAP")); | ||
311 | 124 | if (!snapRoot.isEmpty()) { | ||
312 | 125 | for (int i = 0; i < m_iconSearchDirectories.size(); i++) { | ||
313 | 126 | m_iconSearchDirectories[i] = snapRoot + m_iconSearchDirectories[i].path(); | ||
314 | 127 | } | ||
315 | 128 | } | ||
316 | 129 | |||
317 | 122 | setModel(m_model); | 130 | setModel(m_model); |
318 | 123 | setSourceModel(m_model); | 131 | setSourceModel(m_model); |
319 | 124 | setSortCaseSensitivity(Qt::CaseInsensitive); | 132 | setSortCaseSensitivity(Qt::CaseInsensitive); |
320 | 125 | 133 | ||
321 | === modified file 'plugins/Utils/constants.cpp' | |||
322 | --- plugins/Utils/constants.cpp 2015-11-20 15:01:39 +0000 | |||
323 | +++ plugins/Utils/constants.cpp 2016-11-14 12:06:52 +0000 | |||
324 | @@ -1,5 +1,5 @@ | |||
325 | 1 | /* | 1 | /* |
327 | 2 | * Copyright 2015 Canonical Ltd. | 2 | * Copyright 2015-2016 Canonical Ltd. |
328 | 3 | * | 3 | * |
329 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
330 | 5 | * it under the terms of the GNU Lesser General Public License as published by | 5 | * it under the terms of the GNU Lesser General Public License as published by |
331 | @@ -16,6 +16,8 @@ | |||
332 | 16 | 16 | ||
333 | 17 | #include "constants.h" | 17 | #include "constants.h" |
334 | 18 | 18 | ||
335 | 19 | #include <QFile> | ||
336 | 20 | |||
337 | 19 | Constants::Constants(QObject *parent) | 21 | Constants::Constants(QObject *parent) |
338 | 20 | : QObject(parent) | 22 | : QObject(parent) |
339 | 21 | { | 23 | { |
340 | @@ -24,4 +26,7 @@ | |||
341 | 24 | } else { | 26 | } else { |
342 | 25 | m_indicatorValueTimeout = 5000; | 27 | m_indicatorValueTimeout = 5000; |
343 | 26 | } | 28 | } |
344 | 29 | |||
345 | 30 | QString snapRoot = QFile::decodeName(qgetenv("SNAP")); | ||
346 | 31 | m_defaultWallpaper = snapRoot + "/usr/share/backgrounds/warty-final-ubuntu.png"; | ||
347 | 27 | } | 32 | } |
348 | 28 | 33 | ||
349 | === modified file 'plugins/Utils/constants.h' | |||
350 | --- plugins/Utils/constants.h 2015-03-11 08:07:31 +0000 | |||
351 | +++ plugins/Utils/constants.h 2016-11-14 12:06:52 +0000 | |||
352 | @@ -1,5 +1,5 @@ | |||
353 | 1 | /* | 1 | /* |
355 | 2 | * Copyright 2015 Canonical Ltd. | 2 | * Copyright 2015-2016 Canonical Ltd. |
356 | 3 | * | 3 | * |
357 | 4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
358 | 5 | * it under the terms of the GNU Lesser General Public License as published by | 5 | * it under the terms of the GNU Lesser General Public License as published by |
359 | @@ -14,8 +14,7 @@ | |||
360 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
361 | 15 | */ | 15 | */ |
362 | 16 | 16 | ||
365 | 17 | #ifndef CONSTANTS_H | 17 | #pragma once |
364 | 18 | #define CONSTANTS_H | ||
366 | 19 | 18 | ||
367 | 20 | #include <QObject> | 19 | #include <QObject> |
368 | 21 | 20 | ||
369 | @@ -30,14 +29,15 @@ | |||
370 | 30 | { | 29 | { |
371 | 31 | Q_OBJECT | 30 | Q_OBJECT |
372 | 32 | Q_PROPERTY(int indicatorValueTimeout READ indicatorValueTimeout CONSTANT) | 31 | Q_PROPERTY(int indicatorValueTimeout READ indicatorValueTimeout CONSTANT) |
373 | 32 | Q_PROPERTY(QString defaultWallpaper READ defaultWallpaper CONSTANT) | ||
374 | 33 | 33 | ||
375 | 34 | public: | 34 | public: |
376 | 35 | Constants(QObject *parent = 0); | 35 | Constants(QObject *parent = 0); |
377 | 36 | 36 | ||
378 | 37 | int indicatorValueTimeout() const { return m_indicatorValueTimeout; } | 37 | int indicatorValueTimeout() const { return m_indicatorValueTimeout; } |
379 | 38 | QString defaultWallpaper() const { return m_defaultWallpaper; } | ||
380 | 38 | 39 | ||
381 | 39 | private: | 40 | private: |
382 | 40 | int m_indicatorValueTimeout; | 41 | int m_indicatorValueTimeout; |
383 | 42 | QString m_defaultWallpaper; | ||
384 | 41 | }; | 43 | }; |
385 | 42 | |||
386 | 43 | #endif | ||
387 | 44 | 44 | ||
388 | === modified file 'po/aa.po' | |||
389 | --- po/aa.po 2016-11-08 05:41:47 +0000 | |||
390 | +++ po/aa.po 2016-11-14 12:06:52 +0000 | |||
391 | @@ -7,7 +7,11 @@ | |||
392 | 7 | msgstr "" | 7 | msgstr "" |
393 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
394 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
395 | 10 | <<<<<<< TREE | ||
396 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
397 | 12 | ======= | ||
398 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
399 | 14 | >>>>>>> MERGE-SOURCE | ||
400 | 11 | "PO-Revision-Date: 2016-02-12 10:18+0000\n" | 15 | "PO-Revision-Date: 2016-02-12 10:18+0000\n" |
401 | 12 | "Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n" | 16 | "Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n" |
402 | 13 | "Language-Team: Afar <aa@li.org>\n" | 17 | "Language-Team: Afar <aa@li.org>\n" |
403 | @@ -15,8 +19,13 @@ | |||
404 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
405 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
406 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
407 | 22 | <<<<<<< TREE | ||
408 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
409 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
410 | 25 | ======= | ||
411 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:08+0000\n" | ||
412 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
413 | 28 | >>>>>>> MERGE-SOURCE | ||
414 | 20 | 29 | ||
415 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
416 | 22 | msgid "Password: " | 31 | msgid "Password: " |
417 | @@ -311,26 +320,26 @@ | |||
418 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
419 | 312 | msgstr "" | 321 | msgstr "" |
420 | 313 | 322 | ||
422 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
423 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
424 | 316 | msgid "Store" | 325 | msgid "Store" |
425 | 317 | msgstr "" | 326 | msgstr "" |
426 | 318 | 327 | ||
428 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
429 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
430 | 321 | msgid "Search" | 330 | msgid "Search" |
431 | 322 | msgstr "Goranto" | 331 | msgstr "Goranto" |
432 | 323 | 332 | ||
434 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
435 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
436 | 326 | msgid "Settings" | 335 | msgid "Settings" |
437 | 327 | msgstr "Massosu" | 336 | msgstr "Massosu" |
438 | 328 | 337 | ||
440 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
441 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
442 | 331 | msgstr "" | 340 | msgstr "" |
443 | 332 | 341 | ||
445 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
446 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
447 | 335 | msgstr "" | 344 | msgstr "" |
448 | 336 | 345 | ||
449 | @@ -342,15 +351,15 @@ | |||
450 | 342 | msgid "Reset" | 351 | msgid "Reset" |
451 | 343 | msgstr "" | 352 | msgstr "" |
452 | 344 | 353 | ||
454 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
455 | 346 | msgid "Show less" | 355 | msgid "Show less" |
456 | 347 | msgstr "" | 356 | msgstr "" |
457 | 348 | 357 | ||
459 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
460 | 350 | msgid "Show all" | 359 | msgid "Show all" |
461 | 351 | msgstr "" | 360 | msgstr "" |
462 | 352 | 361 | ||
464 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
465 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
466 | 355 | msgid "Search" | 364 | msgid "Search" |
467 | 356 | msgstr "Goranto" | 365 | msgstr "Goranto" |
468 | @@ -363,24 +372,24 @@ | |||
469 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
470 | 364 | msgstr "" | 373 | msgstr "" |
471 | 365 | 374 | ||
473 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
474 | 367 | msgid "More..." | 376 | msgid "More..." |
475 | 368 | msgstr "" | 377 | msgstr "" |
476 | 369 | 378 | ||
478 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
479 | 371 | msgid "Less..." | 380 | msgid "Less..." |
480 | 372 | msgstr "" | 381 | msgstr "" |
481 | 373 | 382 | ||
482 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
484 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
485 | 376 | msgid "Send" | 385 | msgid "Send" |
486 | 377 | msgstr "Rub" | 386 | msgstr "Rub" |
487 | 378 | 387 | ||
489 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
490 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
491 | 381 | msgstr "" | 390 | msgstr "" |
492 | 382 | 391 | ||
494 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
495 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
496 | 385 | msgstr "" | 394 | msgstr "" |
497 | 386 | 395 | ||
498 | 387 | 396 | ||
499 | === modified file 'po/am.po' | |||
500 | --- po/am.po 2016-11-08 05:41:47 +0000 | |||
501 | +++ po/am.po 2016-11-14 12:06:52 +0000 | |||
502 | @@ -7,7 +7,11 @@ | |||
503 | 7 | msgstr "" | 7 | msgstr "" |
504 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
505 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
506 | 10 | <<<<<<< TREE | ||
507 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
508 | 12 | ======= | ||
509 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
510 | 14 | >>>>>>> MERGE-SOURCE | ||
511 | 11 | "PO-Revision-Date: 2016-08-13 14:45+0000\n" | 15 | "PO-Revision-Date: 2016-08-13 14:45+0000\n" |
512 | 12 | "Last-Translator: samson <Unknown>\n" | 16 | "Last-Translator: samson <Unknown>\n" |
513 | 13 | "Language-Team: Amharic <am@li.org>\n" | 17 | "Language-Team: Amharic <am@li.org>\n" |
514 | @@ -15,8 +19,13 @@ | |||
515 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
516 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
517 | 17 | "Plural-Forms: nplurals=2; plural=n > 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n > 1;\n" |
518 | 22 | <<<<<<< TREE | ||
519 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
520 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
521 | 25 | ======= | ||
522 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:08+0000\n" | ||
523 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
524 | 28 | >>>>>>> MERGE-SOURCE | ||
525 | 20 | 29 | ||
526 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
527 | 22 | msgid "Password: " | 31 | msgid "Password: " |
528 | @@ -313,26 +322,26 @@ | |||
529 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
530 | 314 | msgstr "የሚካፈሉትን እቃ ቅድመ እይታ" | 323 | msgstr "የሚካፈሉትን እቃ ቅድመ እይታ" |
531 | 315 | 324 | ||
533 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
534 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
535 | 318 | msgid "Store" | 327 | msgid "Store" |
536 | 319 | msgstr "ማስቀመጫ" | 328 | msgstr "ማስቀመጫ" |
537 | 320 | 329 | ||
539 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
540 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
541 | 323 | msgid "Search" | 332 | msgid "Search" |
542 | 324 | msgstr "መፈለጊያ" | 333 | msgstr "መፈለጊያ" |
543 | 325 | 334 | ||
545 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
546 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
547 | 328 | msgid "Settings" | 337 | msgid "Settings" |
548 | 329 | msgstr "ማሰናጃዎች" | 338 | msgstr "ማሰናጃዎች" |
549 | 330 | 339 | ||
551 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
552 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
553 | 333 | msgstr "ከምወዳቸው ማስወገጃ" | 342 | msgstr "ከምወዳቸው ማስወገጃ" |
554 | 334 | 343 | ||
556 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
557 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
558 | 337 | msgstr "ወደምወዳቸው መጨመሪያ" | 346 | msgstr "ወደምወዳቸው መጨመሪያ" |
559 | 338 | 347 | ||
560 | @@ -344,15 +353,15 @@ | |||
561 | 344 | msgid "Reset" | 353 | msgid "Reset" |
562 | 345 | msgstr "እንደ ነበረ መመለሻ" | 354 | msgstr "እንደ ነበረ መመለሻ" |
563 | 346 | 355 | ||
565 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
566 | 348 | msgid "Show less" | 357 | msgid "Show less" |
567 | 349 | msgstr "ትንሽ ማሳያ" | 358 | msgstr "ትንሽ ማሳያ" |
568 | 350 | 359 | ||
570 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
571 | 352 | msgid "Show all" | 361 | msgid "Show all" |
572 | 353 | msgstr "ሁሉንም ማሳያ" | 362 | msgstr "ሁሉንም ማሳያ" |
573 | 354 | 363 | ||
575 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
576 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
577 | 357 | msgid "Search" | 366 | msgid "Search" |
578 | 358 | msgstr "መፈለጊያ" | 367 | msgstr "መፈለጊያ" |
579 | @@ -365,24 +374,24 @@ | |||
580 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
581 | 366 | msgstr "ሁሉንም ማጽጃ" | 375 | msgstr "ሁሉንም ማጽጃ" |
582 | 367 | 376 | ||
584 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
585 | 369 | msgid "More..." | 378 | msgid "More..." |
586 | 370 | msgstr "ተጨማሪ..." | 379 | msgstr "ተጨማሪ..." |
587 | 371 | 380 | ||
589 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
590 | 373 | msgid "Less..." | 382 | msgid "Less..." |
591 | 374 | msgstr "አነስተኛ..." | 383 | msgstr "አነስተኛ..." |
592 | 375 | 384 | ||
593 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
595 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
596 | 378 | msgid "Send" | 387 | msgid "Send" |
597 | 379 | msgstr "መላኪያ" | 388 | msgstr "መላኪያ" |
598 | 380 | 389 | ||
600 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
601 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
602 | 383 | msgstr "ለዚህ ደረጃ ይስጡ" | 392 | msgstr "ለዚህ ደረጃ ይስጡ" |
603 | 384 | 393 | ||
605 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
606 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
607 | 387 | msgstr "ግምገማ መጨመሪያ" | 396 | msgstr "ግምገማ መጨመሪያ" |
608 | 388 | 397 | ||
609 | 389 | 398 | ||
610 | === modified file 'po/ar.po' | |||
611 | --- po/ar.po 2016-11-08 05:41:47 +0000 | |||
612 | +++ po/ar.po 2016-11-14 12:06:52 +0000 | |||
613 | @@ -7,7 +7,11 @@ | |||
614 | 7 | msgstr "" | 7 | msgstr "" |
615 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
616 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
617 | 10 | <<<<<<< TREE | ||
618 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
619 | 12 | ======= | ||
620 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
621 | 14 | >>>>>>> MERGE-SOURCE | ||
622 | 11 | "PO-Revision-Date: 2015-07-29 09:41+0000\n" | 15 | "PO-Revision-Date: 2015-07-29 09:41+0000\n" |
623 | 12 | "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n" | 16 | "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n" |
624 | 13 | "Language-Team: Arabic <ar@li.org>\n" | 17 | "Language-Team: Arabic <ar@li.org>\n" |
625 | @@ -16,8 +20,13 @@ | |||
626 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
627 | 17 | "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " | 21 | "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " |
628 | 18 | "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" | 22 | "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" |
629 | 23 | <<<<<<< TREE | ||
630 | 19 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
631 | 20 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
632 | 26 | ======= | ||
633 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:08+0000\n" | ||
634 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
635 | 29 | >>>>>>> MERGE-SOURCE | ||
636 | 21 | 30 | ||
637 | 22 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
638 | 23 | msgid "Password: " | 32 | msgid "Password: " |
639 | @@ -314,26 +323,26 @@ | |||
640 | 314 | msgid "Preview Share Item" | 323 | msgid "Preview Share Item" |
641 | 315 | msgstr "" | 324 | msgstr "" |
642 | 316 | 325 | ||
644 | 317 | #: qml/Dash/DashPageHeader.qml:362 | 326 | #: qml/Dash/DashPageHeader.qml:361 |
645 | 318 | msgctxt "Button: Open the Ubuntu Store" | 327 | msgctxt "Button: Open the Ubuntu Store" |
646 | 319 | msgid "Store" | 328 | msgid "Store" |
647 | 320 | msgstr "المتجر" | 329 | msgstr "المتجر" |
648 | 321 | 330 | ||
650 | 322 | #: qml/Dash/DashPageHeader.qml:369 | 331 | #: qml/Dash/DashPageHeader.qml:368 |
651 | 323 | msgctxt "Button: Start a search in the current dash scope" | 332 | msgctxt "Button: Start a search in the current dash scope" |
652 | 324 | msgid "Search" | 333 | msgid "Search" |
653 | 325 | msgstr "بحث" | 334 | msgstr "بحث" |
654 | 326 | 335 | ||
656 | 327 | #: qml/Dash/DashPageHeader.qml:379 | 336 | #: qml/Dash/DashPageHeader.qml:378 |
657 | 328 | msgctxt "Button: Show the current dash scope settings" | 337 | msgctxt "Button: Show the current dash scope settings" |
658 | 329 | msgid "Settings" | 338 | msgid "Settings" |
659 | 330 | msgstr "الإعدادات" | 339 | msgstr "الإعدادات" |
660 | 331 | 340 | ||
662 | 332 | #: qml/Dash/DashPageHeader.qml:386 | 341 | #: qml/Dash/DashPageHeader.qml:385 |
663 | 333 | msgid "Remove from Favorites" | 342 | msgid "Remove from Favorites" |
664 | 334 | msgstr "حذف من المفضلات" | 343 | msgstr "حذف من المفضلات" |
665 | 335 | 344 | ||
667 | 336 | #: qml/Dash/DashPageHeader.qml:386 | 345 | #: qml/Dash/DashPageHeader.qml:385 |
668 | 337 | msgid "Add to Favorites" | 346 | msgid "Add to Favorites" |
669 | 338 | msgstr "إضافة إلى المفضلات" | 347 | msgstr "إضافة إلى المفضلات" |
670 | 339 | 348 | ||
671 | @@ -345,15 +354,15 @@ | |||
672 | 345 | msgid "Reset" | 354 | msgid "Reset" |
673 | 346 | msgstr "" | 355 | msgstr "" |
674 | 347 | 356 | ||
676 | 348 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 357 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
677 | 349 | msgid "Show less" | 358 | msgid "Show less" |
678 | 350 | msgstr "" | 359 | msgstr "" |
679 | 351 | 360 | ||
681 | 352 | #: qml/Dash/GenericScopeView.qml:586 | 361 | #: qml/Dash/GenericScopeView.qml:545 |
682 | 353 | msgid "Show all" | 362 | msgid "Show all" |
683 | 354 | msgstr "" | 363 | msgstr "" |
684 | 355 | 364 | ||
686 | 356 | #: qml/Dash/GenericScopeView.qml:643 | 365 | #: qml/Dash/GenericScopeView.qml:576 |
687 | 357 | msgctxt "Label: Hint for dash search line edit" | 366 | msgctxt "Label: Hint for dash search line edit" |
688 | 358 | msgid "Search" | 367 | msgid "Search" |
689 | 359 | msgstr "بحث" | 368 | msgstr "بحث" |
690 | @@ -366,24 +375,24 @@ | |||
691 | 366 | msgid "Clear All" | 375 | msgid "Clear All" |
692 | 367 | msgstr "" | 376 | msgstr "" |
693 | 368 | 377 | ||
695 | 369 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 378 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
696 | 370 | msgid "More..." | 379 | msgid "More..." |
697 | 371 | msgstr "المزيد..." | 380 | msgstr "المزيد..." |
698 | 372 | 381 | ||
700 | 373 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 382 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
701 | 374 | msgid "Less..." | 383 | msgid "Less..." |
702 | 375 | msgstr "أقل..." | 384 | msgstr "أقل..." |
703 | 376 | 385 | ||
704 | 377 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 386 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
706 | 378 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
707 | 379 | msgid "Send" | 388 | msgid "Send" |
708 | 380 | msgstr "أرسل" | 389 | msgstr "أرسل" |
709 | 381 | 390 | ||
711 | 382 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 391 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
712 | 383 | msgid "Rate this" | 392 | msgid "Rate this" |
713 | 384 | msgstr "قيّم ذلك" | 393 | msgstr "قيّم ذلك" |
714 | 385 | 394 | ||
716 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 395 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
717 | 387 | msgid "Add a review" | 396 | msgid "Add a review" |
718 | 388 | msgstr "أضف تعليق" | 397 | msgstr "أضف تعليق" |
719 | 389 | 398 | ||
720 | 390 | 399 | ||
721 | === modified file 'po/ast.po' | |||
722 | --- po/ast.po 2016-11-08 05:41:47 +0000 | |||
723 | +++ po/ast.po 2016-11-14 12:06:52 +0000 | |||
724 | @@ -7,7 +7,11 @@ | |||
725 | 7 | msgstr "" | 7 | msgstr "" |
726 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
727 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
728 | 10 | <<<<<<< TREE | ||
729 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
730 | 12 | ======= | ||
731 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
732 | 14 | >>>>>>> MERGE-SOURCE | ||
733 | 11 | "PO-Revision-Date: 2016-09-28 13:40+0000\n" | 15 | "PO-Revision-Date: 2016-09-28 13:40+0000\n" |
734 | 12 | "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n" | 16 | "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n" |
735 | 13 | "Language-Team: Asturian <ast@li.org>\n" | 17 | "Language-Team: Asturian <ast@li.org>\n" |
736 | @@ -15,8 +19,13 @@ | |||
737 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
738 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
739 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
740 | 22 | <<<<<<< TREE | ||
741 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
742 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
743 | 25 | ======= | ||
744 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
745 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
746 | 28 | >>>>>>> MERGE-SOURCE | ||
747 | 20 | 29 | ||
748 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
749 | 22 | msgid "Password: " | 31 | msgid "Password: " |
750 | @@ -313,26 +322,26 @@ | |||
751 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
752 | 314 | msgstr "Entever l'elementu compartíu" | 323 | msgstr "Entever l'elementu compartíu" |
753 | 315 | 324 | ||
755 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
756 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
757 | 318 | msgid "Store" | 327 | msgid "Store" |
758 | 319 | msgstr "Tienda" | 328 | msgstr "Tienda" |
759 | 320 | 329 | ||
761 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
762 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
763 | 323 | msgid "Search" | 332 | msgid "Search" |
764 | 324 | msgstr "Guetar" | 333 | msgstr "Guetar" |
765 | 325 | 334 | ||
767 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
768 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
769 | 328 | msgid "Settings" | 337 | msgid "Settings" |
770 | 329 | msgstr "Axustes" | 338 | msgstr "Axustes" |
771 | 330 | 339 | ||
773 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
774 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
775 | 333 | msgstr "Desaniciar de favoritos" | 342 | msgstr "Desaniciar de favoritos" |
776 | 334 | 343 | ||
778 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
779 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
780 | 337 | msgstr "Amestar a favoritos" | 346 | msgstr "Amestar a favoritos" |
781 | 338 | 347 | ||
782 | @@ -344,15 +353,15 @@ | |||
783 | 344 | msgid "Reset" | 353 | msgid "Reset" |
784 | 345 | msgstr "Reafitar" | 354 | msgstr "Reafitar" |
785 | 346 | 355 | ||
787 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
788 | 348 | msgid "Show less" | 357 | msgid "Show less" |
789 | 349 | msgstr "Ver menos" | 358 | msgstr "Ver menos" |
790 | 350 | 359 | ||
792 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
793 | 352 | msgid "Show all" | 361 | msgid "Show all" |
794 | 353 | msgstr "Ver too" | 362 | msgstr "Ver too" |
795 | 354 | 363 | ||
797 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
798 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
799 | 357 | msgid "Search" | 366 | msgid "Search" |
800 | 358 | msgstr "Guetar" | 367 | msgstr "Guetar" |
801 | @@ -365,24 +374,24 @@ | |||
802 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
803 | 366 | msgstr "Llimpiar too" | 375 | msgstr "Llimpiar too" |
804 | 367 | 376 | ||
806 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
807 | 369 | msgid "More..." | 378 | msgid "More..." |
808 | 370 | msgstr "Más…" | 379 | msgstr "Más…" |
809 | 371 | 380 | ||
811 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
812 | 373 | msgid "Less..." | 382 | msgid "Less..." |
813 | 374 | msgstr "Menos…" | 383 | msgstr "Menos…" |
814 | 375 | 384 | ||
815 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
817 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
818 | 378 | msgid "Send" | 387 | msgid "Send" |
819 | 379 | msgstr "Unviar" | 388 | msgstr "Unviar" |
820 | 380 | 389 | ||
822 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
823 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
824 | 383 | msgstr "Valorar esto" | 392 | msgstr "Valorar esto" |
825 | 384 | 393 | ||
827 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
828 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
829 | 387 | msgstr "Amestar una reseña" | 396 | msgstr "Amestar una reseña" |
830 | 388 | 397 | ||
831 | 389 | 398 | ||
832 | === modified file 'po/az.po' | |||
833 | --- po/az.po 2016-11-08 05:41:47 +0000 | |||
834 | +++ po/az.po 2016-11-14 12:06:52 +0000 | |||
835 | @@ -7,7 +7,11 @@ | |||
836 | 7 | msgstr "" | 7 | msgstr "" |
837 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
838 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
839 | 10 | <<<<<<< TREE | ||
840 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
841 | 12 | ======= | ||
842 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
843 | 14 | >>>>>>> MERGE-SOURCE | ||
844 | 11 | "PO-Revision-Date: 2014-09-03 16:39+0000\n" | 15 | "PO-Revision-Date: 2014-09-03 16:39+0000\n" |
845 | 12 | "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n" | 16 | "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n" |
846 | 13 | "Language-Team: Azerbaijani <az@li.org>\n" | 17 | "Language-Team: Azerbaijani <az@li.org>\n" |
847 | @@ -15,8 +19,13 @@ | |||
848 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
849 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
850 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
851 | 22 | <<<<<<< TREE | ||
852 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
853 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
854 | 25 | ======= | ||
855 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
856 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
857 | 28 | >>>>>>> MERGE-SOURCE | ||
858 | 20 | 29 | ||
859 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
860 | 22 | msgid "Password: " | 31 | msgid "Password: " |
861 | @@ -311,26 +320,26 @@ | |||
862 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
863 | 312 | msgstr "" | 321 | msgstr "" |
864 | 313 | 322 | ||
866 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
867 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
868 | 316 | msgid "Store" | 325 | msgid "Store" |
869 | 317 | msgstr "" | 326 | msgstr "" |
870 | 318 | 327 | ||
872 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
873 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
874 | 321 | msgid "Search" | 330 | msgid "Search" |
875 | 322 | msgstr "" | 331 | msgstr "" |
876 | 323 | 332 | ||
878 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
879 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
880 | 326 | msgid "Settings" | 335 | msgid "Settings" |
881 | 327 | msgstr "" | 336 | msgstr "" |
882 | 328 | 337 | ||
884 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
885 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
886 | 331 | msgstr "Seçilmişlәrdәn çıxart" | 340 | msgstr "Seçilmişlәrdәn çıxart" |
887 | 332 | 341 | ||
889 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
890 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
891 | 335 | msgstr "Seçilmişlәrә әlavә et" | 344 | msgstr "Seçilmişlәrә әlavә et" |
892 | 336 | 345 | ||
893 | @@ -342,15 +351,15 @@ | |||
894 | 342 | msgid "Reset" | 351 | msgid "Reset" |
895 | 343 | msgstr "" | 352 | msgstr "" |
896 | 344 | 353 | ||
898 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
899 | 346 | msgid "Show less" | 355 | msgid "Show less" |
900 | 347 | msgstr "" | 356 | msgstr "" |
901 | 348 | 357 | ||
903 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
904 | 350 | msgid "Show all" | 359 | msgid "Show all" |
905 | 351 | msgstr "" | 360 | msgstr "" |
906 | 352 | 361 | ||
908 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
909 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
910 | 355 | msgid "Search" | 364 | msgid "Search" |
911 | 356 | msgstr "" | 365 | msgstr "" |
912 | @@ -363,24 +372,24 @@ | |||
913 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
914 | 364 | msgstr "" | 373 | msgstr "" |
915 | 365 | 374 | ||
917 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
918 | 367 | msgid "More..." | 376 | msgid "More..." |
919 | 368 | msgstr "Daha çox..." | 377 | msgstr "Daha çox..." |
920 | 369 | 378 | ||
922 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
923 | 371 | msgid "Less..." | 380 | msgid "Less..." |
924 | 372 | msgstr "Az..." | 381 | msgstr "Az..." |
925 | 373 | 382 | ||
926 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
928 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
929 | 376 | msgid "Send" | 385 | msgid "Send" |
930 | 377 | msgstr "Göndər" | 386 | msgstr "Göndər" |
931 | 378 | 387 | ||
933 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
934 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
935 | 381 | msgstr "Qiymәtlәndir" | 390 | msgstr "Qiymәtlәndir" |
936 | 382 | 391 | ||
938 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
939 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
940 | 385 | msgstr "Rəy yaz" | 394 | msgstr "Rəy yaz" |
941 | 386 | 395 | ||
942 | 387 | 396 | ||
943 | === modified file 'po/be.po' | |||
944 | --- po/be.po 2016-11-08 05:41:47 +0000 | |||
945 | +++ po/be.po 2016-11-14 12:06:52 +0000 | |||
946 | @@ -7,7 +7,11 @@ | |||
947 | 7 | msgstr "" | 7 | msgstr "" |
948 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
949 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
950 | 10 | <<<<<<< TREE | ||
951 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
952 | 12 | ======= | ||
953 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
954 | 14 | >>>>>>> MERGE-SOURCE | ||
955 | 11 | "PO-Revision-Date: 2015-12-13 13:12+0000\n" | 15 | "PO-Revision-Date: 2015-12-13 13:12+0000\n" |
956 | 12 | "Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n" | 16 | "Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n" |
957 | 13 | "Language-Team: Belarusian <be@li.org>\n" | 17 | "Language-Team: Belarusian <be@li.org>\n" |
958 | @@ -16,8 +20,13 @@ | |||
959 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
960 | 17 | "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " | 21 | "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " |
961 | 18 | "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" | 22 | "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" |
962 | 23 | <<<<<<< TREE | ||
963 | 19 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
964 | 20 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
965 | 26 | ======= | ||
966 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
967 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
968 | 29 | >>>>>>> MERGE-SOURCE | ||
969 | 21 | 30 | ||
970 | 22 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
971 | 23 | msgid "Password: " | 32 | msgid "Password: " |
972 | @@ -314,26 +323,26 @@ | |||
973 | 314 | msgid "Preview Share Item" | 323 | msgid "Preview Share Item" |
974 | 315 | msgstr "Праглядзець элемент" | 324 | msgstr "Праглядзець элемент" |
975 | 316 | 325 | ||
977 | 317 | #: qml/Dash/DashPageHeader.qml:362 | 326 | #: qml/Dash/DashPageHeader.qml:361 |
978 | 318 | msgctxt "Button: Open the Ubuntu Store" | 327 | msgctxt "Button: Open the Ubuntu Store" |
979 | 319 | msgid "Store" | 328 | msgid "Store" |
980 | 320 | msgstr "Крама" | 329 | msgstr "Крама" |
981 | 321 | 330 | ||
983 | 322 | #: qml/Dash/DashPageHeader.qml:369 | 331 | #: qml/Dash/DashPageHeader.qml:368 |
984 | 323 | msgctxt "Button: Start a search in the current dash scope" | 332 | msgctxt "Button: Start a search in the current dash scope" |
985 | 324 | msgid "Search" | 333 | msgid "Search" |
986 | 325 | msgstr "Пошук" | 334 | msgstr "Пошук" |
987 | 326 | 335 | ||
989 | 327 | #: qml/Dash/DashPageHeader.qml:379 | 336 | #: qml/Dash/DashPageHeader.qml:378 |
990 | 328 | msgctxt "Button: Show the current dash scope settings" | 337 | msgctxt "Button: Show the current dash scope settings" |
991 | 329 | msgid "Settings" | 338 | msgid "Settings" |
992 | 330 | msgstr "Налады" | 339 | msgstr "Налады" |
993 | 331 | 340 | ||
995 | 332 | #: qml/Dash/DashPageHeader.qml:386 | 341 | #: qml/Dash/DashPageHeader.qml:385 |
996 | 333 | msgid "Remove from Favorites" | 342 | msgid "Remove from Favorites" |
997 | 334 | msgstr "Выдаліць з абранага" | 343 | msgstr "Выдаліць з абранага" |
998 | 335 | 344 | ||
1000 | 336 | #: qml/Dash/DashPageHeader.qml:386 | 345 | #: qml/Dash/DashPageHeader.qml:385 |
1001 | 337 | msgid "Add to Favorites" | 346 | msgid "Add to Favorites" |
1002 | 338 | msgstr "Дадаць да абранага" | 347 | msgstr "Дадаць да абранага" |
1003 | 339 | 348 | ||
1004 | @@ -345,15 +354,15 @@ | |||
1005 | 345 | msgid "Reset" | 354 | msgid "Reset" |
1006 | 346 | msgstr "" | 355 | msgstr "" |
1007 | 347 | 356 | ||
1009 | 348 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 357 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1010 | 349 | msgid "Show less" | 358 | msgid "Show less" |
1011 | 350 | msgstr "" | 359 | msgstr "" |
1012 | 351 | 360 | ||
1014 | 352 | #: qml/Dash/GenericScopeView.qml:586 | 361 | #: qml/Dash/GenericScopeView.qml:545 |
1015 | 353 | msgid "Show all" | 362 | msgid "Show all" |
1016 | 354 | msgstr "" | 363 | msgstr "" |
1017 | 355 | 364 | ||
1019 | 356 | #: qml/Dash/GenericScopeView.qml:643 | 365 | #: qml/Dash/GenericScopeView.qml:576 |
1020 | 357 | msgctxt "Label: Hint for dash search line edit" | 366 | msgctxt "Label: Hint for dash search line edit" |
1021 | 358 | msgid "Search" | 367 | msgid "Search" |
1022 | 359 | msgstr "Пошук" | 368 | msgstr "Пошук" |
1023 | @@ -366,24 +375,24 @@ | |||
1024 | 366 | msgid "Clear All" | 375 | msgid "Clear All" |
1025 | 367 | msgstr "" | 376 | msgstr "" |
1026 | 368 | 377 | ||
1028 | 369 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 378 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1029 | 370 | msgid "More..." | 379 | msgid "More..." |
1030 | 371 | msgstr "Болей…" | 380 | msgstr "Болей…" |
1031 | 372 | 381 | ||
1033 | 373 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 382 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1034 | 374 | msgid "Less..." | 383 | msgid "Less..." |
1035 | 375 | msgstr "Менш..." | 384 | msgstr "Менш..." |
1036 | 376 | 385 | ||
1037 | 377 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 386 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1039 | 378 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1040 | 379 | msgid "Send" | 388 | msgid "Send" |
1041 | 380 | msgstr "Адправіць" | 389 | msgstr "Адправіць" |
1042 | 381 | 390 | ||
1044 | 382 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 391 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1045 | 383 | msgid "Rate this" | 392 | msgid "Rate this" |
1046 | 384 | msgstr "Ацаніць" | 393 | msgstr "Ацаніць" |
1047 | 385 | 394 | ||
1049 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 395 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1050 | 387 | msgid "Add a review" | 396 | msgid "Add a review" |
1051 | 388 | msgstr "Дадаць рэцэнзію" | 397 | msgstr "Дадаць рэцэнзію" |
1052 | 389 | 398 | ||
1053 | 390 | 399 | ||
1054 | === modified file 'po/bg.po' | |||
1055 | --- po/bg.po 2016-11-08 05:41:47 +0000 | |||
1056 | +++ po/bg.po 2016-11-14 12:06:52 +0000 | |||
1057 | @@ -7,7 +7,11 @@ | |||
1058 | 7 | msgstr "" | 7 | msgstr "" |
1059 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
1060 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1061 | 10 | <<<<<<< TREE | ||
1062 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1063 | 12 | ======= | ||
1064 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1065 | 14 | >>>>>>> MERGE-SOURCE | ||
1066 | 11 | "PO-Revision-Date: 2015-04-12 14:43+0000\n" | 15 | "PO-Revision-Date: 2015-04-12 14:43+0000\n" |
1067 | 12 | "Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n" | 16 | "Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n" |
1068 | 13 | "Language-Team: Bulgarian <bg@li.org>\n" | 17 | "Language-Team: Bulgarian <bg@li.org>\n" |
1069 | @@ -15,8 +19,13 @@ | |||
1070 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
1071 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1072 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1073 | 22 | <<<<<<< TREE | ||
1074 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
1075 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
1076 | 25 | ======= | ||
1077 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
1078 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
1079 | 28 | >>>>>>> MERGE-SOURCE | ||
1080 | 20 | 29 | ||
1081 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
1082 | 22 | msgid "Password: " | 31 | msgid "Password: " |
1083 | @@ -313,26 +322,26 @@ | |||
1084 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
1085 | 314 | msgstr "" | 323 | msgstr "" |
1086 | 315 | 324 | ||
1088 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
1089 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
1090 | 318 | msgid "Store" | 327 | msgid "Store" |
1091 | 319 | msgstr "" | 328 | msgstr "" |
1092 | 320 | 329 | ||
1094 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
1095 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
1096 | 323 | msgid "Search" | 332 | msgid "Search" |
1097 | 324 | msgstr "" | 333 | msgstr "" |
1098 | 325 | 334 | ||
1100 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
1101 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
1102 | 328 | msgid "Settings" | 337 | msgid "Settings" |
1103 | 329 | msgstr "" | 338 | msgstr "" |
1104 | 330 | 339 | ||
1106 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
1107 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
1108 | 333 | msgstr "" | 342 | msgstr "" |
1109 | 334 | 343 | ||
1111 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
1112 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
1113 | 337 | msgstr "" | 346 | msgstr "" |
1114 | 338 | 347 | ||
1115 | @@ -344,15 +353,15 @@ | |||
1116 | 344 | msgid "Reset" | 353 | msgid "Reset" |
1117 | 345 | msgstr "" | 354 | msgstr "" |
1118 | 346 | 355 | ||
1120 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1121 | 348 | msgid "Show less" | 357 | msgid "Show less" |
1122 | 349 | msgstr "" | 358 | msgstr "" |
1123 | 350 | 359 | ||
1125 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
1126 | 352 | msgid "Show all" | 361 | msgid "Show all" |
1127 | 353 | msgstr "" | 362 | msgstr "" |
1128 | 354 | 363 | ||
1130 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
1131 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
1132 | 357 | msgid "Search" | 366 | msgid "Search" |
1133 | 358 | msgstr "" | 367 | msgstr "" |
1134 | @@ -365,24 +374,24 @@ | |||
1135 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
1136 | 366 | msgstr "" | 375 | msgstr "" |
1137 | 367 | 376 | ||
1139 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1140 | 369 | msgid "More..." | 378 | msgid "More..." |
1141 | 370 | msgstr "" | 379 | msgstr "" |
1142 | 371 | 380 | ||
1144 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1145 | 373 | msgid "Less..." | 382 | msgid "Less..." |
1146 | 374 | msgstr "По-малко..." | 383 | msgstr "По-малко..." |
1147 | 375 | 384 | ||
1148 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1150 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1151 | 378 | msgid "Send" | 387 | msgid "Send" |
1152 | 379 | msgstr "Изпрати" | 388 | msgstr "Изпрати" |
1153 | 380 | 389 | ||
1155 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1156 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
1157 | 383 | msgstr "Оценете това" | 392 | msgstr "Оценете това" |
1158 | 384 | 393 | ||
1160 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1161 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
1162 | 387 | msgstr "Добави отзив" | 396 | msgstr "Добави отзив" |
1163 | 388 | 397 | ||
1164 | 389 | 398 | ||
1165 | === modified file 'po/bn.po' | |||
1166 | --- po/bn.po 2016-11-08 05:41:47 +0000 | |||
1167 | +++ po/bn.po 2016-11-14 12:06:52 +0000 | |||
1168 | @@ -7,7 +7,11 @@ | |||
1169 | 7 | msgstr "" | 7 | msgstr "" |
1170 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
1171 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1172 | 10 | <<<<<<< TREE | ||
1173 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1174 | 12 | ======= | ||
1175 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1176 | 14 | >>>>>>> MERGE-SOURCE | ||
1177 | 11 | "PO-Revision-Date: 2015-11-27 19:38+0000\n" | 15 | "PO-Revision-Date: 2015-11-27 19:38+0000\n" |
1178 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1179 | 13 | "Language-Team: Bengali <bn@li.org>\n" | 17 | "Language-Team: Bengali <bn@li.org>\n" |
1180 | @@ -15,8 +19,13 @@ | |||
1181 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
1182 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1183 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1184 | 22 | <<<<<<< TREE | ||
1185 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
1186 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
1187 | 25 | ======= | ||
1188 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
1189 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
1190 | 28 | >>>>>>> MERGE-SOURCE | ||
1191 | 20 | 29 | ||
1192 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
1193 | 22 | msgid "Password: " | 31 | msgid "Password: " |
1194 | @@ -313,26 +322,26 @@ | |||
1195 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
1196 | 314 | msgstr "" | 323 | msgstr "" |
1197 | 315 | 324 | ||
1199 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
1200 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
1201 | 318 | msgid "Store" | 327 | msgid "Store" |
1202 | 319 | msgstr "স্টোর" | 328 | msgstr "স্টোর" |
1203 | 320 | 329 | ||
1205 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
1206 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
1207 | 323 | msgid "Search" | 332 | msgid "Search" |
1208 | 324 | msgstr "খুঁজুন" | 333 | msgstr "খুঁজুন" |
1209 | 325 | 334 | ||
1211 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
1212 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
1213 | 328 | msgid "Settings" | 337 | msgid "Settings" |
1214 | 329 | msgstr "সেটিংস" | 338 | msgstr "সেটিংস" |
1215 | 330 | 339 | ||
1217 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
1218 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
1219 | 333 | msgstr "পছন্দ থেকে মুছে ফেলুন" | 342 | msgstr "পছন্দ থেকে মুছে ফেলুন" |
1220 | 334 | 343 | ||
1222 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
1223 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
1224 | 337 | msgstr "পছন্দতে যোগ করুন" | 346 | msgstr "পছন্দতে যোগ করুন" |
1225 | 338 | 347 | ||
1226 | @@ -344,15 +353,15 @@ | |||
1227 | 344 | msgid "Reset" | 353 | msgid "Reset" |
1228 | 345 | msgstr "" | 354 | msgstr "" |
1229 | 346 | 355 | ||
1231 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1232 | 348 | msgid "Show less" | 357 | msgid "Show less" |
1233 | 349 | msgstr "" | 358 | msgstr "" |
1234 | 350 | 359 | ||
1236 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
1237 | 352 | msgid "Show all" | 361 | msgid "Show all" |
1238 | 353 | msgstr "" | 362 | msgstr "" |
1239 | 354 | 363 | ||
1241 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
1242 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
1243 | 357 | msgid "Search" | 366 | msgid "Search" |
1244 | 358 | msgstr "খুঁজুন" | 367 | msgstr "খুঁজুন" |
1245 | @@ -365,24 +374,24 @@ | |||
1246 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
1247 | 366 | msgstr "" | 375 | msgstr "" |
1248 | 367 | 376 | ||
1250 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1251 | 369 | msgid "More..." | 378 | msgid "More..." |
1252 | 370 | msgstr "আরো..." | 379 | msgstr "আরো..." |
1253 | 371 | 380 | ||
1255 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1256 | 373 | msgid "Less..." | 382 | msgid "Less..." |
1257 | 374 | msgstr "কম..." | 383 | msgstr "কম..." |
1258 | 375 | 384 | ||
1259 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1261 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1262 | 378 | msgid "Send" | 387 | msgid "Send" |
1263 | 379 | msgstr "পাঠান" | 388 | msgstr "পাঠান" |
1264 | 380 | 389 | ||
1266 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1267 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
1268 | 383 | msgstr "রেটিং দিন" | 392 | msgstr "রেটিং দিন" |
1269 | 384 | 393 | ||
1271 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1272 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
1273 | 387 | msgstr "আপনার মতামত দিন" | 396 | msgstr "আপনার মতামত দিন" |
1274 | 388 | 397 | ||
1275 | 389 | 398 | ||
1276 | === modified file 'po/br.po' | |||
1277 | --- po/br.po 2016-11-08 05:41:47 +0000 | |||
1278 | +++ po/br.po 2016-11-14 12:06:52 +0000 | |||
1279 | @@ -7,7 +7,11 @@ | |||
1280 | 7 | msgstr "" | 7 | msgstr "" |
1281 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
1282 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1283 | 10 | <<<<<<< TREE | ||
1284 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1285 | 12 | ======= | ||
1286 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1287 | 14 | >>>>>>> MERGE-SOURCE | ||
1288 | 11 | "PO-Revision-Date: 2016-08-29 11:37+0000\n" | 15 | "PO-Revision-Date: 2016-08-29 11:37+0000\n" |
1289 | 12 | "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n" | 16 | "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n" |
1290 | 13 | "Language-Team: Breton <br@li.org>\n" | 17 | "Language-Team: Breton <br@li.org>\n" |
1291 | @@ -15,8 +19,13 @@ | |||
1292 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
1293 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1294 | 17 | "Plural-Forms: nplurals=2; plural=n > 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n > 1;\n" |
1295 | 22 | <<<<<<< TREE | ||
1296 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
1297 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
1298 | 25 | ======= | ||
1299 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
1300 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
1301 | 28 | >>>>>>> MERGE-SOURCE | ||
1302 | 20 | 29 | ||
1303 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
1304 | 22 | msgid "Password: " | 31 | msgid "Password: " |
1305 | @@ -316,26 +325,26 @@ | |||
1306 | 316 | msgid "Preview Share Item" | 325 | msgid "Preview Share Item" |
1307 | 317 | msgstr "Rakwelet an elfenn lodet" | 326 | msgstr "Rakwelet an elfenn lodet" |
1308 | 318 | 327 | ||
1310 | 319 | #: qml/Dash/DashPageHeader.qml:362 | 328 | #: qml/Dash/DashPageHeader.qml:361 |
1311 | 320 | msgctxt "Button: Open the Ubuntu Store" | 329 | msgctxt "Button: Open the Ubuntu Store" |
1312 | 321 | msgid "Store" | 330 | msgid "Store" |
1313 | 322 | msgstr "Stal" | 331 | msgstr "Stal" |
1314 | 323 | 332 | ||
1316 | 324 | #: qml/Dash/DashPageHeader.qml:369 | 333 | #: qml/Dash/DashPageHeader.qml:368 |
1317 | 325 | msgctxt "Button: Start a search in the current dash scope" | 334 | msgctxt "Button: Start a search in the current dash scope" |
1318 | 326 | msgid "Search" | 335 | msgid "Search" |
1319 | 327 | msgstr "Klask" | 336 | msgstr "Klask" |
1320 | 328 | 337 | ||
1322 | 329 | #: qml/Dash/DashPageHeader.qml:379 | 338 | #: qml/Dash/DashPageHeader.qml:378 |
1323 | 330 | msgctxt "Button: Show the current dash scope settings" | 339 | msgctxt "Button: Show the current dash scope settings" |
1324 | 331 | msgid "Settings" | 340 | msgid "Settings" |
1325 | 332 | msgstr "Arventennoù" | 341 | msgstr "Arventennoù" |
1326 | 333 | 342 | ||
1328 | 334 | #: qml/Dash/DashPageHeader.qml:386 | 343 | #: qml/Dash/DashPageHeader.qml:385 |
1329 | 335 | msgid "Remove from Favorites" | 344 | msgid "Remove from Favorites" |
1330 | 336 | msgstr "Lemel eus ar sinedoù" | 345 | msgstr "Lemel eus ar sinedoù" |
1331 | 337 | 346 | ||
1333 | 338 | #: qml/Dash/DashPageHeader.qml:386 | 347 | #: qml/Dash/DashPageHeader.qml:385 |
1334 | 339 | msgid "Add to Favorites" | 348 | msgid "Add to Favorites" |
1335 | 340 | msgstr "Ouzhpennañ d'ar sinedoù" | 349 | msgstr "Ouzhpennañ d'ar sinedoù" |
1336 | 341 | 350 | ||
1337 | @@ -347,15 +356,15 @@ | |||
1338 | 347 | msgid "Reset" | 356 | msgid "Reset" |
1339 | 348 | msgstr "Adderaouekaat" | 357 | msgstr "Adderaouekaat" |
1340 | 349 | 358 | ||
1342 | 350 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 359 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1343 | 351 | msgid "Show less" | 360 | msgid "Show less" |
1344 | 352 | msgstr "Diskouez nebeutoc'h" | 361 | msgstr "Diskouez nebeutoc'h" |
1345 | 353 | 362 | ||
1347 | 354 | #: qml/Dash/GenericScopeView.qml:586 | 363 | #: qml/Dash/GenericScopeView.qml:545 |
1348 | 355 | msgid "Show all" | 364 | msgid "Show all" |
1349 | 356 | msgstr "Diskouez pep tra" | 365 | msgstr "Diskouez pep tra" |
1350 | 357 | 366 | ||
1352 | 358 | #: qml/Dash/GenericScopeView.qml:643 | 367 | #: qml/Dash/GenericScopeView.qml:576 |
1353 | 359 | msgctxt "Label: Hint for dash search line edit" | 368 | msgctxt "Label: Hint for dash search line edit" |
1354 | 360 | msgid "Search" | 369 | msgid "Search" |
1355 | 361 | msgstr "Klask" | 370 | msgstr "Klask" |
1356 | @@ -368,24 +377,24 @@ | |||
1357 | 368 | msgid "Clear All" | 377 | msgid "Clear All" |
1358 | 369 | msgstr "Diverkañ pep tra" | 378 | msgstr "Diverkañ pep tra" |
1359 | 370 | 379 | ||
1361 | 371 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 380 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1362 | 372 | msgid "More..." | 381 | msgid "More..." |
1363 | 373 | msgstr "Muioc'h..." | 382 | msgstr "Muioc'h..." |
1364 | 374 | 383 | ||
1366 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 384 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1367 | 376 | msgid "Less..." | 385 | msgid "Less..." |
1368 | 377 | msgstr "Nebeutoc'h..." | 386 | msgstr "Nebeutoc'h..." |
1369 | 378 | 387 | ||
1370 | 379 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 388 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1372 | 380 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1373 | 381 | msgid "Send" | 390 | msgid "Send" |
1374 | 382 | msgstr "Kas" | 391 | msgstr "Kas" |
1375 | 383 | 392 | ||
1377 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 393 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1378 | 385 | msgid "Rate this" | 394 | msgid "Rate this" |
1379 | 386 | msgstr "Priziit an dra-mañ" | 395 | msgstr "Priziit an dra-mañ" |
1380 | 387 | 396 | ||
1382 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 397 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1383 | 389 | msgid "Add a review" | 398 | msgid "Add a review" |
1384 | 390 | msgstr "Ouzhpennañ un ali" | 399 | msgstr "Ouzhpennañ un ali" |
1385 | 391 | 400 | ||
1386 | 392 | 401 | ||
1387 | === modified file 'po/bs.po' | |||
1388 | --- po/bs.po 2016-11-08 05:41:47 +0000 | |||
1389 | +++ po/bs.po 2016-11-14 12:06:52 +0000 | |||
1390 | @@ -7,7 +7,11 @@ | |||
1391 | 7 | msgstr "" | 7 | msgstr "" |
1392 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
1393 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1394 | 10 | <<<<<<< TREE | ||
1395 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1396 | 12 | ======= | ||
1397 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1398 | 14 | >>>>>>> MERGE-SOURCE | ||
1399 | 11 | "PO-Revision-Date: 2015-12-01 20:06+0000\n" | 15 | "PO-Revision-Date: 2015-12-01 20:06+0000\n" |
1400 | 12 | "Last-Translator: Kenan Gutić <Unknown>\n" | 16 | "Last-Translator: Kenan Gutić <Unknown>\n" |
1401 | 13 | "Language-Team: Bosnian <bs@li.org>\n" | 17 | "Language-Team: Bosnian <bs@li.org>\n" |
1402 | @@ -16,8 +20,13 @@ | |||
1403 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1404 | 17 | "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " | 21 | "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " |
1405 | 18 | "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" | 22 | "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" |
1406 | 23 | <<<<<<< TREE | ||
1407 | 19 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
1408 | 20 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
1409 | 26 | ======= | ||
1410 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
1411 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
1412 | 29 | >>>>>>> MERGE-SOURCE | ||
1413 | 21 | 30 | ||
1414 | 22 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
1415 | 23 | msgid "Password: " | 32 | msgid "Password: " |
1416 | @@ -316,26 +325,26 @@ | |||
1417 | 316 | msgid "Preview Share Item" | 325 | msgid "Preview Share Item" |
1418 | 317 | msgstr "Pogledaj stavku koja se dijeli" | 326 | msgstr "Pogledaj stavku koja se dijeli" |
1419 | 318 | 327 | ||
1421 | 319 | #: qml/Dash/DashPageHeader.qml:362 | 328 | #: qml/Dash/DashPageHeader.qml:361 |
1422 | 320 | msgctxt "Button: Open the Ubuntu Store" | 329 | msgctxt "Button: Open the Ubuntu Store" |
1423 | 321 | msgid "Store" | 330 | msgid "Store" |
1424 | 322 | msgstr "Trgovina" | 331 | msgstr "Trgovina" |
1425 | 323 | 332 | ||
1427 | 324 | #: qml/Dash/DashPageHeader.qml:369 | 333 | #: qml/Dash/DashPageHeader.qml:368 |
1428 | 325 | msgctxt "Button: Start a search in the current dash scope" | 334 | msgctxt "Button: Start a search in the current dash scope" |
1429 | 326 | msgid "Search" | 335 | msgid "Search" |
1430 | 327 | msgstr "Pretraživanje" | 336 | msgstr "Pretraživanje" |
1431 | 328 | 337 | ||
1433 | 329 | #: qml/Dash/DashPageHeader.qml:379 | 338 | #: qml/Dash/DashPageHeader.qml:378 |
1434 | 330 | msgctxt "Button: Show the current dash scope settings" | 339 | msgctxt "Button: Show the current dash scope settings" |
1435 | 331 | msgid "Settings" | 340 | msgid "Settings" |
1436 | 332 | msgstr "Podešavanja" | 341 | msgstr "Podešavanja" |
1437 | 333 | 342 | ||
1439 | 334 | #: qml/Dash/DashPageHeader.qml:386 | 343 | #: qml/Dash/DashPageHeader.qml:385 |
1440 | 335 | msgid "Remove from Favorites" | 344 | msgid "Remove from Favorites" |
1441 | 336 | msgstr "Ukloni iz Omiljenih" | 345 | msgstr "Ukloni iz Omiljenih" |
1442 | 337 | 346 | ||
1444 | 338 | #: qml/Dash/DashPageHeader.qml:386 | 347 | #: qml/Dash/DashPageHeader.qml:385 |
1445 | 339 | msgid "Add to Favorites" | 348 | msgid "Add to Favorites" |
1446 | 340 | msgstr "Dodaj u Omiljene" | 349 | msgstr "Dodaj u Omiljene" |
1447 | 341 | 350 | ||
1448 | @@ -347,15 +356,15 @@ | |||
1449 | 347 | msgid "Reset" | 356 | msgid "Reset" |
1450 | 348 | msgstr "" | 357 | msgstr "" |
1451 | 349 | 358 | ||
1453 | 350 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 359 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1454 | 351 | msgid "Show less" | 360 | msgid "Show less" |
1455 | 352 | msgstr "" | 361 | msgstr "" |
1456 | 353 | 362 | ||
1458 | 354 | #: qml/Dash/GenericScopeView.qml:586 | 363 | #: qml/Dash/GenericScopeView.qml:545 |
1459 | 355 | msgid "Show all" | 364 | msgid "Show all" |
1460 | 356 | msgstr "" | 365 | msgstr "" |
1461 | 357 | 366 | ||
1463 | 358 | #: qml/Dash/GenericScopeView.qml:643 | 367 | #: qml/Dash/GenericScopeView.qml:576 |
1464 | 359 | msgctxt "Label: Hint for dash search line edit" | 368 | msgctxt "Label: Hint for dash search line edit" |
1465 | 360 | msgid "Search" | 369 | msgid "Search" |
1466 | 361 | msgstr "Pretraži" | 370 | msgstr "Pretraži" |
1467 | @@ -368,24 +377,24 @@ | |||
1468 | 368 | msgid "Clear All" | 377 | msgid "Clear All" |
1469 | 369 | msgstr "" | 378 | msgstr "" |
1470 | 370 | 379 | ||
1472 | 371 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 380 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1473 | 372 | msgid "More..." | 381 | msgid "More..." |
1474 | 373 | msgstr "Više..." | 382 | msgstr "Više..." |
1475 | 374 | 383 | ||
1477 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 384 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1478 | 376 | msgid "Less..." | 385 | msgid "Less..." |
1479 | 377 | msgstr "Manje..." | 386 | msgstr "Manje..." |
1480 | 378 | 387 | ||
1481 | 379 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 388 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1483 | 380 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1484 | 381 | msgid "Send" | 390 | msgid "Send" |
1485 | 382 | msgstr "Pošalji" | 391 | msgstr "Pošalji" |
1486 | 383 | 392 | ||
1488 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 393 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1489 | 385 | msgid "Rate this" | 394 | msgid "Rate this" |
1490 | 386 | msgstr "Ocijeni ovo" | 395 | msgstr "Ocijeni ovo" |
1491 | 387 | 396 | ||
1493 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 397 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1494 | 389 | msgid "Add a review" | 398 | msgid "Add a review" |
1495 | 390 | msgstr "Dodaj recenziju" | 399 | msgstr "Dodaj recenziju" |
1496 | 391 | 400 | ||
1497 | 392 | 401 | ||
1498 | === modified file 'po/ca.po' | |||
1499 | --- po/ca.po 2016-11-08 05:41:47 +0000 | |||
1500 | +++ po/ca.po 2016-11-14 12:06:52 +0000 | |||
1501 | @@ -7,16 +7,26 @@ | |||
1502 | 7 | msgstr "" | 7 | msgstr "" |
1503 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
1504 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1505 | 10 | <<<<<<< TREE | ||
1506 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1507 | 11 | "PO-Revision-Date: 2016-09-27 06:51+0000\n" | 12 | "PO-Revision-Date: 2016-09-27 06:51+0000\n" |
1508 | 13 | ======= | ||
1509 | 14 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1510 | 15 | "PO-Revision-Date: 2016-11-11 06:30+0000\n" | ||
1511 | 16 | >>>>>>> MERGE-SOURCE | ||
1512 | 12 | "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n" | 17 | "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n" |
1513 | 13 | "Language-Team: Catalan <ca@li.org>\n" | 18 | "Language-Team: Catalan <ca@li.org>\n" |
1514 | 14 | "MIME-Version: 1.0\n" | 19 | "MIME-Version: 1.0\n" |
1515 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 20 | "Content-Type: text/plain; charset=UTF-8\n" |
1516 | 16 | "Content-Transfer-Encoding: 8bit\n" | 21 | "Content-Transfer-Encoding: 8bit\n" |
1517 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 22 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1518 | 23 | <<<<<<< TREE | ||
1519 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
1520 | 19 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
1521 | 26 | ======= | ||
1522 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
1523 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
1524 | 29 | >>>>>>> MERGE-SOURCE | ||
1525 | 20 | 30 | ||
1526 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
1527 | 22 | msgid "Password: " | 32 | msgid "Password: " |
1528 | @@ -315,26 +325,26 @@ | |||
1529 | 315 | msgid "Preview Share Item" | 325 | msgid "Preview Share Item" |
1530 | 316 | msgstr "Previsualitzeu l'element a compartir" | 326 | msgstr "Previsualitzeu l'element a compartir" |
1531 | 317 | 327 | ||
1533 | 318 | #: qml/Dash/DashPageHeader.qml:362 | 328 | #: qml/Dash/DashPageHeader.qml:361 |
1534 | 319 | msgctxt "Button: Open the Ubuntu Store" | 329 | msgctxt "Button: Open the Ubuntu Store" |
1535 | 320 | msgid "Store" | 330 | msgid "Store" |
1536 | 321 | msgstr "Botiga" | 331 | msgstr "Botiga" |
1537 | 322 | 332 | ||
1539 | 323 | #: qml/Dash/DashPageHeader.qml:369 | 333 | #: qml/Dash/DashPageHeader.qml:368 |
1540 | 324 | msgctxt "Button: Start a search in the current dash scope" | 334 | msgctxt "Button: Start a search in the current dash scope" |
1541 | 325 | msgid "Search" | 335 | msgid "Search" |
1542 | 326 | msgstr "Cerca" | 336 | msgstr "Cerca" |
1543 | 327 | 337 | ||
1545 | 328 | #: qml/Dash/DashPageHeader.qml:379 | 338 | #: qml/Dash/DashPageHeader.qml:378 |
1546 | 329 | msgctxt "Button: Show the current dash scope settings" | 339 | msgctxt "Button: Show the current dash scope settings" |
1547 | 330 | msgid "Settings" | 340 | msgid "Settings" |
1548 | 331 | msgstr "Paràmetres" | 341 | msgstr "Paràmetres" |
1549 | 332 | 342 | ||
1551 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 343 | #: qml/Dash/DashPageHeader.qml:385 |
1552 | 334 | msgid "Remove from Favorites" | 344 | msgid "Remove from Favorites" |
1553 | 335 | msgstr "Suprimeix dels preferits" | 345 | msgstr "Suprimeix dels preferits" |
1554 | 336 | 346 | ||
1556 | 337 | #: qml/Dash/DashPageHeader.qml:386 | 347 | #: qml/Dash/DashPageHeader.qml:385 |
1557 | 338 | msgid "Add to Favorites" | 348 | msgid "Add to Favorites" |
1558 | 339 | msgstr "Afegeix als preferits" | 349 | msgstr "Afegeix als preferits" |
1559 | 340 | 350 | ||
1560 | @@ -346,15 +356,15 @@ | |||
1561 | 346 | msgid "Reset" | 356 | msgid "Reset" |
1562 | 347 | msgstr "Restableix" | 357 | msgstr "Restableix" |
1563 | 348 | 358 | ||
1565 | 349 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 359 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1566 | 350 | msgid "Show less" | 360 | msgid "Show less" |
1567 | 351 | msgstr "Mostra menys" | 361 | msgstr "Mostra menys" |
1568 | 352 | 362 | ||
1570 | 353 | #: qml/Dash/GenericScopeView.qml:586 | 363 | #: qml/Dash/GenericScopeView.qml:545 |
1571 | 354 | msgid "Show all" | 364 | msgid "Show all" |
1573 | 355 | msgstr "Mostra tot" | 365 | msgstr "Mostra-ho tot" |
1574 | 356 | 366 | ||
1576 | 357 | #: qml/Dash/GenericScopeView.qml:643 | 367 | #: qml/Dash/GenericScopeView.qml:576 |
1577 | 358 | msgctxt "Label: Hint for dash search line edit" | 368 | msgctxt "Label: Hint for dash search line edit" |
1578 | 359 | msgid "Search" | 369 | msgid "Search" |
1579 | 360 | msgstr "Cerca" | 370 | msgstr "Cerca" |
1580 | @@ -367,24 +377,24 @@ | |||
1581 | 367 | msgid "Clear All" | 377 | msgid "Clear All" |
1582 | 368 | msgstr "Neteja-ho tot" | 378 | msgstr "Neteja-ho tot" |
1583 | 369 | 379 | ||
1585 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 380 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1586 | 371 | msgid "More..." | 381 | msgid "More..." |
1587 | 372 | msgstr "Més..." | 382 | msgstr "Més..." |
1588 | 373 | 383 | ||
1590 | 374 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 384 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1591 | 375 | msgid "Less..." | 385 | msgid "Less..." |
1592 | 376 | msgstr "Menys..." | 386 | msgstr "Menys..." |
1593 | 377 | 387 | ||
1594 | 378 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 388 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1596 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1597 | 380 | msgid "Send" | 390 | msgid "Send" |
1598 | 381 | msgstr "Envia" | 391 | msgstr "Envia" |
1599 | 382 | 392 | ||
1601 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 393 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1602 | 384 | msgid "Rate this" | 394 | msgid "Rate this" |
1603 | 385 | msgstr "Puntueu-ho" | 395 | msgstr "Puntueu-ho" |
1604 | 386 | 396 | ||
1606 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 397 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1607 | 388 | msgid "Add a review" | 398 | msgid "Add a review" |
1608 | 389 | msgstr "Afegiu una ressenya" | 399 | msgstr "Afegiu una ressenya" |
1609 | 390 | 400 | ||
1610 | 391 | 401 | ||
1611 | === modified file 'po/ca@valencia.po' | |||
1612 | --- po/ca@valencia.po 2016-11-08 05:41:47 +0000 | |||
1613 | +++ po/ca@valencia.po 2016-11-14 12:06:52 +0000 | |||
1614 | @@ -7,7 +7,11 @@ | |||
1615 | 7 | msgstr "" | 7 | msgstr "" |
1616 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
1617 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1618 | 10 | <<<<<<< TREE | ||
1619 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1620 | 12 | ======= | ||
1621 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1622 | 14 | >>>>>>> MERGE-SOURCE | ||
1623 | 11 | "PO-Revision-Date: 2015-02-22 15:22+0000\n" | 15 | "PO-Revision-Date: 2015-02-22 15:22+0000\n" |
1624 | 12 | "Last-Translator: David Planella <david.planella@gmail.com>\n" | 16 | "Last-Translator: David Planella <david.planella@gmail.com>\n" |
1625 | 13 | "Language-Team: Catalan <ca@li.org>\n" | 17 | "Language-Team: Catalan <ca@li.org>\n" |
1626 | @@ -15,8 +19,13 @@ | |||
1627 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
1628 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1629 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1630 | 22 | <<<<<<< TREE | ||
1631 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
1632 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
1633 | 25 | ======= | ||
1634 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:10+0000\n" | ||
1635 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
1636 | 28 | >>>>>>> MERGE-SOURCE | ||
1637 | 20 | 29 | ||
1638 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
1639 | 22 | msgid "Password: " | 31 | msgid "Password: " |
1640 | @@ -313,26 +322,26 @@ | |||
1641 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
1642 | 314 | msgstr "" | 323 | msgstr "" |
1643 | 315 | 324 | ||
1645 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
1646 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
1647 | 318 | msgid "Store" | 327 | msgid "Store" |
1648 | 319 | msgstr "" | 328 | msgstr "" |
1649 | 320 | 329 | ||
1651 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
1652 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
1653 | 323 | msgid "Search" | 332 | msgid "Search" |
1654 | 324 | msgstr "" | 333 | msgstr "" |
1655 | 325 | 334 | ||
1657 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
1658 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
1659 | 328 | msgid "Settings" | 337 | msgid "Settings" |
1660 | 329 | msgstr "" | 338 | msgstr "" |
1661 | 330 | 339 | ||
1663 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
1664 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
1665 | 333 | msgstr "Suprimeix dels preferits" | 342 | msgstr "Suprimeix dels preferits" |
1666 | 334 | 343 | ||
1668 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
1669 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
1670 | 337 | msgstr "Afig als preferits" | 346 | msgstr "Afig als preferits" |
1671 | 338 | 347 | ||
1672 | @@ -344,15 +353,15 @@ | |||
1673 | 344 | msgid "Reset" | 353 | msgid "Reset" |
1674 | 345 | msgstr "" | 354 | msgstr "" |
1675 | 346 | 355 | ||
1677 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1678 | 348 | msgid "Show less" | 357 | msgid "Show less" |
1679 | 349 | msgstr "" | 358 | msgstr "" |
1680 | 350 | 359 | ||
1682 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
1683 | 352 | msgid "Show all" | 361 | msgid "Show all" |
1684 | 353 | msgstr "" | 362 | msgstr "" |
1685 | 354 | 363 | ||
1687 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
1688 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
1689 | 357 | msgid "Search" | 366 | msgid "Search" |
1690 | 358 | msgstr "" | 367 | msgstr "" |
1691 | @@ -365,24 +374,24 @@ | |||
1692 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
1693 | 366 | msgstr "" | 375 | msgstr "" |
1694 | 367 | 376 | ||
1696 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1697 | 369 | msgid "More..." | 378 | msgid "More..." |
1698 | 370 | msgstr "Més..." | 379 | msgstr "Més..." |
1699 | 371 | 380 | ||
1701 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1702 | 373 | msgid "Less..." | 382 | msgid "Less..." |
1703 | 374 | msgstr "Menys..." | 383 | msgstr "Menys..." |
1704 | 375 | 384 | ||
1705 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1707 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1708 | 378 | msgid "Send" | 387 | msgid "Send" |
1709 | 379 | msgstr "Envia" | 388 | msgstr "Envia" |
1710 | 380 | 389 | ||
1712 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1713 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
1714 | 383 | msgstr "Puntueu-ho" | 392 | msgstr "Puntueu-ho" |
1715 | 384 | 393 | ||
1717 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1718 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
1719 | 387 | msgstr "Afegiu una ressenya" | 396 | msgstr "Afegiu una ressenya" |
1720 | 388 | 397 | ||
1721 | 389 | 398 | ||
1722 | === modified file 'po/ce.po' | |||
1723 | --- po/ce.po 2016-11-08 05:41:47 +0000 | |||
1724 | +++ po/ce.po 2016-11-14 12:06:52 +0000 | |||
1725 | @@ -7,7 +7,11 @@ | |||
1726 | 7 | msgstr "" | 7 | msgstr "" |
1727 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
1728 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1729 | 10 | <<<<<<< TREE | ||
1730 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1731 | 12 | ======= | ||
1732 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1733 | 14 | >>>>>>> MERGE-SOURCE | ||
1734 | 11 | "PO-Revision-Date: 2015-02-15 04:01+0000\n" | 15 | "PO-Revision-Date: 2015-02-15 04:01+0000\n" |
1735 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1736 | 13 | "Language-Team: Chechen <ce@li.org>\n" | 17 | "Language-Team: Chechen <ce@li.org>\n" |
1737 | @@ -15,8 +19,13 @@ | |||
1738 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
1739 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1740 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1741 | 22 | <<<<<<< TREE | ||
1742 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
1743 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
1744 | 25 | ======= | ||
1745 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
1746 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
1747 | 28 | >>>>>>> MERGE-SOURCE | ||
1748 | 20 | 29 | ||
1749 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
1750 | 22 | msgid "Password: " | 31 | msgid "Password: " |
1751 | @@ -311,26 +320,26 @@ | |||
1752 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
1753 | 312 | msgstr "" | 321 | msgstr "" |
1754 | 313 | 322 | ||
1756 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
1757 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
1758 | 316 | msgid "Store" | 325 | msgid "Store" |
1759 | 317 | msgstr "" | 326 | msgstr "" |
1760 | 318 | 327 | ||
1762 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
1763 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
1764 | 321 | msgid "Search" | 330 | msgid "Search" |
1765 | 322 | msgstr "" | 331 | msgstr "" |
1766 | 323 | 332 | ||
1768 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
1769 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
1770 | 326 | msgid "Settings" | 335 | msgid "Settings" |
1771 | 327 | msgstr "" | 336 | msgstr "" |
1772 | 328 | 337 | ||
1774 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
1775 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
1776 | 331 | msgstr "" | 340 | msgstr "" |
1777 | 332 | 341 | ||
1779 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
1780 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
1781 | 335 | msgstr "" | 344 | msgstr "" |
1782 | 336 | 345 | ||
1783 | @@ -342,15 +351,15 @@ | |||
1784 | 342 | msgid "Reset" | 351 | msgid "Reset" |
1785 | 343 | msgstr "" | 352 | msgstr "" |
1786 | 344 | 353 | ||
1788 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1789 | 346 | msgid "Show less" | 355 | msgid "Show less" |
1790 | 347 | msgstr "" | 356 | msgstr "" |
1791 | 348 | 357 | ||
1793 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
1794 | 350 | msgid "Show all" | 359 | msgid "Show all" |
1795 | 351 | msgstr "" | 360 | msgstr "" |
1796 | 352 | 361 | ||
1798 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
1799 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
1800 | 355 | msgid "Search" | 364 | msgid "Search" |
1801 | 356 | msgstr "" | 365 | msgstr "" |
1802 | @@ -363,24 +372,24 @@ | |||
1803 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
1804 | 364 | msgstr "" | 373 | msgstr "" |
1805 | 365 | 374 | ||
1807 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1808 | 367 | msgid "More..." | 376 | msgid "More..." |
1809 | 368 | msgstr "" | 377 | msgstr "" |
1810 | 369 | 378 | ||
1812 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1813 | 371 | msgid "Less..." | 380 | msgid "Less..." |
1814 | 372 | msgstr "" | 381 | msgstr "" |
1815 | 373 | 382 | ||
1816 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1818 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1819 | 376 | msgid "Send" | 385 | msgid "Send" |
1820 | 377 | msgstr "" | 386 | msgstr "" |
1821 | 378 | 387 | ||
1823 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1824 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
1825 | 381 | msgstr "" | 390 | msgstr "" |
1826 | 382 | 391 | ||
1828 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1829 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
1830 | 385 | msgstr "" | 394 | msgstr "" |
1831 | 386 | 395 | ||
1832 | 387 | 396 | ||
1833 | === modified file 'po/ckb.po' | |||
1834 | --- po/ckb.po 2016-11-08 05:41:47 +0000 | |||
1835 | +++ po/ckb.po 2016-11-14 12:06:52 +0000 | |||
1836 | @@ -7,7 +7,11 @@ | |||
1837 | 7 | msgstr "" | 7 | msgstr "" |
1838 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
1839 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1840 | 10 | <<<<<<< TREE | ||
1841 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1842 | 12 | ======= | ||
1843 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1844 | 14 | >>>>>>> MERGE-SOURCE | ||
1845 | 11 | "PO-Revision-Date: 2014-01-21 11:05+0000\n" | 15 | "PO-Revision-Date: 2014-01-21 11:05+0000\n" |
1846 | 12 | "Last-Translator: Aras <aras.noori@gmail.com>\n" | 16 | "Last-Translator: Aras <aras.noori@gmail.com>\n" |
1847 | 13 | "Language-Team: Kurdish (Sorani) <ckb@li.org>\n" | 17 | "Language-Team: Kurdish (Sorani) <ckb@li.org>\n" |
1848 | @@ -15,8 +19,13 @@ | |||
1849 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
1850 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1851 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1852 | 22 | <<<<<<< TREE | ||
1853 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
1854 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
1855 | 25 | ======= | ||
1856 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:10+0000\n" | ||
1857 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
1858 | 28 | >>>>>>> MERGE-SOURCE | ||
1859 | 20 | 29 | ||
1860 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
1861 | 22 | msgid "Password: " | 31 | msgid "Password: " |
1862 | @@ -311,26 +320,26 @@ | |||
1863 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
1864 | 312 | msgstr "" | 321 | msgstr "" |
1865 | 313 | 322 | ||
1867 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
1868 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
1869 | 316 | msgid "Store" | 325 | msgid "Store" |
1870 | 317 | msgstr "" | 326 | msgstr "" |
1871 | 318 | 327 | ||
1873 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
1874 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
1875 | 321 | msgid "Search" | 330 | msgid "Search" |
1876 | 322 | msgstr "" | 331 | msgstr "" |
1877 | 323 | 332 | ||
1879 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
1880 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
1881 | 326 | msgid "Settings" | 335 | msgid "Settings" |
1882 | 327 | msgstr "" | 336 | msgstr "" |
1883 | 328 | 337 | ||
1885 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
1886 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
1887 | 331 | msgstr "" | 340 | msgstr "" |
1888 | 332 | 341 | ||
1890 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
1891 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
1892 | 335 | msgstr "" | 344 | msgstr "" |
1893 | 336 | 345 | ||
1894 | @@ -342,15 +351,15 @@ | |||
1895 | 342 | msgid "Reset" | 351 | msgid "Reset" |
1896 | 343 | msgstr "" | 352 | msgstr "" |
1897 | 344 | 353 | ||
1899 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
1900 | 346 | msgid "Show less" | 355 | msgid "Show less" |
1901 | 347 | msgstr "" | 356 | msgstr "" |
1902 | 348 | 357 | ||
1904 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
1905 | 350 | msgid "Show all" | 359 | msgid "Show all" |
1906 | 351 | msgstr "" | 360 | msgstr "" |
1907 | 352 | 361 | ||
1909 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
1910 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
1911 | 355 | msgid "Search" | 364 | msgid "Search" |
1912 | 356 | msgstr "" | 365 | msgstr "" |
1913 | @@ -363,24 +372,24 @@ | |||
1914 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
1915 | 364 | msgstr "" | 373 | msgstr "" |
1916 | 365 | 374 | ||
1918 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1919 | 367 | msgid "More..." | 376 | msgid "More..." |
1920 | 368 | msgstr "" | 377 | msgstr "" |
1921 | 369 | 378 | ||
1923 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
1924 | 371 | msgid "Less..." | 380 | msgid "Less..." |
1925 | 372 | msgstr "" | 381 | msgstr "" |
1926 | 373 | 382 | ||
1927 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
1929 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
1930 | 376 | msgid "Send" | 385 | msgid "Send" |
1931 | 377 | msgstr "ناردن" | 386 | msgstr "ناردن" |
1932 | 378 | 387 | ||
1934 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
1935 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
1936 | 381 | msgstr "پلە دابنی بۆی" | 390 | msgstr "پلە دابنی بۆی" |
1937 | 382 | 391 | ||
1939 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
1940 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
1941 | 385 | msgstr "پێداچوونەوە زۆر بکە" | 394 | msgstr "پێداچوونەوە زۆر بکە" |
1942 | 386 | 395 | ||
1943 | 387 | 396 | ||
1944 | === modified file 'po/co.po' | |||
1945 | --- po/co.po 2016-11-08 05:41:47 +0000 | |||
1946 | +++ po/co.po 2016-11-14 12:06:52 +0000 | |||
1947 | @@ -7,7 +7,11 @@ | |||
1948 | 7 | msgstr "" | 7 | msgstr "" |
1949 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
1950 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
1951 | 10 | <<<<<<< TREE | ||
1952 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
1953 | 12 | ======= | ||
1954 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
1955 | 14 | >>>>>>> MERGE-SOURCE | ||
1956 | 11 | "PO-Revision-Date: 2016-05-24 10:40+0000\n" | 15 | "PO-Revision-Date: 2016-05-24 10:40+0000\n" |
1957 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1958 | 13 | "Language-Team: Corsican <co@li.org>\n" | 17 | "Language-Team: Corsican <co@li.org>\n" |
1959 | @@ -15,8 +19,13 @@ | |||
1960 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
1961 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
1962 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
1963 | 22 | <<<<<<< TREE | ||
1964 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
1965 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
1966 | 25 | ======= | ||
1967 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
1968 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
1969 | 28 | >>>>>>> MERGE-SOURCE | ||
1970 | 20 | 29 | ||
1971 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
1972 | 22 | msgid "Password: " | 31 | msgid "Password: " |
1973 | @@ -315,26 +324,26 @@ | |||
1974 | 315 | msgid "Preview Share Item" | 324 | msgid "Preview Share Item" |
1975 | 316 | msgstr "Anteprima elementi da sparte" | 325 | msgstr "Anteprima elementi da sparte" |
1976 | 317 | 326 | ||
1978 | 318 | #: qml/Dash/DashPageHeader.qml:362 | 327 | #: qml/Dash/DashPageHeader.qml:361 |
1979 | 319 | msgctxt "Button: Open the Ubuntu Store" | 328 | msgctxt "Button: Open the Ubuntu Store" |
1980 | 320 | msgid "Store" | 329 | msgid "Store" |
1981 | 321 | msgstr "Buttega" | 330 | msgstr "Buttega" |
1982 | 322 | 331 | ||
1984 | 323 | #: qml/Dash/DashPageHeader.qml:369 | 332 | #: qml/Dash/DashPageHeader.qml:368 |
1985 | 324 | msgctxt "Button: Start a search in the current dash scope" | 333 | msgctxt "Button: Start a search in the current dash scope" |
1986 | 325 | msgid "Search" | 334 | msgid "Search" |
1987 | 326 | msgstr "Circà" | 335 | msgstr "Circà" |
1988 | 327 | 336 | ||
1990 | 328 | #: qml/Dash/DashPageHeader.qml:379 | 337 | #: qml/Dash/DashPageHeader.qml:378 |
1991 | 329 | msgctxt "Button: Show the current dash scope settings" | 338 | msgctxt "Button: Show the current dash scope settings" |
1992 | 330 | msgid "Settings" | 339 | msgid "Settings" |
1993 | 331 | msgstr "Parametri" | 340 | msgstr "Parametri" |
1994 | 332 | 341 | ||
1996 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
1997 | 334 | msgid "Remove from Favorites" | 343 | msgid "Remove from Favorites" |
1998 | 335 | msgstr "Toglie da i Favuriti" | 344 | msgstr "Toglie da i Favuriti" |
1999 | 336 | 345 | ||
2001 | 337 | #: qml/Dash/DashPageHeader.qml:386 | 346 | #: qml/Dash/DashPageHeader.qml:385 |
2002 | 338 | msgid "Add to Favorites" | 347 | msgid "Add to Favorites" |
2003 | 339 | msgstr "Aghjustà à i Favuriti" | 348 | msgstr "Aghjustà à i Favuriti" |
2004 | 340 | 349 | ||
2005 | @@ -346,15 +355,15 @@ | |||
2006 | 346 | msgid "Reset" | 355 | msgid "Reset" |
2007 | 347 | msgstr "Re-inizializzà" | 356 | msgstr "Re-inizializzà" |
2008 | 348 | 357 | ||
2010 | 349 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 358 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2011 | 350 | msgid "Show less" | 359 | msgid "Show less" |
2012 | 351 | msgstr "" | 360 | msgstr "" |
2013 | 352 | 361 | ||
2015 | 353 | #: qml/Dash/GenericScopeView.qml:586 | 362 | #: qml/Dash/GenericScopeView.qml:545 |
2016 | 354 | msgid "Show all" | 363 | msgid "Show all" |
2017 | 355 | msgstr "" | 364 | msgstr "" |
2018 | 356 | 365 | ||
2020 | 357 | #: qml/Dash/GenericScopeView.qml:643 | 366 | #: qml/Dash/GenericScopeView.qml:576 |
2021 | 358 | msgctxt "Label: Hint for dash search line edit" | 367 | msgctxt "Label: Hint for dash search line edit" |
2022 | 359 | msgid "Search" | 368 | msgid "Search" |
2023 | 360 | msgstr "Circà" | 369 | msgstr "Circà" |
2024 | @@ -367,24 +376,24 @@ | |||
2025 | 367 | msgid "Clear All" | 376 | msgid "Clear All" |
2026 | 368 | msgstr "Squassà tuttu" | 377 | msgstr "Squassà tuttu" |
2027 | 369 | 378 | ||
2029 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2030 | 371 | msgid "More..." | 380 | msgid "More..." |
2031 | 372 | msgstr "Di più..." | 381 | msgstr "Di più..." |
2032 | 373 | 382 | ||
2034 | 374 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 383 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2035 | 375 | msgid "Less..." | 384 | msgid "Less..." |
2036 | 376 | msgstr "Menu..." | 385 | msgstr "Menu..." |
2037 | 377 | 386 | ||
2038 | 378 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 387 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2040 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2041 | 380 | msgid "Send" | 389 | msgid "Send" |
2042 | 381 | msgstr "Mandà" | 390 | msgstr "Mandà" |
2043 | 382 | 391 | ||
2045 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2046 | 384 | msgid "Rate this" | 393 | msgid "Rate this" |
2047 | 385 | msgstr "Ghjudicà questu" | 394 | msgstr "Ghjudicà questu" |
2048 | 386 | 395 | ||
2050 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 396 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2051 | 388 | msgid "Add a review" | 397 | msgid "Add a review" |
2052 | 389 | msgstr "Aghjustà una recensione" | 398 | msgstr "Aghjustà una recensione" |
2053 | 390 | 399 | ||
2054 | 391 | 400 | ||
2055 | === modified file 'po/cs.po' | |||
2056 | --- po/cs.po 2016-11-08 05:41:47 +0000 | |||
2057 | +++ po/cs.po 2016-11-14 12:06:52 +0000 | |||
2058 | @@ -7,7 +7,11 @@ | |||
2059 | 7 | msgstr "" | 7 | msgstr "" |
2060 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
2061 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2062 | 10 | <<<<<<< TREE | ||
2063 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2064 | 12 | ======= | ||
2065 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2066 | 14 | >>>>>>> MERGE-SOURCE | ||
2067 | 11 | "PO-Revision-Date: 2015-07-07 10:44+0000\n" | 15 | "PO-Revision-Date: 2015-07-07 10:44+0000\n" |
2068 | 12 | "Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n" | 16 | "Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n" |
2069 | 13 | "Language-Team: Czech <cs@li.org>\n" | 17 | "Language-Team: Czech <cs@li.org>\n" |
2070 | @@ -15,8 +19,13 @@ | |||
2071 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
2072 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2073 | 17 | "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" | 21 | "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" |
2074 | 22 | <<<<<<< TREE | ||
2075 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
2076 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
2077 | 25 | ======= | ||
2078 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
2079 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
2080 | 28 | >>>>>>> MERGE-SOURCE | ||
2081 | 20 | "Language: cs\n" | 29 | "Language: cs\n" |
2082 | 21 | 30 | ||
2083 | 22 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
2084 | @@ -314,26 +323,26 @@ | |||
2085 | 314 | msgid "Preview Share Item" | 323 | msgid "Preview Share Item" |
2086 | 315 | msgstr "" | 324 | msgstr "" |
2087 | 316 | 325 | ||
2089 | 317 | #: qml/Dash/DashPageHeader.qml:362 | 326 | #: qml/Dash/DashPageHeader.qml:361 |
2090 | 318 | msgctxt "Button: Open the Ubuntu Store" | 327 | msgctxt "Button: Open the Ubuntu Store" |
2091 | 319 | msgid "Store" | 328 | msgid "Store" |
2092 | 320 | msgstr "Obchod" | 329 | msgstr "Obchod" |
2093 | 321 | 330 | ||
2095 | 322 | #: qml/Dash/DashPageHeader.qml:369 | 331 | #: qml/Dash/DashPageHeader.qml:368 |
2096 | 323 | msgctxt "Button: Start a search in the current dash scope" | 332 | msgctxt "Button: Start a search in the current dash scope" |
2097 | 324 | msgid "Search" | 333 | msgid "Search" |
2098 | 325 | msgstr "Hledat" | 334 | msgstr "Hledat" |
2099 | 326 | 335 | ||
2101 | 327 | #: qml/Dash/DashPageHeader.qml:379 | 336 | #: qml/Dash/DashPageHeader.qml:378 |
2102 | 328 | msgctxt "Button: Show the current dash scope settings" | 337 | msgctxt "Button: Show the current dash scope settings" |
2103 | 329 | msgid "Settings" | 338 | msgid "Settings" |
2104 | 330 | msgstr "Nastavení" | 339 | msgstr "Nastavení" |
2105 | 331 | 340 | ||
2107 | 332 | #: qml/Dash/DashPageHeader.qml:386 | 341 | #: qml/Dash/DashPageHeader.qml:385 |
2108 | 333 | msgid "Remove from Favorites" | 342 | msgid "Remove from Favorites" |
2109 | 334 | msgstr "Odstranit z oblíbených" | 343 | msgstr "Odstranit z oblíbených" |
2110 | 335 | 344 | ||
2112 | 336 | #: qml/Dash/DashPageHeader.qml:386 | 345 | #: qml/Dash/DashPageHeader.qml:385 |
2113 | 337 | msgid "Add to Favorites" | 346 | msgid "Add to Favorites" |
2114 | 338 | msgstr "Přidat do oblíbených" | 347 | msgstr "Přidat do oblíbených" |
2115 | 339 | 348 | ||
2116 | @@ -345,15 +354,15 @@ | |||
2117 | 345 | msgid "Reset" | 354 | msgid "Reset" |
2118 | 346 | msgstr "" | 355 | msgstr "" |
2119 | 347 | 356 | ||
2121 | 348 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 357 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2122 | 349 | msgid "Show less" | 358 | msgid "Show less" |
2123 | 350 | msgstr "" | 359 | msgstr "" |
2124 | 351 | 360 | ||
2126 | 352 | #: qml/Dash/GenericScopeView.qml:586 | 361 | #: qml/Dash/GenericScopeView.qml:545 |
2127 | 353 | msgid "Show all" | 362 | msgid "Show all" |
2128 | 354 | msgstr "" | 363 | msgstr "" |
2129 | 355 | 364 | ||
2131 | 356 | #: qml/Dash/GenericScopeView.qml:643 | 365 | #: qml/Dash/GenericScopeView.qml:576 |
2132 | 357 | msgctxt "Label: Hint for dash search line edit" | 366 | msgctxt "Label: Hint for dash search line edit" |
2133 | 358 | msgid "Search" | 367 | msgid "Search" |
2134 | 359 | msgstr "Hledat" | 368 | msgstr "Hledat" |
2135 | @@ -366,24 +375,24 @@ | |||
2136 | 366 | msgid "Clear All" | 375 | msgid "Clear All" |
2137 | 367 | msgstr "" | 376 | msgstr "" |
2138 | 368 | 377 | ||
2140 | 369 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 378 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2141 | 370 | msgid "More..." | 379 | msgid "More..." |
2142 | 371 | msgstr "Více..." | 380 | msgstr "Více..." |
2143 | 372 | 381 | ||
2145 | 373 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 382 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2146 | 374 | msgid "Less..." | 383 | msgid "Less..." |
2147 | 375 | msgstr "Méně..." | 384 | msgstr "Méně..." |
2148 | 376 | 385 | ||
2149 | 377 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 386 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2151 | 378 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2152 | 379 | msgid "Send" | 388 | msgid "Send" |
2153 | 380 | msgstr "Odeslat" | 389 | msgstr "Odeslat" |
2154 | 381 | 390 | ||
2156 | 382 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 391 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2157 | 383 | msgid "Rate this" | 392 | msgid "Rate this" |
2158 | 384 | msgstr "Ohodnoťte to" | 393 | msgstr "Ohodnoťte to" |
2159 | 385 | 394 | ||
2161 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 395 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2162 | 387 | msgid "Add a review" | 396 | msgid "Add a review" |
2163 | 388 | msgstr "Přidat recenzi" | 397 | msgstr "Přidat recenzi" |
2164 | 389 | 398 | ||
2165 | 390 | 399 | ||
2166 | === modified file 'po/cy.po' | |||
2167 | --- po/cy.po 2016-11-08 05:41:47 +0000 | |||
2168 | +++ po/cy.po 2016-11-14 12:06:52 +0000 | |||
2169 | @@ -7,7 +7,11 @@ | |||
2170 | 7 | msgstr "" | 7 | msgstr "" |
2171 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
2172 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2173 | 10 | <<<<<<< TREE | ||
2174 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2175 | 12 | ======= | ||
2176 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2177 | 14 | >>>>>>> MERGE-SOURCE | ||
2178 | 11 | "PO-Revision-Date: 2015-07-31 13:21+0000\n" | 15 | "PO-Revision-Date: 2015-07-31 13:21+0000\n" |
2179 | 12 | "Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n" | 16 | "Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n" |
2180 | 13 | "Language-Team: Welsh <cy@li.org>\n" | 17 | "Language-Team: Welsh <cy@li.org>\n" |
2181 | @@ -16,8 +20,13 @@ | |||
2182 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2183 | 17 | "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? " | 21 | "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? " |
2184 | 18 | "2 : 3;\n" | 22 | "2 : 3;\n" |
2185 | 23 | <<<<<<< TREE | ||
2186 | 19 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
2187 | 20 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
2188 | 26 | ======= | ||
2189 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:10+0000\n" | ||
2190 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
2191 | 29 | >>>>>>> MERGE-SOURCE | ||
2192 | 21 | 30 | ||
2193 | 22 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
2194 | 23 | msgid "Password: " | 32 | msgid "Password: " |
2195 | @@ -314,26 +323,26 @@ | |||
2196 | 314 | msgid "Preview Share Item" | 323 | msgid "Preview Share Item" |
2197 | 315 | msgstr "" | 324 | msgstr "" |
2198 | 316 | 325 | ||
2200 | 317 | #: qml/Dash/DashPageHeader.qml:362 | 326 | #: qml/Dash/DashPageHeader.qml:361 |
2201 | 318 | msgctxt "Button: Open the Ubuntu Store" | 327 | msgctxt "Button: Open the Ubuntu Store" |
2202 | 319 | msgid "Store" | 328 | msgid "Store" |
2203 | 320 | msgstr "Marchnad" | 329 | msgstr "Marchnad" |
2204 | 321 | 330 | ||
2206 | 322 | #: qml/Dash/DashPageHeader.qml:369 | 331 | #: qml/Dash/DashPageHeader.qml:368 |
2207 | 323 | msgctxt "Button: Start a search in the current dash scope" | 332 | msgctxt "Button: Start a search in the current dash scope" |
2208 | 324 | msgid "Search" | 333 | msgid "Search" |
2209 | 325 | msgstr "Chwilio" | 334 | msgstr "Chwilio" |
2210 | 326 | 335 | ||
2212 | 327 | #: qml/Dash/DashPageHeader.qml:379 | 336 | #: qml/Dash/DashPageHeader.qml:378 |
2213 | 328 | msgctxt "Button: Show the current dash scope settings" | 337 | msgctxt "Button: Show the current dash scope settings" |
2214 | 329 | msgid "Settings" | 338 | msgid "Settings" |
2215 | 330 | msgstr "Gosodiadau" | 339 | msgstr "Gosodiadau" |
2216 | 331 | 340 | ||
2218 | 332 | #: qml/Dash/DashPageHeader.qml:386 | 341 | #: qml/Dash/DashPageHeader.qml:385 |
2219 | 333 | msgid "Remove from Favorites" | 342 | msgid "Remove from Favorites" |
2220 | 334 | msgstr "Tynnu o Ffefrynnau" | 343 | msgstr "Tynnu o Ffefrynnau" |
2221 | 335 | 344 | ||
2223 | 336 | #: qml/Dash/DashPageHeader.qml:386 | 345 | #: qml/Dash/DashPageHeader.qml:385 |
2224 | 337 | msgid "Add to Favorites" | 346 | msgid "Add to Favorites" |
2225 | 338 | msgstr "Ychwanegu at Ffefrynnau" | 347 | msgstr "Ychwanegu at Ffefrynnau" |
2226 | 339 | 348 | ||
2227 | @@ -345,15 +354,15 @@ | |||
2228 | 345 | msgid "Reset" | 354 | msgid "Reset" |
2229 | 346 | msgstr "" | 355 | msgstr "" |
2230 | 347 | 356 | ||
2232 | 348 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 357 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2233 | 349 | msgid "Show less" | 358 | msgid "Show less" |
2234 | 350 | msgstr "" | 359 | msgstr "" |
2235 | 351 | 360 | ||
2237 | 352 | #: qml/Dash/GenericScopeView.qml:586 | 361 | #: qml/Dash/GenericScopeView.qml:545 |
2238 | 353 | msgid "Show all" | 362 | msgid "Show all" |
2239 | 354 | msgstr "" | 363 | msgstr "" |
2240 | 355 | 364 | ||
2242 | 356 | #: qml/Dash/GenericScopeView.qml:643 | 365 | #: qml/Dash/GenericScopeView.qml:576 |
2243 | 357 | msgctxt "Label: Hint for dash search line edit" | 366 | msgctxt "Label: Hint for dash search line edit" |
2244 | 358 | msgid "Search" | 367 | msgid "Search" |
2245 | 359 | msgstr "Chwilio" | 368 | msgstr "Chwilio" |
2246 | @@ -366,24 +375,24 @@ | |||
2247 | 366 | msgid "Clear All" | 375 | msgid "Clear All" |
2248 | 367 | msgstr "" | 376 | msgstr "" |
2249 | 368 | 377 | ||
2251 | 369 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 378 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2252 | 370 | msgid "More..." | 379 | msgid "More..." |
2253 | 371 | msgstr "Mwy..." | 380 | msgstr "Mwy..." |
2254 | 372 | 381 | ||
2256 | 373 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 382 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2257 | 374 | msgid "Less..." | 383 | msgid "Less..." |
2258 | 375 | msgstr "Llai..." | 384 | msgstr "Llai..." |
2259 | 376 | 385 | ||
2260 | 377 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 386 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2262 | 378 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2263 | 379 | msgid "Send" | 388 | msgid "Send" |
2264 | 380 | msgstr "Anfon" | 389 | msgstr "Anfon" |
2265 | 381 | 390 | ||
2267 | 382 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 391 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2268 | 383 | msgid "Rate this" | 392 | msgid "Rate this" |
2269 | 384 | msgstr "Graddio hwn" | 393 | msgstr "Graddio hwn" |
2270 | 385 | 394 | ||
2272 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 395 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2273 | 387 | msgid "Add a review" | 396 | msgid "Add a review" |
2274 | 388 | msgstr "Ychwanegu adolygiad" | 397 | msgstr "Ychwanegu adolygiad" |
2275 | 389 | 398 | ||
2276 | 390 | 399 | ||
2277 | === modified file 'po/da.po' | |||
2278 | --- po/da.po 2016-11-08 05:41:47 +0000 | |||
2279 | +++ po/da.po 2016-11-14 12:06:52 +0000 | |||
2280 | @@ -8,7 +8,11 @@ | |||
2281 | 8 | msgstr "" | 8 | msgstr "" |
2282 | 9 | "Project-Id-Version: unity8\n" | 9 | "Project-Id-Version: unity8\n" |
2283 | 10 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 10 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2284 | 11 | <<<<<<< TREE | ||
2285 | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 12 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2286 | 13 | ======= | ||
2287 | 14 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2288 | 15 | >>>>>>> MERGE-SOURCE | ||
2289 | 12 | "PO-Revision-Date: 2015-07-06 12:05+0000\n" | 16 | "PO-Revision-Date: 2015-07-06 12:05+0000\n" |
2290 | 13 | "Last-Translator: Folmer Fredslund <Unknown>\n" | 17 | "Last-Translator: Folmer Fredslund <Unknown>\n" |
2291 | 14 | "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" | 18 | "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" |
2292 | @@ -16,8 +20,13 @@ | |||
2293 | 16 | "Content-Type: text/plain; charset=UTF-8\n" | 20 | "Content-Type: text/plain; charset=UTF-8\n" |
2294 | 17 | "Content-Transfer-Encoding: 8bit\n" | 21 | "Content-Transfer-Encoding: 8bit\n" |
2295 | 18 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 22 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2296 | 23 | <<<<<<< TREE | ||
2297 | 19 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
2298 | 20 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
2299 | 26 | ======= | ||
2300 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
2301 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
2302 | 29 | >>>>>>> MERGE-SOURCE | ||
2303 | 21 | 30 | ||
2304 | 22 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
2305 | 23 | msgid "Password: " | 32 | msgid "Password: " |
2306 | @@ -314,26 +323,26 @@ | |||
2307 | 314 | msgid "Preview Share Item" | 323 | msgid "Preview Share Item" |
2308 | 315 | msgstr "" | 324 | msgstr "" |
2309 | 316 | 325 | ||
2311 | 317 | #: qml/Dash/DashPageHeader.qml:362 | 326 | #: qml/Dash/DashPageHeader.qml:361 |
2312 | 318 | msgctxt "Button: Open the Ubuntu Store" | 327 | msgctxt "Button: Open the Ubuntu Store" |
2313 | 319 | msgid "Store" | 328 | msgid "Store" |
2314 | 320 | msgstr "Butik" | 329 | msgstr "Butik" |
2315 | 321 | 330 | ||
2317 | 322 | #: qml/Dash/DashPageHeader.qml:369 | 331 | #: qml/Dash/DashPageHeader.qml:368 |
2318 | 323 | msgctxt "Button: Start a search in the current dash scope" | 332 | msgctxt "Button: Start a search in the current dash scope" |
2319 | 324 | msgid "Search" | 333 | msgid "Search" |
2320 | 325 | msgstr "Søg" | 334 | msgstr "Søg" |
2321 | 326 | 335 | ||
2323 | 327 | #: qml/Dash/DashPageHeader.qml:379 | 336 | #: qml/Dash/DashPageHeader.qml:378 |
2324 | 328 | msgctxt "Button: Show the current dash scope settings" | 337 | msgctxt "Button: Show the current dash scope settings" |
2325 | 329 | msgid "Settings" | 338 | msgid "Settings" |
2326 | 330 | msgstr "Indstillinger" | 339 | msgstr "Indstillinger" |
2327 | 331 | 340 | ||
2329 | 332 | #: qml/Dash/DashPageHeader.qml:386 | 341 | #: qml/Dash/DashPageHeader.qml:385 |
2330 | 333 | msgid "Remove from Favorites" | 342 | msgid "Remove from Favorites" |
2331 | 334 | msgstr "Fjern fra Favoritter" | 343 | msgstr "Fjern fra Favoritter" |
2332 | 335 | 344 | ||
2334 | 336 | #: qml/Dash/DashPageHeader.qml:386 | 345 | #: qml/Dash/DashPageHeader.qml:385 |
2335 | 337 | msgid "Add to Favorites" | 346 | msgid "Add to Favorites" |
2336 | 338 | msgstr "Tilføj til Favoritter" | 347 | msgstr "Tilføj til Favoritter" |
2337 | 339 | 348 | ||
2338 | @@ -345,15 +354,15 @@ | |||
2339 | 345 | msgid "Reset" | 354 | msgid "Reset" |
2340 | 346 | msgstr "" | 355 | msgstr "" |
2341 | 347 | 356 | ||
2343 | 348 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 357 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2344 | 349 | msgid "Show less" | 358 | msgid "Show less" |
2345 | 350 | msgstr "" | 359 | msgstr "" |
2346 | 351 | 360 | ||
2348 | 352 | #: qml/Dash/GenericScopeView.qml:586 | 361 | #: qml/Dash/GenericScopeView.qml:545 |
2349 | 353 | msgid "Show all" | 362 | msgid "Show all" |
2350 | 354 | msgstr "" | 363 | msgstr "" |
2351 | 355 | 364 | ||
2353 | 356 | #: qml/Dash/GenericScopeView.qml:643 | 365 | #: qml/Dash/GenericScopeView.qml:576 |
2354 | 357 | msgctxt "Label: Hint for dash search line edit" | 366 | msgctxt "Label: Hint for dash search line edit" |
2355 | 358 | msgid "Search" | 367 | msgid "Search" |
2356 | 359 | msgstr "Søg" | 368 | msgstr "Søg" |
2357 | @@ -366,24 +375,24 @@ | |||
2358 | 366 | msgid "Clear All" | 375 | msgid "Clear All" |
2359 | 367 | msgstr "" | 376 | msgstr "" |
2360 | 368 | 377 | ||
2362 | 369 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 378 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2363 | 370 | msgid "More..." | 379 | msgid "More..." |
2364 | 371 | msgstr "Mere..." | 380 | msgstr "Mere..." |
2365 | 372 | 381 | ||
2367 | 373 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 382 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2368 | 374 | msgid "Less..." | 383 | msgid "Less..." |
2369 | 375 | msgstr "Mindre..." | 384 | msgstr "Mindre..." |
2370 | 376 | 385 | ||
2371 | 377 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 386 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2373 | 378 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2374 | 379 | msgid "Send" | 388 | msgid "Send" |
2375 | 380 | msgstr "Send" | 389 | msgstr "Send" |
2376 | 381 | 390 | ||
2378 | 382 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 391 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2379 | 383 | msgid "Rate this" | 392 | msgid "Rate this" |
2380 | 384 | msgstr "Bedøm dette" | 393 | msgstr "Bedøm dette" |
2381 | 385 | 394 | ||
2383 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 395 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2384 | 387 | msgid "Add a review" | 396 | msgid "Add a review" |
2385 | 388 | msgstr "Tilføj en anmeldelse" | 397 | msgstr "Tilføj en anmeldelse" |
2386 | 389 | 398 | ||
2387 | 390 | 399 | ||
2388 | === modified file 'po/de.po' | |||
2389 | --- po/de.po 2016-11-08 05:41:47 +0000 | |||
2390 | +++ po/de.po 2016-11-14 12:06:52 +0000 | |||
2391 | @@ -7,7 +7,11 @@ | |||
2392 | 7 | msgstr "" | 7 | msgstr "" |
2393 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
2394 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2395 | 10 | <<<<<<< TREE | ||
2396 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2397 | 12 | ======= | ||
2398 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2399 | 14 | >>>>>>> MERGE-SOURCE | ||
2400 | 11 | "PO-Revision-Date: 2016-09-29 12:06+0000\n" | 15 | "PO-Revision-Date: 2016-09-29 12:06+0000\n" |
2401 | 12 | "Last-Translator: Matthias Seidel <matthias.seidel@hamburg.de>\n" | 16 | "Last-Translator: Matthias Seidel <matthias.seidel@hamburg.de>\n" |
2402 | 13 | "Language-Team: German <de@li.org>\n" | 17 | "Language-Team: German <de@li.org>\n" |
2403 | @@ -15,8 +19,13 @@ | |||
2404 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
2405 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2406 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2407 | 22 | <<<<<<< TREE | ||
2408 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
2409 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
2410 | 25 | ======= | ||
2411 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
2412 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
2413 | 28 | >>>>>>> MERGE-SOURCE | ||
2414 | 20 | 29 | ||
2415 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
2416 | 22 | msgid "Password: " | 31 | msgid "Password: " |
2417 | @@ -315,26 +324,26 @@ | |||
2418 | 315 | msgid "Preview Share Item" | 324 | msgid "Preview Share Item" |
2419 | 316 | msgstr "Vorschau für zu teilendes Element" | 325 | msgstr "Vorschau für zu teilendes Element" |
2420 | 317 | 326 | ||
2422 | 318 | #: qml/Dash/DashPageHeader.qml:362 | 327 | #: qml/Dash/DashPageHeader.qml:361 |
2423 | 319 | msgctxt "Button: Open the Ubuntu Store" | 328 | msgctxt "Button: Open the Ubuntu Store" |
2424 | 320 | msgid "Store" | 329 | msgid "Store" |
2425 | 321 | msgstr "Speichern" | 330 | msgstr "Speichern" |
2426 | 322 | 331 | ||
2428 | 323 | #: qml/Dash/DashPageHeader.qml:369 | 332 | #: qml/Dash/DashPageHeader.qml:368 |
2429 | 324 | msgctxt "Button: Start a search in the current dash scope" | 333 | msgctxt "Button: Start a search in the current dash scope" |
2430 | 325 | msgid "Search" | 334 | msgid "Search" |
2431 | 326 | msgstr "Suchen" | 335 | msgstr "Suchen" |
2432 | 327 | 336 | ||
2434 | 328 | #: qml/Dash/DashPageHeader.qml:379 | 337 | #: qml/Dash/DashPageHeader.qml:378 |
2435 | 329 | msgctxt "Button: Show the current dash scope settings" | 338 | msgctxt "Button: Show the current dash scope settings" |
2436 | 330 | msgid "Settings" | 339 | msgid "Settings" |
2437 | 331 | msgstr "Einstellungen" | 340 | msgstr "Einstellungen" |
2438 | 332 | 341 | ||
2440 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
2441 | 334 | msgid "Remove from Favorites" | 343 | msgid "Remove from Favorites" |
2442 | 335 | msgstr "Aus den Favoriten entfernen" | 344 | msgstr "Aus den Favoriten entfernen" |
2443 | 336 | 345 | ||
2445 | 337 | #: qml/Dash/DashPageHeader.qml:386 | 346 | #: qml/Dash/DashPageHeader.qml:385 |
2446 | 338 | msgid "Add to Favorites" | 347 | msgid "Add to Favorites" |
2447 | 339 | msgstr "Zu Favoriten hinzufügen" | 348 | msgstr "Zu Favoriten hinzufügen" |
2448 | 340 | 349 | ||
2449 | @@ -346,15 +355,15 @@ | |||
2450 | 346 | msgid "Reset" | 355 | msgid "Reset" |
2451 | 347 | msgstr "Zurücksetzen" | 356 | msgstr "Zurücksetzen" |
2452 | 348 | 357 | ||
2454 | 349 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 358 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2455 | 350 | msgid "Show less" | 359 | msgid "Show less" |
2456 | 351 | msgstr "Weniger anzeigen" | 360 | msgstr "Weniger anzeigen" |
2457 | 352 | 361 | ||
2459 | 353 | #: qml/Dash/GenericScopeView.qml:586 | 362 | #: qml/Dash/GenericScopeView.qml:545 |
2460 | 354 | msgid "Show all" | 363 | msgid "Show all" |
2461 | 355 | msgstr "Alle anzeigen" | 364 | msgstr "Alle anzeigen" |
2462 | 356 | 365 | ||
2464 | 357 | #: qml/Dash/GenericScopeView.qml:643 | 366 | #: qml/Dash/GenericScopeView.qml:576 |
2465 | 358 | msgctxt "Label: Hint for dash search line edit" | 367 | msgctxt "Label: Hint for dash search line edit" |
2466 | 359 | msgid "Search" | 368 | msgid "Search" |
2467 | 360 | msgstr "Suchen" | 369 | msgstr "Suchen" |
2468 | @@ -367,24 +376,24 @@ | |||
2469 | 367 | msgid "Clear All" | 376 | msgid "Clear All" |
2470 | 368 | msgstr "Alle zurücksetzen" | 377 | msgstr "Alle zurücksetzen" |
2471 | 369 | 378 | ||
2473 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2474 | 371 | msgid "More..." | 380 | msgid "More..." |
2475 | 372 | msgstr "Mehr …" | 381 | msgstr "Mehr …" |
2476 | 373 | 382 | ||
2478 | 374 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 383 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2479 | 375 | msgid "Less..." | 384 | msgid "Less..." |
2480 | 376 | msgstr "Weniger …" | 385 | msgstr "Weniger …" |
2481 | 377 | 386 | ||
2482 | 378 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 387 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2484 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2485 | 380 | msgid "Send" | 389 | msgid "Send" |
2486 | 381 | msgstr "Senden" | 390 | msgstr "Senden" |
2487 | 382 | 391 | ||
2489 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2490 | 384 | msgid "Rate this" | 393 | msgid "Rate this" |
2491 | 385 | msgstr "Bewerten" | 394 | msgstr "Bewerten" |
2492 | 386 | 395 | ||
2494 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 396 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2495 | 388 | msgid "Add a review" | 397 | msgid "Add a review" |
2496 | 389 | msgstr "Bewertung hinzufügen" | 398 | msgstr "Bewertung hinzufügen" |
2497 | 390 | 399 | ||
2498 | 391 | 400 | ||
2499 | === modified file 'po/el.po' | |||
2500 | --- po/el.po 2016-11-08 05:41:47 +0000 | |||
2501 | +++ po/el.po 2016-11-14 12:06:52 +0000 | |||
2502 | @@ -7,7 +7,11 @@ | |||
2503 | 7 | msgstr "" | 7 | msgstr "" |
2504 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
2505 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2506 | 10 | <<<<<<< TREE | ||
2507 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2508 | 12 | ======= | ||
2509 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2510 | 14 | >>>>>>> MERGE-SOURCE | ||
2511 | 11 | "PO-Revision-Date: 2016-04-25 16:24+0000\n" | 15 | "PO-Revision-Date: 2016-04-25 16:24+0000\n" |
2512 | 12 | "Last-Translator: Aggelos Arnaoutis <angelosarn@hotmail.com>\n" | 16 | "Last-Translator: Aggelos Arnaoutis <angelosarn@hotmail.com>\n" |
2513 | 13 | "Language-Team: Greek <el@li.org>\n" | 17 | "Language-Team: Greek <el@li.org>\n" |
2514 | @@ -15,8 +19,13 @@ | |||
2515 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
2516 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2517 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2518 | 22 | <<<<<<< TREE | ||
2519 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
2520 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
2521 | 25 | ======= | ||
2522 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
2523 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
2524 | 28 | >>>>>>> MERGE-SOURCE | ||
2525 | 20 | 29 | ||
2526 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
2527 | 22 | msgid "Password: " | 31 | msgid "Password: " |
2528 | @@ -315,26 +324,26 @@ | |||
2529 | 315 | msgid "Preview Share Item" | 324 | msgid "Preview Share Item" |
2530 | 316 | msgstr "Προεπισκόπηση κοινής χρήσης αντικειμένου" | 325 | msgstr "Προεπισκόπηση κοινής χρήσης αντικειμένου" |
2531 | 317 | 326 | ||
2533 | 318 | #: qml/Dash/DashPageHeader.qml:362 | 327 | #: qml/Dash/DashPageHeader.qml:361 |
2534 | 319 | msgctxt "Button: Open the Ubuntu Store" | 328 | msgctxt "Button: Open the Ubuntu Store" |
2535 | 320 | msgid "Store" | 329 | msgid "Store" |
2536 | 321 | msgstr "Κατάστημα" | 330 | msgstr "Κατάστημα" |
2537 | 322 | 331 | ||
2539 | 323 | #: qml/Dash/DashPageHeader.qml:369 | 332 | #: qml/Dash/DashPageHeader.qml:368 |
2540 | 324 | msgctxt "Button: Start a search in the current dash scope" | 333 | msgctxt "Button: Start a search in the current dash scope" |
2541 | 325 | msgid "Search" | 334 | msgid "Search" |
2542 | 326 | msgstr "Αναζήτηση" | 335 | msgstr "Αναζήτηση" |
2543 | 327 | 336 | ||
2545 | 328 | #: qml/Dash/DashPageHeader.qml:379 | 337 | #: qml/Dash/DashPageHeader.qml:378 |
2546 | 329 | msgctxt "Button: Show the current dash scope settings" | 338 | msgctxt "Button: Show the current dash scope settings" |
2547 | 330 | msgid "Settings" | 339 | msgid "Settings" |
2548 | 331 | msgstr "Ρυθμίσεις" | 340 | msgstr "Ρυθμίσεις" |
2549 | 332 | 341 | ||
2551 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
2552 | 334 | msgid "Remove from Favorites" | 343 | msgid "Remove from Favorites" |
2553 | 335 | msgstr "Αφαίρεση από τα αγαπημένα" | 344 | msgstr "Αφαίρεση από τα αγαπημένα" |
2554 | 336 | 345 | ||
2556 | 337 | #: qml/Dash/DashPageHeader.qml:386 | 346 | #: qml/Dash/DashPageHeader.qml:385 |
2557 | 338 | msgid "Add to Favorites" | 347 | msgid "Add to Favorites" |
2558 | 339 | msgstr "Προσθήκη στα αγαπημένα" | 348 | msgstr "Προσθήκη στα αγαπημένα" |
2559 | 340 | 349 | ||
2560 | @@ -346,15 +355,15 @@ | |||
2561 | 346 | msgid "Reset" | 355 | msgid "Reset" |
2562 | 347 | msgstr "Επαναφορά" | 356 | msgstr "Επαναφορά" |
2563 | 348 | 357 | ||
2565 | 349 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 358 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2566 | 350 | msgid "Show less" | 359 | msgid "Show less" |
2567 | 351 | msgstr "" | 360 | msgstr "" |
2568 | 352 | 361 | ||
2570 | 353 | #: qml/Dash/GenericScopeView.qml:586 | 362 | #: qml/Dash/GenericScopeView.qml:545 |
2571 | 354 | msgid "Show all" | 363 | msgid "Show all" |
2572 | 355 | msgstr "" | 364 | msgstr "" |
2573 | 356 | 365 | ||
2575 | 357 | #: qml/Dash/GenericScopeView.qml:643 | 366 | #: qml/Dash/GenericScopeView.qml:576 |
2576 | 358 | msgctxt "Label: Hint for dash search line edit" | 367 | msgctxt "Label: Hint for dash search line edit" |
2577 | 359 | msgid "Search" | 368 | msgid "Search" |
2578 | 360 | msgstr "Αναζήτηση" | 369 | msgstr "Αναζήτηση" |
2579 | @@ -367,24 +376,24 @@ | |||
2580 | 367 | msgid "Clear All" | 376 | msgid "Clear All" |
2581 | 368 | msgstr "Καθαρισμός όλων" | 377 | msgstr "Καθαρισμός όλων" |
2582 | 369 | 378 | ||
2584 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2585 | 371 | msgid "More..." | 380 | msgid "More..." |
2586 | 372 | msgstr "Περισσότερα..." | 381 | msgstr "Περισσότερα..." |
2587 | 373 | 382 | ||
2589 | 374 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 383 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2590 | 375 | msgid "Less..." | 384 | msgid "Less..." |
2591 | 376 | msgstr "Λιγότερα..." | 385 | msgstr "Λιγότερα..." |
2592 | 377 | 386 | ||
2593 | 378 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 387 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2595 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2596 | 380 | msgid "Send" | 389 | msgid "Send" |
2597 | 381 | msgstr "Αποστολή" | 390 | msgstr "Αποστολή" |
2598 | 382 | 391 | ||
2600 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2601 | 384 | msgid "Rate this" | 393 | msgid "Rate this" |
2602 | 385 | msgstr "Βαθμολογήστε το" | 394 | msgstr "Βαθμολογήστε το" |
2603 | 386 | 395 | ||
2605 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 396 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2606 | 388 | msgid "Add a review" | 397 | msgid "Add a review" |
2607 | 389 | msgstr "Προσθέστε την αξιολόγησή σας" | 398 | msgstr "Προσθέστε την αξιολόγησή σας" |
2608 | 390 | 399 | ||
2609 | 391 | 400 | ||
2610 | === modified file 'po/en_AU.po' | |||
2611 | --- po/en_AU.po 2016-11-08 05:41:47 +0000 | |||
2612 | +++ po/en_AU.po 2016-11-14 12:06:52 +0000 | |||
2613 | @@ -7,7 +7,11 @@ | |||
2614 | 7 | msgstr "" | 7 | msgstr "" |
2615 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
2616 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2617 | 10 | <<<<<<< TREE | ||
2618 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2619 | 12 | ======= | ||
2620 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2621 | 14 | >>>>>>> MERGE-SOURCE | ||
2622 | 11 | "PO-Revision-Date: 2016-03-27 10:09+0000\n" | 15 | "PO-Revision-Date: 2016-03-27 10:09+0000\n" |
2623 | 12 | "Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n" | 16 | "Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n" |
2624 | 13 | "Language-Team: English (Australia) <en_AU@li.org>\n" | 17 | "Language-Team: English (Australia) <en_AU@li.org>\n" |
2625 | @@ -15,8 +19,13 @@ | |||
2626 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
2627 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2628 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2629 | 22 | <<<<<<< TREE | ||
2630 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
2631 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
2632 | 25 | ======= | ||
2633 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:10+0000\n" | ||
2634 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
2635 | 28 | >>>>>>> MERGE-SOURCE | ||
2636 | 20 | 29 | ||
2637 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
2638 | 22 | msgid "Password: " | 31 | msgid "Password: " |
2639 | @@ -313,26 +322,26 @@ | |||
2640 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
2641 | 314 | msgstr "Preview Share Item" | 323 | msgstr "Preview Share Item" |
2642 | 315 | 324 | ||
2644 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
2645 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
2646 | 318 | msgid "Store" | 327 | msgid "Store" |
2647 | 319 | msgstr "Store" | 328 | msgstr "Store" |
2648 | 320 | 329 | ||
2650 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
2651 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
2652 | 323 | msgid "Search" | 332 | msgid "Search" |
2653 | 324 | msgstr "Search" | 333 | msgstr "Search" |
2654 | 325 | 334 | ||
2656 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
2657 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
2658 | 328 | msgid "Settings" | 337 | msgid "Settings" |
2659 | 329 | msgstr "Settings" | 338 | msgstr "Settings" |
2660 | 330 | 339 | ||
2662 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
2663 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
2664 | 333 | msgstr "Remove from Favourites" | 342 | msgstr "Remove from Favourites" |
2665 | 334 | 343 | ||
2667 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
2668 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
2669 | 337 | msgstr "Add to Favourites" | 346 | msgstr "Add to Favourites" |
2670 | 338 | 347 | ||
2671 | @@ -344,15 +353,15 @@ | |||
2672 | 344 | msgid "Reset" | 353 | msgid "Reset" |
2673 | 345 | msgstr "Reset" | 354 | msgstr "Reset" |
2674 | 346 | 355 | ||
2676 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2677 | 348 | msgid "Show less" | 357 | msgid "Show less" |
2678 | 349 | msgstr "" | 358 | msgstr "" |
2679 | 350 | 359 | ||
2681 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
2682 | 352 | msgid "Show all" | 361 | msgid "Show all" |
2683 | 353 | msgstr "" | 362 | msgstr "" |
2684 | 354 | 363 | ||
2686 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
2687 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
2688 | 357 | msgid "Search" | 366 | msgid "Search" |
2689 | 358 | msgstr "Search" | 367 | msgstr "Search" |
2690 | @@ -365,24 +374,24 @@ | |||
2691 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
2692 | 366 | msgstr "Clear All" | 375 | msgstr "Clear All" |
2693 | 367 | 376 | ||
2695 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2696 | 369 | msgid "More..." | 378 | msgid "More..." |
2697 | 370 | msgstr "More..." | 379 | msgstr "More..." |
2698 | 371 | 380 | ||
2700 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2701 | 373 | msgid "Less..." | 382 | msgid "Less..." |
2702 | 374 | msgstr "Less..." | 383 | msgstr "Less..." |
2703 | 375 | 384 | ||
2704 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2706 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2707 | 378 | msgid "Send" | 387 | msgid "Send" |
2708 | 379 | msgstr "Send" | 388 | msgstr "Send" |
2709 | 380 | 389 | ||
2711 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2712 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
2713 | 383 | msgstr "Rate this" | 392 | msgstr "Rate this" |
2714 | 384 | 393 | ||
2716 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2717 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
2718 | 387 | msgstr "Add a review" | 396 | msgstr "Add a review" |
2719 | 388 | 397 | ||
2720 | 389 | 398 | ||
2721 | === modified file 'po/en_GB.po' | |||
2722 | --- po/en_GB.po 2016-11-08 05:41:47 +0000 | |||
2723 | +++ po/en_GB.po 2016-11-14 12:06:52 +0000 | |||
2724 | @@ -7,7 +7,11 @@ | |||
2725 | 7 | msgstr "" | 7 | msgstr "" |
2726 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
2727 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2728 | 10 | <<<<<<< TREE | ||
2729 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2730 | 12 | ======= | ||
2731 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2732 | 14 | >>>>>>> MERGE-SOURCE | ||
2733 | 11 | "PO-Revision-Date: 2016-07-05 00:37+0000\n" | 15 | "PO-Revision-Date: 2016-07-05 00:37+0000\n" |
2734 | 12 | "Last-Translator: Andi Chandler <Unknown>\n" | 16 | "Last-Translator: Andi Chandler <Unknown>\n" |
2735 | 13 | "Language-Team: English (United Kingdom) <en_GB@li.org>\n" | 17 | "Language-Team: English (United Kingdom) <en_GB@li.org>\n" |
2736 | @@ -15,8 +19,13 @@ | |||
2737 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
2738 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2739 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2740 | 22 | <<<<<<< TREE | ||
2741 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
2742 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
2743 | 25 | ======= | ||
2744 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:10+0000\n" | ||
2745 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
2746 | 28 | >>>>>>> MERGE-SOURCE | ||
2747 | 20 | 29 | ||
2748 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
2749 | 22 | msgid "Password: " | 31 | msgid "Password: " |
2750 | @@ -313,26 +322,26 @@ | |||
2751 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
2752 | 314 | msgstr "Preview Share Item" | 323 | msgstr "Preview Share Item" |
2753 | 315 | 324 | ||
2755 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
2756 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
2757 | 318 | msgid "Store" | 327 | msgid "Store" |
2758 | 319 | msgstr "Store" | 328 | msgstr "Store" |
2759 | 320 | 329 | ||
2761 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
2762 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
2763 | 323 | msgid "Search" | 332 | msgid "Search" |
2764 | 324 | msgstr "Search" | 333 | msgstr "Search" |
2765 | 325 | 334 | ||
2767 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
2768 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
2769 | 328 | msgid "Settings" | 337 | msgid "Settings" |
2770 | 329 | msgstr "Settings" | 338 | msgstr "Settings" |
2771 | 330 | 339 | ||
2773 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
2774 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
2775 | 333 | msgstr "Remove from Favourites" | 342 | msgstr "Remove from Favourites" |
2776 | 334 | 343 | ||
2778 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
2779 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
2780 | 337 | msgstr "Add to Favourites" | 346 | msgstr "Add to Favourites" |
2781 | 338 | 347 | ||
2782 | @@ -344,15 +353,15 @@ | |||
2783 | 344 | msgid "Reset" | 353 | msgid "Reset" |
2784 | 345 | msgstr "Reset" | 354 | msgstr "Reset" |
2785 | 346 | 355 | ||
2787 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2788 | 348 | msgid "Show less" | 357 | msgid "Show less" |
2789 | 349 | msgstr "Show less" | 358 | msgstr "Show less" |
2790 | 350 | 359 | ||
2792 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
2793 | 352 | msgid "Show all" | 361 | msgid "Show all" |
2794 | 353 | msgstr "Show all" | 362 | msgstr "Show all" |
2795 | 354 | 363 | ||
2797 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
2798 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
2799 | 357 | msgid "Search" | 366 | msgid "Search" |
2800 | 358 | msgstr "Search" | 367 | msgstr "Search" |
2801 | @@ -365,24 +374,24 @@ | |||
2802 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
2803 | 366 | msgstr "Clear All" | 375 | msgstr "Clear All" |
2804 | 367 | 376 | ||
2806 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2807 | 369 | msgid "More..." | 378 | msgid "More..." |
2808 | 370 | msgstr "More..." | 379 | msgstr "More..." |
2809 | 371 | 380 | ||
2811 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2812 | 373 | msgid "Less..." | 382 | msgid "Less..." |
2813 | 374 | msgstr "Less..." | 383 | msgstr "Less..." |
2814 | 375 | 384 | ||
2815 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2817 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2818 | 378 | msgid "Send" | 387 | msgid "Send" |
2819 | 379 | msgstr "Send" | 388 | msgstr "Send" |
2820 | 380 | 389 | ||
2822 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2823 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
2824 | 383 | msgstr "Rate this" | 392 | msgstr "Rate this" |
2825 | 384 | 393 | ||
2827 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2828 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
2829 | 387 | msgstr "Add a review" | 396 | msgstr "Add a review" |
2830 | 388 | 397 | ||
2831 | 389 | 398 | ||
2832 | === modified file 'po/eo.po' | |||
2833 | --- po/eo.po 2016-11-08 05:41:47 +0000 | |||
2834 | +++ po/eo.po 2016-11-14 12:06:52 +0000 | |||
2835 | @@ -7,7 +7,11 @@ | |||
2836 | 7 | msgstr "" | 7 | msgstr "" |
2837 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
2838 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2839 | 10 | <<<<<<< TREE | ||
2840 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2841 | 12 | ======= | ||
2842 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2843 | 14 | >>>>>>> MERGE-SOURCE | ||
2844 | 11 | "PO-Revision-Date: 2015-06-06 23:37+0000\n" | 15 | "PO-Revision-Date: 2015-06-06 23:37+0000\n" |
2845 | 12 | "Last-Translator: Eliovir <Unknown>\n" | 16 | "Last-Translator: Eliovir <Unknown>\n" |
2846 | 13 | "Language-Team: Esperanto <eo@li.org>\n" | 17 | "Language-Team: Esperanto <eo@li.org>\n" |
2847 | @@ -15,8 +19,13 @@ | |||
2848 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
2849 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2850 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2851 | 22 | <<<<<<< TREE | ||
2852 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
2853 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
2854 | 25 | ======= | ||
2855 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
2856 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
2857 | 28 | >>>>>>> MERGE-SOURCE | ||
2858 | 20 | 29 | ||
2859 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
2860 | 22 | msgid "Password: " | 31 | msgid "Password: " |
2861 | @@ -311,26 +320,26 @@ | |||
2862 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
2863 | 312 | msgstr "" | 321 | msgstr "" |
2864 | 313 | 322 | ||
2866 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
2867 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
2868 | 316 | msgid "Store" | 325 | msgid "Store" |
2869 | 317 | msgstr "Programarejo" | 326 | msgstr "Programarejo" |
2870 | 318 | 327 | ||
2872 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
2873 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
2874 | 321 | msgid "Search" | 330 | msgid "Search" |
2875 | 322 | msgstr "Serĉi" | 331 | msgstr "Serĉi" |
2876 | 323 | 332 | ||
2878 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
2879 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
2880 | 326 | msgid "Settings" | 335 | msgid "Settings" |
2881 | 327 | msgstr "Agordoj" | 336 | msgstr "Agordoj" |
2882 | 328 | 337 | ||
2884 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
2885 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
2886 | 331 | msgstr "" | 340 | msgstr "" |
2887 | 332 | 341 | ||
2889 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
2890 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
2891 | 335 | msgstr "Aldoni al favoritoj" | 344 | msgstr "Aldoni al favoritoj" |
2892 | 336 | 345 | ||
2893 | @@ -342,15 +351,15 @@ | |||
2894 | 342 | msgid "Reset" | 351 | msgid "Reset" |
2895 | 343 | msgstr "" | 352 | msgstr "" |
2896 | 344 | 353 | ||
2898 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
2899 | 346 | msgid "Show less" | 355 | msgid "Show less" |
2900 | 347 | msgstr "" | 356 | msgstr "" |
2901 | 348 | 357 | ||
2903 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
2904 | 350 | msgid "Show all" | 359 | msgid "Show all" |
2905 | 351 | msgstr "" | 360 | msgstr "" |
2906 | 352 | 361 | ||
2908 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
2909 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
2910 | 355 | msgid "Search" | 364 | msgid "Search" |
2911 | 356 | msgstr "Serĉi" | 365 | msgstr "Serĉi" |
2912 | @@ -363,24 +372,24 @@ | |||
2913 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
2914 | 364 | msgstr "" | 373 | msgstr "" |
2915 | 365 | 374 | ||
2917 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2918 | 367 | msgid "More..." | 376 | msgid "More..." |
2919 | 368 | msgstr "Pli…" | 377 | msgstr "Pli…" |
2920 | 369 | 378 | ||
2922 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
2923 | 371 | msgid "Less..." | 380 | msgid "Less..." |
2924 | 372 | msgstr "Malpli..." | 381 | msgstr "Malpli..." |
2925 | 373 | 382 | ||
2926 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
2928 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
2929 | 376 | msgid "Send" | 385 | msgid "Send" |
2930 | 377 | msgstr "Sendi" | 386 | msgstr "Sendi" |
2931 | 378 | 387 | ||
2933 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
2934 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
2935 | 381 | msgstr "" | 390 | msgstr "" |
2936 | 382 | 391 | ||
2938 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
2939 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
2940 | 385 | msgstr "" | 394 | msgstr "" |
2941 | 386 | 395 | ||
2942 | 387 | 396 | ||
2943 | === modified file 'po/es.po' | |||
2944 | --- po/es.po 2016-11-08 05:41:47 +0000 | |||
2945 | +++ po/es.po 2016-11-14 12:06:52 +0000 | |||
2946 | @@ -7,7 +7,11 @@ | |||
2947 | 7 | msgstr "" | 7 | msgstr "" |
2948 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
2949 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2950 | 10 | <<<<<<< TREE | ||
2951 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
2952 | 12 | ======= | ||
2953 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
2954 | 14 | >>>>>>> MERGE-SOURCE | ||
2955 | 11 | "PO-Revision-Date: 2016-03-25 12:02+0000\n" | 15 | "PO-Revision-Date: 2016-03-25 12:02+0000\n" |
2956 | 12 | "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n" | 16 | "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n" |
2957 | 13 | "Language-Team: Spanish <es@li.org>\n" | 17 | "Language-Team: Spanish <es@li.org>\n" |
2958 | @@ -15,8 +19,13 @@ | |||
2959 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
2960 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
2961 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
2962 | 22 | <<<<<<< TREE | ||
2963 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
2964 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
2965 | 25 | ======= | ||
2966 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:10+0000\n" | ||
2967 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
2968 | 28 | >>>>>>> MERGE-SOURCE | ||
2969 | 20 | 29 | ||
2970 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
2971 | 22 | msgid "Password: " | 31 | msgid "Password: " |
2972 | @@ -314,26 +323,26 @@ | |||
2973 | 314 | msgid "Preview Share Item" | 323 | msgid "Preview Share Item" |
2974 | 315 | msgstr "Revisar elemento compartido" | 324 | msgstr "Revisar elemento compartido" |
2975 | 316 | 325 | ||
2977 | 317 | #: qml/Dash/DashPageHeader.qml:362 | 326 | #: qml/Dash/DashPageHeader.qml:361 |
2978 | 318 | msgctxt "Button: Open the Ubuntu Store" | 327 | msgctxt "Button: Open the Ubuntu Store" |
2979 | 319 | msgid "Store" | 328 | msgid "Store" |
2980 | 320 | msgstr "Tienda" | 329 | msgstr "Tienda" |
2981 | 321 | 330 | ||
2983 | 322 | #: qml/Dash/DashPageHeader.qml:369 | 331 | #: qml/Dash/DashPageHeader.qml:368 |
2984 | 323 | msgctxt "Button: Start a search in the current dash scope" | 332 | msgctxt "Button: Start a search in the current dash scope" |
2985 | 324 | msgid "Search" | 333 | msgid "Search" |
2986 | 325 | msgstr "Buscar" | 334 | msgstr "Buscar" |
2987 | 326 | 335 | ||
2989 | 327 | #: qml/Dash/DashPageHeader.qml:379 | 336 | #: qml/Dash/DashPageHeader.qml:378 |
2990 | 328 | msgctxt "Button: Show the current dash scope settings" | 337 | msgctxt "Button: Show the current dash scope settings" |
2991 | 329 | msgid "Settings" | 338 | msgid "Settings" |
2992 | 330 | msgstr "Ajustes" | 339 | msgstr "Ajustes" |
2993 | 331 | 340 | ||
2995 | 332 | #: qml/Dash/DashPageHeader.qml:386 | 341 | #: qml/Dash/DashPageHeader.qml:385 |
2996 | 333 | msgid "Remove from Favorites" | 342 | msgid "Remove from Favorites" |
2997 | 334 | msgstr "Quitar de favoritos" | 343 | msgstr "Quitar de favoritos" |
2998 | 335 | 344 | ||
3000 | 336 | #: qml/Dash/DashPageHeader.qml:386 | 345 | #: qml/Dash/DashPageHeader.qml:385 |
3001 | 337 | msgid "Add to Favorites" | 346 | msgid "Add to Favorites" |
3002 | 338 | msgstr "Añadir a favoritos" | 347 | msgstr "Añadir a favoritos" |
3003 | 339 | 348 | ||
3004 | @@ -345,15 +354,15 @@ | |||
3005 | 345 | msgid "Reset" | 354 | msgid "Reset" |
3006 | 346 | msgstr "Restablecer" | 355 | msgstr "Restablecer" |
3007 | 347 | 356 | ||
3009 | 348 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 357 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3010 | 349 | msgid "Show less" | 358 | msgid "Show less" |
3011 | 350 | msgstr "Mostrar menos" | 359 | msgstr "Mostrar menos" |
3012 | 351 | 360 | ||
3014 | 352 | #: qml/Dash/GenericScopeView.qml:586 | 361 | #: qml/Dash/GenericScopeView.qml:545 |
3015 | 353 | msgid "Show all" | 362 | msgid "Show all" |
3016 | 354 | msgstr "Mostrar todo" | 363 | msgstr "Mostrar todo" |
3017 | 355 | 364 | ||
3019 | 356 | #: qml/Dash/GenericScopeView.qml:643 | 365 | #: qml/Dash/GenericScopeView.qml:576 |
3020 | 357 | msgctxt "Label: Hint for dash search line edit" | 366 | msgctxt "Label: Hint for dash search line edit" |
3021 | 358 | msgid "Search" | 367 | msgid "Search" |
3022 | 359 | msgstr "Búsqueda" | 368 | msgstr "Búsqueda" |
3023 | @@ -366,24 +375,24 @@ | |||
3024 | 366 | msgid "Clear All" | 375 | msgid "Clear All" |
3025 | 367 | msgstr "Borrar todo" | 376 | msgstr "Borrar todo" |
3026 | 368 | 377 | ||
3028 | 369 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 378 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3029 | 370 | msgid "More..." | 379 | msgid "More..." |
3030 | 371 | msgstr "Más…" | 380 | msgstr "Más…" |
3031 | 372 | 381 | ||
3033 | 373 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 382 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3034 | 374 | msgid "Less..." | 383 | msgid "Less..." |
3035 | 375 | msgstr "Menos…" | 384 | msgstr "Menos…" |
3036 | 376 | 385 | ||
3037 | 377 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 386 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3039 | 378 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3040 | 379 | msgid "Send" | 388 | msgid "Send" |
3041 | 380 | msgstr "Enviar" | 389 | msgstr "Enviar" |
3042 | 381 | 390 | ||
3044 | 382 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 391 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3045 | 383 | msgid "Rate this" | 392 | msgid "Rate this" |
3046 | 384 | msgstr "Valorar esto" | 393 | msgstr "Valorar esto" |
3047 | 385 | 394 | ||
3049 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 395 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3050 | 387 | msgid "Add a review" | 396 | msgid "Add a review" |
3051 | 388 | msgstr "Añadir una reseña" | 397 | msgstr "Añadir una reseña" |
3052 | 389 | 398 | ||
3053 | 390 | 399 | ||
3054 | === modified file 'po/eu.po' | |||
3055 | --- po/eu.po 2016-11-08 05:41:47 +0000 | |||
3056 | +++ po/eu.po 2016-11-14 12:06:52 +0000 | |||
3057 | @@ -7,7 +7,11 @@ | |||
3058 | 7 | msgstr "" | 7 | msgstr "" |
3059 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
3060 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3061 | 10 | <<<<<<< TREE | ||
3062 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3063 | 12 | ======= | ||
3064 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3065 | 14 | >>>>>>> MERGE-SOURCE | ||
3066 | 11 | "PO-Revision-Date: 2015-07-13 23:29+0000\n" | 15 | "PO-Revision-Date: 2015-07-13 23:29+0000\n" |
3067 | 12 | "Last-Translator: Ibai Oihanguren Sala <Unknown>\n" | 16 | "Last-Translator: Ibai Oihanguren Sala <Unknown>\n" |
3068 | 13 | "Language-Team: Basque <eu@li.org>\n" | 17 | "Language-Team: Basque <eu@li.org>\n" |
3069 | @@ -15,8 +19,13 @@ | |||
3070 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3071 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3072 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
3073 | 22 | <<<<<<< TREE | ||
3074 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3075 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3076 | 25 | ======= | ||
3077 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3078 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3079 | 28 | >>>>>>> MERGE-SOURCE | ||
3080 | 20 | 29 | ||
3081 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3082 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3083 | @@ -311,26 +320,26 @@ | |||
3084 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
3085 | 312 | msgstr "" | 321 | msgstr "" |
3086 | 313 | 322 | ||
3088 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
3089 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
3090 | 316 | msgid "Store" | 325 | msgid "Store" |
3091 | 317 | msgstr "Denda" | 326 | msgstr "Denda" |
3092 | 318 | 327 | ||
3094 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
3095 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
3096 | 321 | msgid "Search" | 330 | msgid "Search" |
3097 | 322 | msgstr "Bilatu" | 331 | msgstr "Bilatu" |
3098 | 323 | 332 | ||
3100 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
3101 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
3102 | 326 | msgid "Settings" | 335 | msgid "Settings" |
3103 | 327 | msgstr "Ezarpenak" | 336 | msgstr "Ezarpenak" |
3104 | 328 | 337 | ||
3106 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
3107 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
3108 | 331 | msgstr "Kendu gogokoetatik" | 340 | msgstr "Kendu gogokoetatik" |
3109 | 332 | 341 | ||
3111 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
3112 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
3113 | 335 | msgstr "Gehitu gogokoetara" | 344 | msgstr "Gehitu gogokoetara" |
3114 | 336 | 345 | ||
3115 | @@ -342,15 +351,15 @@ | |||
3116 | 342 | msgid "Reset" | 351 | msgid "Reset" |
3117 | 343 | msgstr "" | 352 | msgstr "" |
3118 | 344 | 353 | ||
3120 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3121 | 346 | msgid "Show less" | 355 | msgid "Show less" |
3122 | 347 | msgstr "" | 356 | msgstr "" |
3123 | 348 | 357 | ||
3125 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
3126 | 350 | msgid "Show all" | 359 | msgid "Show all" |
3127 | 351 | msgstr "" | 360 | msgstr "" |
3128 | 352 | 361 | ||
3130 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
3131 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
3132 | 355 | msgid "Search" | 364 | msgid "Search" |
3133 | 356 | msgstr "Bilatu" | 365 | msgstr "Bilatu" |
3134 | @@ -363,24 +372,24 @@ | |||
3135 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
3136 | 364 | msgstr "" | 373 | msgstr "" |
3137 | 365 | 374 | ||
3139 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3140 | 367 | msgid "More..." | 376 | msgid "More..." |
3141 | 368 | msgstr "Gehiago..." | 377 | msgstr "Gehiago..." |
3142 | 369 | 378 | ||
3144 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3145 | 371 | msgid "Less..." | 380 | msgid "Less..." |
3146 | 372 | msgstr "Gutxiago..." | 381 | msgstr "Gutxiago..." |
3147 | 373 | 382 | ||
3148 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3150 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3151 | 376 | msgid "Send" | 385 | msgid "Send" |
3152 | 377 | msgstr "Bidali" | 386 | msgstr "Bidali" |
3153 | 378 | 387 | ||
3155 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3156 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
3157 | 381 | msgstr "Puntuatu hau" | 390 | msgstr "Puntuatu hau" |
3158 | 382 | 391 | ||
3160 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3161 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
3162 | 385 | msgstr "Gehitu kritika" | 394 | msgstr "Gehitu kritika" |
3163 | 386 | 395 | ||
3164 | 387 | 396 | ||
3165 | === modified file 'po/fa.po' | |||
3166 | --- po/fa.po 2016-11-08 05:41:47 +0000 | |||
3167 | +++ po/fa.po 2016-11-14 12:06:52 +0000 | |||
3168 | @@ -7,7 +7,11 @@ | |||
3169 | 7 | msgstr "" | 7 | msgstr "" |
3170 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
3171 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3172 | 10 | <<<<<<< TREE | ||
3173 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3174 | 12 | ======= | ||
3175 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3176 | 14 | >>>>>>> MERGE-SOURCE | ||
3177 | 11 | "PO-Revision-Date: 2016-10-18 07:03+0000\n" | 15 | "PO-Revision-Date: 2016-10-18 07:03+0000\n" |
3178 | 12 | "Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n" | 16 | "Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n" |
3179 | 13 | "Language-Team: Persian <fa@li.org>\n" | 17 | "Language-Team: Persian <fa@li.org>\n" |
3180 | @@ -15,8 +19,13 @@ | |||
3181 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3182 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3183 | 17 | "Plural-Forms: nplurals=1; plural=0;\n" | 21 | "Plural-Forms: nplurals=1; plural=0;\n" |
3184 | 22 | <<<<<<< TREE | ||
3185 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
3186 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3187 | 25 | ======= | ||
3188 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3189 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3190 | 28 | >>>>>>> MERGE-SOURCE | ||
3191 | 20 | 29 | ||
3192 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3193 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3194 | @@ -314,26 +323,26 @@ | |||
3195 | 314 | msgid "Preview Share Item" | 323 | msgid "Preview Share Item" |
3196 | 315 | msgstr "پیشنمای مورد همرسانی" | 324 | msgstr "پیشنمای مورد همرسانی" |
3197 | 316 | 325 | ||
3199 | 317 | #: qml/Dash/DashPageHeader.qml:362 | 326 | #: qml/Dash/DashPageHeader.qml:361 |
3200 | 318 | msgctxt "Button: Open the Ubuntu Store" | 327 | msgctxt "Button: Open the Ubuntu Store" |
3201 | 319 | msgid "Store" | 328 | msgid "Store" |
3202 | 320 | msgstr "ذخیره" | 329 | msgstr "ذخیره" |
3203 | 321 | 330 | ||
3205 | 322 | #: qml/Dash/DashPageHeader.qml:369 | 331 | #: qml/Dash/DashPageHeader.qml:368 |
3206 | 323 | msgctxt "Button: Start a search in the current dash scope" | 332 | msgctxt "Button: Start a search in the current dash scope" |
3207 | 324 | msgid "Search" | 333 | msgid "Search" |
3208 | 325 | msgstr "جستوجو" | 334 | msgstr "جستوجو" |
3209 | 326 | 335 | ||
3211 | 327 | #: qml/Dash/DashPageHeader.qml:379 | 336 | #: qml/Dash/DashPageHeader.qml:378 |
3212 | 328 | msgctxt "Button: Show the current dash scope settings" | 337 | msgctxt "Button: Show the current dash scope settings" |
3213 | 329 | msgid "Settings" | 338 | msgid "Settings" |
3214 | 330 | msgstr "تنظیمات" | 339 | msgstr "تنظیمات" |
3215 | 331 | 340 | ||
3217 | 332 | #: qml/Dash/DashPageHeader.qml:386 | 341 | #: qml/Dash/DashPageHeader.qml:385 |
3218 | 333 | msgid "Remove from Favorites" | 342 | msgid "Remove from Favorites" |
3219 | 334 | msgstr "برداشتن از برگزیدهها" | 343 | msgstr "برداشتن از برگزیدهها" |
3220 | 335 | 344 | ||
3222 | 336 | #: qml/Dash/DashPageHeader.qml:386 | 345 | #: qml/Dash/DashPageHeader.qml:385 |
3223 | 337 | msgid "Add to Favorites" | 346 | msgid "Add to Favorites" |
3224 | 338 | msgstr "افزودن به برگزیدهها" | 347 | msgstr "افزودن به برگزیدهها" |
3225 | 339 | 348 | ||
3226 | @@ -345,15 +354,15 @@ | |||
3227 | 345 | msgid "Reset" | 354 | msgid "Reset" |
3228 | 346 | msgstr "بازنشانی" | 355 | msgstr "بازنشانی" |
3229 | 347 | 356 | ||
3231 | 348 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 357 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3232 | 349 | msgid "Show less" | 358 | msgid "Show less" |
3233 | 350 | msgstr "نمایش کمتر" | 359 | msgstr "نمایش کمتر" |
3234 | 351 | 360 | ||
3236 | 352 | #: qml/Dash/GenericScopeView.qml:586 | 361 | #: qml/Dash/GenericScopeView.qml:545 |
3237 | 353 | msgid "Show all" | 362 | msgid "Show all" |
3238 | 354 | msgstr "نمایش همه" | 363 | msgstr "نمایش همه" |
3239 | 355 | 364 | ||
3241 | 356 | #: qml/Dash/GenericScopeView.qml:643 | 365 | #: qml/Dash/GenericScopeView.qml:576 |
3242 | 357 | msgctxt "Label: Hint for dash search line edit" | 366 | msgctxt "Label: Hint for dash search line edit" |
3243 | 358 | msgid "Search" | 367 | msgid "Search" |
3244 | 359 | msgstr "جستوجو" | 368 | msgstr "جستوجو" |
3245 | @@ -366,24 +375,24 @@ | |||
3246 | 366 | msgid "Clear All" | 375 | msgid "Clear All" |
3247 | 367 | msgstr "پاکسازی همه" | 376 | msgstr "پاکسازی همه" |
3248 | 368 | 377 | ||
3250 | 369 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 378 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3251 | 370 | msgid "More..." | 379 | msgid "More..." |
3252 | 371 | msgstr "بیشتر…" | 380 | msgstr "بیشتر…" |
3253 | 372 | 381 | ||
3255 | 373 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 382 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3256 | 374 | msgid "Less..." | 383 | msgid "Less..." |
3257 | 375 | msgstr "کمتر…" | 384 | msgstr "کمتر…" |
3258 | 376 | 385 | ||
3259 | 377 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 386 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3261 | 378 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3262 | 379 | msgid "Send" | 388 | msgid "Send" |
3263 | 380 | msgstr "ارسال" | 389 | msgstr "ارسال" |
3264 | 381 | 390 | ||
3266 | 382 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 391 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3267 | 383 | msgid "Rate this" | 392 | msgid "Rate this" |
3268 | 384 | msgstr "امتیاز دادن" | 393 | msgstr "امتیاز دادن" |
3269 | 385 | 394 | ||
3271 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 395 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3272 | 387 | msgid "Add a review" | 396 | msgid "Add a review" |
3273 | 388 | msgstr "افزودن یک بازبینی" | 397 | msgstr "افزودن یک بازبینی" |
3274 | 389 | 398 | ||
3275 | 390 | 399 | ||
3276 | === modified file 'po/fi.po' | |||
3277 | --- po/fi.po 2016-11-08 05:41:47 +0000 | |||
3278 | +++ po/fi.po 2016-11-14 12:06:52 +0000 | |||
3279 | @@ -7,7 +7,11 @@ | |||
3280 | 7 | msgstr "" | 7 | msgstr "" |
3281 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
3282 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3283 | 10 | <<<<<<< TREE | ||
3284 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3285 | 12 | ======= | ||
3286 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3287 | 14 | >>>>>>> MERGE-SOURCE | ||
3288 | 11 | "PO-Revision-Date: 2015-07-04 18:32+0000\n" | 15 | "PO-Revision-Date: 2015-07-04 18:32+0000\n" |
3289 | 12 | "Last-Translator: Jiri Grönroos <Unknown>\n" | 16 | "Last-Translator: Jiri Grönroos <Unknown>\n" |
3290 | 13 | "Language-Team: Finnish <fi@li.org>\n" | 17 | "Language-Team: Finnish <fi@li.org>\n" |
3291 | @@ -15,8 +19,13 @@ | |||
3292 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3293 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3294 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
3295 | 22 | <<<<<<< TREE | ||
3296 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3297 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3298 | 25 | ======= | ||
3299 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3300 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3301 | 28 | >>>>>>> MERGE-SOURCE | ||
3302 | 20 | 29 | ||
3303 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3304 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3305 | @@ -315,26 +324,26 @@ | |||
3306 | 315 | msgid "Preview Share Item" | 324 | msgid "Preview Share Item" |
3307 | 316 | msgstr "Jaon esikatselu" | 325 | msgstr "Jaon esikatselu" |
3308 | 317 | 326 | ||
3310 | 318 | #: qml/Dash/DashPageHeader.qml:362 | 327 | #: qml/Dash/DashPageHeader.qml:361 |
3311 | 319 | msgctxt "Button: Open the Ubuntu Store" | 328 | msgctxt "Button: Open the Ubuntu Store" |
3312 | 320 | msgid "Store" | 329 | msgid "Store" |
3313 | 321 | msgstr "Kauppa" | 330 | msgstr "Kauppa" |
3314 | 322 | 331 | ||
3316 | 323 | #: qml/Dash/DashPageHeader.qml:369 | 332 | #: qml/Dash/DashPageHeader.qml:368 |
3317 | 324 | msgctxt "Button: Start a search in the current dash scope" | 333 | msgctxt "Button: Start a search in the current dash scope" |
3318 | 325 | msgid "Search" | 334 | msgid "Search" |
3319 | 326 | msgstr "Etsi" | 335 | msgstr "Etsi" |
3320 | 327 | 336 | ||
3322 | 328 | #: qml/Dash/DashPageHeader.qml:379 | 337 | #: qml/Dash/DashPageHeader.qml:378 |
3323 | 329 | msgctxt "Button: Show the current dash scope settings" | 338 | msgctxt "Button: Show the current dash scope settings" |
3324 | 330 | msgid "Settings" | 339 | msgid "Settings" |
3325 | 331 | msgstr "Asetukset" | 340 | msgstr "Asetukset" |
3326 | 332 | 341 | ||
3328 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
3329 | 334 | msgid "Remove from Favorites" | 343 | msgid "Remove from Favorites" |
3330 | 335 | msgstr "Poista suosikeista" | 344 | msgstr "Poista suosikeista" |
3331 | 336 | 345 | ||
3333 | 337 | #: qml/Dash/DashPageHeader.qml:386 | 346 | #: qml/Dash/DashPageHeader.qml:385 |
3334 | 338 | msgid "Add to Favorites" | 347 | msgid "Add to Favorites" |
3335 | 339 | msgstr "Lisää suosikkeihin" | 348 | msgstr "Lisää suosikkeihin" |
3336 | 340 | 349 | ||
3337 | @@ -346,15 +355,15 @@ | |||
3338 | 346 | msgid "Reset" | 355 | msgid "Reset" |
3339 | 347 | msgstr "Palauta" | 356 | msgstr "Palauta" |
3340 | 348 | 357 | ||
3342 | 349 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 358 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3343 | 350 | msgid "Show less" | 359 | msgid "Show less" |
3344 | 351 | msgstr "Näytä vähemmän" | 360 | msgstr "Näytä vähemmän" |
3345 | 352 | 361 | ||
3347 | 353 | #: qml/Dash/GenericScopeView.qml:586 | 362 | #: qml/Dash/GenericScopeView.qml:545 |
3348 | 354 | msgid "Show all" | 363 | msgid "Show all" |
3349 | 355 | msgstr "Näytä kaikki" | 364 | msgstr "Näytä kaikki" |
3350 | 356 | 365 | ||
3352 | 357 | #: qml/Dash/GenericScopeView.qml:643 | 366 | #: qml/Dash/GenericScopeView.qml:576 |
3353 | 358 | msgctxt "Label: Hint for dash search line edit" | 367 | msgctxt "Label: Hint for dash search line edit" |
3354 | 359 | msgid "Search" | 368 | msgid "Search" |
3355 | 360 | msgstr "Etsi" | 369 | msgstr "Etsi" |
3356 | @@ -367,24 +376,24 @@ | |||
3357 | 367 | msgid "Clear All" | 376 | msgid "Clear All" |
3358 | 368 | msgstr "Tyhjennä kaikki" | 377 | msgstr "Tyhjennä kaikki" |
3359 | 369 | 378 | ||
3361 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3362 | 371 | msgid "More..." | 380 | msgid "More..." |
3363 | 372 | msgstr "Lisää..." | 381 | msgstr "Lisää..." |
3364 | 373 | 382 | ||
3366 | 374 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 383 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3367 | 375 | msgid "Less..." | 384 | msgid "Less..." |
3368 | 376 | msgstr "Vähemmän..." | 385 | msgstr "Vähemmän..." |
3369 | 377 | 386 | ||
3370 | 378 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 387 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3372 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3373 | 380 | msgid "Send" | 389 | msgid "Send" |
3374 | 381 | msgstr "Lähetä" | 390 | msgstr "Lähetä" |
3375 | 382 | 391 | ||
3377 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3378 | 384 | msgid "Rate this" | 393 | msgid "Rate this" |
3379 | 385 | msgstr "Arvioi tämä" | 394 | msgstr "Arvioi tämä" |
3380 | 386 | 395 | ||
3382 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 396 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3383 | 388 | msgid "Add a review" | 397 | msgid "Add a review" |
3384 | 389 | msgstr "Lisää arvostelu" | 398 | msgstr "Lisää arvostelu" |
3385 | 390 | 399 | ||
3386 | 391 | 400 | ||
3387 | === modified file 'po/fo.po' | |||
3388 | --- po/fo.po 2016-11-08 05:41:47 +0000 | |||
3389 | +++ po/fo.po 2016-11-14 12:06:52 +0000 | |||
3390 | @@ -7,7 +7,11 @@ | |||
3391 | 7 | msgstr "" | 7 | msgstr "" |
3392 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
3393 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3394 | 10 | <<<<<<< TREE | ||
3395 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3396 | 12 | ======= | ||
3397 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3398 | 14 | >>>>>>> MERGE-SOURCE | ||
3399 | 11 | "PO-Revision-Date: 2014-01-14 20:08+0000\n" | 15 | "PO-Revision-Date: 2014-01-14 20:08+0000\n" |
3400 | 12 | "Last-Translator: Jógvan Olsen <jo@jebster.net>\n" | 16 | "Last-Translator: Jógvan Olsen <jo@jebster.net>\n" |
3401 | 13 | "Language-Team: Faroese <fo@li.org>\n" | 17 | "Language-Team: Faroese <fo@li.org>\n" |
3402 | @@ -15,8 +19,13 @@ | |||
3403 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3404 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3405 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
3406 | 22 | <<<<<<< TREE | ||
3407 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3408 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3409 | 25 | ======= | ||
3410 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3411 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3412 | 28 | >>>>>>> MERGE-SOURCE | ||
3413 | 20 | 29 | ||
3414 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3415 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3416 | @@ -313,26 +322,26 @@ | |||
3417 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
3418 | 314 | msgstr "" | 323 | msgstr "" |
3419 | 315 | 324 | ||
3421 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
3422 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
3423 | 318 | msgid "Store" | 327 | msgid "Store" |
3424 | 319 | msgstr "Handil" | 328 | msgstr "Handil" |
3425 | 320 | 329 | ||
3427 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
3428 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
3429 | 323 | msgid "Search" | 332 | msgid "Search" |
3430 | 324 | msgstr "Leita" | 333 | msgstr "Leita" |
3431 | 325 | 334 | ||
3433 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
3434 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
3435 | 328 | msgid "Settings" | 337 | msgid "Settings" |
3436 | 329 | msgstr "Stillingar" | 338 | msgstr "Stillingar" |
3437 | 330 | 339 | ||
3439 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
3440 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
3441 | 333 | msgstr "" | 342 | msgstr "" |
3442 | 334 | 343 | ||
3444 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
3445 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
3446 | 337 | msgstr "" | 346 | msgstr "" |
3447 | 338 | 347 | ||
3448 | @@ -344,15 +353,15 @@ | |||
3449 | 344 | msgid "Reset" | 353 | msgid "Reset" |
3450 | 345 | msgstr "Tómstilla" | 354 | msgstr "Tómstilla" |
3451 | 346 | 355 | ||
3453 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3454 | 348 | msgid "Show less" | 357 | msgid "Show less" |
3455 | 349 | msgstr "Sý minni" | 358 | msgstr "Sý minni" |
3456 | 350 | 359 | ||
3458 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
3459 | 352 | msgid "Show all" | 361 | msgid "Show all" |
3460 | 353 | msgstr "Sý alt" | 362 | msgstr "Sý alt" |
3461 | 354 | 363 | ||
3463 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
3464 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
3465 | 357 | msgid "Search" | 366 | msgid "Search" |
3466 | 358 | msgstr "Leita" | 367 | msgstr "Leita" |
3467 | @@ -365,24 +374,24 @@ | |||
3468 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
3469 | 366 | msgstr "Strika Alt" | 375 | msgstr "Strika Alt" |
3470 | 367 | 376 | ||
3472 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3473 | 369 | msgid "More..." | 378 | msgid "More..." |
3474 | 370 | msgstr "Meira..." | 379 | msgstr "Meira..." |
3475 | 371 | 380 | ||
3477 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3478 | 373 | msgid "Less..." | 382 | msgid "Less..." |
3479 | 374 | msgstr "Minni..." | 383 | msgstr "Minni..." |
3480 | 375 | 384 | ||
3481 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3483 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3484 | 378 | msgid "Send" | 387 | msgid "Send" |
3485 | 379 | msgstr "Send" | 388 | msgstr "Send" |
3486 | 380 | 389 | ||
3488 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3489 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
3490 | 383 | msgstr "" | 392 | msgstr "" |
3491 | 384 | 393 | ||
3493 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3494 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
3495 | 387 | msgstr "" | 396 | msgstr "" |
3496 | 388 | 397 | ||
3497 | 389 | 398 | ||
3498 | === modified file 'po/fr.po' | |||
3499 | --- po/fr.po 2016-11-08 05:41:47 +0000 | |||
3500 | +++ po/fr.po 2016-11-14 12:06:52 +0000 | |||
3501 | @@ -7,7 +7,11 @@ | |||
3502 | 7 | msgstr "" | 7 | msgstr "" |
3503 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
3504 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3505 | 10 | <<<<<<< TREE | ||
3506 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3507 | 12 | ======= | ||
3508 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3509 | 14 | >>>>>>> MERGE-SOURCE | ||
3510 | 11 | "PO-Revision-Date: 2016-10-02 08:06+0000\n" | 15 | "PO-Revision-Date: 2016-10-02 08:06+0000\n" |
3511 | 12 | "Last-Translator: Olivier Febwin <febwin@free.fr>\n" | 16 | "Last-Translator: Olivier Febwin <febwin@free.fr>\n" |
3512 | 13 | "Language-Team: French <fr@li.org>\n" | 17 | "Language-Team: French <fr@li.org>\n" |
3513 | @@ -15,8 +19,13 @@ | |||
3514 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3515 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3516 | 17 | "Plural-Forms: nplurals=2; plural=n > 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n > 1;\n" |
3517 | 22 | <<<<<<< TREE | ||
3518 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3519 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3520 | 25 | ======= | ||
3521 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3522 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3523 | 28 | >>>>>>> MERGE-SOURCE | ||
3524 | 20 | 29 | ||
3525 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3526 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3527 | @@ -317,26 +326,26 @@ | |||
3528 | 317 | msgid "Preview Share Item" | 326 | msgid "Preview Share Item" |
3529 | 318 | msgstr "Aperçu de l'élément partagé" | 327 | msgstr "Aperçu de l'élément partagé" |
3530 | 319 | 328 | ||
3532 | 320 | #: qml/Dash/DashPageHeader.qml:362 | 329 | #: qml/Dash/DashPageHeader.qml:361 |
3533 | 321 | msgctxt "Button: Open the Ubuntu Store" | 330 | msgctxt "Button: Open the Ubuntu Store" |
3534 | 322 | msgid "Store" | 331 | msgid "Store" |
3535 | 323 | msgstr "Logithèque" | 332 | msgstr "Logithèque" |
3536 | 324 | 333 | ||
3538 | 325 | #: qml/Dash/DashPageHeader.qml:369 | 334 | #: qml/Dash/DashPageHeader.qml:368 |
3539 | 326 | msgctxt "Button: Start a search in the current dash scope" | 335 | msgctxt "Button: Start a search in the current dash scope" |
3540 | 327 | msgid "Search" | 336 | msgid "Search" |
3541 | 328 | msgstr "Rechercher" | 337 | msgstr "Rechercher" |
3542 | 329 | 338 | ||
3544 | 330 | #: qml/Dash/DashPageHeader.qml:379 | 339 | #: qml/Dash/DashPageHeader.qml:378 |
3545 | 331 | msgctxt "Button: Show the current dash scope settings" | 340 | msgctxt "Button: Show the current dash scope settings" |
3546 | 332 | msgid "Settings" | 341 | msgid "Settings" |
3547 | 333 | msgstr "Paramètres" | 342 | msgstr "Paramètres" |
3548 | 334 | 343 | ||
3550 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
3551 | 336 | msgid "Remove from Favorites" | 345 | msgid "Remove from Favorites" |
3552 | 337 | msgstr "Retirer des favoris" | 346 | msgstr "Retirer des favoris" |
3553 | 338 | 347 | ||
3555 | 339 | #: qml/Dash/DashPageHeader.qml:386 | 348 | #: qml/Dash/DashPageHeader.qml:385 |
3556 | 340 | msgid "Add to Favorites" | 349 | msgid "Add to Favorites" |
3557 | 341 | msgstr "Ajouter aux favoris" | 350 | msgstr "Ajouter aux favoris" |
3558 | 342 | 351 | ||
3559 | @@ -348,15 +357,15 @@ | |||
3560 | 348 | msgid "Reset" | 357 | msgid "Reset" |
3561 | 349 | msgstr "Réinitialiser" | 358 | msgstr "Réinitialiser" |
3562 | 350 | 359 | ||
3564 | 351 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 360 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3565 | 352 | msgid "Show less" | 361 | msgid "Show less" |
3566 | 353 | msgstr "Afficher plus" | 362 | msgstr "Afficher plus" |
3567 | 354 | 363 | ||
3569 | 355 | #: qml/Dash/GenericScopeView.qml:586 | 364 | #: qml/Dash/GenericScopeView.qml:545 |
3570 | 356 | msgid "Show all" | 365 | msgid "Show all" |
3571 | 357 | msgstr "Tout afficher" | 366 | msgstr "Tout afficher" |
3572 | 358 | 367 | ||
3574 | 359 | #: qml/Dash/GenericScopeView.qml:643 | 368 | #: qml/Dash/GenericScopeView.qml:576 |
3575 | 360 | msgctxt "Label: Hint for dash search line edit" | 369 | msgctxt "Label: Hint for dash search line edit" |
3576 | 361 | msgid "Search" | 370 | msgid "Search" |
3577 | 362 | msgstr "Rechercher" | 371 | msgstr "Rechercher" |
3578 | @@ -369,24 +378,24 @@ | |||
3579 | 369 | msgid "Clear All" | 378 | msgid "Clear All" |
3580 | 370 | msgstr "Tout effacer" | 379 | msgstr "Tout effacer" |
3581 | 371 | 380 | ||
3583 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3584 | 373 | msgid "More..." | 382 | msgid "More..." |
3585 | 374 | msgstr "Plus..." | 383 | msgstr "Plus..." |
3586 | 375 | 384 | ||
3588 | 376 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 385 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3589 | 377 | msgid "Less..." | 386 | msgid "Less..." |
3590 | 378 | msgstr "Moins..." | 387 | msgstr "Moins..." |
3591 | 379 | 388 | ||
3592 | 380 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 389 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3594 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3595 | 382 | msgid "Send" | 391 | msgid "Send" |
3596 | 383 | msgstr "Envoyer" | 392 | msgstr "Envoyer" |
3597 | 384 | 393 | ||
3599 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3600 | 386 | msgid "Rate this" | 395 | msgid "Rate this" |
3601 | 387 | msgstr "Évaluez ceci" | 396 | msgstr "Évaluez ceci" |
3602 | 388 | 397 | ||
3604 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 398 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3605 | 390 | msgid "Add a review" | 399 | msgid "Add a review" |
3606 | 391 | msgstr "Ajouter un avis" | 400 | msgstr "Ajouter un avis" |
3607 | 392 | 401 | ||
3608 | 393 | 402 | ||
3609 | === modified file 'po/ga.po' | |||
3610 | --- po/ga.po 2016-11-08 05:41:47 +0000 | |||
3611 | +++ po/ga.po 2016-11-14 12:06:52 +0000 | |||
3612 | @@ -7,7 +7,11 @@ | |||
3613 | 7 | msgstr "" | 7 | msgstr "" |
3614 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
3615 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3616 | 10 | <<<<<<< TREE | ||
3617 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3618 | 12 | ======= | ||
3619 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3620 | 14 | >>>>>>> MERGE-SOURCE | ||
3621 | 11 | "PO-Revision-Date: 2016-01-25 11:33+0000\n" | 15 | "PO-Revision-Date: 2016-01-25 11:33+0000\n" |
3622 | 12 | "Last-Translator: Joshua Kiley <Unknown>\n" | 16 | "Last-Translator: Joshua Kiley <Unknown>\n" |
3623 | 13 | "Language-Team: Irish <ga@li.org>\n" | 17 | "Language-Team: Irish <ga@li.org>\n" |
3624 | @@ -15,8 +19,13 @@ | |||
3625 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3626 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3627 | 17 | "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n" | 21 | "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n" |
3628 | 22 | <<<<<<< TREE | ||
3629 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3630 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3631 | 25 | ======= | ||
3632 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3633 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3634 | 28 | >>>>>>> MERGE-SOURCE | ||
3635 | 20 | 29 | ||
3636 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3637 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3638 | @@ -311,26 +320,26 @@ | |||
3639 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
3640 | 312 | msgstr "Réamhthaispeántas Rud Le Chéile" | 321 | msgstr "Réamhthaispeántas Rud Le Chéile" |
3641 | 313 | 322 | ||
3643 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
3644 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
3645 | 316 | msgid "Store" | 325 | msgid "Store" |
3646 | 317 | msgstr "Siopa" | 326 | msgstr "Siopa" |
3647 | 318 | 327 | ||
3649 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
3650 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
3651 | 321 | msgid "Search" | 330 | msgid "Search" |
3652 | 322 | msgstr "Cuardach" | 331 | msgstr "Cuardach" |
3653 | 323 | 332 | ||
3655 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
3656 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
3657 | 326 | msgid "Settings" | 335 | msgid "Settings" |
3658 | 327 | msgstr "Socruithe" | 336 | msgstr "Socruithe" |
3659 | 328 | 337 | ||
3661 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
3662 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
3663 | 331 | msgstr "Bain ó Cheanáin" | 340 | msgstr "Bain ó Cheanáin" |
3664 | 332 | 341 | ||
3666 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
3667 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
3668 | 335 | msgstr "Cuir le Ceanáin" | 344 | msgstr "Cuir le Ceanáin" |
3669 | 336 | 345 | ||
3670 | @@ -342,15 +351,15 @@ | |||
3671 | 342 | msgid "Reset" | 351 | msgid "Reset" |
3672 | 343 | msgstr "" | 352 | msgstr "" |
3673 | 344 | 353 | ||
3675 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3676 | 346 | msgid "Show less" | 355 | msgid "Show less" |
3677 | 347 | msgstr "" | 356 | msgstr "" |
3678 | 348 | 357 | ||
3680 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
3681 | 350 | msgid "Show all" | 359 | msgid "Show all" |
3682 | 351 | msgstr "" | 360 | msgstr "" |
3683 | 352 | 361 | ||
3685 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
3686 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
3687 | 355 | msgid "Search" | 364 | msgid "Search" |
3688 | 356 | msgstr "Cuardach" | 365 | msgstr "Cuardach" |
3689 | @@ -363,24 +372,24 @@ | |||
3690 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
3691 | 364 | msgstr "" | 373 | msgstr "" |
3692 | 365 | 374 | ||
3694 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3695 | 367 | msgid "More..." | 376 | msgid "More..." |
3696 | 368 | msgstr "Tuilleadh..." | 377 | msgstr "Tuilleadh..." |
3697 | 369 | 378 | ||
3699 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3700 | 371 | msgid "Less..." | 380 | msgid "Less..." |
3701 | 372 | msgstr "Níos lú..." | 381 | msgstr "Níos lú..." |
3702 | 373 | 382 | ||
3703 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3705 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3706 | 376 | msgid "Send" | 385 | msgid "Send" |
3707 | 377 | msgstr "Seol" | 386 | msgstr "Seol" |
3708 | 378 | 387 | ||
3710 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3711 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
3712 | 381 | msgstr "Grádaigh é seo" | 390 | msgstr "Grádaigh é seo" |
3713 | 382 | 391 | ||
3715 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3716 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
3717 | 385 | msgstr "Cuir léirmheas leis" | 394 | msgstr "Cuir léirmheas leis" |
3718 | 386 | 395 | ||
3719 | 387 | 396 | ||
3720 | === modified file 'po/gd.po' | |||
3721 | --- po/gd.po 2016-11-08 05:41:47 +0000 | |||
3722 | +++ po/gd.po 2016-11-14 12:06:52 +0000 | |||
3723 | @@ -7,7 +7,11 @@ | |||
3724 | 7 | msgstr "" | 7 | msgstr "" |
3725 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
3726 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3727 | 10 | <<<<<<< TREE | ||
3728 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3729 | 12 | ======= | ||
3730 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3731 | 14 | >>>>>>> MERGE-SOURCE | ||
3732 | 11 | "PO-Revision-Date: 2016-04-08 18:34+0000\n" | 15 | "PO-Revision-Date: 2016-04-08 18:34+0000\n" |
3733 | 12 | "Last-Translator: Akerbeltz <fios@akerbeltz.org>\n" | 16 | "Last-Translator: Akerbeltz <fios@akerbeltz.org>\n" |
3734 | 13 | "Language-Team: Fòram na Gàidhlig\n" | 17 | "Language-Team: Fòram na Gàidhlig\n" |
3735 | @@ -16,8 +20,13 @@ | |||
3736 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3737 | 17 | "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " | 21 | "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " |
3738 | 18 | "(n > 2 && n < 20) ? 2 : 3;\n" | 22 | "(n > 2 && n < 20) ? 2 : 3;\n" |
3739 | 23 | <<<<<<< TREE | ||
3740 | 19 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3741 | 20 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
3742 | 26 | ======= | ||
3743 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3744 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
3745 | 29 | >>>>>>> MERGE-SOURCE | ||
3746 | 21 | "Language: gd\n" | 30 | "Language: gd\n" |
3747 | 22 | 31 | ||
3748 | 23 | #: plugins/LightDM/Greeter.cpp:123 | 32 | #: plugins/LightDM/Greeter.cpp:123 |
3749 | @@ -317,26 +326,26 @@ | |||
3750 | 317 | msgid "Preview Share Item" | 326 | msgid "Preview Share Item" |
3751 | 318 | msgstr "Ro-sheall an nì co-roinnidh" | 327 | msgstr "Ro-sheall an nì co-roinnidh" |
3752 | 319 | 328 | ||
3754 | 320 | #: qml/Dash/DashPageHeader.qml:362 | 329 | #: qml/Dash/DashPageHeader.qml:361 |
3755 | 321 | msgctxt "Button: Open the Ubuntu Store" | 330 | msgctxt "Button: Open the Ubuntu Store" |
3756 | 322 | msgid "Store" | 331 | msgid "Store" |
3757 | 323 | msgstr "Am bùth" | 332 | msgstr "Am bùth" |
3758 | 324 | 333 | ||
3760 | 325 | #: qml/Dash/DashPageHeader.qml:369 | 334 | #: qml/Dash/DashPageHeader.qml:368 |
3761 | 326 | msgctxt "Button: Start a search in the current dash scope" | 335 | msgctxt "Button: Start a search in the current dash scope" |
3762 | 327 | msgid "Search" | 336 | msgid "Search" |
3763 | 328 | msgstr "Lorg" | 337 | msgstr "Lorg" |
3764 | 329 | 338 | ||
3766 | 330 | #: qml/Dash/DashPageHeader.qml:379 | 339 | #: qml/Dash/DashPageHeader.qml:378 |
3767 | 331 | msgctxt "Button: Show the current dash scope settings" | 340 | msgctxt "Button: Show the current dash scope settings" |
3768 | 332 | msgid "Settings" | 341 | msgid "Settings" |
3769 | 333 | msgstr "Roghainnean" | 342 | msgstr "Roghainnean" |
3770 | 334 | 343 | ||
3772 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
3773 | 336 | msgid "Remove from Favorites" | 345 | msgid "Remove from Favorites" |
3774 | 337 | msgstr "Thoir air falbh o na h-annsachdan" | 346 | msgstr "Thoir air falbh o na h-annsachdan" |
3775 | 338 | 347 | ||
3777 | 339 | #: qml/Dash/DashPageHeader.qml:386 | 348 | #: qml/Dash/DashPageHeader.qml:385 |
3778 | 340 | msgid "Add to Favorites" | 349 | msgid "Add to Favorites" |
3779 | 341 | msgstr "Cuir ris na h-annsachdan" | 350 | msgstr "Cuir ris na h-annsachdan" |
3780 | 342 | 351 | ||
3781 | @@ -348,15 +357,15 @@ | |||
3782 | 348 | msgid "Reset" | 357 | msgid "Reset" |
3783 | 349 | msgstr "Ath-shuidhich" | 358 | msgstr "Ath-shuidhich" |
3784 | 350 | 359 | ||
3786 | 351 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 360 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3787 | 352 | msgid "Show less" | 361 | msgid "Show less" |
3788 | 353 | msgstr "Seall nas lugha dhiubh" | 362 | msgstr "Seall nas lugha dhiubh" |
3789 | 354 | 363 | ||
3791 | 355 | #: qml/Dash/GenericScopeView.qml:586 | 364 | #: qml/Dash/GenericScopeView.qml:545 |
3792 | 356 | msgid "Show all" | 365 | msgid "Show all" |
3793 | 357 | msgstr "Seall na h-uile" | 366 | msgstr "Seall na h-uile" |
3794 | 358 | 367 | ||
3796 | 359 | #: qml/Dash/GenericScopeView.qml:643 | 368 | #: qml/Dash/GenericScopeView.qml:576 |
3797 | 360 | msgctxt "Label: Hint for dash search line edit" | 369 | msgctxt "Label: Hint for dash search line edit" |
3798 | 361 | msgid "Search" | 370 | msgid "Search" |
3799 | 362 | msgstr "Lorg" | 371 | msgstr "Lorg" |
3800 | @@ -369,24 +378,24 @@ | |||
3801 | 369 | msgid "Clear All" | 378 | msgid "Clear All" |
3802 | 370 | msgstr "Falamhaich na h-uile" | 379 | msgstr "Falamhaich na h-uile" |
3803 | 371 | 380 | ||
3805 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3806 | 373 | msgid "More..." | 382 | msgid "More..." |
3807 | 374 | msgstr "Barrachd..." | 383 | msgstr "Barrachd..." |
3808 | 375 | 384 | ||
3810 | 376 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 385 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3811 | 377 | msgid "Less..." | 386 | msgid "Less..." |
3812 | 378 | msgstr "Nas lugha..." | 387 | msgstr "Nas lugha..." |
3813 | 379 | 388 | ||
3814 | 380 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 389 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3816 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3817 | 382 | msgid "Send" | 391 | msgid "Send" |
3818 | 383 | msgstr "Cuir" | 392 | msgstr "Cuir" |
3819 | 384 | 393 | ||
3821 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3822 | 386 | msgid "Rate this" | 395 | msgid "Rate this" |
3823 | 387 | msgstr "Rangaich seo" | 396 | msgstr "Rangaich seo" |
3824 | 388 | 397 | ||
3826 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 398 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3827 | 390 | msgid "Add a review" | 399 | msgid "Add a review" |
3828 | 391 | msgstr "Cuir lèirmheas ris" | 400 | msgstr "Cuir lèirmheas ris" |
3829 | 392 | 401 | ||
3830 | 393 | 402 | ||
3831 | === modified file 'po/gl.po' | |||
3832 | --- po/gl.po 2016-11-08 05:41:47 +0000 | |||
3833 | +++ po/gl.po 2016-11-14 12:06:52 +0000 | |||
3834 | @@ -7,7 +7,11 @@ | |||
3835 | 7 | msgstr "" | 7 | msgstr "" |
3836 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
3837 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3838 | 10 | <<<<<<< TREE | ||
3839 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3840 | 12 | ======= | ||
3841 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3842 | 14 | >>>>>>> MERGE-SOURCE | ||
3843 | 11 | "PO-Revision-Date: 2016-01-15 14:56+0000\n" | 15 | "PO-Revision-Date: 2016-01-15 14:56+0000\n" |
3844 | 12 | "Last-Translator: Marcos Lans <Unknown>\n" | 16 | "Last-Translator: Marcos Lans <Unknown>\n" |
3845 | 13 | "Language-Team: Galician <gl@li.org>\n" | 17 | "Language-Team: Galician <gl@li.org>\n" |
3846 | @@ -15,8 +19,13 @@ | |||
3847 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3848 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3849 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
3850 | 22 | <<<<<<< TREE | ||
3851 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3852 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3853 | 25 | ======= | ||
3854 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3855 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3856 | 28 | >>>>>>> MERGE-SOURCE | ||
3857 | 20 | 29 | ||
3858 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3859 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3860 | @@ -313,26 +322,26 @@ | |||
3861 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
3862 | 314 | msgstr "Ver elemento compartido" | 323 | msgstr "Ver elemento compartido" |
3863 | 315 | 324 | ||
3865 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
3866 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
3867 | 318 | msgid "Store" | 327 | msgid "Store" |
3868 | 319 | msgstr "Tenda" | 328 | msgstr "Tenda" |
3869 | 320 | 329 | ||
3871 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
3872 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
3873 | 323 | msgid "Search" | 332 | msgid "Search" |
3874 | 324 | msgstr "Buscar" | 333 | msgstr "Buscar" |
3875 | 325 | 334 | ||
3877 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
3878 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
3879 | 328 | msgid "Settings" | 337 | msgid "Settings" |
3880 | 329 | msgstr "Axustes" | 338 | msgstr "Axustes" |
3881 | 330 | 339 | ||
3883 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
3884 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
3885 | 333 | msgstr "Eliminar dos favoritos" | 342 | msgstr "Eliminar dos favoritos" |
3886 | 334 | 343 | ||
3888 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
3889 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
3890 | 337 | msgstr "Engadir aos favoritos" | 346 | msgstr "Engadir aos favoritos" |
3891 | 338 | 347 | ||
3892 | @@ -344,15 +353,15 @@ | |||
3893 | 344 | msgid "Reset" | 353 | msgid "Reset" |
3894 | 345 | msgstr "Restabelecer" | 354 | msgstr "Restabelecer" |
3895 | 346 | 355 | ||
3897 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
3898 | 348 | msgid "Show less" | 357 | msgid "Show less" |
3899 | 349 | msgstr "Mostrar menos" | 358 | msgstr "Mostrar menos" |
3900 | 350 | 359 | ||
3902 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
3903 | 352 | msgid "Show all" | 361 | msgid "Show all" |
3904 | 353 | msgstr "Mostrar todo" | 362 | msgstr "Mostrar todo" |
3905 | 354 | 363 | ||
3907 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
3908 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
3909 | 357 | msgid "Search" | 366 | msgid "Search" |
3910 | 358 | msgstr "Buscar" | 367 | msgstr "Buscar" |
3911 | @@ -365,24 +374,24 @@ | |||
3912 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
3913 | 366 | msgstr "Limpar todo" | 375 | msgstr "Limpar todo" |
3914 | 367 | 376 | ||
3916 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3917 | 369 | msgid "More..." | 378 | msgid "More..." |
3918 | 370 | msgstr "Máis…" | 379 | msgstr "Máis…" |
3919 | 371 | 380 | ||
3921 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
3922 | 373 | msgid "Less..." | 382 | msgid "Less..." |
3923 | 374 | msgstr "Menos..." | 383 | msgstr "Menos..." |
3924 | 375 | 384 | ||
3925 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
3927 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
3928 | 378 | msgid "Send" | 387 | msgid "Send" |
3929 | 379 | msgstr "Enviar" | 388 | msgstr "Enviar" |
3930 | 380 | 389 | ||
3932 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
3933 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
3934 | 383 | msgstr "Valore isto" | 392 | msgstr "Valore isto" |
3935 | 384 | 393 | ||
3937 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
3938 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
3939 | 387 | msgstr "Engadir unha opinión" | 396 | msgstr "Engadir unha opinión" |
3940 | 388 | 397 | ||
3941 | 389 | 398 | ||
3942 | === modified file 'po/gv.po' | |||
3943 | --- po/gv.po 2016-11-08 05:41:47 +0000 | |||
3944 | +++ po/gv.po 2016-11-14 12:06:52 +0000 | |||
3945 | @@ -7,7 +7,11 @@ | |||
3946 | 7 | msgstr "" | 7 | msgstr "" |
3947 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
3948 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
3949 | 10 | <<<<<<< TREE | ||
3950 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
3951 | 12 | ======= | ||
3952 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
3953 | 14 | >>>>>>> MERGE-SOURCE | ||
3954 | 11 | "PO-Revision-Date: 2015-04-02 14:24+0000\n" | 15 | "PO-Revision-Date: 2015-04-02 14:24+0000\n" |
3955 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
3956 | 13 | "Language-Team: Manx <gv@li.org>\n" | 17 | "Language-Team: Manx <gv@li.org>\n" |
3957 | @@ -15,8 +19,13 @@ | |||
3958 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
3959 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
3960 | 17 | "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : (n == 2 ? 1 : 2);\n" | 21 | "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : (n == 2 ? 1 : 2);\n" |
3961 | 22 | <<<<<<< TREE | ||
3962 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
3963 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
3964 | 25 | ======= | ||
3965 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
3966 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
3967 | 28 | >>>>>>> MERGE-SOURCE | ||
3968 | 20 | 29 | ||
3969 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
3970 | 22 | msgid "Password: " | 31 | msgid "Password: " |
3971 | @@ -313,26 +322,26 @@ | |||
3972 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
3973 | 314 | msgstr "" | 323 | msgstr "" |
3974 | 315 | 324 | ||
3976 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
3977 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
3978 | 318 | msgid "Store" | 327 | msgid "Store" |
3979 | 319 | msgstr "" | 328 | msgstr "" |
3980 | 320 | 329 | ||
3982 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
3983 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
3984 | 323 | msgid "Search" | 332 | msgid "Search" |
3985 | 324 | msgstr "" | 333 | msgstr "" |
3986 | 325 | 334 | ||
3988 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
3989 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
3990 | 328 | msgid "Settings" | 337 | msgid "Settings" |
3991 | 329 | msgstr "" | 338 | msgstr "" |
3992 | 330 | 339 | ||
3994 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
3995 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
3996 | 333 | msgstr "Jean scughey woish Reihyn" | 342 | msgstr "Jean scughey woish Reihyn" |
3997 | 334 | 343 | ||
3999 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
4000 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
4001 | 337 | msgstr "Cur ayns Reihyn" | 346 | msgstr "Cur ayns Reihyn" |
4002 | 338 | 347 | ||
4003 | @@ -344,15 +353,15 @@ | |||
4004 | 344 | msgid "Reset" | 353 | msgid "Reset" |
4005 | 345 | msgstr "" | 354 | msgstr "" |
4006 | 346 | 355 | ||
4008 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4009 | 348 | msgid "Show less" | 357 | msgid "Show less" |
4010 | 349 | msgstr "" | 358 | msgstr "" |
4011 | 350 | 359 | ||
4013 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
4014 | 352 | msgid "Show all" | 361 | msgid "Show all" |
4015 | 353 | msgstr "" | 362 | msgstr "" |
4016 | 354 | 363 | ||
4018 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
4019 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
4020 | 357 | msgid "Search" | 366 | msgid "Search" |
4021 | 358 | msgstr "" | 367 | msgstr "" |
4022 | @@ -365,24 +374,24 @@ | |||
4023 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
4024 | 366 | msgstr "" | 375 | msgstr "" |
4025 | 367 | 376 | ||
4027 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4028 | 369 | msgid "More..." | 378 | msgid "More..." |
4029 | 370 | msgstr "Tooilley..." | 379 | msgstr "Tooilley..." |
4030 | 371 | 380 | ||
4032 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4033 | 373 | msgid "Less..." | 382 | msgid "Less..." |
4034 | 374 | msgstr "Ny sloo..." | 383 | msgstr "Ny sloo..." |
4035 | 375 | 384 | ||
4036 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4038 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4039 | 378 | msgid "Send" | 387 | msgid "Send" |
4040 | 379 | msgstr "Cur" | 388 | msgstr "Cur" |
4041 | 380 | 389 | ||
4043 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4044 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
4045 | 383 | msgstr "Jean sessal shoh" | 392 | msgstr "Jean sessal shoh" |
4046 | 384 | 393 | ||
4048 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4049 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
4050 | 387 | msgstr "Jean aavriwnys" | 396 | msgstr "Jean aavriwnys" |
4051 | 388 | 397 | ||
4052 | 389 | 398 | ||
4053 | === modified file 'po/he.po' | |||
4054 | --- po/he.po 2016-11-08 05:41:47 +0000 | |||
4055 | +++ po/he.po 2016-11-14 12:06:52 +0000 | |||
4056 | @@ -7,7 +7,11 @@ | |||
4057 | 7 | msgstr "" | 7 | msgstr "" |
4058 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
4059 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4060 | 10 | <<<<<<< TREE | ||
4061 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4062 | 12 | ======= | ||
4063 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4064 | 14 | >>>>>>> MERGE-SOURCE | ||
4065 | 11 | "PO-Revision-Date: 2015-07-12 08:47+0000\n" | 15 | "PO-Revision-Date: 2015-07-12 08:47+0000\n" |
4066 | 12 | "Last-Translator: Yaron <sh.yaron@gmail.com>\n" | 16 | "Last-Translator: Yaron <sh.yaron@gmail.com>\n" |
4067 | 13 | "Language-Team: Hebrew <he@li.org>\n" | 17 | "Language-Team: Hebrew <he@li.org>\n" |
4068 | @@ -15,8 +19,13 @@ | |||
4069 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
4070 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4071 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4072 | 22 | <<<<<<< TREE | ||
4073 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4074 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
4075 | 25 | ======= | ||
4076 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4077 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
4078 | 28 | >>>>>>> MERGE-SOURCE | ||
4079 | 20 | 29 | ||
4080 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
4081 | 22 | msgid "Password: " | 31 | msgid "Password: " |
4082 | @@ -311,26 +320,26 @@ | |||
4083 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
4084 | 312 | msgstr "" | 321 | msgstr "" |
4085 | 313 | 322 | ||
4087 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
4088 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
4089 | 316 | msgid "Store" | 325 | msgid "Store" |
4090 | 317 | msgstr "חנות" | 326 | msgstr "חנות" |
4091 | 318 | 327 | ||
4093 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
4094 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
4095 | 321 | msgid "Search" | 330 | msgid "Search" |
4096 | 322 | msgstr "חיפוש" | 331 | msgstr "חיפוש" |
4097 | 323 | 332 | ||
4099 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
4100 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
4101 | 326 | msgid "Settings" | 335 | msgid "Settings" |
4102 | 327 | msgstr "הגדרות" | 336 | msgstr "הגדרות" |
4103 | 328 | 337 | ||
4105 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
4106 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
4107 | 331 | msgstr "הסרה מהמועדפים" | 340 | msgstr "הסרה מהמועדפים" |
4108 | 332 | 341 | ||
4110 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
4111 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
4112 | 335 | msgstr "הוספה למועדפים" | 344 | msgstr "הוספה למועדפים" |
4113 | 336 | 345 | ||
4114 | @@ -342,15 +351,15 @@ | |||
4115 | 342 | msgid "Reset" | 351 | msgid "Reset" |
4116 | 343 | msgstr "" | 352 | msgstr "" |
4117 | 344 | 353 | ||
4119 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4120 | 346 | msgid "Show less" | 355 | msgid "Show less" |
4121 | 347 | msgstr "" | 356 | msgstr "" |
4122 | 348 | 357 | ||
4124 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
4125 | 350 | msgid "Show all" | 359 | msgid "Show all" |
4126 | 351 | msgstr "" | 360 | msgstr "" |
4127 | 352 | 361 | ||
4129 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
4130 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
4131 | 355 | msgid "Search" | 364 | msgid "Search" |
4132 | 356 | msgstr "חיפוש" | 365 | msgstr "חיפוש" |
4133 | @@ -363,24 +372,24 @@ | |||
4134 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
4135 | 364 | msgstr "" | 373 | msgstr "" |
4136 | 365 | 374 | ||
4138 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4139 | 367 | msgid "More..." | 376 | msgid "More..." |
4140 | 368 | msgstr "עוד…" | 377 | msgstr "עוד…" |
4141 | 369 | 378 | ||
4143 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4144 | 371 | msgid "Less..." | 380 | msgid "Less..." |
4145 | 372 | msgstr "פחות…" | 381 | msgstr "פחות…" |
4146 | 373 | 382 | ||
4147 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4149 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4150 | 376 | msgid "Send" | 385 | msgid "Send" |
4151 | 377 | msgstr "שליחה" | 386 | msgstr "שליחה" |
4152 | 378 | 387 | ||
4154 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4155 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
4156 | 381 | msgstr "דירוג היישום" | 390 | msgstr "דירוג היישום" |
4157 | 382 | 391 | ||
4159 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4160 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
4161 | 385 | msgstr "הוספת סקירה" | 394 | msgstr "הוספת סקירה" |
4162 | 386 | 395 | ||
4163 | 387 | 396 | ||
4164 | === modified file 'po/hi.po' | |||
4165 | --- po/hi.po 2016-11-08 05:41:47 +0000 | |||
4166 | +++ po/hi.po 2016-11-14 12:06:52 +0000 | |||
4167 | @@ -7,7 +7,11 @@ | |||
4168 | 7 | msgstr "" | 7 | msgstr "" |
4169 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
4170 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4171 | 10 | <<<<<<< TREE | ||
4172 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4173 | 12 | ======= | ||
4174 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4175 | 14 | >>>>>>> MERGE-SOURCE | ||
4176 | 11 | "PO-Revision-Date: 2014-01-15 01:49+0000\n" | 15 | "PO-Revision-Date: 2014-01-15 01:49+0000\n" |
4177 | 12 | "Last-Translator: Siddhanathan Shanmugam <Unknown>\n" | 16 | "Last-Translator: Siddhanathan Shanmugam <Unknown>\n" |
4178 | 13 | "Language-Team: Hindi <hi@li.org>\n" | 17 | "Language-Team: Hindi <hi@li.org>\n" |
4179 | @@ -15,8 +19,13 @@ | |||
4180 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
4181 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4182 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4183 | 22 | <<<<<<< TREE | ||
4184 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4185 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
4186 | 25 | ======= | ||
4187 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4188 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
4189 | 28 | >>>>>>> MERGE-SOURCE | ||
4190 | 20 | 29 | ||
4191 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
4192 | 22 | msgid "Password: " | 31 | msgid "Password: " |
4193 | @@ -311,26 +320,26 @@ | |||
4194 | 311 | msgid "Preview Share Item" | 320 | msgid "Preview Share Item" |
4195 | 312 | msgstr "" | 321 | msgstr "" |
4196 | 313 | 322 | ||
4198 | 314 | #: qml/Dash/DashPageHeader.qml:362 | 323 | #: qml/Dash/DashPageHeader.qml:361 |
4199 | 315 | msgctxt "Button: Open the Ubuntu Store" | 324 | msgctxt "Button: Open the Ubuntu Store" |
4200 | 316 | msgid "Store" | 325 | msgid "Store" |
4201 | 317 | msgstr "" | 326 | msgstr "" |
4202 | 318 | 327 | ||
4204 | 319 | #: qml/Dash/DashPageHeader.qml:369 | 328 | #: qml/Dash/DashPageHeader.qml:368 |
4205 | 320 | msgctxt "Button: Start a search in the current dash scope" | 329 | msgctxt "Button: Start a search in the current dash scope" |
4206 | 321 | msgid "Search" | 330 | msgid "Search" |
4207 | 322 | msgstr "" | 331 | msgstr "" |
4208 | 323 | 332 | ||
4210 | 324 | #: qml/Dash/DashPageHeader.qml:379 | 333 | #: qml/Dash/DashPageHeader.qml:378 |
4211 | 325 | msgctxt "Button: Show the current dash scope settings" | 334 | msgctxt "Button: Show the current dash scope settings" |
4212 | 326 | msgid "Settings" | 335 | msgid "Settings" |
4213 | 327 | msgstr "" | 336 | msgstr "" |
4214 | 328 | 337 | ||
4216 | 329 | #: qml/Dash/DashPageHeader.qml:386 | 338 | #: qml/Dash/DashPageHeader.qml:385 |
4217 | 330 | msgid "Remove from Favorites" | 339 | msgid "Remove from Favorites" |
4218 | 331 | msgstr "" | 340 | msgstr "" |
4219 | 332 | 341 | ||
4221 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
4222 | 334 | msgid "Add to Favorites" | 343 | msgid "Add to Favorites" |
4223 | 335 | msgstr "" | 344 | msgstr "" |
4224 | 336 | 345 | ||
4225 | @@ -342,15 +351,15 @@ | |||
4226 | 342 | msgid "Reset" | 351 | msgid "Reset" |
4227 | 343 | msgstr "" | 352 | msgstr "" |
4228 | 344 | 353 | ||
4230 | 345 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 354 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4231 | 346 | msgid "Show less" | 355 | msgid "Show less" |
4232 | 347 | msgstr "" | 356 | msgstr "" |
4233 | 348 | 357 | ||
4235 | 349 | #: qml/Dash/GenericScopeView.qml:586 | 358 | #: qml/Dash/GenericScopeView.qml:545 |
4236 | 350 | msgid "Show all" | 359 | msgid "Show all" |
4237 | 351 | msgstr "" | 360 | msgstr "" |
4238 | 352 | 361 | ||
4240 | 353 | #: qml/Dash/GenericScopeView.qml:643 | 362 | #: qml/Dash/GenericScopeView.qml:576 |
4241 | 354 | msgctxt "Label: Hint for dash search line edit" | 363 | msgctxt "Label: Hint for dash search line edit" |
4242 | 355 | msgid "Search" | 364 | msgid "Search" |
4243 | 356 | msgstr "" | 365 | msgstr "" |
4244 | @@ -363,24 +372,24 @@ | |||
4245 | 363 | msgid "Clear All" | 372 | msgid "Clear All" |
4246 | 364 | msgstr "" | 373 | msgstr "" |
4247 | 365 | 374 | ||
4249 | 366 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4250 | 367 | msgid "More..." | 376 | msgid "More..." |
4251 | 368 | msgstr "" | 377 | msgstr "" |
4252 | 369 | 378 | ||
4254 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4255 | 371 | msgid "Less..." | 380 | msgid "Less..." |
4256 | 372 | msgstr "" | 381 | msgstr "" |
4257 | 373 | 382 | ||
4258 | 374 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 383 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4260 | 375 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4261 | 376 | msgid "Send" | 385 | msgid "Send" |
4262 | 377 | msgstr "भेजें" | 386 | msgstr "भेजें" |
4263 | 378 | 387 | ||
4265 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4266 | 380 | msgid "Rate this" | 389 | msgid "Rate this" |
4267 | 381 | msgstr "" | 390 | msgstr "" |
4268 | 382 | 391 | ||
4270 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4271 | 384 | msgid "Add a review" | 393 | msgid "Add a review" |
4272 | 385 | msgstr "समीक्षा दे" | 394 | msgstr "समीक्षा दे" |
4273 | 386 | 395 | ||
4274 | 387 | 396 | ||
4275 | === modified file 'po/hr.po' | |||
4276 | --- po/hr.po 2016-11-08 05:41:47 +0000 | |||
4277 | +++ po/hr.po 2016-11-14 12:06:52 +0000 | |||
4278 | @@ -7,7 +7,11 @@ | |||
4279 | 7 | msgstr "" | 7 | msgstr "" |
4280 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
4281 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4282 | 10 | <<<<<<< TREE | ||
4283 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4284 | 12 | ======= | ||
4285 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4286 | 14 | >>>>>>> MERGE-SOURCE | ||
4287 | 11 | "PO-Revision-Date: 2016-05-04 17:52+0000\n" | 15 | "PO-Revision-Date: 2016-05-04 17:52+0000\n" |
4288 | 12 | "Last-Translator: gogo <trebelnik2@gmail.com>\n" | 16 | "Last-Translator: gogo <trebelnik2@gmail.com>\n" |
4289 | 13 | "Language-Team: Croatian <hr@li.org>\n" | 17 | "Language-Team: Croatian <hr@li.org>\n" |
4290 | @@ -16,8 +20,13 @@ | |||
4291 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4292 | 17 | "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " | 21 | "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " |
4293 | 18 | "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" | 22 | "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" |
4294 | 23 | <<<<<<< TREE | ||
4295 | 19 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" | 24 | "X-Launchpad-Export-Date: 2016-11-08 05:41+0000\n" |
4296 | 20 | "X-Generator: Launchpad (build 18246)\n" | 25 | "X-Generator: Launchpad (build 18246)\n" |
4297 | 26 | ======= | ||
4298 | 27 | "X-Launchpad-Export-Date: 2016-11-12 06:10+0000\n" | ||
4299 | 28 | "X-Generator: Launchpad (build 18255)\n" | ||
4300 | 29 | >>>>>>> MERGE-SOURCE | ||
4301 | 21 | 30 | ||
4302 | 22 | #: plugins/LightDM/Greeter.cpp:123 | 31 | #: plugins/LightDM/Greeter.cpp:123 |
4303 | 23 | msgid "Password: " | 32 | msgid "Password: " |
4304 | @@ -316,26 +325,26 @@ | |||
4305 | 316 | msgid "Preview Share Item" | 325 | msgid "Preview Share Item" |
4306 | 317 | msgstr "Pregled stavki dijeljenja" | 326 | msgstr "Pregled stavki dijeljenja" |
4307 | 318 | 327 | ||
4309 | 319 | #: qml/Dash/DashPageHeader.qml:362 | 328 | #: qml/Dash/DashPageHeader.qml:361 |
4310 | 320 | msgctxt "Button: Open the Ubuntu Store" | 329 | msgctxt "Button: Open the Ubuntu Store" |
4311 | 321 | msgid "Store" | 330 | msgid "Store" |
4312 | 322 | msgstr "Trgovina" | 331 | msgstr "Trgovina" |
4313 | 323 | 332 | ||
4315 | 324 | #: qml/Dash/DashPageHeader.qml:369 | 333 | #: qml/Dash/DashPageHeader.qml:368 |
4316 | 325 | msgctxt "Button: Start a search in the current dash scope" | 334 | msgctxt "Button: Start a search in the current dash scope" |
4317 | 326 | msgid "Search" | 335 | msgid "Search" |
4318 | 327 | msgstr "Pretraži" | 336 | msgstr "Pretraži" |
4319 | 328 | 337 | ||
4321 | 329 | #: qml/Dash/DashPageHeader.qml:379 | 338 | #: qml/Dash/DashPageHeader.qml:378 |
4322 | 330 | msgctxt "Button: Show the current dash scope settings" | 339 | msgctxt "Button: Show the current dash scope settings" |
4323 | 331 | msgid "Settings" | 340 | msgid "Settings" |
4324 | 332 | msgstr "Postavke" | 341 | msgstr "Postavke" |
4325 | 333 | 342 | ||
4327 | 334 | #: qml/Dash/DashPageHeader.qml:386 | 343 | #: qml/Dash/DashPageHeader.qml:385 |
4328 | 335 | msgid "Remove from Favorites" | 344 | msgid "Remove from Favorites" |
4329 | 336 | msgstr "Ukloni iz omiljenih" | 345 | msgstr "Ukloni iz omiljenih" |
4330 | 337 | 346 | ||
4332 | 338 | #: qml/Dash/DashPageHeader.qml:386 | 347 | #: qml/Dash/DashPageHeader.qml:385 |
4333 | 339 | msgid "Add to Favorites" | 348 | msgid "Add to Favorites" |
4334 | 340 | msgstr "Dodaj u omiljene" | 349 | msgstr "Dodaj u omiljene" |
4335 | 341 | 350 | ||
4336 | @@ -347,15 +356,15 @@ | |||
4337 | 347 | msgid "Reset" | 356 | msgid "Reset" |
4338 | 348 | msgstr "Ponovno postavi" | 357 | msgstr "Ponovno postavi" |
4339 | 349 | 358 | ||
4341 | 350 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 359 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4342 | 351 | msgid "Show less" | 360 | msgid "Show less" |
4343 | 352 | msgstr "Prikaži manje" | 361 | msgstr "Prikaži manje" |
4344 | 353 | 362 | ||
4346 | 354 | #: qml/Dash/GenericScopeView.qml:586 | 363 | #: qml/Dash/GenericScopeView.qml:545 |
4347 | 355 | msgid "Show all" | 364 | msgid "Show all" |
4348 | 356 | msgstr "Prikaži sve" | 365 | msgstr "Prikaži sve" |
4349 | 357 | 366 | ||
4351 | 358 | #: qml/Dash/GenericScopeView.qml:643 | 367 | #: qml/Dash/GenericScopeView.qml:576 |
4352 | 359 | msgctxt "Label: Hint for dash search line edit" | 368 | msgctxt "Label: Hint for dash search line edit" |
4353 | 360 | msgid "Search" | 369 | msgid "Search" |
4354 | 361 | msgstr "Pretraži" | 370 | msgstr "Pretraži" |
4355 | @@ -368,24 +377,24 @@ | |||
4356 | 368 | msgid "Clear All" | 377 | msgid "Clear All" |
4357 | 369 | msgstr "Obriši sve" | 378 | msgstr "Obriši sve" |
4358 | 370 | 379 | ||
4360 | 371 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 380 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4361 | 372 | msgid "More..." | 381 | msgid "More..." |
4362 | 373 | msgstr "Više..." | 382 | msgstr "Više..." |
4363 | 374 | 383 | ||
4365 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 384 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4366 | 376 | msgid "Less..." | 385 | msgid "Less..." |
4367 | 377 | msgstr "Manje..." | 386 | msgstr "Manje..." |
4368 | 378 | 387 | ||
4369 | 379 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 388 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4371 | 380 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4372 | 381 | msgid "Send" | 390 | msgid "Send" |
4373 | 382 | msgstr "Pošalji" | 391 | msgstr "Pošalji" |
4374 | 383 | 392 | ||
4376 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 393 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4377 | 385 | msgid "Rate this" | 394 | msgid "Rate this" |
4378 | 386 | msgstr "Ocijeni ovo" | 395 | msgstr "Ocijeni ovo" |
4379 | 387 | 396 | ||
4381 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 397 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4382 | 389 | msgid "Add a review" | 398 | msgid "Add a review" |
4383 | 390 | msgstr "Dodaj recenziju" | 399 | msgstr "Dodaj recenziju" |
4384 | 391 | 400 | ||
4385 | 392 | 401 | ||
4386 | === modified file 'po/hu.po' | |||
4387 | --- po/hu.po 2016-11-08 05:41:47 +0000 | |||
4388 | +++ po/hu.po 2016-11-14 12:06:52 +0000 | |||
4389 | @@ -7,7 +7,11 @@ | |||
4390 | 7 | msgstr "" | 7 | msgstr "" |
4391 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
4392 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4393 | 10 | <<<<<<< TREE | ||
4394 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4395 | 12 | ======= | ||
4396 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4397 | 14 | >>>>>>> MERGE-SOURCE | ||
4398 | 11 | "PO-Revision-Date: 2016-08-17 10:53+0000\n" | 15 | "PO-Revision-Date: 2016-08-17 10:53+0000\n" |
4399 | 12 | "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n" | 16 | "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n" |
4400 | 13 | "Language-Team: Hungarian <hu@li.org>\n" | 17 | "Language-Team: Hungarian <hu@li.org>\n" |
4401 | @@ -15,8 +19,13 @@ | |||
4402 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
4403 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4404 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4405 | 22 | <<<<<<< TREE | ||
4406 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4407 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
4408 | 25 | ======= | ||
4409 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4410 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
4411 | 28 | >>>>>>> MERGE-SOURCE | ||
4412 | 20 | 29 | ||
4413 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
4414 | 22 | msgid "Password: " | 31 | msgid "Password: " |
4415 | @@ -315,26 +324,26 @@ | |||
4416 | 315 | msgid "Preview Share Item" | 324 | msgid "Preview Share Item" |
4417 | 316 | msgstr "Megosztandó elem előnézete" | 325 | msgstr "Megosztandó elem előnézete" |
4418 | 317 | 326 | ||
4420 | 318 | #: qml/Dash/DashPageHeader.qml:362 | 327 | #: qml/Dash/DashPageHeader.qml:361 |
4421 | 319 | msgctxt "Button: Open the Ubuntu Store" | 328 | msgctxt "Button: Open the Ubuntu Store" |
4422 | 320 | msgid "Store" | 329 | msgid "Store" |
4423 | 321 | msgstr "Áruház" | 330 | msgstr "Áruház" |
4424 | 322 | 331 | ||
4426 | 323 | #: qml/Dash/DashPageHeader.qml:369 | 332 | #: qml/Dash/DashPageHeader.qml:368 |
4427 | 324 | msgctxt "Button: Start a search in the current dash scope" | 333 | msgctxt "Button: Start a search in the current dash scope" |
4428 | 325 | msgid "Search" | 334 | msgid "Search" |
4429 | 326 | msgstr "Keresés" | 335 | msgstr "Keresés" |
4430 | 327 | 336 | ||
4432 | 328 | #: qml/Dash/DashPageHeader.qml:379 | 337 | #: qml/Dash/DashPageHeader.qml:378 |
4433 | 329 | msgctxt "Button: Show the current dash scope settings" | 338 | msgctxt "Button: Show the current dash scope settings" |
4434 | 330 | msgid "Settings" | 339 | msgid "Settings" |
4435 | 331 | msgstr "Beállítások" | 340 | msgstr "Beállítások" |
4436 | 332 | 341 | ||
4438 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
4439 | 334 | msgid "Remove from Favorites" | 343 | msgid "Remove from Favorites" |
4440 | 335 | msgstr "Eltávolítás a kedvencek közül" | 344 | msgstr "Eltávolítás a kedvencek közül" |
4441 | 336 | 345 | ||
4443 | 337 | #: qml/Dash/DashPageHeader.qml:386 | 346 | #: qml/Dash/DashPageHeader.qml:385 |
4444 | 338 | msgid "Add to Favorites" | 347 | msgid "Add to Favorites" |
4445 | 339 | msgstr "Hozzáadás a kedvencekhez" | 348 | msgstr "Hozzáadás a kedvencekhez" |
4446 | 340 | 349 | ||
4447 | @@ -346,15 +355,15 @@ | |||
4448 | 346 | msgid "Reset" | 355 | msgid "Reset" |
4449 | 347 | msgstr "Alaphelyzetbe állítás" | 356 | msgstr "Alaphelyzetbe állítás" |
4450 | 348 | 357 | ||
4452 | 349 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 358 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4453 | 350 | msgid "Show less" | 359 | msgid "Show less" |
4454 | 351 | msgstr "Kevesebb" | 360 | msgstr "Kevesebb" |
4455 | 352 | 361 | ||
4457 | 353 | #: qml/Dash/GenericScopeView.qml:586 | 362 | #: qml/Dash/GenericScopeView.qml:545 |
4458 | 354 | msgid "Show all" | 363 | msgid "Show all" |
4459 | 355 | msgstr "Összes megjelenítése" | 364 | msgstr "Összes megjelenítése" |
4460 | 356 | 365 | ||
4462 | 357 | #: qml/Dash/GenericScopeView.qml:643 | 366 | #: qml/Dash/GenericScopeView.qml:576 |
4463 | 358 | msgctxt "Label: Hint for dash search line edit" | 367 | msgctxt "Label: Hint for dash search line edit" |
4464 | 359 | msgid "Search" | 368 | msgid "Search" |
4465 | 360 | msgstr "Keresés" | 369 | msgstr "Keresés" |
4466 | @@ -367,24 +376,24 @@ | |||
4467 | 367 | msgid "Clear All" | 376 | msgid "Clear All" |
4468 | 368 | msgstr "Összes törlése" | 377 | msgstr "Összes törlése" |
4469 | 369 | 378 | ||
4471 | 370 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 379 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4472 | 371 | msgid "More..." | 380 | msgid "More..." |
4473 | 372 | msgstr "Több…" | 381 | msgstr "Több…" |
4474 | 373 | 382 | ||
4476 | 374 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 383 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4477 | 375 | msgid "Less..." | 384 | msgid "Less..." |
4478 | 376 | msgstr "Kevesebb…" | 385 | msgstr "Kevesebb…" |
4479 | 377 | 386 | ||
4480 | 378 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 387 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4482 | 379 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4483 | 380 | msgid "Send" | 389 | msgid "Send" |
4484 | 381 | msgstr "Küldés" | 390 | msgstr "Küldés" |
4485 | 382 | 391 | ||
4487 | 383 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 392 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4488 | 384 | msgid "Rate this" | 393 | msgid "Rate this" |
4489 | 385 | msgstr "Értékelje" | 394 | msgstr "Értékelje" |
4490 | 386 | 395 | ||
4492 | 387 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 396 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4493 | 388 | msgid "Add a review" | 397 | msgid "Add a review" |
4494 | 389 | msgstr "Értékelés hozzáadása" | 398 | msgstr "Értékelés hozzáadása" |
4495 | 390 | 399 | ||
4496 | 391 | 400 | ||
4497 | === modified file 'po/hy.po' | |||
4498 | --- po/hy.po 2016-11-08 05:41:47 +0000 | |||
4499 | +++ po/hy.po 2016-11-14 12:06:52 +0000 | |||
4500 | @@ -7,7 +7,11 @@ | |||
4501 | 7 | msgstr "" | 7 | msgstr "" |
4502 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
4503 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4504 | 10 | <<<<<<< TREE | ||
4505 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4506 | 12 | ======= | ||
4507 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4508 | 14 | >>>>>>> MERGE-SOURCE | ||
4509 | 11 | "PO-Revision-Date: 2014-10-28 06:34+0000\n" | 15 | "PO-Revision-Date: 2014-10-28 06:34+0000\n" |
4510 | 12 | "Last-Translator: Vahan Harutyunyan <Unknown>\n" | 16 | "Last-Translator: Vahan Harutyunyan <Unknown>\n" |
4511 | 13 | "Language-Team: Armenian <hy@li.org>\n" | 17 | "Language-Team: Armenian <hy@li.org>\n" |
4512 | @@ -15,8 +19,13 @@ | |||
4513 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
4514 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4515 | 17 | "Plural-Forms: nplurals=1; plural=0;\n" | 21 | "Plural-Forms: nplurals=1; plural=0;\n" |
4516 | 22 | <<<<<<< TREE | ||
4517 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4518 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
4519 | 25 | ======= | ||
4520 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4521 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
4522 | 28 | >>>>>>> MERGE-SOURCE | ||
4523 | 20 | 29 | ||
4524 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
4525 | 22 | msgid "Password: " | 31 | msgid "Password: " |
4526 | @@ -312,26 +321,26 @@ | |||
4527 | 312 | msgid "Preview Share Item" | 321 | msgid "Preview Share Item" |
4528 | 313 | msgstr "" | 322 | msgstr "" |
4529 | 314 | 323 | ||
4531 | 315 | #: qml/Dash/DashPageHeader.qml:362 | 324 | #: qml/Dash/DashPageHeader.qml:361 |
4532 | 316 | msgctxt "Button: Open the Ubuntu Store" | 325 | msgctxt "Button: Open the Ubuntu Store" |
4533 | 317 | msgid "Store" | 326 | msgid "Store" |
4534 | 318 | msgstr "" | 327 | msgstr "" |
4535 | 319 | 328 | ||
4537 | 320 | #: qml/Dash/DashPageHeader.qml:369 | 329 | #: qml/Dash/DashPageHeader.qml:368 |
4538 | 321 | msgctxt "Button: Start a search in the current dash scope" | 330 | msgctxt "Button: Start a search in the current dash scope" |
4539 | 322 | msgid "Search" | 331 | msgid "Search" |
4540 | 323 | msgstr "" | 332 | msgstr "" |
4541 | 324 | 333 | ||
4543 | 325 | #: qml/Dash/DashPageHeader.qml:379 | 334 | #: qml/Dash/DashPageHeader.qml:378 |
4544 | 326 | msgctxt "Button: Show the current dash scope settings" | 335 | msgctxt "Button: Show the current dash scope settings" |
4545 | 327 | msgid "Settings" | 336 | msgid "Settings" |
4546 | 328 | msgstr "" | 337 | msgstr "" |
4547 | 329 | 338 | ||
4549 | 330 | #: qml/Dash/DashPageHeader.qml:386 | 339 | #: qml/Dash/DashPageHeader.qml:385 |
4550 | 331 | msgid "Remove from Favorites" | 340 | msgid "Remove from Favorites" |
4551 | 332 | msgstr "Հեռացնել ընտրյալների ցուցակից" | 341 | msgstr "Հեռացնել ընտրյալների ցուցակից" |
4552 | 333 | 342 | ||
4554 | 334 | #: qml/Dash/DashPageHeader.qml:386 | 343 | #: qml/Dash/DashPageHeader.qml:385 |
4555 | 335 | msgid "Add to Favorites" | 344 | msgid "Add to Favorites" |
4556 | 336 | msgstr "Ավելացնել ընտրյալների ցուցակում" | 345 | msgstr "Ավելացնել ընտրյալների ցուցակում" |
4557 | 337 | 346 | ||
4558 | @@ -343,15 +352,15 @@ | |||
4559 | 343 | msgid "Reset" | 352 | msgid "Reset" |
4560 | 344 | msgstr "" | 353 | msgstr "" |
4561 | 345 | 354 | ||
4563 | 346 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 355 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4564 | 347 | msgid "Show less" | 356 | msgid "Show less" |
4565 | 348 | msgstr "" | 357 | msgstr "" |
4566 | 349 | 358 | ||
4568 | 350 | #: qml/Dash/GenericScopeView.qml:586 | 359 | #: qml/Dash/GenericScopeView.qml:545 |
4569 | 351 | msgid "Show all" | 360 | msgid "Show all" |
4570 | 352 | msgstr "" | 361 | msgstr "" |
4571 | 353 | 362 | ||
4573 | 354 | #: qml/Dash/GenericScopeView.qml:643 | 363 | #: qml/Dash/GenericScopeView.qml:576 |
4574 | 355 | msgctxt "Label: Hint for dash search line edit" | 364 | msgctxt "Label: Hint for dash search line edit" |
4575 | 356 | msgid "Search" | 365 | msgid "Search" |
4576 | 357 | msgstr "" | 366 | msgstr "" |
4577 | @@ -364,24 +373,24 @@ | |||
4578 | 364 | msgid "Clear All" | 373 | msgid "Clear All" |
4579 | 365 | msgstr "" | 374 | msgstr "" |
4580 | 366 | 375 | ||
4582 | 367 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 376 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4583 | 368 | msgid "More..." | 377 | msgid "More..." |
4584 | 369 | msgstr "Ավելին..." | 378 | msgstr "Ավելին..." |
4585 | 370 | 379 | ||
4587 | 371 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 380 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4588 | 372 | msgid "Less..." | 381 | msgid "Less..." |
4589 | 373 | msgstr "Ավելի քիչ..." | 382 | msgstr "Ավելի քիչ..." |
4590 | 374 | 383 | ||
4591 | 375 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 384 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4593 | 376 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4594 | 377 | msgid "Send" | 386 | msgid "Send" |
4595 | 378 | msgstr "Ուղղարկել" | 387 | msgstr "Ուղղարկել" |
4596 | 379 | 388 | ||
4598 | 380 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4599 | 381 | msgid "Rate this" | 390 | msgid "Rate this" |
4600 | 382 | msgstr "Գնահատեք սա" | 391 | msgstr "Գնահատեք սա" |
4601 | 383 | 392 | ||
4603 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 393 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4604 | 385 | msgid "Add a review" | 394 | msgid "Add a review" |
4605 | 386 | msgstr "" | 395 | msgstr "" |
4606 | 387 | 396 | ||
4607 | 388 | 397 | ||
4608 | === modified file 'po/ia.po' | |||
4609 | --- po/ia.po 2016-11-08 05:41:47 +0000 | |||
4610 | +++ po/ia.po 2016-11-14 12:06:52 +0000 | |||
4611 | @@ -7,7 +7,11 @@ | |||
4612 | 7 | msgstr "" | 7 | msgstr "" |
4613 | 8 | "Project-Id-Version: unity8\n" | 8 | "Project-Id-Version: unity8\n" |
4614 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4615 | 10 | <<<<<<< TREE | ||
4616 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4617 | 12 | ======= | ||
4618 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4619 | 14 | >>>>>>> MERGE-SOURCE | ||
4620 | 11 | "PO-Revision-Date: 2015-08-25 19:31+0000\n" | 15 | "PO-Revision-Date: 2015-08-25 19:31+0000\n" |
4621 | 12 | "Last-Translator: karm <melo@carmu.com>\n" | 16 | "Last-Translator: karm <melo@carmu.com>\n" |
4622 | 13 | "Language-Team: Interlingua <ia@li.org>\n" | 17 | "Language-Team: Interlingua <ia@li.org>\n" |
4623 | @@ -15,8 +19,13 @@ | |||
4624 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
4625 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4626 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4627 | 22 | <<<<<<< TREE | ||
4628 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4629 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
4630 | 25 | ======= | ||
4631 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4632 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
4633 | 28 | >>>>>>> MERGE-SOURCE | ||
4634 | 20 | 29 | ||
4635 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
4636 | 22 | msgid "Password: " | 31 | msgid "Password: " |
4637 | @@ -313,26 +322,26 @@ | |||
4638 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
4639 | 314 | msgstr "Elemento compartite de vista preliminar" | 323 | msgstr "Elemento compartite de vista preliminar" |
4640 | 315 | 324 | ||
4642 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
4643 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
4644 | 318 | msgid "Store" | 327 | msgid "Store" |
4645 | 319 | msgstr "Salva" | 328 | msgstr "Salva" |
4646 | 320 | 329 | ||
4648 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
4649 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
4650 | 323 | msgid "Search" | 332 | msgid "Search" |
4651 | 324 | msgstr "Cerca" | 333 | msgstr "Cerca" |
4652 | 325 | 334 | ||
4654 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
4655 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
4656 | 328 | msgid "Settings" | 337 | msgid "Settings" |
4657 | 329 | msgstr "Configurationes" | 338 | msgstr "Configurationes" |
4658 | 330 | 339 | ||
4660 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
4661 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
4662 | 333 | msgstr "Remover ex le Favoritos" | 342 | msgstr "Remover ex le Favoritos" |
4663 | 334 | 343 | ||
4665 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
4666 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
4667 | 337 | msgstr "Adder al Favoritos" | 346 | msgstr "Adder al Favoritos" |
4668 | 338 | 347 | ||
4669 | @@ -344,15 +353,15 @@ | |||
4670 | 344 | msgid "Reset" | 353 | msgid "Reset" |
4671 | 345 | msgstr "Restabilir" | 354 | msgstr "Restabilir" |
4672 | 346 | 355 | ||
4674 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4675 | 348 | msgid "Show less" | 357 | msgid "Show less" |
4676 | 349 | msgstr "Monstrar minus" | 358 | msgstr "Monstrar minus" |
4677 | 350 | 359 | ||
4679 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
4680 | 352 | msgid "Show all" | 361 | msgid "Show all" |
4681 | 353 | msgstr "Monstrar toto" | 362 | msgstr "Monstrar toto" |
4682 | 354 | 363 | ||
4684 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
4685 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
4686 | 357 | msgid "Search" | 366 | msgid "Search" |
4687 | 358 | msgstr "Cerca" | 367 | msgstr "Cerca" |
4688 | @@ -365,24 +374,24 @@ | |||
4689 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
4690 | 366 | msgstr "Clarar toto" | 375 | msgstr "Clarar toto" |
4691 | 367 | 376 | ||
4693 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4694 | 369 | msgid "More..." | 378 | msgid "More..." |
4695 | 370 | msgstr "Plus..." | 379 | msgstr "Plus..." |
4696 | 371 | 380 | ||
4698 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4699 | 373 | msgid "Less..." | 382 | msgid "Less..." |
4700 | 374 | msgstr "Minus..." | 383 | msgstr "Minus..." |
4701 | 375 | 384 | ||
4702 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4704 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4705 | 378 | msgid "Send" | 387 | msgid "Send" |
4706 | 379 | msgstr "Mandar" | 388 | msgstr "Mandar" |
4707 | 380 | 389 | ||
4709 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4710 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
4711 | 383 | msgstr "Evalutar isto" | 392 | msgstr "Evalutar isto" |
4712 | 384 | 393 | ||
4714 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4715 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
4716 | 387 | msgstr "Adder un revision" | 396 | msgstr "Adder un revision" |
4717 | 388 | 397 | ||
4718 | 389 | 398 | ||
4719 | === modified file 'po/id.po' | |||
4720 | --- po/id.po 2016-11-08 05:41:47 +0000 | |||
4721 | +++ po/id.po 2016-11-14 12:06:52 +0000 | |||
4722 | @@ -7,7 +7,11 @@ | |||
4723 | 7 | msgstr "" | 7 | msgstr "" |
4724 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
4725 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4726 | 10 | <<<<<<< TREE | ||
4727 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4728 | 12 | ======= | ||
4729 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4730 | 14 | >>>>>>> MERGE-SOURCE | ||
4731 | 11 | "PO-Revision-Date: 2013-06-26 22:35+0000\n" | 15 | "PO-Revision-Date: 2013-06-26 22:35+0000\n" |
4732 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
4733 | 13 | "Language-Team: Indonesian <id@li.org>\n" | 17 | "Language-Team: Indonesian <id@li.org>\n" |
4734 | @@ -15,8 +19,13 @@ | |||
4735 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
4736 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4737 | 17 | "Plural-Forms: nplurals=1; plural=0;\n" | 21 | "Plural-Forms: nplurals=1; plural=0;\n" |
4738 | 22 | <<<<<<< TREE | ||
4739 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4740 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
4741 | 25 | ======= | ||
4742 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4743 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
4744 | 28 | >>>>>>> MERGE-SOURCE | ||
4745 | 20 | 29 | ||
4746 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
4747 | 22 | msgid "Password: " | 31 | msgid "Password: " |
4748 | @@ -313,26 +322,26 @@ | |||
4749 | 313 | msgid "Preview Share Item" | 322 | msgid "Preview Share Item" |
4750 | 314 | msgstr "" | 323 | msgstr "" |
4751 | 315 | 324 | ||
4753 | 316 | #: qml/Dash/DashPageHeader.qml:362 | 325 | #: qml/Dash/DashPageHeader.qml:361 |
4754 | 317 | msgctxt "Button: Open the Ubuntu Store" | 326 | msgctxt "Button: Open the Ubuntu Store" |
4755 | 318 | msgid "Store" | 327 | msgid "Store" |
4756 | 319 | msgstr "" | 328 | msgstr "" |
4757 | 320 | 329 | ||
4759 | 321 | #: qml/Dash/DashPageHeader.qml:369 | 330 | #: qml/Dash/DashPageHeader.qml:368 |
4760 | 322 | msgctxt "Button: Start a search in the current dash scope" | 331 | msgctxt "Button: Start a search in the current dash scope" |
4761 | 323 | msgid "Search" | 332 | msgid "Search" |
4762 | 324 | msgstr "" | 333 | msgstr "" |
4763 | 325 | 334 | ||
4765 | 326 | #: qml/Dash/DashPageHeader.qml:379 | 335 | #: qml/Dash/DashPageHeader.qml:378 |
4766 | 327 | msgctxt "Button: Show the current dash scope settings" | 336 | msgctxt "Button: Show the current dash scope settings" |
4767 | 328 | msgid "Settings" | 337 | msgid "Settings" |
4768 | 329 | msgstr "" | 338 | msgstr "" |
4769 | 330 | 339 | ||
4771 | 331 | #: qml/Dash/DashPageHeader.qml:386 | 340 | #: qml/Dash/DashPageHeader.qml:385 |
4772 | 332 | msgid "Remove from Favorites" | 341 | msgid "Remove from Favorites" |
4773 | 333 | msgstr "Hapus dari Favorit" | 342 | msgstr "Hapus dari Favorit" |
4774 | 334 | 343 | ||
4776 | 335 | #: qml/Dash/DashPageHeader.qml:386 | 344 | #: qml/Dash/DashPageHeader.qml:385 |
4777 | 336 | msgid "Add to Favorites" | 345 | msgid "Add to Favorites" |
4778 | 337 | msgstr "Tambah ke Favorit" | 346 | msgstr "Tambah ke Favorit" |
4779 | 338 | 347 | ||
4780 | @@ -344,15 +353,15 @@ | |||
4781 | 344 | msgid "Reset" | 353 | msgid "Reset" |
4782 | 345 | msgstr "" | 354 | msgstr "" |
4783 | 346 | 355 | ||
4785 | 347 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 356 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4786 | 348 | msgid "Show less" | 357 | msgid "Show less" |
4787 | 349 | msgstr "" | 358 | msgstr "" |
4788 | 350 | 359 | ||
4790 | 351 | #: qml/Dash/GenericScopeView.qml:586 | 360 | #: qml/Dash/GenericScopeView.qml:545 |
4791 | 352 | msgid "Show all" | 361 | msgid "Show all" |
4792 | 353 | msgstr "" | 362 | msgstr "" |
4793 | 354 | 363 | ||
4795 | 355 | #: qml/Dash/GenericScopeView.qml:643 | 364 | #: qml/Dash/GenericScopeView.qml:576 |
4796 | 356 | msgctxt "Label: Hint for dash search line edit" | 365 | msgctxt "Label: Hint for dash search line edit" |
4797 | 357 | msgid "Search" | 366 | msgid "Search" |
4798 | 358 | msgstr "" | 367 | msgstr "" |
4799 | @@ -365,24 +374,24 @@ | |||
4800 | 365 | msgid "Clear All" | 374 | msgid "Clear All" |
4801 | 366 | msgstr "" | 375 | msgstr "" |
4802 | 367 | 376 | ||
4804 | 368 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 377 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4805 | 369 | msgid "More..." | 378 | msgid "More..." |
4806 | 370 | msgstr "Lebih..." | 379 | msgstr "Lebih..." |
4807 | 371 | 380 | ||
4809 | 372 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 381 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4810 | 373 | msgid "Less..." | 382 | msgid "Less..." |
4811 | 374 | msgstr "Kurang..." | 383 | msgstr "Kurang..." |
4812 | 375 | 384 | ||
4813 | 376 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 385 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4815 | 377 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 386 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4816 | 378 | msgid "Send" | 387 | msgid "Send" |
4817 | 379 | msgstr "Kirim" | 388 | msgstr "Kirim" |
4818 | 380 | 389 | ||
4820 | 381 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 390 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4821 | 382 | msgid "Rate this" | 391 | msgid "Rate this" |
4822 | 383 | msgstr "Beri peringkat" | 392 | msgstr "Beri peringkat" |
4823 | 384 | 393 | ||
4825 | 385 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 394 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4826 | 386 | msgid "Add a review" | 395 | msgid "Add a review" |
4827 | 387 | msgstr "Berikan ulasan" | 396 | msgstr "Berikan ulasan" |
4828 | 388 | 397 | ||
4829 | 389 | 398 | ||
4830 | === modified file 'po/is.po' | |||
4831 | --- po/is.po 2016-11-08 05:41:47 +0000 | |||
4832 | +++ po/is.po 2016-11-14 12:06:52 +0000 | |||
4833 | @@ -9,7 +9,11 @@ | |||
4834 | 9 | msgstr "" | 9 | msgstr "" |
4835 | 10 | "Project-Id-Version: po_unity8-is\n" | 10 | "Project-Id-Version: po_unity8-is\n" |
4836 | 11 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 11 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4837 | 12 | <<<<<<< TREE | ||
4838 | 12 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 13 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4839 | 14 | ======= | ||
4840 | 15 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4841 | 16 | >>>>>>> MERGE-SOURCE | ||
4842 | 13 | "PO-Revision-Date: 2014-11-13 09:32+0000\n" | 17 | "PO-Revision-Date: 2014-11-13 09:32+0000\n" |
4843 | 14 | "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n" | 18 | "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n" |
4844 | 15 | "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n" | 19 | "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n" |
4845 | @@ -17,8 +21,13 @@ | |||
4846 | 17 | "Content-Type: text/plain; charset=UTF-8\n" | 21 | "Content-Type: text/plain; charset=UTF-8\n" |
4847 | 18 | "Content-Transfer-Encoding: 8bit\n" | 22 | "Content-Transfer-Encoding: 8bit\n" |
4848 | 19 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 23 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4849 | 24 | <<<<<<< TREE | ||
4850 | 20 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 25 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4851 | 21 | "X-Generator: Launchpad (build 18246)\n" | 26 | "X-Generator: Launchpad (build 18246)\n" |
4852 | 27 | ======= | ||
4853 | 28 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4854 | 29 | "X-Generator: Launchpad (build 18255)\n" | ||
4855 | 30 | >>>>>>> MERGE-SOURCE | ||
4856 | 22 | "Language: is\n" | 31 | "Language: is\n" |
4857 | 23 | 32 | ||
4858 | 24 | #: plugins/LightDM/Greeter.cpp:123 | 33 | #: plugins/LightDM/Greeter.cpp:123 |
4859 | @@ -316,26 +325,26 @@ | |||
4860 | 316 | msgid "Preview Share Item" | 325 | msgid "Preview Share Item" |
4861 | 317 | msgstr "" | 326 | msgstr "" |
4862 | 318 | 327 | ||
4864 | 319 | #: qml/Dash/DashPageHeader.qml:362 | 328 | #: qml/Dash/DashPageHeader.qml:361 |
4865 | 320 | msgctxt "Button: Open the Ubuntu Store" | 329 | msgctxt "Button: Open the Ubuntu Store" |
4866 | 321 | msgid "Store" | 330 | msgid "Store" |
4867 | 322 | msgstr "" | 331 | msgstr "" |
4868 | 323 | 332 | ||
4870 | 324 | #: qml/Dash/DashPageHeader.qml:369 | 333 | #: qml/Dash/DashPageHeader.qml:368 |
4871 | 325 | msgctxt "Button: Start a search in the current dash scope" | 334 | msgctxt "Button: Start a search in the current dash scope" |
4872 | 326 | msgid "Search" | 335 | msgid "Search" |
4873 | 327 | msgstr "" | 336 | msgstr "" |
4874 | 328 | 337 | ||
4876 | 329 | #: qml/Dash/DashPageHeader.qml:379 | 338 | #: qml/Dash/DashPageHeader.qml:378 |
4877 | 330 | msgctxt "Button: Show the current dash scope settings" | 339 | msgctxt "Button: Show the current dash scope settings" |
4878 | 331 | msgid "Settings" | 340 | msgid "Settings" |
4879 | 332 | msgstr "" | 341 | msgstr "" |
4880 | 333 | 342 | ||
4882 | 334 | #: qml/Dash/DashPageHeader.qml:386 | 343 | #: qml/Dash/DashPageHeader.qml:385 |
4883 | 335 | msgid "Remove from Favorites" | 344 | msgid "Remove from Favorites" |
4884 | 336 | msgstr "Fjarlægja úr Eftirlæti" | 345 | msgstr "Fjarlægja úr Eftirlæti" |
4885 | 337 | 346 | ||
4887 | 338 | #: qml/Dash/DashPageHeader.qml:386 | 347 | #: qml/Dash/DashPageHeader.qml:385 |
4888 | 339 | msgid "Add to Favorites" | 348 | msgid "Add to Favorites" |
4889 | 340 | msgstr "Bæta við Eftirlæti" | 349 | msgstr "Bæta við Eftirlæti" |
4890 | 341 | 350 | ||
4891 | @@ -347,15 +356,15 @@ | |||
4892 | 347 | msgid "Reset" | 356 | msgid "Reset" |
4893 | 348 | msgstr "" | 357 | msgstr "" |
4894 | 349 | 358 | ||
4896 | 350 | #: qml/Dash/GenericScopeView.qml:586 qml/Dash/GenericScopeView.qml:782 | 359 | #: qml/Dash/GenericScopeView.qml:545 qml/Dash/GenericScopeView.qml:716 |
4897 | 351 | msgid "Show less" | 360 | msgid "Show less" |
4898 | 352 | msgstr "" | 361 | msgstr "" |
4899 | 353 | 362 | ||
4901 | 354 | #: qml/Dash/GenericScopeView.qml:586 | 363 | #: qml/Dash/GenericScopeView.qml:545 |
4902 | 355 | msgid "Show all" | 364 | msgid "Show all" |
4903 | 356 | msgstr "" | 365 | msgstr "" |
4904 | 357 | 366 | ||
4906 | 358 | #: qml/Dash/GenericScopeView.qml:643 | 367 | #: qml/Dash/GenericScopeView.qml:576 |
4907 | 359 | msgctxt "Label: Hint for dash search line edit" | 368 | msgctxt "Label: Hint for dash search line edit" |
4908 | 360 | msgid "Search" | 369 | msgid "Search" |
4909 | 361 | msgstr "" | 370 | msgstr "" |
4910 | @@ -368,24 +377,24 @@ | |||
4911 | 368 | msgid "Clear All" | 377 | msgid "Clear All" |
4912 | 369 | msgstr "" | 378 | msgstr "" |
4913 | 370 | 379 | ||
4915 | 371 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 380 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4916 | 372 | msgid "More..." | 381 | msgid "More..." |
4917 | 373 | msgstr "Meira..." | 382 | msgstr "Meira..." |
4918 | 374 | 383 | ||
4920 | 375 | #: qml/Dash/Previews/PreviewActionCombo.qml:35 | 384 | #: qml/Dash/Previews/PreviewActionCombo.qml:36 |
4921 | 376 | msgid "Less..." | 385 | msgid "Less..." |
4922 | 377 | msgstr "Minna..." | 386 | msgstr "Minna..." |
4923 | 378 | 387 | ||
4924 | 379 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 | 388 | #: qml/Dash/Previews/PreviewCommentInput.qml:83 |
4926 | 380 | #: qml/Dash/Previews/PreviewRatingInput.qml:201 | 389 | #: qml/Dash/Previews/PreviewRatingInput.qml:202 |
4927 | 381 | msgid "Send" | 390 | msgid "Send" |
4928 | 382 | msgstr "Senda" | 391 | msgstr "Senda" |
4929 | 383 | 392 | ||
4931 | 384 | #: qml/Dash/Previews/PreviewRatingInput.qml:108 | 393 | #: qml/Dash/Previews/PreviewRatingInput.qml:109 |
4932 | 385 | msgid "Rate this" | 394 | msgid "Rate this" |
4933 | 386 | msgstr "Gefa þessu einkunn" | 395 | msgstr "Gefa þessu einkunn" |
4934 | 387 | 396 | ||
4936 | 388 | #: qml/Dash/Previews/PreviewRatingInput.qml:183 | 397 | #: qml/Dash/Previews/PreviewRatingInput.qml:184 |
4937 | 389 | msgid "Add a review" | 398 | msgid "Add a review" |
4938 | 390 | msgstr "Gefa umsögn" | 399 | msgstr "Gefa umsögn" |
4939 | 391 | 400 | ||
4940 | 392 | 401 | ||
4941 | === modified file 'po/it.po' | |||
4942 | --- po/it.po 2016-11-08 05:41:47 +0000 | |||
4943 | +++ po/it.po 2016-11-14 12:06:52 +0000 | |||
4944 | @@ -7,7 +7,11 @@ | |||
4945 | 7 | msgstr "" | 7 | msgstr "" |
4946 | 8 | "Project-Id-Version: unity\n" | 8 | "Project-Id-Version: unity\n" |
4947 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
4948 | 10 | <<<<<<< TREE | ||
4949 | 10 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" | 11 | "POT-Creation-Date: 2016-10-27 12:32+0000\n" |
4950 | 12 | ======= | ||
4951 | 13 | "POT-Creation-Date: 2016-11-09 15:10+0000\n" | ||
4952 | 14 | >>>>>>> MERGE-SOURCE | ||
4953 | 11 | "PO-Revision-Date: 2016-09-11 10:40+0000\n" | 15 | "PO-Revision-Date: 2016-09-11 10:40+0000\n" |
4954 | 12 | "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n" | 16 | "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n" |
4955 | 13 | "Language-Team: Italian <it@li.org>\n" | 17 | "Language-Team: Italian <it@li.org>\n" |
4956 | @@ -15,8 +19,13 @@ | |||
4957 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 19 | "Content-Type: text/plain; charset=UTF-8\n" |
4958 | 16 | "Content-Transfer-Encoding: 8bit\n" | 20 | "Content-Transfer-Encoding: 8bit\n" |
4959 | 17 | "Plural-Forms: nplurals=2; plural=n != 1;\n" | 21 | "Plural-Forms: nplurals=2; plural=n != 1;\n" |
4960 | 22 | <<<<<<< TREE | ||
4961 | 18 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" | 23 | "X-Launchpad-Export-Date: 2016-11-08 05:40+0000\n" |
4962 | 19 | "X-Generator: Launchpad (build 18246)\n" | 24 | "X-Generator: Launchpad (build 18246)\n" |
4963 | 25 | ======= | ||
4964 | 26 | "X-Launchpad-Export-Date: 2016-11-12 06:09+0000\n" | ||
4965 | 27 | "X-Generator: Launchpad (build 18255)\n" | ||
4966 | 28 | >>>>>>> MERGE-SOURCE | ||
4967 | 20 | 29 | ||
4968 | 21 | #: plugins/LightDM/Greeter.cpp:123 | 30 | #: plugins/LightDM/Greeter.cpp:123 |
4969 | 22 | msgid "Password: " | 31 | msgid "Password: " |
4970 | @@ -315,26 +324,26 @@ | |||
4971 | 315 | msgid "Preview Share Item" | 324 | msgid "Preview Share Item" |
4972 | 316 | msgstr "Anteprima elementi da condividere" | 325 | msgstr "Anteprima elementi da condividere" |
4973 | 317 | 326 | ||
4975 | 318 | #: qml/Dash/DashPageHeader.qml:362 | 327 | #: qml/Dash/DashPageHeader.qml:361 |
4976 | 319 | msgctxt "Button: Open the Ubuntu Store" | 328 | msgctxt "Button: Open the Ubuntu Store" |
4977 | 320 | msgid "Store" | 329 | msgid "Store" |
4978 | 321 | msgstr "Store" | 330 | msgstr "Store" |
4979 | 322 | 331 | ||
4981 | 323 | #: qml/Dash/DashPageHeader.qml:369 | 332 | #: qml/Dash/DashPageHeader.qml:368 |
4982 | 324 | msgctxt "Button: Start a search in the current dash scope" | 333 | msgctxt "Button: Start a search in the current dash scope" |
4983 | 325 | msgid "Search" | 334 | msgid "Search" |
4984 | 326 | msgstr "Cerca" | 335 | msgstr "Cerca" |
4985 | 327 | 336 | ||
4987 | 328 | #: qml/Dash/DashPageHeader.qml:379 | 337 | #: qml/Dash/DashPageHeader.qml:378 |
4988 | 329 | msgctxt "Button: Show the current dash scope settings" | 338 | msgctxt "Button: Show the current dash scope settings" |
4989 | 330 | msgid "Settings" | 339 | msgid "Settings" |
4990 | 331 | msgstr "Impostazioni" | 340 | msgstr "Impostazioni" |
4991 | 332 | 341 | ||
4993 | 333 | #: qml/Dash/DashPageHeader.qml:386 | 342 | #: qml/Dash/DashPageHeader.qml:385 |
4994 | 334 | msgid "Remove from Favorites" | 343 | msgid "Remove from Favorites" |
4995 | 335 | msgstr "Rimuovi dai preferiti" | 344 | msgstr "Rimuovi dai preferiti" |
4996 | 336 | 345 | ||
4998 | 337 | #: qml/Dash/DashPageHeader.qml:386 | 346 | #: qml/Dash/DashPageHeader.qml:385 |
4999 | 338 | msgid "Add to Favorites" | 347 | msgid "Add to Favorites" |
5000 | 339 | msgstr "Aggiungi ai preferiti" | 348 | msgstr "Aggiungi ai preferiti" |
The diff has been truncated for viewing.