From 30b62a1c042c150daa5700bbd86bb14df80b7744 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 May 2022 01:44:35 +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 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/dolphinpart.json.in') diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 2d56db904..d99151f72 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -35,13 +35,16 @@ "Name[lv]": "Dolphin skats", "Name[ml]": "ഡോള്‍ഫിന്‍ അവതരണരീതി", "Name[my]": "လင်းပိုင် မြင်ကွင်း", + "Name[nb]": "Dolphin visning", "Name[nl]": "Dolphin-weergave", + "Name[nn]": "Dolphin-vising", "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ", "Name[pl]": "Widok Dolphina", "Name[pt]": "Área do Dolphin", "Name[pt_BR]": "Visualização do Dolphin", "Name[ro]": "Dolphin – Vizualizare", "Name[ru]": "Представление Dolphin", + "Name[se]": "Dolphinčájeheapmi", "Name[sk]": "Dolphin pohľad", "Name[sl]": "Dolphin - pogled", "Name[sr@ijekavian]": "Делфинов приказ", -- cgit v1.3