Commit 0d7861ba 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 d39b87ab
Pipeline #39445 skipped
......@@ -54,7 +54,7 @@ Comment[nb]=Kontact programtillegg for KOrganizer dagbok
Comment[nds]=KOrganizer-Daagbookmoduul för Kontact
Comment[ne]=केडीई आयोजक जर्नल प्लगइन सम्पर्क गर्नुहोस्
Comment[nl]=Kontact KOrganizer Journaalplug-in
Comment[nn]=Kontakt-programtillegg for KOrganizer-dagbøker
Comment[nn]=Kontact-programtillegg for KOrganizer-dagbøker
Comment[pl]=Wtyczka Kontact do współpracy z dziennikiem KOrganizera
Comment[pt]='Plugin' de Diários do KOrganizer para o Kontact
Comment[pt_BR]=Plugin de diário do KOrganizer para o Kontact
......
......@@ -58,7 +58,7 @@ Comment[nb]=Kontact programtillegg for KOrganizer
Comment[nds]=KOrganizer-Moduul för Kontact
Comment[ne]=केडीई आयोजक प्लगइन सम्पर्क गर्नुहोस्
Comment[nl]=Kontact KOrganizer-plug-in
Comment[nn]=Kontakt-programtillegg for KOrganizer
Comment[nn]=Kontact-programtillegg for KOrganizer
Comment[pl]=Wtyczka Kontact do współpracy z KOrganizerem
Comment[pt]='Plugin' do KOrganizer para o Kontact
Comment[pt_BR]=Plugin do KOrganizer para o Kontact
......
......@@ -54,7 +54,7 @@ Comment[nb]=Kontact programtillegg for KOrganizer gjøreliste
Comment[nds]=KOrganizer-Opgavenlistmoduul för Kontact
Comment[ne]=गर्नुपर्ने कार्यसूची प्लगइन गर्न केडीई आयोजकलाई सम्पर्क गर्नुहोस्
Comment[nl]=Kontact KOrganizer takenlijstplug-in
Comment[nn]=Kontakt-programtillegg for KOrganizer-hugselister
Comment[nn]=Kontact-programtillegg for KOrganizer-hugselister
Comment[pl]=Wtyczka Kontact do współpracy z listą zadań KOrganizera
Comment[pt]='Plugin' de Itens Por-Fazer do KOrganizer para o Kontact
Comment[pt_BR]=Plugin de lista de tarefas do KOrganizer para o Kontact
......
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