1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01: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 2019-08-24 05:01:51 +02:00
parent 6f1c729906
commit 220e609d47

View File

@ -10,7 +10,7 @@ Name[es]=Validar página
Name[fi]=Tarkista sivu
Name[fr]=Valider la page
Name[gl]=Validar a páxina
Name[id]=Validasi halaman
Name[id]=Absahkan halaman
Name[it]=Convalida la pagina
Name[ko]=
Name[lt]=Patikrinti puslapį