Commit 810da5c9 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 decb2324
Pipeline #36571 skipped
......@@ -49,9 +49,12 @@ Name[ca]=Google Groupware s'ha d'autenticar
Name[ca@valencia]=Google Groupware s'ha d'autenticar
Name[en_GB]=Google Groupware needs to authenticate
Name[es]=Google Groupware necesita autenticación
Name[fr]=La suite de groupe de travail « Google Groupware » a besoin de s'authentifier
Name[ko]=Google 그룹웨어에 인증해야 함
Name[nl]=Google Groupware heeft authenticatie nodig
Name[pt]=O Google Groupware necessita de se autenticar
Name[sl]=Google Groupware se mora overiti
Name[sv]=Google grupprogram behöver behörighetskontroll
Name[uk]=Потрібне розпізнавання на Google Groupware
Name[x-test]=xxGoogle Groupware needs to authenticatexx
Comment=Google Groupware has been logged off and needs to be reauthenticated
......@@ -59,9 +62,12 @@ Comment[ca]=S'ha tancat la sessió de Google Groupware i cal tornar-se a autenti
Comment[ca@valencia]=S'ha tancat la sessió de Google Groupware i cal tornar-se a autenticar
Comment[en_GB]=Google Groupware has been logged off and needs to be re-authenticated
Comment[es]=Se ha cerrado la sesión de Google Groupware y necesita volver a autenticarse
Comment[fr]=La suite de groupe de travail « Google Groupware » s'est déconnectée et doit de s'authentifier à nouveau
Comment[ko]=Google 그룹웨어에서 로그아웃되어서 다시 인증해야 함
Comment[nl]=Google Groupware is afgemeld en opnieuw er is opnieuw authenticatie nodig
Comment[pt]=A sessão do Google Groupware foi encerrada e necessita de se autenticar de novo
Comment[sl]=Google Groupware je bil odjavljen se mora ponovno overiti
Comment[sv]=Google grupprogram har loggats ut och behöver ny behörighetskontroll
Comment[uk]=Було здійснено вихід із Google Groupware — потрібне повторне розпізнавання
Comment[x-test]=xxGoogle Groupware has been logged off and needs to be reauthenticatedxx
Urgency=Normal
......
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