From a8966d230c7bdbca269ddc5b6ec1c71d9c8b2e20 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 29 Mar 2022 03:51:20 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dolphinpart.desktop.in') diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index cdd51c832..c0f2be4e4 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -5,7 +5,7 @@ Name[ar]=عرض دولفين Name[ast]=Vista de Dolphin Name[az]=Dolphin görünüşü Name[ca]=Vista del Dolphin -Name[ca@valencia]=Vista del Dolphin +Name[ca@valencia]=Vista de Dolphin Name[cs]=Pohled Dolphin Name[da]=Dolphin-visning Name[de]=Dolphin-Ansicht -- cgit v1.3