Commit 2b2bca69 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 bea63538
......@@ -19,6 +19,7 @@ Name[pt]=Calendário do KOrganizer
Name[pt_BR]=Calendário do KOrganizer
Name[ru]=Служба календаря KOrganizer
Name[sk]=KOrganizer Kalendár
Name[sl]=KOrganizerjev koledar
Name[sv]=Korganizer-kalender
Name[uk]=Календар KOrganizer
Name[x-test]=xxKOrganizer Calendarxx
......
......@@ -20,13 +20,13 @@ Name[es]=Comentarios del usuario
Name[et]=Kasutaja tagasiside
Name[fi]=Käyttäjäpalaute
Name[fr]=UserFeedBack
Name[ia]=Responsa de usator
Name[it]=UserFeedback
Name[ko]=사용자 피드백
Name[nl]=UserFeedBack
Name[pt]=UserFeedBack
Name[pt_BR]=Comentários do usuário
Name[ru]=UserFeedBack
Name[sl]=UserFeedBack
Name[sv]=Användaråterkoppling
Name[uk]=Відгуки користувача
Name[x-test]=xxUserFeedBackxx
......@@ -45,6 +45,7 @@ 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
Comment[ru]=Настройка параметров обратной связи KOrganizer
Comment[sl]=Nastavitve uporabniškega povratnega odziva za KOrganizer
Comment[sv]=Inställning av Korganizer användaråterkoppling
Comment[uk]=Налаштовування відгуків користувача у KOrganizer
Comment[x-test]=xxKOrganizer UserFeedBack Configurationxx
......@@ -63,6 +64,7 @@ X-KDE-Keywords[nl]=korganizer,userfeedback
X-KDE-Keywords[pt]=korganizer,reacções,utilizadores
X-KDE-Keywords[pt_BR]=korganizer,comentários do usuario
X-KDE-Keywords[ru]=korganizer,userfeedback,органайзер,обратная связь
X-KDE-Keywords[sl]=korganizer,uporabnikov odziv
X-KDE-Keywords[sv]=korganizer,användaråterkoppling
X-KDE-Keywords[uk]=korganizer,userfeedback,відгуки,дані
X-KDE-Keywords[x-test]=xxkorganizerxx,xxuserfeedbackxx
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