Merge remote-tracking branch 'origin/KDE/4.8'

Conflicts:
	dolphin/src/main.cpp

4 files changed, 23 insertions, 3 deletions

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 18b862ab8..632c655b4 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -32,7 +32,7 @@ Name[is]=Almennar stillingar Dolphin
 Name[it]=Impostazioni generali di Dolphin
 Name[ja]=Dolphin 全般
 Name[kk]=Dolphin жалпы
-Name[km]=ភាព​ទូទៅ​របស់​ឌូហ្វីន
+Name[km]=ភាព​ទូទៅ​របស់ Dolphin
 Name[kn]=ಡಾಲ್ಫಿನ್ ಸಾಮಾನ್ಯ
 Name[ko]=Dolphin 일반
 Name[lt]=Dolphin bendrieji
@@ -255,7 +255,7 @@ Comment[is]=Almennar stillingar skráastjóra
 Comment[it]=Configura le impostazioni generali del gestore dei file
 Comment[ja]=ファイルマネージャの全般的な設定を行います
 Comment[kk]=Файл менеджер жалпы параметрлерін баптау
-Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​នៃ​ការ​កំណត់​កម្មវិធី​គ្រប់គ្រង​ឯកសារ
+Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​នៃ​ការ​កំណត់​កម្មវិធី​គ្រប់គ្រង​ឯកសារ​ទូទៅ
 Comment[kn]=ಸಾಮಾನ್ಯ ಕಡತ ವ್ಯವಸ್ಥಾಪಕದ ಸಂಯೋಜನೆಗಳನ್ನು ಸಂರಚಿಸಿ
 Comment[ko]=일반 파일 관리자 설정
 Comment[lt]=Bendrųjų failų tvarkyklės nustatymų konfigūravimas
@@ -293,14 +293,18 @@ Comment[zh_CN]=配置常规文件管理器设置
 Comment[zh_TW]=設定一般檔案管理員
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ca]=gestor de fitxers
+X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
 X-KDE-Keywords[da]=filhåndtering
 X-KDE-Keywords[de]=Dateimanager
+X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
+X-KDE-Keywords[ga]=bainisteoir comhad
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[kk]=file manager
+X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nds]=Dateipleger
 X-KDE-Keywords[nl]=bestandsbeheerder
@@ -312,4 +316,5 @@ X-KDE-Keywords[sl]=upravljalnik datotek
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
+X-KDE-Keywords[zh_CN]=file manager,文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 285698eec..3b0b1a293 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -293,14 +293,18 @@ Comment[zh_CN]=配置文件管理器导航
 Comment[zh_TW]=設定檔案管理員導覽
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ca]=gestor de fitxers
+X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
 X-KDE-Keywords[da]=filhåndtering
 X-KDE-Keywords[de]=Dateimanager
+X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
+X-KDE-Keywords[ga]=bainisteoir comhad
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[kk]=file manager
+X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nds]=Dateipleger
 X-KDE-Keywords[nl]=bestandsbeheerder
@@ -312,4 +316,5 @@ X-KDE-Keywords[sl]=upravljalnik datotek
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
+X-KDE-Keywords[zh_CN]=file manager,文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 1bc663935..74a6711c4 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -168,8 +168,8 @@ Name[uz]=Xizmatlar
 Name[uz@cyrillic]=Хизматлар
 Name[vi]=Dịch vụ
 Name[wa]=Siervices
-Name[x-test]=xxServicesxx
 Name[xh]=Iinkonzo
+Name[x-test]=xxServicesxx
 Name[zh_CN]=服务
 Name[zh_TW]=服務
 Comment=Configure file manager services
@@ -244,14 +244,18 @@ Comment[zh_CN]=配置文件管理器服务
 Comment[zh_TW]=設定檔案管理員服務
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ca]=gestor de fitxers
+X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
 X-KDE-Keywords[da]=filhåndtering
 X-KDE-Keywords[de]=Dateimanager
+X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
+X-KDE-Keywords[ga]=bainisteoir comhad
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[kk]=file manager
+X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nds]=Dateipleger
 X-KDE-Keywords[nl]=bestandsbeheerder
@@ -263,4 +267,5 @@ X-KDE-Keywords[sl]=upravljalnik datotek
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
+X-KDE-Keywords[zh_CN]=file manager,文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 7e16b2e36..0e3c38308 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -291,14 +291,18 @@ Comment[zh_CN]=配置文件管理器视图模式
 Comment[zh_TW]=設定檔案管理員檢視模式
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ca]=gestor de fitxers
+X-KDE-Keywords[ca@valencia]=gestor de fitxers
 X-KDE-Keywords[cs]=správce souborů
 X-KDE-Keywords[da]=filhåndtering
 X-KDE-Keywords[de]=Dateimanager
+X-KDE-Keywords[es]=gestor de archivos
 X-KDE-Keywords[et]=failihaldur
 X-KDE-Keywords[fi]=tiedostonhallinta
+X-KDE-Keywords[ga]=bainisteoir comhad
 X-KDE-Keywords[hu]=fájlkezelő
 X-KDE-Keywords[ia]=gerente de file
 X-KDE-Keywords[kk]=file manager
+X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ
 X-KDE-Keywords[nb]=filbehandler
 X-KDE-Keywords[nds]=Dateipleger
 X-KDE-Keywords[nl]=bestandsbeheerder
@@ -310,4 +314,5 @@ X-KDE-Keywords[sl]=upravljalnik datotek
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
+X-KDE-Keywords[zh_CN]=file manager,文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員