From d5c1ac07db9bf9d97cab3cc09918286870fa377c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 17 Jun 2020 16:57:19 +0200 Subject: 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" --- src/settings/kcm/kcmdolphinservices.desktop | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/settings/kcm/kcmdolphinservices.desktop') diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 1187733a4..82b5aaad3 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -40,7 +40,6 @@ Name[sr@latin]=Dolphinovi servisi Name[sv]=Dolphin tjänster Name[tr]=Dolphin Servisleri Name[uk]=Служби Dolphin -Name[x-test]=xxDolphin Servicesxx Name[zh_CN]=Dolphin 服务 Name[zh_TW]=Dolphin 服務 @@ -97,7 +96,6 @@ Name[sr@latin]=Servisi Name[sv]=Tjänster Name[tr]=Servisler Name[uk]=Служби -Name[x-test]=xxServicesxx Name[zh_CN]=服务 Name[zh_TW]=服務 Comment=Configure file manager services @@ -142,7 +140,6 @@ Comment[sr@latin]=Podešavanje servisa menadžera fajlova Comment[sv]=Anpassa filhanterarens tjänster Comment[tr]=Dosya yöneticisi servislerini yapılandır Comment[uk]=Налаштувати служби менеджера файлів -Comment[x-test]=xxConfigure file manager servicesxx Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager @@ -188,6 +185,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]=檔案管理員 -- cgit v1.3.1