diff options
| author | l10n daemon script <[email protected]> | 2023-11-07 03:15:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-07 03:15:28 +0000 |
| commit | d558c9a5dd8082488ea884feece22c1add1ea6cd (patch) | |
| tree | 4d6e0d79627ace2f475fad8d9b92cb8b5a356dc2 /src/dolphinpartactions.desktop | |
| parent | 5644e08579963e63443a3d62d44b885b992c35b3 (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, 3 insertions, 0 deletions
diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 87d493171..24ee78f7e 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -61,6 +61,7 @@ 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 @@ -122,6 +123,7 @@ 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 @@ -183,6 +185,7 @@ 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 |