1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-21 11:16:35 +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 2022-03-23 03:29:15 +00:00
parent 1ef7a6547a
commit 440f015283
3 changed files with 3 additions and 3 deletions

View File

@ -36,7 +36,7 @@ Name[zh_TW]=Google
Comment=Search with...
Comment[az]=Bununla axtarmaq...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Cerca amb...
Comment[ca@valencia]=Busca amb...
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...

View File

@ -36,7 +36,7 @@ Name[zh_TW]=TinEye
Comment=Search with...
Comment[az]=Bununla axtarmaq...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Cerca amb...
Comment[ca@valencia]=Busca amb...
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...

View File

@ -36,7 +36,7 @@ Name[zh_TW]=Yandex
Comment=Search with...
Comment[az]=Bununla axtarmaq...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Cerca amb...
Comment[ca@valencia]=Busca amb...
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...