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/kcmdolphinviewmodes.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/kcmdolphinviewmodes.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 16b3fd568..41d9d4101 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -41,7 +41,6 @@ Name[sr@latin]=Dolphinovi režimi prikaza Name[sv]=Dolphin visningslägen Name[tr]=Dolphin Görünüm Kipleri Name[uk]=Режими перегляду Dolphin -Name[x-test]=xxDolphin View Modesxx Name[zh_CN]=Dolphin 视图模式 Name[zh_TW]=設定檔案管理員服務 Comment=This service allows configuration of the Dolphin view modes. @@ -86,7 +85,6 @@ Comment[sr@latin]=Ovaj servis omogućava podešavanje Dolphinovih režima prikaz Comment[sv]=Den här tjänsten låter dig anpassa visningslägen i Dolphin. Comment[tr]=Bu servis Dolphin görünüm kiplerini yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати режими перегляду Dolphin. -Comment[x-test]=xxThis service allows configuration of the Dolphin view modes.xx Comment[zh_CN]=此服务允许您配置 Dolphin 的视图模式。 Comment[zh_TW]=此服務允許設定 Dolphin 的檢視模式。 @@ -143,7 +141,6 @@ Name[sr@latin]=Režimi prikaza Name[sv]=Visningslägen Name[tr]=Görünüm Kipleri Name[uk]=Режими перегляду -Name[x-test]=xxView Modesxx Name[zh_CN]=视图模式 Name[zh_TW]=檢視模式 Comment=Configure file manager view modes @@ -189,7 +186,6 @@ Comment[sr@latin]=Podešavanje režima prikaza u menadžeru fajlova Comment[sv]=Anpassa filhanterarens visningslägen Comment[tr]=Dosya yöneticisi görünüm ayarlarını yapılandır Comment[uk]=Налаштувати режими перегляду менеджера файлів -Comment[x-test]=xxConfigure file manager view modesxx 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]=檔案管理員 |