Commit 478091c8 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 a5cfd44e
......@@ -6,7 +6,7 @@ Comment[ast]=Regla na pantalla
Comment[bg]=Линийка за екрана
Comment[bs]=Ekranski lenjir
Comment[ca]=Regle de la pantalla
Comment[ca@valencia]=Regle de pantalla
Comment[ca@valencia]=Regle de la pantalla
Comment[cs]=Obrazovkové pravítko
Comment[da]=Skærmlineal
Comment[de]=Bildschirmlineal
......
......@@ -6,7 +6,7 @@ GenericName[ast]=Regla de pantalla
GenericName[bg]=Линийка за екрана
GenericName[bs]=Ekranski lenjir
GenericName[ca]=Regle de la pantalla
GenericName[ca@valencia]=Regle de pantalla
GenericName[ca@valencia]=Regle de la pantalla
GenericName[cs]=Obrazovkové pravítko
GenericName[cy]=Mesurydd Sgrîn
GenericName[da]=Skærmlineal
......
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