Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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 02:03:16 +00:00
parent 02feca74ce
commit 8edcd52593
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/runaction/actions/googleimagesearch.desktop
View File

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

2
src/scripts/runaction/actions/tineyeimagesearch.desktop
View File

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

2
src/scripts/runaction/actions/yandeximagesearch.desktop
View File

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