Commit b133487a 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 5c9914b3
......@@ -16,6 +16,7 @@ Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
Name[nl]=Terugkoppeling van gebruiker
Name[pt]=Reacções dos Utilizadores
Name[pt_BR]=Comentários do usuário
Name[uk]=Відгуки користувача
Name[x-test]=xxUser FeedBackxx
......@@ -26,6 +27,7 @@ X-KDE-Keywords[es]=akregator, configurar, preferencias, comentarios del usuario
X-KDE-Keywords[et]=akregator, seadistamine, seadistused, kasutaja tagasiside
X-KDE-Keywords[nl]=akregator, configureren, instellingen, terugkoppeling van gebruiker
X-KDE-Keywords[pt]=akregator, configurar, configuração, reacções dos utilizadores
X-KDE-Keywords[pt_BR]=akregator, configurar, configurações, geral, comentários do usuário
X-KDE-Keywords[sv]=akregator, anpassa, inställningar, användaråterkoppling
X-KDE-Keywords[x-test]=xxakregatorxx,xx configurexx,xx settingsxx,xx userfeedbackxx
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