1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00

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"
This commit is contained in:
l10n daemon script 2020-11-05 06:29:54 +01:00
parent a661ac27d4
commit ba4f184781

View File

@ -59,7 +59,7 @@ Comment[nl]=Breeze-team
Comment[nn]=Breeze-laget
Comment[pl]=Zespół Bryzy
Comment[pt]=Equipa do Brisa
Comment[pt_BR]=Equipe Breeze
Comment[pt_BR]=Equipe do Breeze
Comment[ru]=Команда Breeze
Comment[sk]=Breeze Team
Comment[sl]=Team Sapice