diff options
| author | l10n daemon script <[email protected]> | 2025-09-08 02:03:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-08 02:03:45 +0000 |
| commit | ae7a57ecbf7e2375fa79a910fdf74bf97e69b3ad (patch) | |
| tree | 9282f68e02e774d14e33db4e42e36cac98c5415c /src/dolphinpartactions.desktop | |
| parent | 76b2443130955a7a830d06ef23f647950ad48507 (diff) | |
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"
Diffstat (limited to 'src/dolphinpartactions.desktop')
| -rw-r--r-- | src/dolphinpartactions.desktop | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 139e497c6..e60352692 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -63,7 +63,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 @@ -126,7 +125,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 @@ -190,7 +188,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 |