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-11-11 01:22:10 +01:00 · 2024-05-12 01:19:01 +00:00 · 2024-05-12 01:19:01 +00:00 · 0c0de256d5
commit 0c0de256d5
parent 7e24b499bc
3 changed files with 3 additions and 3 deletions
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -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 ...
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@ -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 ...
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@ -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 ...