From d3cb7d249fe7943955a2ec481622b37ef3c95e47 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 14 Jun 2017 08:20:40 +0200 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" --- desktop/konsole.notifyrc | 2 +- desktop/konsolerun.desktop | 4 ++-- desktop/org.kde.konsole.desktop | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index e571bb6a..545869df 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -81,7 +81,7 @@ Comment[ta]=கான்சோல் Comment[te]=కాన్సొల్ Comment[tg]=Консол Comment[th]=คอนโซล-K -Comment[tr]=Konsol +Comment[tr]=Konsole Comment[ug]=Konsole Comment[uk]=Konsole Comment[uz]=Terminal diff --git a/desktop/konsolerun.desktop b/desktop/konsolerun.desktop index 724ec823..6b610c39 100644 --- a/desktop/konsolerun.desktop +++ b/desktop/konsolerun.desktop @@ -51,7 +51,7 @@ Name[sr@ijekavian]=Изврши у Конзоли Name[sr@ijekavianlatin]=Izvrši u Konsoli Name[sr@latin]=Izvrši u Konsoli Name[sv]=Kör i Terminal -Name[tr]=Konsolda Çalıştır +Name[tr]=Konsole'da Çalıştır Name[uk]=Запустити у Konsole Name[x-test]=xxRun In Konsolexx Name[zh_CN]=在 Konsole 中运行 @@ -91,7 +91,7 @@ Comment[sr@ijekavian]=Изврши у Конзоли Comment[sr@ijekavianlatin]=Izvrši u Konsoli Comment[sr@latin]=Izvrši u Konsoli Comment[sv]=Kör i Terminal -Comment[tr]=Konsolda Çalıştır +Comment[tr]=Konsol İçinde Çalıştır Comment[uk]=Запустити у Konsole Comment[x-test]=xxRun within Konsolexx Comment[zh_CN]=在 Konsole 中运行 diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop index 79a065e3..f6bc8c93 100755 --- a/desktop/org.kde.konsole.desktop +++ b/desktop/org.kde.konsole.desktop @@ -92,7 +92,7 @@ Name[ta]=கான்சோல் Name[te]=కాన్సోల్ Name[tg]=Консол Name[th]=คอนโซล-K -Name[tr]=Konsol +Name[tr]=Konsole Name[ug]=Konsole Name[uk]=Konsole Name[uz]=Konsole