From 889a574fcdde7d378cdcec75ffc5972b39efbf55 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 30 Dec 2015 09:19: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/dolphinpart.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dolphinpart.desktop') diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index d063af3a9..93d07704b 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -73,7 +73,7 @@ Name[id]=Ikon Name[it]=Icone Name[ja]=アイコン Name[ko]=아이콘 -Name[lt]=Piktogramos +Name[lt]=Ženkliukai Name[nb]=Ikoner Name[nl]=Pictogrammen Name[nn]=Ikon -- cgit v1.3