Commit 814f570a 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 2dbb0620
......@@ -49,6 +49,7 @@ Name[sk]=Platnosť overenia servera Microsoft Exchange vypršala
Name[sv]=Microsoft Exchange behörighet utgången
Name[uk]=Строк дії розпізнавання Microsoft Exchange вичерпано
Name[x-test]=xxMicrosoft Exchange authentication expiredxx
Name[zh_CN]=Microsoft Exchange 身份验证过期
Name[zh_TW]=Microsoft Exchange 認證方式已過期
Comment=Credentials used to access Microsoft Exchange are no longer valid
Comment[ca]=Les credencials que s'usen per accedir al Microsoft Exchange ja no són vàlides
......@@ -71,5 +72,6 @@ Comment[sk]=Poverenia použité na prístup k Microsoft Exchange už nie sú pla
Comment[sv]=Inloggningsinformation använd för att komma åt Microsoft Exchange är inte längre giltig
Comment[uk]=Реєстраційні дані для доступу Microsoft Exchange втратили чинність
Comment[x-test]=xxCredentials used to access Microsoft Exchange are no longer validxx
Comment[zh_CN]=访问 Microsoft Exchange 所使用的凭据不再有效
Comment[zh_TW]=曾用來存取 Microsoft Exchange 的憑證現已無效
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