diff options
| author | l10n daemon script <[email protected]> | 2020-06-18 08:34:48 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-18 08:34:48 +0200 |
| commit | db408cf09d9cc106405fdb496e333246e795902a (patch) | |
| tree | d32ff74a9046665826a61357a204c6308a6f7ea0 /src/dolphinpart.desktop | |
| parent | 5a9a644fb8cb0d9e5cff8f511713552c7639ef54 (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, 4 insertions, 0 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index ec4d6968a..13e267ad5 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -43,6 +43,7 @@ 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; @@ -103,6 +104,7 @@ 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 @@ -153,6 +155,7 @@ 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 @@ -203,6 +206,7 @@ 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 |