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/settings/kcm/kcmdolphingeneral.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/settings/kcm/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index f46d5118b..08d68638b 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -41,7 +41,6 @@ Name[sr@latin]=Dolphinovo opšte Name[sv]=Dolphin allmänt Name[tr]=Dolphin Genel Name[uk]=«Загальне» Dolphin -Name[x-test]=xxDolphin Generalxx Name[zh_CN]=Dolphin 常规 Name[zh_TW]=Dolphin 一般 Comment=This service allows configuration of general Dolphin settings. @@ -86,7 +85,6 @@ Comment[sr@latin]=Ovaj servis omogućava podešavanje opštih Dolphinovih postav Comment[sv]=Den här tjänsten låter dig anpassa allmänna inställningar i Dolphin. Comment[tr]=Bu servis genel Dolphin ayarlarını yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати загальні параметри Dolphin. -Comment[x-test]=xxThis service allows configuration of general Dolphin settings.xx Comment[zh_CN]=此服务允许您配置 Dolphin 的常规设置。 Comment[zh_TW]=此服務允許設定 Dolphin 的一般設定。 @@ -144,7 +142,6 @@ Name[sr@latin]=Opšte Name[sv]=Allmänt Name[tr]=Genel Name[uk]=Загальне -Name[x-test]=xxGeneralxx Name[zh_CN]=常规 Name[zh_TW]=一般 Comment=Configure general file manager settings @@ -189,7 +186,6 @@ Comment[sr@latin]=Podešavanje opštih postavki menadžera fajlova Comment[sv]=Anpassa filhanterarens allmänna inställningar Comment[tr]=Genel dosya yöneticisi ayarlarını yapılandır Comment[uk]=Налаштувати загальні параметри менеджера файлів -Comment[x-test]=xxConfigure general file manager settingsxx Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager @@ -235,6 +231,5 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova 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]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 |