diff options
| author | l10n daemon script <[email protected]> | 2020-06-17 16:57:19 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-17 16:57:19 +0200 |
| commit | d5c1ac07db9bf9d97cab3cc09918286870fa377c (patch) | |
| tree | 9fbd9bca7e1722e0f0a8196c110a1774ce5c2060 /src/dolphinpart.desktop | |
| parent | 418b225f89e39e06f8ce881ecb7889de31ad4c51 (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/dolphinpart.desktop')
| -rw-r--r-- | src/dolphinpart.desktop | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 13e267ad5..ec4d6968a 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -43,7 +43,6 @@ Name[sr@latin]=Dolphinov prikaz Name[sv]=Vy i Dolphin Name[tr]=Dolphin Görünümü Name[uk]=Перегляд Dolphin -Name[x-test]=xxDolphin Viewxx Name[zh_CN]=Dolphin 视图 Name[zh_TW]=Dolphin 檢視 MimeType=inode/directory; @@ -104,7 +103,6 @@ Name[sr@latin]=Ikonice Name[sv]=Ikoner Name[tr]=Simgeler Name[uk]=Піктограми -Name[x-test]=xxIconsxx Name[zh_CN]=图标 Name[zh_TW]=圖示 Icon=view-list-icons @@ -155,7 +153,6 @@ Name[sr@latin]=Sažeto Name[sv]=Kompakt Name[tr]=Sıkışık Name[uk]=Компактний -Name[x-test]=xxCompactxx Name[zh_CN]=紧凑 Name[zh_TW]=簡潔模式 Icon=view-list-details @@ -206,7 +203,6 @@ Name[sr@latin]=Detalji Name[sv]=Detaljinformation Name[tr]=Ayrıntılar Name[uk]=Подробиці -Name[x-test]=xxDetailsxx Name[zh_CN]=详细 Name[zh_TW]=詳細模式 Icon=view-list-tree |