From 60fc262bc0ef9f53aca332448f53bb64864a7181 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 14 May 2024 01:17:03 +0000 Subject: [PATCH] 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" --- src/scripts/runaction/actions/googleimagesearch.desktop | 2 +- src/scripts/runaction/actions/tineyeimagesearch.desktop | 2 +- src/scripts/runaction/actions/yandeximagesearch.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index bff287d27..c622726aa 100644 --- 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í... diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index d1289fb83..02e7ada5f 100644 --- 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í... diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index d737747ef..e18598fb5 100644 --- 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í...