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-14 01:17:03 +00:00 · 2024-05-14 01:17:03 +00:00 · 60fc262bc0
commit 60fc262bc0
parent 4cef4a6987
3 changed files with 3 additions and 3 deletions
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -45,7 +45,7 @@ Name[zh_TW]=Google
 Comment=Search with...
 Comment[ar]=ابحث باستخدام...
 Comment[az]=Bununla axtarmaq...
-Comment[bg]=Търсене с...
+Comment[bg]=Търсене с…
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Busca amb…
 Comment[cs]=Hledat pomocí...
--- a/src/scripts/runaction/actions/tineyeimagesearch.desktop
+++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop
@ -43,7 +43,7 @@ Name[zh_TW]=TinEye
 Comment=Search with...
 Comment[ar]=ابحث باستخدام...
 Comment[az]=Bununla axtarmaq...
-Comment[bg]=Търсене с...
+Comment[bg]=Търсене с…
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Busca amb…
 Comment[cs]=Hledat pomocí...
--- a/src/scripts/runaction/actions/yandeximagesearch.desktop
+++ b/src/scripts/runaction/actions/yandeximagesearch.desktop
@ -43,7 +43,7 @@ Name[zh_TW]=Yandex
 Comment=Search with...
 Comment[ar]=ابحث باستخدام...
 Comment[az]=Bununla axtarmaq...
-Comment[bg]=Търсене с...
+Comment[bg]=Търсене с…
 Comment[ca]=Cerca amb...
 Comment[ca@valencia]=Busca amb…
 Comment[cs]=Hledat pomocí...