Commit 5fd1683f 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 b785d894
...@@ -15,6 +15,7 @@ X-KDE-Weight=600 ...@@ -15,6 +15,7 @@ X-KDE-Weight=600
Name=UserFeedBack Name=UserFeedBack
Name[ca]=UserFeedBack Name[ca]=UserFeedBack
Name[ca@valencia]=UserFeedBack Name[ca@valencia]=UserFeedBack
Name[en_GB]=UserFeedBack
Name[es]=Comentarios del usuario Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside Name[et]=Kasutaja tagasiside
Name[it]=UserFeedback Name[it]=UserFeedback
...@@ -28,6 +29,7 @@ Name[x-test]=xxUserFeedBackxx ...@@ -28,6 +29,7 @@ Name[x-test]=xxUserFeedBackxx
Comment=KOrganizer UserFeedBack Configuration Comment=KOrganizer UserFeedBack Configuration
Comment[ca]=Configuració de l'UserFeedBack per a KOrganizer Comment[ca]=Configuració de l'UserFeedBack per a KOrganizer
Comment[ca@valencia]=Configuració de l'UserFeedBack per a KOrganizer Comment[ca@valencia]=Configuració de l'UserFeedBack per a KOrganizer
Comment[en_GB]=KOrganizer UserFeedBack Configuration
Comment[es]=Configuración de los comentarios del usuario de KOrganizer Comment[es]=Configuración de los comentarios del usuario de KOrganizer
Comment[et]=KOrganizeri kasutaja tagasiside seadistused Comment[et]=KOrganizeri kasutaja tagasiside seadistused
Comment[it]=Configurazione UserFeedBack di KOrganizer Comment[it]=Configurazione UserFeedBack di KOrganizer
...@@ -41,6 +43,7 @@ Comment[x-test]=xxKOrganizer UserFeedBack Configurationxx ...@@ -41,6 +43,7 @@ Comment[x-test]=xxKOrganizer UserFeedBack Configurationxx
X-KDE-Keywords=korganizer,userfeedback X-KDE-Keywords=korganizer,userfeedback
X-KDE-Keywords[ca]=korganizer,userfeedback X-KDE-Keywords[ca]=korganizer,userfeedback
X-KDE-Keywords[ca@valencia]=korganizer,userfeedback X-KDE-Keywords[ca@valencia]=korganizer,userfeedback
X-KDE-Keywords[en_GB]=korganizer,userfeedback
X-KDE-Keywords[es]=korganizer,comentarios del usuario X-KDE-Keywords[es]=korganizer,comentarios del usuario
X-KDE-Keywords[et]=korganizer,kasutaja tagasiside X-KDE-Keywords[et]=korganizer,kasutaja tagasiside
X-KDE-Keywords[it]=korganizer,userfeedback X-KDE-Keywords[it]=korganizer,userfeedback
......
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