diff options
| author | Aaron Seigo <[email protected]> | 2011-12-21 17:08:23 +0100 |
|---|---|---|
| committer | Aaron Seigo <[email protected]> | 2011-12-21 17:08:23 +0100 |
| commit | 5e0e05e8f0c82e987cc56a17bdac1718e8feb320 (patch) | |
| tree | 7eccc6b7372ac6fe7d973e035abc31088d3f2fa4 /src/settings | |
| parent | a8622c7a1ed9b04645eb5a4c72060ea5f08b5364 (diff) | |
| parent | 050e094e6b2ecd3c5ff4cc809d4ce3eedc61f3b8 (diff) | |
Merge remote branch 'origin/KDE/4.8'
Conflicts:
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 3 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 9784e6a97..18b862ab8 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -296,6 +296,7 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager +X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index a0dbe97ac..285698eec 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -296,6 +296,7 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager +X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index c18bfb2d5..1bc663935 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[xh]=Iinkonzo Name[x-test]=xxServicesxx +Name[xh]=Iinkonzo Name[zh_CN]=服务 Name[zh_TW]=服務 Comment=Configure file manager services @@ -247,6 +247,7 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager +X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 0d7ae4a57..7e16b2e36 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -294,6 +294,7 @@ X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager +X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file |