diff options
| author | l10n daemon script <[email protected]> | 2023-11-04 12:00:15 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-04 12:00:15 +0000 |
| commit | d1f4e8d1e79814f6ddf56e56c7d121c9f1838b4e (patch) | |
| tree | 0c23f56ad01ed6170514a2eae23a41d90e715ccf /src/dolphinpartactions.desktop | |
| parent | 6403ce27ccd4ec420735d0348fdb603d69a2dd7b (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 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 |