Commit 12213e15 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 eb036676
......@@ -44,6 +44,7 @@ Comment[cs]=Přidejte svoje účty online
Comment[de]=Fügen Sie Ihre Online-Zugänge hinzu
Comment[en_GB]=Add Your Online Accounts
Comment[es]=Añadir cuentas con conexión
Comment[et]=Võrgukontode lisamine
Comment[eu]=Gehitu zure online kontuak
Comment[fr]=Ajouter vos comptes en ligne
Comment[gl]=Engadir as contas de Internet
......@@ -56,6 +57,7 @@ Comment[pt_BR]=Adicione suas contas online
Comment[sv]=Lägg till dina nätkonton
Comment[uk]=Додавання ваших облікових записів
Comment[x-test]=xxAdd Your Online Accountsxx
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