Commit 7763a1e0 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 8749fc7e
......@@ -17,6 +17,7 @@ Name[en_GB]=Browse Files with File Manager
Name[es]=Explorar archivos con el gestor de archivos
Name[et]=Failide sirvimine failihalduriga
Name[eu]=Arakatu fitxategiak fitxategi kudeatzailearekin
Name[fi]=Selaa tiedostoja tiedostonhallinnassa
Name[fr]=Parcourir les fichiers avec le gestionnaire de fichiers
Name[gl]=Explorar o ficheiros co xestor de ficheiros
Name[it]=Sfoglia file con il gestore dei file
......
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