From df11f2f168911c3d350216ddb013daac94b9fde4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Dec 2022 02:03:50 +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 459a01a73..8e7523daf 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -9,6 +9,7 @@ Actions=icons;details;compact; Name=Icons Name[ar]=الأيقونات Name[az]=İkonlar +Name[be]=Значкі Name[bg]=Икони Name[ca]=Icones Name[ca@valencia]=Icones @@ -70,6 +71,7 @@ Exec=dolphin Name=Compact Name[ar]=متراصّ Name[az]=Yığcam +Name[be]=Сціслы выгляд Name[bg]=Компактен Name[ca]=Compacta Name[ca@valencia]=Compacta @@ -130,6 +132,7 @@ Exec=dolphin Name=Details Name[ar]=التّفاصيل Name[az]=Ətraflı +Name[be]=Падрабязы выгляд Name[bg]=Подробности Name[ca]=Detalls Name[ca@valencia]=Detalls -- cgit v1.3