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"
3 years ago · 93a0fb62da
parent 581d4e6a73
commit 93a0fb62da
1 changed files with 1 additions and 1 deletions
--- a/app/lattedock.notifyrc
+++ b/app/lattedock.notifyrc
@ -290,7 +290,7 @@ Action=Popup
 Name=Switch to layout
 Name[az]=Maketi Keçmək
 Name[ca]=Commuta a la disposició
-Name[ca@valencia]=Commuta a la disposició
+Name[ca@valencia]=Canvia a la disposició
 Name[cs]=Přepnout na rozložení
 Name[da]=Skift til layout
 Name[de]=Wechsel zu Profil