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 · 710671d5cb
parent c327915a8d
commit 710671d5cb
1 changed files with 1 additions and 0 deletions
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -9,6 +9,7 @@ Comment[el]=Γλώσσα σχεδιασμού επιφάνειας εργασί
 Comment[en_GB]=Breeze Dark Desktop Design Language by the KDE VDG
 Comment[es]=Lenguaje de diseño del escritorio Breeze Dark, por el VDG de KDE
 Comment[fi]=Työpöydän design-kieli Breeze Dark KDE VDG:ltä
+Comment[fr]=Thème sombre pour Brise, réalisé par KDE VDG
 Comment[gl]=Linguaxe de deseño do escritorio para Breeze Dark do KDE VDG
 Comment[hu]=Breeze Dark asztali tervezőnyelv a KDE VDG-től
 Comment[it]=Breeze Dark Desktop Design Language dal KDE VDG