diff options
| author | l10n daemon script <[email protected]> | 2019-01-28 08:29:51 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-01-28 08:29:51 +0100 |
| commit | df3c2c1391a59a4d7d55365c6259f786e81ae642 (patch) | |
| tree | 9ac6c5d7f8bca9122210f6566f750d0dba41958a | |
| parent | 8f051a391db543a05c00bc1323634a48d7e6444d (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"
| -rw-r--r-- | src/dolphinpart.desktop | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index a217e34c5..033a27e98 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -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 |