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 · 74364c02be
parent 13520a2e4c
commit 74364c02be
2 changed files with 2 additions and 0 deletions
--- a/icons-dark/index.theme
+++ b/icons-dark/index.theme
@ -45,6 +45,7 @@ Comment[en_GB]=Default Plasma 5 Theme for Dark themes
 Comment[es]=Tema por omisión de Plasma 5 para temas oscuros
 Comment[fi]=Plasma 5:n oletusteema tummille teemoille
 Comment[it]=Tema predefinito di icone di Plasma 5 per temi scuri
+Comment[ko]=기본 Plasma 5 테마의 어두운 버전
 Comment[nl]=Standaard Plasma 5 thema voor donkere thema's
 Comment[nn]=Standard Plasma 5-tema for mørke tema
 Comment[pl]=Domyślny wystrój Plazma 5 dla ciemnych wystrojów
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -9,6 +9,7 @@ Comment[fi]=Työpöydän design-kieli Breeze Dark KDE VDG:ltä
 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
+Comment[ko]=KDE VDG에서 만든 어두운 Breeze 데스크톱 디자인 언어
 Comment[nb]=Breeze Dark-språk for skrivebordsutforming  fra KDE-gruppa for visuell design
 Comment[nl]=Breeze Dark ontwerptaal van het bureaublad door KDE VDG
 Comment[nn]=Breeze Dark-designspråk av KDE VDG