Commit 1b58b539 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 511a548e
Pipeline #59116 skipped
......@@ -50,6 +50,7 @@ Comment[x-test]=xxAccess your Google Calendars, Contacts and Tasks from KDExx
Name=Google Groupware needs to authenticate
Name[ca]=Google Groupware s'ha d'autenticar
Name[ca@valencia]=Google Groupware s'ha d'autenticar
Name[cs]=Google Groupware vyžaduje ověření totožnosti
Name[en_GB]=Google Groupware needs to authenticate
Name[es]=Google Groupware necesita autenticación
Name[fi]=Google Groupware vaatii todennuksen
......
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