Commit acab04d7 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 b98b86af
......@@ -12,6 +12,8 @@ X-KDE-System-Settings-Parent-Category=personalization
Name=User Feedback
Name[ca]=Comentaris de l'usuari
Name[es]=Comentarios del usuario
Name[lt]=Naudotojo grįžtamasis ryšys
Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários dos usuários
......@@ -19,6 +21,8 @@ Name[uk]=Відгуки користувача
Name[x-test]=xxUser Feedbackxx
Comment=Configure user feedback settings
Comment[ca]=Configura els ajustaments dels comentaris de l'usuari
Comment[es]=Configurar las preferencias de los comentarios del usuario
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
Comment[pt_BR]=Configure as definições dos comentários dos usuários
[Desktop Entry]
Name[lt]=Grįžtamasis ryšys
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