From 58a7772a19204f467432d098253a32f0fc705b34 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 2 Jul 2022 02:06:49 +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 c0f2be4e4..e2f0ec9cd 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -4,6 +4,7 @@ Name=Dolphin View Name[ar]=عرض دولفين Name[ast]=Vista de Dolphin Name[az]=Dolphin görünüşü +Name[bg]=Изглед на Dolphin Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista de Dolphin Name[cs]=Pohled Dolphin @@ -76,6 +77,7 @@ Name=Icons Name[ar]=الأيقونات Name[ast]=Iconos Name[az]=İkonlar +Name[bg]=Икони Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony @@ -135,6 +137,7 @@ Name=Compact Name[ar]=متراصّ Name[ast]=Compauta Name[az]=Yığcam +Name[bg]=Компактен Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní @@ -193,6 +196,7 @@ Name=Details Name[ar]=التّفاصيل Name[ast]=Detalles Name[az]=Ətraflı +Name[bg]=Подробности Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti -- cgit v1.3.1