From f7e83b4bcfd75bda6bc1c9084921e08f604566b3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 1 Apr 2017 04:05:09 +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" --- examples/applets/bugreport/metadata.desktop | 4 ++-- src/plasma/data/servicetypes/plasma-lookandfeel.desktop | 2 +- src/plasma/data/servicetypes/plasma-shell.desktop | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index 9a1456493..b3656d10e 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -34,7 +34,7 @@ Comment[sr@ijekavian]=Пријавите грешку у Плазми Comment[sr@ijekavianlatin]=Prijavite grešku u Plasmi Comment[sr@latin]=Prijavite grešku u Plasmi Comment[sv]=Rapportera ett fel i Plasma -Comment[tr]=Plazmada hata raporla +Comment[tr]=Plasma'da hata raporla Comment[uk]=Повідомити про ваду у Плазмі Comment[x-test]=xxReport a bug in Plasmaxx Comment[zh_CN]=报告 Plasma 的错误 @@ -71,7 +71,7 @@ Keywords[sr@ijekavian]=plasma;bugzilla;bug;development;support;Плазма;Бу Keywords[sr@ijekavianlatin]=plasma;bugzilla;bug;development;support;Plasma;Bubaždaja;greška;razvoj;podrška; Keywords[sr@latin]=plasma;bugzilla;bug;development;support;Plasma;Bubaždaja;greška;razvoj;podrška; Keywords[sv]=plasma;bugzilla;fel;utveckling;support; -Keywords[tr]=plazma;bugzilla;hata;geliştirme;destek; +Keywords[tr]=plazma;bugzilla;hata;geliştirme;destek;plasma Keywords[uk]=plasma;bugzilla;bug;development;support;плазма;багзілла;вада;баг;розробка;підтримка;супровід;помилка; Keywords[x-test]=xxplasmaxx;xxbugzillaxx;xxbugxx;xxdevelopmentxx;xxsupportxx; Keywords[zh_CN]=plasma;bugzilla;bug;development;support;错误;开发;支持; diff --git a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop index 9c24d8e27..caa103b70 100644 --- a/src/plasma/data/servicetypes/plasma-lookandfeel.desktop +++ b/src/plasma/data/servicetypes/plasma-lookandfeel.desktop @@ -74,7 +74,7 @@ Comment[sr@ijekavian]=Дефинише визуелни језик за плаз Comment[sr@ijekavianlatin]=Definiše vizuelni jezik za plasma školjke Comment[sr@latin]=Definiše vizuelni jezik za plasma školjke Comment[sv]=Definierar det visuella språket för Plasma skal -Comment[tr]=Plazma Kabukları için Sanal Dili tanımlar +Comment[tr]=Plasma Kabukları için Sanal Dili tanımlar Comment[uk]=Визначає візуальну мову для оболонок Плазми Comment[x-test]=xxDefines the Visual Language for Plasma Shellsxx Comment[zh_CN]=定义 Plasma Shell 的视觉语言 diff --git a/src/plasma/data/servicetypes/plasma-shell.desktop b/src/plasma/data/servicetypes/plasma-shell.desktop index 57c89b7e1..63872575a 100644 --- a/src/plasma/data/servicetypes/plasma-shell.desktop +++ b/src/plasma/data/servicetypes/plasma-shell.desktop @@ -38,7 +38,7 @@ Name[sr@ijekavian]=Плазма шкољка Name[sr@ijekavianlatin]=Plasma školjka Name[sr@latin]=Plasma školjka Name[sv]=Plasma skal -Name[tr]=Plazma Kabuğu +Name[tr]=Plasma Kabuğu Name[uk]=Оболонка Плазми Name[x-test]=xxPlasma Shellxx Name[zh_CN]=Plasma 外壳 @@ -78,7 +78,7 @@ Comment[sr@ijekavian]=Компоненте плазма шкољке Comment[sr@ijekavianlatin]=Komponente plasma školjke Comment[sr@latin]=Komponente plasma školjke Comment[sv]=Plasma skalkomponenter -Comment[tr]=Plazma Kabuğu Bileşenleri +Comment[tr]=Plasma Kabuğu Bileşenleri Comment[uk]=Компоненти оболонки Плазми Comment[x-test]=xxPlasma Shell Componentsxx Comment[zh_CN]=Plasma 外壳部件