Commit 7cc0fe22 authored by Script Kiddy's avatar Script Kiddy

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 e023c187
......@@ -68,6 +68,7 @@ Comment[ia]=Configura integration de actualisation de software
Comment[it]=Configura l'integrazione degli aggiornamenti software
Comment[nl]=Integratie van software bijwerken configureren
Comment[nn]=Set opp integrering med programoppdateringar
Comment[pl]=Ustawienia integracji uaktualniania oprogramowania
Comment[pt]=Configurar a integração com as actualizações de aplicações
Comment[ru]=Параметры службы обновления программ
Comment[sk]=Konfigurácia integrácie aktualizácií softvéru
......@@ -16,6 +16,7 @@ Name[ia]=Actualisationes de Software
Name[it]=Aggiornamenti software
Name[nl]=Elementen voor software bijwerken
Name[pl]=Uaktualnienia oprogramowania
Name[pt]=Actualizações de Aplicações
Name[ru]=Обновления программ
Name[sk]=Aktualizácie softvéru
......@@ -23,7 +23,7 @@ Name[ko]=Snap 로그인 동작
Name[lt]=Snap prisijungimo veiksmas
Name[nl]=Actie voor aanmelden van snap
Name[pl]=Logowanie snap
Name[pl]=Działanie logowania Snap
Name[pt]=Acção de autenticação do Snap
Name[pt_BR]=Ação de login do Snap
Name[ro]=Acțiune de autentificare Snap
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