Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 10:16:34 +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 2024-05-12 01:19:01 +00:00
parent 7e24b499bc
commit 0c0de256d5
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

@ -47,7 +47,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 ...

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

@ -45,7 +45,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 ...

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

@ -45,7 +45,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 ...