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"
10 years ago · 625089cd44
parent 1ebeb3883a
commit 625089cd44
2 changed files with 2 additions and 1 deletions
--- a/runners/baloo/plasma-runner-baloosearch.desktop
+++ b/runners/baloo/plasma-runner-baloosearch.desktop
@ -48,7 +48,7 @@ Comment[ca]=Executor que cerca per fitxers, correus electrònics i contactes
 Comment[ca@valencia]=Executor que cerca per fitxers, correus electrònics i contactes
 Comment[cs]=Spouštěč, který prohledává v souborech, emailech a kontaktech
 Comment[da]=Runner som gennemsøger filer, e-mails og kontakter
-Comment[de]=Runner, der Dateiene, E-Mails und Kontakte durchsucht
+Comment[de]=Runner, der Dateien, E-Mails und Kontakte durchsucht
 Comment[el]=Εκτελεστής που εκτελεί αναζήτηση σε αρχεία, μηνύματα ηλ. ταχυδρομείου και επαφές
 Comment[en_GB]=Runner which searches through files, emails and contacts
 Comment[es]=Lanzador que busca en archivos, correo electrónico y contactos
--- a/xembed-sni-proxy/xembedsniproxy.desktop
+++ b/xembed-sni-proxy/xembedsniproxy.desktop
@ -5,6 +5,7 @@ Name[ast]=XembedSniProxy
 Name[ca]=XembedSniProxy
 Name[ca@valencia]=XembedSniProxy
 Name[da]=XembedSniProxy
+Name[de]=XembedSniProxy
 Name[en_GB]=XembedSniProxy
 Name[es]=XembedSniProxy
 Name[et]=XembedSniProxy