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"
This commit is contained in:
l10n daemon script 2015-04-18 10:26:53 +00:00
parent f248bfbfd1
commit 7897780310
5 changed files with 5 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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