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/dolphinpartactions.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dolphinpartactions.desktop') diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 52cdf58c0..d6f15b4de 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -164,7 +164,7 @@ Name[ja]=詳細 Name[ka]=დეტალები Name[ko]=자세히 Name[lt]=Išsamus -Name[lv]=Detaļas +Name[lv]=Informācija Name[ml]=വിശദമായി Name[my]=အသေးစိတ် Name[nb]=Detaljer -- cgit v1.3.1