From 517cc98e1574fdff4944f256d14ff10543b7c718 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Dec 2024 01:47:37 +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 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/dolphinpartactions.desktop') diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index d6f15b4de..139e497c6 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -50,6 +50,7 @@ Name[pt]=Ícones Name[pt_BR]=Ícones Name[ro]=Pictograme Name[ru]=Значки +Name[sa]=चिह्नानि Name[se]=Govažat Name[sk]=Ikony Name[sl]=Ikone @@ -113,6 +114,7 @@ Name[pt]=Compacta Name[pt_BR]=Compacto Name[ro]=Compactă Name[ru]=Столбцы +Name[sa]=संकुचित Name[sk]=Kompaktný Name[sl]=Strnjeno Name[sr]=Сажето @@ -176,6 +178,7 @@ Name[pt]=Detalhes Name[pt_BR]=Detalhes Name[ro]=Detalii Name[ru]=Таблица +Name[sa]=वर्णन Name[sk]=Podrobnosti Name[sl]=Podrobnosti Name[sr]=Детаљи -- cgit v1.3.1