on xenial help sign in
remove conflicts
commit2e1b2d64c32c17ebbc4c8ded013caa233d7cead5 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 3 Sep 2015, 13:01 (11 years ago) parentec9e278
1 file changed−16
po/unity8.pot−16
po/unity8.pot−16
@@ -227,27 +227,15 @@ msgstr ""
227227msgid "OK"
228228msgstr ""
229229
230−<<<<<<< TREE
231−#: qml/Dash/GenericScopeView.qml:544 qml/Dash/GenericScopeView.qml:702
232−=======
233230#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
234−>>>>>>> MERGE-SOURCE
235231msgid "See less"
236232msgstr ""
237233
238−<<<<<<< TREE
239−#: qml/Dash/GenericScopeView.qml:544
240−=======
241234#: qml/Dash/GenericScopeView.qml:569
242−>>>>>>> MERGE-SOURCE
243235msgid "See all"
244236msgstr ""
245237
246−<<<<<<< TREE
247−#: qml/Dash/GenericScopeView.qml:606
248−=======
249238#: qml/Dash/GenericScopeView.qml:631
250−>>>>>>> MERGE-SOURCE
251239msgctxt "Label: Hint for dash search line edit"
252240msgid "Search"
253241msgstr ""
@@ -285,10 +273,6 @@ msgstr ""
285273
286274#: qml/Dash/Previews/PreviewCommentInput.qml:61
287275#: qml/Dash/Previews/PreviewRatingInput.qml:169
288−<<<<<<< TREE
289−#: qml/Panel/Indicators/MessageMenuItemFactory.qml:205
290−=======
291−>>>>>>> MERGE-SOURCE
292276msgid "Send"
293277msgstr ""
294278