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"
4 years ago · c1cd23993c
parent f453cc458a
commit c1cd23993c
2 changed files with 2 additions and 2 deletions
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@ -39,7 +39,7 @@ Comment=Breeze Team
 Comment[ar]=فريق نسيم
 Comment[az]=Breeze Komandası
 Comment[ca]=L'equip del «Breeze»
-Comment[ca@valencia]=L'equip del «Breeze»
+Comment[ca@valencia]=L'equip de «Breeze»
 Comment[cs]=Team Breeze
 Comment[da]=Breeze-tema
 Comment[de]=Breeze-Team
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@ -36,7 +36,7 @@ Name[zh_TW]=Windows
 Comment=Windows like theme based on Material design
 Comment[az]=Material dizaynında Windows oxşarı mövzu
 Comment[ca]=Tema semblant al Windows, basat en el «Material design»
-Comment[ca@valencia]=Tema semblant a Windows, basat en el «Material design»
+Comment[ca@valencia]=Tema semblant a Windows, basat en «Material design»
 Comment[cs]=Motiv podobný Windows založený na designu Material
 Comment[da]=Windows-lignende tema baseret på Material design
 Comment[de]=Windows ähnliches Design auf der Basis des Designs Material