1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26: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 2023-05-01 01:51:31 +00:00
parent f895680602
commit 1bfe25720a

View File

@ -54,7 +54,7 @@ Comment[et]=Soovimatu veebisisu blokkimine
Comment[eu]=Oztopatu nahi ez den web edukia
Comment[fi]=Estää epätoivotun verkkosisällön
Comment[fr]=Blocage des contenus Web indésirables
Comment[gl]=Bloquea contenido web non desexado
Comment[gl]=Bloquea contido web non desexado
Comment[ia]=Bloca contento de web non volite
Comment[id]=Memblokir konten web yang tak diinginkan
Comment[is]=Lokar á óumbeðið vefefni