From 0c0de256d5dd9f67f7bf6672e48d95b1bce75b12 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 May 2024 01:19:01 +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 ba7383f2f..bff287d27 100644 --- 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 ... diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 46658626a..d1289fb83 100644 --- 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 ... diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index baeff767b..d737747ef 100644 --- 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 ...