Commit a1f1b935 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 10b7a1ba
......@@ -15,6 +15,7 @@ X-KDE-Weight=600
Name=UserFeedBack
Name[ca]=UserFeedBack
Name[ca@valencia]=UserFeedBack
Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
Name[nl]=UserFeedBack
Name[pt]=UserFeedBack
......@@ -25,6 +26,7 @@ Name[x-test]=xxUserFeedBackxx
Comment=KOrganizer UserFeedBack Configuration
Comment[ca]=Configuració de l'UserFeedBack per a KOrganizer
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[nl]=KOrganizer UserFeedBack configuratie
Comment[pt]=Configuração das Reacções dos Utilizadores do KOrganizer
......@@ -35,6 +37,7 @@ Comment[x-test]=xxKOrganizer UserFeedBack Configurationxx
X-KDE-Keywords=korganizer,userfeedback
X-KDE-Keywords[ca]=korganizer,userfeedback
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[nl]=korganizer,userfeedback
X-KDE-Keywords[pt]=korganizer,reacções,utilizadores
......
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