kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	dolphin/src/main.cpp
This commit is contained in:
Jekyll Wu 2012-01-10 20:09:21 +08:00
commit 1375f83168
8 changed files with 46 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphin.desktop
View file

@ -174,7 +174,7 @@ GenericName[te]=దస్త్రాల అభికర్త
GenericName[tg]=Мудири файлҳо
GenericName[th]=เครื่องมือจัดการแฟ้ม
GenericName[tr]=Dosya Yönetici
GenericName[ug]=ھۆججەت باشقۇرغۇچ
GenericName[ug]=ھۆججەت باشقۇرغۇ
GenericName[uk]=Менеджер файлів
GenericName[uz]=Fayl boshqaruvchisi
GenericName[uz@cyrillic]=Файл бошқарувчиси

11
src/dolphinmainwindow.cpp
View file

@ -1024,6 +1024,14 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
}
}
void DolphinMainWindow::goHome(Qt::MouseButtons buttons)
{
// The default case (left button pressed) is handled in goHome().
if (buttons == Qt::MidButton) {
openNewTab(GeneralSettings::self()->homeUrl());
}
}
void DolphinMainWindow::compareFiles()
{
// The method is only invoked if exactly 2 files have
@ -1690,7 +1698,8 @@ void DolphinMainWindow::setupActions()
KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
connect(upAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons)));
KStandardAction::home(this, SLOT(goHome()), actionCollection());
KAction* homeAction = KStandardAction::home(this, SLOT(goHome()), actionCollection());
connect(homeAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goHome(Qt::MouseButtons)));
// setup 'Tools' menu
KAction* showFilterBar = actionCollection()->addAction("show_filter_bar");

5
src/dolphinmainwindow.h
View file

@ -301,6 +301,11 @@ private slots:
*/
void goUp(Qt::MouseButtons buttons);
/**
* Open the home URL in a new tab
*/
void goHome(Qt::MouseButtons buttons);
/** Opens Kompare for 2 selected files. */
void compareFiles();

9
src/dolphinpart.desktop
View file

@ -179,14 +179,14 @@ Name[te]=ప్రతిమలు
Name[tg]=Нишонаҳо
Name[th]=ไอคอน
Name[tr]=Simgeler
Name[ug]=سىنبەلگەلەر
Name[ug]=سىنبەلگىلەر
Name[uk]=Піктограми
Name[uz]=Nishonchalar
Name[uz@cyrillic]=Нишончалар
Name[vi]=Biểu tượng
Name[wa]=Imådjetes
Name[x-test]=xxIconsxx
Name[xh]=Imphawu zemmifanekiso
Name[x-test]=xxIconsxx
Name[zh_CN]=图标
Name[zh_TW]=圖示
Icon=view-list-icons
@ -196,14 +196,17 @@ Exec=dolphin
[Desktop Action compact]
Name=Compact
Name[ca]=Compacte
Name[ca@valencia]=Compacte
Name[da]=Kompakt
Name[de]=Kompakt
Name[es]=Compacta
Name[et]=Kompaktne
Name[fi]=Tiivis
Name[ga]=Dlúth
Name[hu]=Kompakt
Name[ia]=Compacte
Name[kk]=Ықшамды
Name[km]=តូច​ល្មម
Name[lt]=Kompaktiškas
Name[nb]=Kompakt
Name[nds]=Drang
@ -211,7 +214,9 @@ Name[nl]=Compact
Name[pa]=ਸੰਖੇਪ
Name[pt]=Compacto
Name[pt_BR]=Compacto
Name[sl]=Strnjeno
Name[sv]=Kompakt
Name[ug]=ئىخچام
Name[uk]=Компактний
Name[x-test]=xxCompactxx
Name[zh_CN]=简洁视图

9
src/settings/kcm/kcmdolphingeneral.desktop
View file

@ -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]=檔案管理員

5
src/settings/kcm/kcmdolphinnavigation.desktop
View file

@ -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]=檔案管理員

7
src/settings/kcm/kcmdolphinservices.desktop
View file

@ -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]=檔案管理員

5
src/settings/kcm/kcmdolphinviewmodes.desktop
View file

@ -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]=檔案管理員