From d174098ea5d4f57ae575bba9ea01cc561db247d8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 May 2024 03:21:05 +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 f4bf95051..9e19f69c6 100644 --- 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 ... diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 052082354..45f55cc39 100644 --- 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 ... diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 98c399e95..37e5d9bb6 100644 --- 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 ...