Commit b054a403 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 1b915dba
......@@ -4,6 +4,7 @@ Name[ast]=Gmail
Name[bg]=Gmail
Name[ca]=Gmail
Name[ca@valencia]=Gmail
Name[cs]=Gmail
Name[da]=Gmail
Name[de]=Gmail
Name[el]=Gmail
......@@ -40,6 +41,7 @@ Comment=Connects to your Gmail account
Comment[bg]=Свързване към вашата сметка в Google
Comment[ca]=Connecta amb el vostre compte de Gmail
Comment[ca@valencia]=Connecta amb el vostre compte de Gmail
Comment[cs]=Připojuje se k účtu Gmail
Comment[da]=Forbinder til din Gmail-konto
Comment[de]=Verbindet mit Ihrem Gmail-Konto
Comment[el]=Σύνδεση με τον λογαριασμό σας στο Gmail
......
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