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"
2024-09-21 09:42:10 +02:00 · 2024-05-12 03:21:05 +00:00 · 2024-05-12 03:21:05 +00:00 · d174098ea5
commit d174098ea5
parent ba70c4d6cd
3 changed files with 3 additions and 3 deletions
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -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 ...
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@ -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 ...
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@ -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 ...