diff options
| author | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
| commit | 01e4f60a0931aba506b184d384a4e2f926b2233c (patch) | |
| tree | 902da94d4ed035af9da2aea537708cdc2ea14d9c /src/settings | |
| parent | cd601a582d5454dfa1818bae7e50864e9bece575 (diff) | |
| parent | a75e81ca01ea61c615582e93ceed69398967831e (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 7 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index a30b6b590..6a5927703 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -1,5 +1,4 @@ Name=Dolphin General -Name[ar]=عام دولفين Name[ast]=Dolphin xeneral Name[bg]=Общо за програмата Name[bn]=ডলফিন সাধারণ @@ -71,7 +70,7 @@ Name[x-test]=xxDolphin Generalxx Name[zh_CN]=Dolphin 常规 Name[zh_TW]=Dolphin 一般 Comment=This service allows configuration of general Dolphin settings. -Comment[ar]=هذه الخدمة تتيح التحكم بإعدادات دولفين العامة. +Comment[ar]=تسمح هذه الخدمة بضبك إعدادات دولفين العامّة. Comment[ast]=Esti serviciu déxate facer la configuración xeneral de Dolphin. Comment[bg]=Това ви позволява да зададете общите настройки на програмата. Comment[bs]=Ovaj servis omogućava podešavanje opštih Delfinovih postavki. @@ -152,7 +151,7 @@ X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-general # ctxt: Random file browsing settings. Name=General -Name[ar]=عام +Name[ar]=عامّ Name[ast]=Xeneral Name[bg]=Общи Name[bn]=সাধারণ @@ -225,7 +224,7 @@ Name[x-test]=xxGeneralxx Name[zh_CN]=常规 Name[zh_TW]=一般 Comment=Configure general file manager settings -Comment[ar]=اضبط إعدادات مدير الملفات العامة +Comment[ar]=اضبط إعدادات مدير الملفات العامّة Comment[ast]=Configurar les preferencies del xestor de ficheros Comment[bg]=Общи настройки на файловия мениджър Comment[bn]=সাধারণ ফাইল ম্যানেজার সেটিংস কনফিগার করুন diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index a9362a996..9c69c691a 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -1,5 +1,4 @@ Name=Dolphin Navigation -Name[ar]=تصفح دولفين Name[ast]=Navegación de Dolphin Name[bg]=Навигация в програмата Name[bn]=ডলফিন ন্যাভিগেশন |