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"
9 years ago · 63a5ab0b56
parent 2012d71b85
commit 63a5ab0b56
1 changed files with 1 additions and 1 deletions
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -12,7 +12,7 @@ Comment[et]=Breeze Dark töölauakujunduse keel KDE VDG-lt
 Comment[eu]=Breeze Dark mahaingain diseinurako lengoaia KDE VDG-k egina
 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[gl]=Linguaxe de deseño do escritorio para Breeze Dark de KDE VDG
 Comment[he]=שפת העיצוב Breeze Dark על ידי KDE VDG
 Comment[hu]=Breeze Dark asztali tervezőnyelv a KDE VDG-től
 Comment[it]=Breeze Dark Desktop Design Language dal KDE VDG