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 · c962d43f78
parent a1aa5993a0
commit c962d43f78
3 changed files with 3 additions and 0 deletions
--- a/icons-dark/index.theme
+++ b/icons-dark/index.theme
@ -39,6 +39,7 @@ Name[zh_TW]=Breeze Dark

 Comment=KDE Plasma 5 Icon Theme for Dark themes
 Comment[ca]=Tema d'icones del Plasma 5 pels temes foscos del KDE
+Comment[cs]=Motiv ikon KDE Plasma 5 pro tmavé motivy vzhledu
 Comment[es]=Tema de iconos de KDE Plasma 5 para temas oscuros
 Comment[fi]=KDE Plasma 5:n kuvaketeema tummille teemoille
 Comment[hu]=KDE Plasma 5 ikontéma sötét témákhoz
--- a/icons/index.theme
+++ b/icons/index.theme
@ -42,6 +42,7 @@ Name[zh_TW]=Breeze

 Comment=KDE Plasma 5 Icon Theme
 Comment[ca]=Tema d'icones del Plasma 5 pel KDE
+Comment[cs]=Motiv ikon KDE Plasma 5
 Comment[es]=Tema de iconos de KDE Plasma 5
 Comment[fi]=KDE Plasma 5:n kuvaketeema
 Comment[hu]=KDE Plasma 5 ikontéma
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Breeze Dark Desktop Design Language by the KDE VDG
 Comment[ca]=Llenguatge de disseny d'escriptori Brisa fosca pel VDG del KDE
+Comment[cs]=Jazyk pro návrh pracovní plochy Breeze Dark od KDE VDG
 Comment[de]=Breeze-Dunkel-Arbeitsflächendesign der 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ä