Commit 64cfa63c 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 f15d7eb4
Pipeline #44047 skipped
......@@ -26,6 +26,7 @@ Name[it]=Segnalazioni degli utenti
Name[ko]=사용자 피드백
Name[nl]=Terugkoppeling van gebruiker
Name[nn]=Tilbakemeldingar
Name[pl]=Informacja zwrotna
Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários do usuário
Name[ru]=Обратная связь
......@@ -51,6 +52,7 @@ X-KDE-Keywords[it]=akregator, configurazione, impostazioni, segnalazioniutenti
X-KDE-Keywords[ko]=akregator, configure, settings, userfeedback, 설정, 일반, 사용자 피드백
X-KDE-Keywords[nl]=akregator, configureren, instellingen, terugkoppeling van gebruiker
X-KDE-Keywords[nn]=akregator, kjelder, oppsett, tilbakemeldingar
X-KDE-Keywords[pl]=akregator, konfiguruj, ustawienia, ogólne, informacja zwrotna
X-KDE-Keywords[pt]=akregator, configurar, configuração, reacções dos utilizadores
X-KDE-Keywords[pt_BR]=akregator, configurar, configurações, geral, comentários do usuário
X-KDE-Keywords[ru]=akregator, configure, settings, 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