diff options
| author | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
| commit | 799c532d239c2c04cb7fe5014aceba449268fd3d (patch) | |
| tree | 48493d409c5b2d623e4b2bb1e470a00e61369737 /src/settings/kcm/kcmdolphinservices.desktop | |
| parent | 85f5156a332c5e2e38facf390dafd6a1fdf1c9a2 (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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 1187733a4..10e806a81 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -1,6 +1,7 @@ Name=Dolphin Services Name[ar]=خدمات دولفين Name[ast]=Servicios de Dolphin +Name[az]=Dolphin xidmətləri Name[ca]=Serveis del Dolphin Name[ca@valencia]=Serveis del Dolphin Name[cs]=Služby Dolphinu @@ -57,6 +58,7 @@ X-DocPath=dolphin/index.html#preferences-dialog-services Name=Services Name[ar]=الخدمات Name[ast]=Servicios +Name[az]=Xidmətlər Name[ca]=Serveis Name[ca@valencia]=Serveis Name[cs]=Služby @@ -103,6 +105,7 @@ Name[zh_TW]=服務 Comment=Configure file manager services Comment[ar]=اضبط خدمات مدير الملفّات Comment[ast]=Configura los servicios del xestor de ficheros +Comment[az]=Fayl meneceri xidmətlərini tənzimləmək Comment[ca]=Configura els serveis del gestor de fitxers Comment[ca@valencia]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů @@ -148,6 +151,7 @@ Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات X-KDE-Keywords[ast]=xestor de ficheros +X-KDE-Keywords[az]=fayl meneceri X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů |