Commit 7cf9f092 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 f536ea4e
Pipeline #45499 skipped
......@@ -10,6 +10,7 @@ Name[ia]=Ressource de EteSync Groupware
Name[it]=Risorsa di groupware EteSync
Name[ko]=EteSync 그룹웨어 자원
Name[pl]=Zasób do pracy grupowej EteSync
Name[pt]=Recurso de 'Groupware' EteSync
Name[pt_BR]=Recurso de groupware por EteSync
Name[sl]=Vir EteSync Groupware
......@@ -27,6 +28,7 @@ Comment[ia]=Accede a tu Calendarios cryptate de EteSync, contactos e cargas ab K
Comment[it]=Accedi ai tuoi calendari, contatti e attività cifrati EteSync da KDE
Comment[ko]=KDE에서 EteSync 캘린더, 연락처, 할 일에 접근합니다
Comment[nl]=Heb toegang tot uw EteSync agenda's, contactpersonen en taken vanuit KDE
Comment[pl]=Dostęp do twoich zaszyfrowanych kalendarzy EteSync, kontaktów i zadań z poziomu KDE
Comment[pt]=Aceda aos seus calendários, contactos e tarefas do EteSync a partir do KDE
Comment[pt_BR]=Acesse seus calendários, contatos e tarefas criptografados do EteSync a partir do KDE
Comment[sl]=Dostopajte do svojih šifriranih EteSync koledarjev, stikov in opravil iz okolja KDE
......@@ -57,6 +57,7 @@ Name[ia]=Google Groupware necessita de authenticar
Name[it]=Google Groupware richiede l'autenticazione
Name[ko]=Google 그룹웨어에 인증해야 함
Name[nl]=Google Groupware heeft authenticatie nodig
Name[pl]=Google Groupware wymaga uwierzytelnienia
Name[pt]=O Google Groupware necessita de se autenticar
Name[pt_BR]=O Google Groupware precisa de autenticação
Name[sl]=Google Groupware se mora overiti
......@@ -74,6 +75,7 @@ Comment[ia]=Google Groupware ha essite disconnectite e necessita de esser re-aut
Comment[it]=Google Groupware si è disconnesso ed è necessario riautenticarsi
Comment[ko]=Google 그룹웨어에서 로그아웃되어서 다시 인증해야 함
Comment[nl]=Google Groupware is afgemeld en opnieuw er is opnieuw authenticatie nodig
Comment[pl]=Google Groupware zostało wylogowane i wymaga ponownego uwierzytelnienia
Comment[pt]=A sessão do Google Groupware foi encerrada e necessita de se autenticar de novo
Comment[pt_BR]=O Google Groupware foi desconectado e necessita ser reautenticado
Comment[sl]=Google Groupware je bil odjavljen se mora ponovno overiti
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