From cb9142a9bbabe0d4adc65253ede01bc998cf0edb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Aug 2021 01:11:30 +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.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/dolphinpart.desktop.in') diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index 619b3c3a8..bc0e342e2 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -17,6 +17,7 @@ Name[eu]=Dolphin ikuspegia Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin +Name[hi]=डॉल्फ़िन दृश्य Name[hu]=Dolphin nézet Name[ia]=Vista de Dolphin Name[id]=Tampilan Dolphin @@ -87,6 +88,7 @@ Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas Name[he]=סמלים +Name[hi]=प्रतीक Name[hu]=Ikonok Name[ia]=Icones Name[id]=Ikon @@ -143,6 +145,7 @@ Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta Name[he]=חסכונית +Name[hi]=सघन Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Ringkas @@ -198,6 +201,7 @@ Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles Name[he]=פרטים +Name[hi]=विवरण Name[hu]=Részletek Name[ia]=Detalios Name[id]=Perincian -- cgit v1.3