git.iko.soy/unity8
on xenial help sign in
remove conflicts
2e1b2d6Lukáš Tinkl
po/unity8.pot−16
compare with xenial
unifiedsplit
@@ -227,27 +227,15 @@ msgstr ""
227msgid "OK"
227msgid "OK"
228msgstr ""
228msgstr ""
229
229
230−<<<<<<< TREE
231−#: qml/Dash/GenericScopeView.qml:544 qml/Dash/GenericScopeView.qml:702
232−=======
233#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
230#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
234−>>>>>>> MERGE-SOURCE
235msgid "See less"
231msgid "See less"
236msgstr ""
232msgstr ""
237
233
238−<<<<<<< TREE
239−#: qml/Dash/GenericScopeView.qml:544
240−=======
241#: qml/Dash/GenericScopeView.qml:569
234#: qml/Dash/GenericScopeView.qml:569
242−>>>>>>> MERGE-SOURCE
243msgid "See all"
235msgid "See all"
244msgstr ""
236msgstr ""
245
237
246−<<<<<<< TREE
247−#: qml/Dash/GenericScopeView.qml:606
248−=======
249#: qml/Dash/GenericScopeView.qml:631
238#: qml/Dash/GenericScopeView.qml:631
250−>>>>>>> MERGE-SOURCE
251msgctxt "Label: Hint for dash search line edit"
239msgctxt "Label: Hint for dash search line edit"
252msgid "Search"
240msgid "Search"
253msgstr ""
241msgstr ""
@@ -285,10 +273,6 @@ msgstr ""
285
273
286#: qml/Dash/Previews/PreviewCommentInput.qml:61
274#: qml/Dash/Previews/PreviewCommentInput.qml:61
287#: qml/Dash/Previews/PreviewRatingInput.qml:169
275#: qml/Dash/Previews/PreviewRatingInput.qml:169
288−<<<<<<< TREE
289−#: qml/Panel/Indicators/MessageMenuItemFactory.qml:205
290−=======
291−>>>>>>> MERGE-SOURCE
292msgid "Send"
276msgid "Send"
293msgstr ""
277msgstr ""
294
278