1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +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 2024-05-12 03:21:05 +00:00
parent ba70c4d6cd
commit d174098ea5
3 changed files with 3 additions and 3 deletions

View File

@ -46,7 +46,7 @@ Comment[ar]=ابحث باستخدام...
Comment[az]=Bununla axtarmaq...
Comment[bg]=Търсене с...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Busca amb...
Comment[ca@valencia]=Busca amb
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...

View File

@ -44,7 +44,7 @@ Comment[ar]=ابحث باستخدام...
Comment[az]=Bununla axtarmaq...
Comment[bg]=Търсене с...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Busca amb...
Comment[ca@valencia]=Busca amb
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...

View File

@ -44,7 +44,7 @@ Comment[ar]=ابحث باستخدام...
Comment[az]=Bununla axtarmaq...
Comment[bg]=Търсене с...
Comment[ca]=Cerca amb...
Comment[ca@valencia]=Busca amb...
Comment[ca@valencia]=Busca amb
Comment[cs]=Hledat pomocí...
Comment[da]=Søg med...
Comment[de]=Suchen mit ...