mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'Applications/15.12'
This commit is contained in:
commit
0743843ebb
|
@ -4,8 +4,8 @@ project(Dolphin)
|
|||
|
||||
# KDE Application Version, managed by release script
|
||||
set (KDE_APPLICATIONS_VERSION_MAJOR "15")
|
||||
set (KDE_APPLICATIONS_VERSION_MINOR "11")
|
||||
set (KDE_APPLICATIONS_VERSION_MICRO "80")
|
||||
set (KDE_APPLICATIONS_VERSION_MINOR "12")
|
||||
set (KDE_APPLICATIONS_VERSION_MICRO "1")
|
||||
set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
|
||||
|
||||
set(QT_MIN_VERSION "5.4.0")
|
||||
|
|
|
@ -789,8 +789,8 @@ void DolphinMainWindow::updateControlMenu()
|
|||
QMenu* menu = qobject_cast<QMenu*>(sender());
|
||||
Q_ASSERT(menu);
|
||||
|
||||
// All actions get cleared by QMenu::clear(). The sub-menus are deleted
|
||||
// by connecting to the aboutToHide() signal from the parent-menu.
|
||||
// All actions get cleared by QMenu::clear(). This includes the sub-menus
|
||||
// because 'menu' is their parent.
|
||||
menu->clear();
|
||||
|
||||
KActionCollection* ac = actionCollection();
|
||||
|
@ -840,7 +840,6 @@ void DolphinMainWindow::updateControlMenu()
|
|||
|
||||
// Add "Go" menu
|
||||
QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
|
||||
connect(menu, &QMenu::aboutToHide, goMenu, &QMenu::deleteLater);
|
||||
goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
|
||||
goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
|
||||
goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
|
||||
|
@ -850,7 +849,6 @@ void DolphinMainWindow::updateControlMenu()
|
|||
|
||||
// Add "Tool" menu
|
||||
QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
|
||||
connect(menu, &QMenu::aboutToHide, toolsMenu, &QMenu::deleteLater);
|
||||
toolsMenu->addAction(ac->action("show_filter_bar"));
|
||||
toolsMenu->addAction(ac->action("compare_files"));
|
||||
toolsMenu->addAction(ac->action("open_terminal"));
|
||||
|
@ -864,7 +862,6 @@ void DolphinMainWindow::updateControlMenu()
|
|||
|
||||
// Add "Help" menu
|
||||
QMenu* helpMenu = new QMenu(i18nc("@action:inmenu", "Help"), menu);
|
||||
connect(menu, &QMenu::aboutToHide, helpMenu, &QMenu::deleteLater);
|
||||
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
|
||||
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
|
||||
helpMenu->addSeparator();
|
||||
|
|
|
@ -9,6 +9,7 @@ Name[de]=Dolphin-Ansicht
|
|||
Name[el]=Dolphin View
|
||||
Name[en_GB]=Dolphin View
|
||||
Name[es]=Vista de Dolphin
|
||||
Name[et]=Dolphini vaade
|
||||
Name[fi]=Dolphin-näkymä
|
||||
Name[fr]=Vue de Dolphin
|
||||
Name[gl]=Vista de Dolphin
|
||||
|
@ -64,6 +65,7 @@ Name[de]=Symbole
|
|||
Name[el]=Εικονίδια
|
||||
Name[en_GB]=Icons
|
||||
Name[es]=Iconos
|
||||
Name[et]=Ikoonid
|
||||
Name[fi]=Kuvakkeet
|
||||
Name[fr]=Icônes
|
||||
Name[gl]=Iconas
|
||||
|
@ -108,6 +110,7 @@ Name[de]=Kompakt
|
|||
Name[el]=Σύμπτυξη
|
||||
Name[en_GB]=Compact
|
||||
Name[es]=Compacto
|
||||
Name[et]=Kompaktne
|
||||
Name[fi]=Tiivis
|
||||
Name[fr]=Concis
|
||||
Name[gl]=Compacta
|
||||
|
@ -151,6 +154,7 @@ Name[de]=Details
|
|||
Name[el]=Λεπτομέρειες
|
||||
Name[en_GB]=Details
|
||||
Name[es]=Detalles
|
||||
Name[et]=Üksikasjad
|
||||
Name[fi]=Yksityiskohdat
|
||||
Name[fr]=Détails
|
||||
Name[gl]=Detalles
|
||||
|
|
|
@ -8,6 +8,7 @@ Name[de]=Dolphin
|
|||
Name[el]=Dolphin
|
||||
Name[en_GB]=Dolphin
|
||||
Name[es]=Dolphin
|
||||
Name[et]=Dolphin
|
||||
Name[fi]=Dolphin
|
||||
Name[fr]=Dolphin
|
||||
Name[gl]=Dolphin
|
||||
|
@ -53,6 +54,7 @@ GenericName[de]=Dateiverwaltung
|
|||
GenericName[el]=Διαχειριστής αρχείων
|
||||
GenericName[en_GB]=File Manager
|
||||
GenericName[es]=Gestor de archivos
|
||||
GenericName[et]=Failihaldur
|
||||
GenericName[fi]=Tiedostonhallinta
|
||||
GenericName[fr]=Gestionnaire de fichiers
|
||||
GenericName[gl]=Xestor de ficheiros
|
||||
|
|
|
@ -7,6 +7,7 @@ Name[de]=Dolphin-Navigation
|
|||
Name[el]=Dolphin Πλοήγηση
|
||||
Name[en_GB]=Dolphin Navigation
|
||||
Name[es]=Navegación de Dolphin
|
||||
Name[et]=Dolphini liikumine
|
||||
Name[fi]=Dolphin – selaus
|
||||
Name[fr]=Navigation avec Dolphin
|
||||
Name[gl]=Navegación de Dolphin
|
||||
|
@ -47,6 +48,7 @@ Comment[de]=Mit diesem Dienst kann die Navigation für Dolphin eingerichtet werd
|
|||
Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση της πλοήγησης του Dolphin
|
||||
Comment[en_GB]=This service allows configuration of the Dolphin navigation.
|
||||
Comment[es]=Este servicio permite configurar la navegación de Dolphin.
|
||||
Comment[et]=See teenus võimaldab seadistada Dolphinis liikumist.
|
||||
Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia.
|
||||
Comment[fr]=Ce service permet de configurer la navigation avec Dolphin.
|
||||
Comment[gl]=Este servizo permite configurar a navegación de Dolphin.
|
||||
|
@ -96,6 +98,7 @@ Name[de]=Navigation
|
|||
Name[el]=Πλοήγηση
|
||||
Name[en_GB]=Navigation
|
||||
Name[es]=Navegación
|
||||
Name[et]=Liikumine
|
||||
Name[fi]=Selaus
|
||||
Name[fr]=Navigation
|
||||
Name[gl]=Navegación
|
||||
|
@ -136,6 +139,7 @@ Comment[de]=Einstellungen zur Navigation mit der Dateiverwaltung
|
|||
Comment[el]=Διαμόρφωση πλοήγησης του διαχειριστή αρχείων
|
||||
Comment[en_GB]=Configure file manager navigation
|
||||
Comment[es]=Configurar la navegación del gestor de archivos
|
||||
Comment[et]=Failihalduris liikumise seadistamine
|
||||
Comment[fi]=Tiedostonhallinnan selausasetukset
|
||||
Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers
|
||||
Comment[gl]=Configurar a navegación do xestor de ficheiros.
|
||||
|
@ -175,6 +179,7 @@ X-KDE-Keywords[de]=Dateiverwaltung
|
|||
X-KDE-Keywords[el]=διαχειριστής αρχείων
|
||||
X-KDE-Keywords[en_GB]=file manager
|
||||
X-KDE-Keywords[es]=gestor de archivos
|
||||
X-KDE-Keywords[et]=failihaldur
|
||||
X-KDE-Keywords[fi]=tiedostonhallinta
|
||||
X-KDE-Keywords[fr]=gestionnaire de fichiers
|
||||
X-KDE-Keywords[gl]=xestor de ficheiros
|
||||
|
|
|
@ -7,6 +7,7 @@ Name[de]=Dolphin-Dienste
|
|||
Name[el]=Dolphin Υπηρεσίες
|
||||
Name[en_GB]=Dolphin Services
|
||||
Name[es]=Servicios de Dolphin
|
||||
Name[et]=Dolphini teenused
|
||||
Name[fi]=Dolphin – palvelut
|
||||
Name[fr]=Services de Dolphin
|
||||
Name[gl]=Servizos de Dolphin
|
||||
|
@ -57,6 +58,7 @@ Name[de]=KDE-Dienste
|
|||
Name[el]=Υπηρεσίες
|
||||
Name[en_GB]=Services
|
||||
Name[es]=Servicios
|
||||
Name[et]=Teenused
|
||||
Name[fi]=Palvelut
|
||||
Name[fr]=Services
|
||||
Name[gl]=Servizos
|
||||
|
@ -96,6 +98,7 @@ Comment[de]=Dateiverwaltungs-Dienste einrichten
|
|||
Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστή αρχείων
|
||||
Comment[en_GB]=Configure file manager services
|
||||
Comment[es]=Configurar los servicios del gestor de archivos
|
||||
Comment[et]=Failihalduri teenuste seadistamine
|
||||
Comment[fi]=Tiedostonhallinnan palveluasetukset
|
||||
Comment[fr]=Configuration des services du gestionnaire de fichiers
|
||||
Comment[gl]=Configurar servizos de xestores de ficheiros.
|
||||
|
@ -134,6 +137,7 @@ X-KDE-Keywords[de]=Dateiverwaltung
|
|||
X-KDE-Keywords[el]=διαχειριστής αρχείων
|
||||
X-KDE-Keywords[en_GB]=file manager
|
||||
X-KDE-Keywords[es]=gestor de archivos
|
||||
X-KDE-Keywords[et]=failihaldur
|
||||
X-KDE-Keywords[fi]=tiedostonhallinta
|
||||
X-KDE-Keywords[fr]=gestionnaire de fichiers
|
||||
X-KDE-Keywords[gl]=xestor de ficheiros
|
||||
|
|
|
@ -7,6 +7,7 @@ Name[de]=Dolphin-Ansichtsmodi
|
|||
Name[el]=Dolphin Λειτουργίες Προβολής
|
||||
Name[en_GB]=Dolphin View Modes
|
||||
Name[es]=Modos de vistas de Dolphin
|
||||
Name[et]=Dolphini vaaterežiimid
|
||||
Name[fi]=Dolphin – näkymät
|
||||
Name[fr]=Modes d'affichage de Dolphin
|
||||
Name[gl]=Modos de vista de Dolphin
|
||||
|
@ -46,6 +47,7 @@ Comment[de]=Mit diesem Dienst können Dolphin-Ansichtsmodi eingerichtet werden.
|
|||
Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση των λειτουργιών προβολής του Dolphin
|
||||
Comment[en_GB]=This service allows configuration of the Dolphin view modes.
|
||||
Comment[es]=Este servicio permite configurar los modos de las vistas de Dolphin.
|
||||
Comment[et]=See teenus võimaldab seadistada Dolphini vaaterežiime.
|
||||
Comment[fi]=Tällä palvelulla voi muokata Dolphinin katselutilojen asetuksia.
|
||||
Comment[fr]=Ce service permet de configurer les modes d'affichage de Dolphin.
|
||||
Comment[gl]=Este servizo permite configurar os modos de vista de Dolphin.
|
||||
|
@ -95,6 +97,7 @@ Name[de]=Ansichts-Modi
|
|||
Name[el]=Λειτουργίες Προβολής
|
||||
Name[en_GB]=View Modes
|
||||
Name[es]=Modos de vistas
|
||||
Name[et]=Vaaterežiimid
|
||||
Name[fi]=Näkymät
|
||||
Name[fr]=Modes d'affichage
|
||||
Name[gl]=Modos de vista
|
||||
|
@ -135,6 +138,7 @@ Comment[de]=Dateiverwaltungs-Ansichten einrichten
|
|||
Comment[el]=Διαμόρφωση των λειτουργιών προβολής του διαχειριστή αρχείων
|
||||
Comment[en_GB]=Configure file manager view modes
|
||||
Comment[es]=Configura los modos de vistas del gestor de archivos
|
||||
Comment[et]=Failihalduri vaaterežiimide seadistamine
|
||||
Comment[fi]=Tiedostonhallinnan katselutilojen asetukset
|
||||
Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers
|
||||
Comment[gl]=Configurar os modos de vista do xestor de ficheiros.
|
||||
|
@ -174,6 +178,7 @@ X-KDE-Keywords[de]=Dateiverwaltung
|
|||
X-KDE-Keywords[el]=διαχειριστής αρχείων
|
||||
X-KDE-Keywords[en_GB]=file manager
|
||||
X-KDE-Keywords[es]=gestor de archivos
|
||||
X-KDE-Keywords[et]=failihaldur
|
||||
X-KDE-Keywords[fi]=tiedostonhallinta
|
||||
X-KDE-Keywords[fr]=gestionnaire de fichiers
|
||||
X-KDE-Keywords[gl]=xestor de ficheiros
|
||||
|
|
|
@ -10,6 +10,7 @@ Comment[de]=Versionskontroll-Modul für Dateiansichten
|
|||
Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων
|
||||
Comment[en_GB]=Version Control Plugin for File Views
|
||||
Comment[es]=Complemento de control de versiones para las vistas de archivos
|
||||
Comment[et]=Failivaadete versioonihaldusplugin
|
||||
Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille
|
||||
Comment[fr]=Module externe pour le contrôle de version applicable aux vues de fichiers
|
||||
Comment[gl]=Complemento de control de versión para vistas de ficheiros.
|
||||
|
|
Loading…
Reference in a new issue