diff options
| author | l10n daemon script <[email protected]> | 2019-01-06 05:25:48 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-01-06 05:25:48 +0100 |
| commit | 1873e2f08fed0397542c04ca02f67efc2fa307d3 (patch) | |
| tree | c9727b289b3c7ee4240f99fe5a3abed04f7ef17b /src/dolphinpart.desktop | |
| parent | 89158c6b3d29b9c01fe9dcc4c2b477dbc80abbdb (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index f0cda29da..a217e34c5 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -101,7 +101,7 @@ Name[sv]=Ikoner Name[tr]=Simgeler Name[uk]=Піктограми Name[x-test]=xxIconsxx -Name[zh_CN]=图标视图 +Name[zh_CN]=图标 Name[zh_TW]=圖示 Icon=view-list-icons # Dummy @@ -150,7 +150,7 @@ Name[sv]=Kompakt Name[tr]=Sıkışık Name[uk]=Компактний Name[x-test]=xxCompactxx -Name[zh_CN]=简洁视图 +Name[zh_CN]=精简视图 Name[zh_TW]=簡潔模式 Icon=view-list-details # Dummy @@ -199,7 +199,7 @@ Name[sv]=Detaljinformation Name[tr]=Ayrıntılar Name[uk]=Подробиці Name[x-test]=xxDetailsxx -Name[zh_CN]=细节视图 +Name[zh_CN]=详细信息 Name[zh_TW]=詳細模式 Icon=view-list-tree # Dummy |