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"
11 years ago · f324bce24d
parent 3e2d112cbb
commit f324bce24d
1 changed files with 2 additions and 0 deletions
--- a/icons-dark/index.theme
+++ b/icons-dark/index.theme
@ -38,6 +38,8 @@ Name[zh_CN]=暗色微风
 Name[zh_TW]=Breeze Dark

 Comment=Default Plasma 5 Theme for Dark themes
+Comment[de]=Dunkles Standard-Arbeitsflächendesign für Plasma 5
+Comment[es]=Tema por omisión de Plasma 5 para temas oscuros
 Comment[nl]=Standaard Plasma 5 thema voor donkere thema's
 Comment[pt]=Tema Escuro por Omissão para o Plasma 5
 Comment[pt_BR]=Tema padrão do Plasma 5 para temas escuros