From be9f4a933f6a8f96e335056a01876460d5cd94b5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Apr 2022 01:46:49 +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/middleclickloader/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index cb72c900a..b1655314e 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -17,7 +17,7 @@ Name[gl]=MiddleClickLoader Name[ia]=MiddleClickLoader Name[id]=MiddleClickLoader Name[it]=Caricatore al clic centrale -Name[ko]=가운데 단추 누름 로더 +Name[ko]=가운데 단추 클릭 로더 Name[lt]=Įkėlimas viduriniojo mygtuko spustelėjimu Name[nl]=MiddleClickLoader Name[nn]=Lasting med midtklikk