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/settings | |
| 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/settings')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 5f569237c..c0faa31a2 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 974ebc3d2..35f0fc723 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -227,5 +227,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index a2421a848..024c44a5d 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -181,5 +181,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 286320eaa..14f3e530e 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 |