Commit a5cfd44e authored by Script Kiddy's avatar Script Kiddy

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"
parent f97bac0a
......@@ -5,7 +5,7 @@ Comment[ar]=مسطرة الشاشة
Comment[ast]=Regla na pantalla
Comment[bg]=Линийка за екрана
Comment[bs]=Ekranski lenjir
Comment[ca]=Regle de pantalla
Comment[ca]=Regle de la pantalla
Comment[ca@valencia]=Regle de pantalla
Comment[cs]=Obrazovkové pravítko
......@@ -5,7 +5,7 @@ GenericName[ar]=مسطرة الشاشة
GenericName[ast]=Regla de pantalla
GenericName[bg]=Линийка за екрана
GenericName[bs]=Ekranski lenjir
GenericName[ca]=Regle de pantalla
GenericName[ca]=Regle de la pantalla
GenericName[ca@valencia]=Regle de pantalla
GenericName[cs]=Obrazovkové pravítko
GenericName[cy]=Mesurydd Sgrîn
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment