From d1f4e8d1e79814f6ddf56e56c7d121c9f1838b4e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Nov 2023 12:00:15 +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 deletions(-) (limited to 'src/dolphinpartactions.desktop') diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 24ee78f7e..87d493171 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -61,7 +61,6 @@ Name[ta]=சின்னங்கள் Name[tr]=Simgeler Name[uk]=Піктограми Name[vi]=Biểu tượng -Name[x-test]=xxIconsxx Name[zh_CN]=图标 Name[zh_TW]=圖示 Icon=view-list-icons @@ -123,7 +122,6 @@ Name[ta]=சுருக்கமானது Name[tr]=Sıkışık Name[uk]=Компактний Name[vi]=Gọn -Name[x-test]=xxCompactxx Name[zh_CN]=紧凑 Name[zh_TW]=簡潔模式 Icon=view-list-details @@ -185,7 +183,6 @@ Name[ta]=விவரங்கள் Name[tr]=Ayrıntılar Name[uk]=Подробиці Name[vi]=Chi tiết -Name[x-test]=xxDetailsxx Name[zh_CN]=详情 Name[zh_TW]=詳細模式 Icon=view-list-tree -- cgit v1.3