Commit ddc24417 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 ef8928fc
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Google Groupware
Name[cs]=Google Groupware
Name[es]=Google Groupware
Name[et]=Google Groupware
Name[it]=Google Groupware
Name[nl]=Google Groupware
Name[pt]='Groupware' do Google
Name[pt_BR]=Google Groupware
......@@ -18,6 +19,7 @@ Comment[ca@valencia]=Accediu als calendaris, contactes i tasques de Google des d
Comment[cs]=Přistupujte ke k kalendářům, kontaktům a úkolům z KDE
Comment[es]=Acceda a sus calendarios, contactos y tareas de Google desde KDE
Comment[et]=Oma Google'i kalendrite, kontaktide ja ülesannete kasutamine otse KDE-st
Comment[it]=Accedi ai tuoi calendari, contatti e attività Google da KDE
Comment[nl]=Heb toegang tot uw Google agenda's, contactpersonen en taken vanuit KDE
Comment[pt]=Aceda aos seus calendários, contactos e tarefas da Google a partir do KDE
Comment[pt_BR]=Acesse seus calendários, contatos e tarefas do Google a partir do KDE
......
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