Commit 94c999c0 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 8bcb0ec2
...@@ -58,6 +58,7 @@ Comment[cs]=Nastavit uzamykání obrazovky ...@@ -58,6 +58,7 @@ Comment[cs]=Nastavit uzamykání obrazovky
Comment[de]=Bildschirmsperre einrichten Comment[de]=Bildschirmsperre einrichten
Comment[en_GB]=Configure screen locking Comment[en_GB]=Configure screen locking
Comment[es]=Configurar el bloqueo de pantalla Comment[es]=Configurar el bloqueo de pantalla
Comment[et]=Ekraani lukustamise seadistamine
Comment[eu]=Konfiguratu pantaila giltzatzea Comment[eu]=Konfiguratu pantaila giltzatzea
Comment[fi]=Näytön lukituksen asetukset Comment[fi]=Näytön lukituksen asetukset
Comment[fr]=Configurer le verrouillage de l'écran Comment[fr]=Configurer le verrouillage de l'écran
......
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