Commit 234275ed 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 0b1cb3bb
......@@ -18,6 +18,7 @@ Name[ca@valencia]=UserFeedBack
Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
Name[ko]=사용자 피드백
Name[pt_BR]=Comentários do usuário
......@@ -30,6 +31,7 @@ Comment[ca@valencia]=Configuració de l'UserFeedBack per a KOrganizer
Comment[es]=Configuración de los comentarios del usuario de KOrganizer
Comment[et]=KOrganizeri kasutaja tagasiside seadistused
Comment[it]=Configurazione UserFeedBack di KOrganizer
Comment[ko]=KOrganizer 사용자 피드백 설정
Comment[nl]=KOrganizer UserFeedBack configuratie
Comment[pt]=Configuração das Reacções dos Utilizadores do KOrganizer
Comment[pt_BR]=Configuração dos comentários do usuário do KOrganizer
......@@ -42,6 +44,7 @@ X-KDE-Keywords[ca@valencia]=korganizer,userfeedback
X-KDE-Keywords[es]=korganizer,comentarios del usuario
X-KDE-Keywords[et]=korganizer,kasutaja tagasiside
X-KDE-Keywords[ko]=korganizer,userfeedback,사용자 피드백
X-KDE-Keywords[pt_BR]=korganizer,comentários do usuario
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