From 345fba11bf6c6d6c78e37e17a353c0fe703a206f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Dec 2015 09:28:22 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- .../plasma-containmentactions-test.desktop | 2 +- src/desktoptheme/oxygen/metadata.desktop | 2 +- src/plasma/data/servicetypes/plasma-applet.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop index e06c38b21..9573dabee 100644 --- a/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop +++ b/examples/testcontainmentactionsplugin/plasma-containmentactions-test.desktop @@ -58,7 +58,7 @@ Comment[hu]=Üres bővítmény tesztelésre Comment[ia]=Un plugin vacue pro essayar Comment[it]=Un'estensione finta di prova Comment[ko]=테스트를 위한 뼈대 플러그인 -Comment[lt]=Netikras priedas testavimui +Comment[lt]=Netikras papildinys testavimui Comment[mr]=चाचणीसाठी नकली प्लगइन Comment[nb]=Et attrapp-programtillegg for testing Comment[nds]=En Platzholler-Moduul för't Utproberen diff --git a/src/desktoptheme/oxygen/metadata.desktop b/src/desktoptheme/oxygen/metadata.desktop index c8dcedd01..cb037d198 100644 --- a/src/desktoptheme/oxygen/metadata.desktop +++ b/src/desktoptheme/oxygen/metadata.desktop @@ -59,7 +59,7 @@ Comment[hu]=Oxygen-stílusú téma Comment[ia]=Thema facite in le stilo de Oxygen Comment[it]=Tema realizzato nello stile di Oxygen Comment[ko]=Oxygen 스타일의 기본 테마 -Comment[lt]=Tema padaryta Oxygen stiliuje +Comment[lt]=Apipavidalinimas padarytas Oxygen stiliumi Comment[mr]=ऑक्सीजन शैली मध्ये शैली तयार केली Comment[nb]=Tema laget i Oxygen-stil Comment[nds]=Muster in den Oxygen-Stil diff --git a/src/plasma/data/servicetypes/plasma-applet.desktop b/src/plasma/data/servicetypes/plasma-applet.desktop index 9898da139..8bf79958f 100644 --- a/src/plasma/data/servicetypes/plasma-applet.desktop +++ b/src/plasma/data/servicetypes/plasma-applet.desktop @@ -20,7 +20,7 @@ Comment[hu]=Plasma kisalkalmazás Comment[ia]=Applet Plasma Comment[it]=Applet di Plasma Comment[ko]=Plasma 애플릿 -Comment[lt]=Plasma įskiepis +Comment[lt]=Plasma papildinys Comment[mr]=प्लाज्मा एप्लेट Comment[nb]=Plasma miniprogram Comment[nds]=Plasma-Lüttprogramm