From 18cd42837f746984ae603513995c07fac8636b75 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Jan 2024 01:13:46 +0000 Subject: 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/dolphinpart.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dolphinpart.json.in') diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 58c0d9a9c..445e309ef 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -37,7 +37,7 @@ "Name[ka]": "Dolphin -ის ხედი", "Name[ko]": "Dolphin 보기", "Name[lt]": "Dolphin rodinys", - "Name[lv]": "Dolphin skats", + "Name[lv]": "„Dolphin“ skats", "Name[ml]": "ഡോള്‍ഫിന്‍ അവതരണരീതി", "Name[my]": "လင်းပိုင် မြင်ကွင်း", "Name[nb]": "Dolphin-visning", -- cgit v1.3.1