Commit 7f59f8b9 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 08823e7b
......@@ -15,6 +15,7 @@ Name[ca]=Comentaris de l'usuari
Name[en_GB]=User Feedback
Name[es]=Comentarios del usuario
Name[gl]=Achegas de usuario
Name[it]=Segnalazioni dell'utente
Name[lt]=Naudotojo grįžtamasis ryšys
Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
......@@ -27,6 +28,7 @@ Comment[ca]=Configura els ajustaments dels comentaris de l'usuari
Comment[en_GB]=Configure user feedback settings
Comment[es]=Configurar las preferencias de los comentarios del usuario
Comment[gl]=Configurar as achegas de usuario
Comment[it]=Configura le impostazioni di segnalazione dell'utente
Comment[lt]=Konfigūruoti naudotojo grįžtamojo ryšio nuostatas
Comment[nl]=Instellingen voor terugkoppeling van gebruikers configureren
Comment[pt]=Configurar as opções das reacções do utilizador
......
......@@ -4,6 +4,7 @@ Name[ca]=Comentaris
Name[en_GB]=Feedback
Name[es]=Comentarios
Name[gl]=Achegas
Name[it]=Segnalazioni
Name[lt]=Grįžtamasis ryšys
Name[nl]=Terugkoppeling
Name[pt]=Reacções
......
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