From 78977803109aaf67f324b3b1fa34c3cfbede9561 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 18 Apr 2015 10:26:53 +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" --- autotests/data/signedPackage/metadata.desktop | 1 + examples/applets/bugreport/metadata.desktop | 1 + examples/applets/conditionalloader/metadata.desktop | 1 + examples/applets/config/metadata.desktop | 1 + examples/applets/testtheme/metadata.desktop | 1 + 5 files changed, 5 insertions(+) diff --git a/autotests/data/signedPackage/metadata.desktop b/autotests/data/signedPackage/metadata.desktop index 3a102a1fd..c67444155 100644 --- a/autotests/data/signedPackage/metadata.desktop +++ b/autotests/data/signedPackage/metadata.desktop @@ -39,6 +39,7 @@ Name[zh_TW]=JavaScript 檔案操作 Comment=Demonstrates accessing data via HTTP in JavaScript Comment[bs]=Demonstrira pristupanje padacima preko HTTP u JavaScript Comment[ca]=Demostra l'accés a dades via HTTP en JavaScript +Comment[cs]=Ukazuje jak v JavaScriptu přistupovat k datům přes HTTP Comment[da]=Demonstrerer tilgang til data via HTTP i JavaScript Comment[de]=Demonstriert den Zugriff auf Daten über HTTP in JavaScript Comment[en_GB]=Demonstrates accessing data via HTTP in JavaScript diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index db0e07d77..00d878a68 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -2,6 +2,7 @@ Comment=Report a bug in Plasma Comment[ar]=أبلغ عن علة في پلازما Comment[ca]=Informa d'un error en el Plasma +Comment[cs]=Nahlásit chybu v Plasmě Comment[da]=Rapportér en fejl i Plasma Comment[de]=Einen Fehler in Plasma berichten Comment[en_GB]=Report a bug in Plasma diff --git a/examples/applets/conditionalloader/metadata.desktop b/examples/applets/conditionalloader/metadata.desktop index 258c06e61..9dccfdc5e 100644 --- a/examples/applets/conditionalloader/metadata.desktop +++ b/examples/applets/conditionalloader/metadata.desktop @@ -4,6 +4,7 @@ Keywords= Name=Applet Test Name[bs]=Applet Test Name[ca]=Miniaplicació de prova +Name[cs]=Test appletu Name[da]=Test af applet Name[de]=Miniprogrammtest Name[en_GB]=Applet Test diff --git a/examples/applets/config/metadata.desktop b/examples/applets/config/metadata.desktop index b4ac8d9fb..fcdbd6c2c 100644 --- a/examples/applets/config/metadata.desktop +++ b/examples/applets/config/metadata.desktop @@ -4,6 +4,7 @@ Keywords= Name=Configuration test Name[bs]=test konfiguracije Name[ca]=Prova la configuració +Name[cs]=Test nastavení Name[da]=Konfigurationstest Name[de]=Einrichtungstest Name[en_GB]=Configuration test diff --git a/examples/applets/testtheme/metadata.desktop b/examples/applets/testtheme/metadata.desktop index 5204b6625..45c642623 100644 --- a/examples/applets/testtheme/metadata.desktop +++ b/examples/applets/testtheme/metadata.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Keywords= Name=Theme Test Name[ca]=Prova el tema +Name[cs]=Test motivu Name[da]=Tema-test Name[de]=Designtest Name[en_GB]=Theme Test