From 272aa65bb55dd31f58e8a8e24ea7bc8bd2712daa Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 6 Aug 2021 00:36:50 +0200 Subject: Revert "Disable Hidden Files Last sort by default" This reverts commit fd2203bb3925edb5d657d49a706e26ea736362d2. --- src/settings/dolphin_directoryviewpropertysettings.kcfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/settings') diff --git a/src/settings/dolphin_directoryviewpropertysettings.kcfg b/src/settings/dolphin_directoryviewpropertysettings.kcfg index f4d288369..9846326b9 100644 --- a/src/settings/dolphin_directoryviewpropertysettings.kcfg +++ b/src/settings/dolphin_directoryviewpropertysettings.kcfg @@ -59,7 +59,7 @@ - false + true -- cgit v1.3 From bb67def173f31819bb9a696627f9af71c7037dcd Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 6 Aug 2021 00:36:57 +0200 Subject: Revert "Configurable Show hidden files and folders last toggle" This reverts commit 50149d6abb8a0a978db3c6afb5238bc42a4a89c8. It breaks the string freeze and I don't think it can count as a bug fix, so it breaks the feature freeze, too. CCMAIL: zrenfire@gmail.com --- src/kitemviews/kfileitemmodel.cpp | 28 +++++---------------- src/kitemviews/kfileitemmodel.h | 7 ------ .../dolphin_directoryviewpropertysettings.kcfg | 5 ---- src/settings/viewpropertiesdialog.cpp | 14 ----------- src/settings/viewpropertiesdialog.h | 2 -- src/views/dolphinview.cpp | 29 ---------------------- src/views/dolphinview.h | 15 ----------- src/views/dolphinviewactionhandler.cpp | 19 -------------- src/views/dolphinviewactionhandler.h | 10 -------- src/views/viewproperties.cpp | 14 ----------- src/views/viewproperties.h | 3 --- 11 files changed, 6 insertions(+), 140 deletions(-) (limited to 'src/settings') diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index ef80b4edb..e03ec7c0e 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -34,7 +34,6 @@ KFileItemModel::KFileItemModel(QObject* parent) : KItemModelBase("text", parent), m_dirLister(nullptr), m_sortDirsFirst(true), - m_sortHiddenLast(true), m_sortRole(NameRole), m_sortingProgressPercent(-1), m_roles(), @@ -213,19 +212,6 @@ bool KFileItemModel::sortDirectoriesFirst() const return m_sortDirsFirst; } -void KFileItemModel::setSortHiddenLast(bool hiddenLast) -{ - if (hiddenLast != m_sortHiddenLast) { - m_sortHiddenLast = hiddenLast; - resortAllItems(); - } -} - -bool KFileItemModel::sortHiddenLast() const -{ - return m_sortHiddenLast; -} - void KFileItemModel::setShowHiddenFiles(bool show) { m_dirLister->setShowingDotFiles(show); @@ -1748,14 +1734,12 @@ bool KFileItemModel::lessThan(const ItemData* a, const ItemData* b, const QColla } // Show hidden files and folders last - if (m_sortHiddenLast) { - const bool isHiddenA = a->item.isHidden(); - const bool isHiddenB = b->item.isHidden(); - if (isHiddenA && !isHiddenB) { - return false; - } else if (!isHiddenA && isHiddenB) { - return true; - } + const bool isHiddenA = a->item.isHidden(); + const bool isHiddenB = b->item.isHidden(); + if (isHiddenA && !isHiddenB) { + return false; + } else if (!isHiddenA && isHiddenB) { + return true; } if (m_sortDirsFirst || (DetailsModeSettings::directorySizeCount() && m_sortRole == SizeRole)) { diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 33838853d..acf4b761c 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -80,12 +80,6 @@ public: void setSortDirectoriesFirst(bool dirsFirst); bool sortDirectoriesFirst() const; - /** - * Sets a separate sorting with hidden files and folders last (true) or not (false). - */ - void setSortHiddenLast(bool hiddenLast); - bool sortHiddenLast() const; - void setShowHiddenFiles(bool show); bool showHiddenFiles() const; @@ -469,7 +463,6 @@ private: QCollator m_collator; bool m_naturalSorting; bool m_sortDirsFirst; - bool m_sortHiddenLast; RoleType m_sortRole; int m_sortingProgressPercent; // Value of directorySortingProgress() signal diff --git a/src/settings/dolphin_directoryviewpropertysettings.kcfg b/src/settings/dolphin_directoryviewpropertysettings.kcfg index 9846326b9..6bcf3cd02 100644 --- a/src/settings/dolphin_directoryviewpropertysettings.kcfg +++ b/src/settings/dolphin_directoryviewpropertysettings.kcfg @@ -57,11 +57,6 @@ true - - - true - - diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 6659d79b6..82d182d1d 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -44,7 +44,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sortOrder(nullptr), m_sorting(nullptr), m_sortFoldersFirst(nullptr), - m_sortHiddenLast(nullptr), m_previewsShown(nullptr), m_showInGroups(nullptr), m_showHiddenFiles(nullptr), @@ -83,7 +82,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : } m_sortFoldersFirst = new QCheckBox(i18nc("@option:check", "Show folders first")); - m_sortHiddenLast = new QCheckBox(i18nc("@option:check", "Show hidden files last")); m_previewsShown = new QCheckBox(i18nc("@option:check", "Show preview")); m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in groups")); m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files")); @@ -148,7 +146,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : layout->addRow(QString(), m_previewsShown); layout->addRow(QString(), m_showInGroups); layout->addRow(QString(), m_showHiddenFiles); - layout->addRow(QString(), m_sortHiddenLast); connect(m_viewMode, QOverload::of(&QComboBox::currentIndexChanged), this, &ViewPropertiesDialog::slotViewModeChanged); @@ -158,8 +155,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, &ViewPropertiesDialog::slotSortOrderChanged); connect(m_sortFoldersFirst, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotSortFoldersFirstChanged); - connect(m_sortHiddenLast, &QCheckBox::clicked, - this, &ViewPropertiesDialog::slotSortHiddenLastChanged); connect(m_previewsShown, &QCheckBox::clicked, this, &ViewPropertiesDialog::slotShowPreviewChanged); connect(m_showInGroups, &QCheckBox::clicked, @@ -287,13 +282,6 @@ void ViewPropertiesDialog::slotSortFoldersFirstChanged() markAsDirty(true); } -void ViewPropertiesDialog::slotSortHiddenLastChanged() -{ - const bool hiddenLast = m_sortHiddenLast->isChecked(); - m_viewProps->setSortHiddenLast(hiddenLast); - markAsDirty(true); -} - void ViewPropertiesDialog::slotShowPreviewChanged() { const bool show = m_previewsShown->isChecked(); @@ -395,7 +383,6 @@ void ViewPropertiesDialog::applyViewProperties() m_dolphinView->setSortRole(m_viewProps->sortRole()); m_dolphinView->setSortOrder(m_viewProps->sortOrder()); m_dolphinView->setSortFoldersFirst(m_viewProps->sortFoldersFirst()); - m_dolphinView->setSortHiddenLast(m_viewProps->sortHiddenLast()); m_dolphinView->setGroupedSorting(m_viewProps->groupedSorting()); m_dolphinView->setVisibleRoles(m_viewProps->visibleRoles()); m_dolphinView->setPreviewsShown(m_viewProps->previewsShown()); @@ -431,7 +418,6 @@ void ViewPropertiesDialog::loadSettings() m_sorting->setCurrentIndex(sortRoleIndex); m_sortFoldersFirst->setChecked(m_viewProps->sortFoldersFirst()); - m_sortHiddenLast->setChecked(m_viewProps->sortHiddenLast()); // Load show preview, show in groups and show hidden files settings m_previewsShown->setChecked(m_viewProps->previewsShown()); diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h index c58fda5c0..f07bb8088 100644 --- a/src/settings/viewpropertiesdialog.h +++ b/src/settings/viewpropertiesdialog.h @@ -46,7 +46,6 @@ private Q_SLOTS: void slotSortOrderChanged(int index); void slotGroupedSortingChanged(); void slotSortFoldersFirstChanged(); - void slotSortHiddenLastChanged(); void slotShowPreviewChanged(); void slotShowHiddenFilesChanged(); void slotItemChanged(QListWidgetItem *item); @@ -68,7 +67,6 @@ private: QComboBox* m_sortOrder; QComboBox* m_sorting; QCheckBox* m_sortFoldersFirst; - QCheckBox* m_sortHiddenLast; QCheckBox* m_previewsShown; QCheckBox* m_showInGroups; QCheckBox* m_showHiddenFiles; diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 57ed73a3a..f5c21a2c5 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -463,18 +463,6 @@ bool DolphinView::sortFoldersFirst() const return m_model->sortDirectoriesFirst(); } -void DolphinView::setSortHiddenLast(bool hiddenLast) -{ - if (sortHiddenLast() != hiddenLast) { - updateSortHiddenLast(hiddenLast); - } -} - -bool DolphinView::sortHiddenLast() const -{ - return m_model->sortHiddenLast(); -} - void DolphinView::setVisibleRoles(const QList& roles) { const QList previousRoles = roles; @@ -1385,17 +1373,6 @@ void DolphinView::updateSortFoldersFirst(bool foldersFirst) Q_EMIT sortFoldersFirstChanged(foldersFirst); } -void DolphinView::updateSortHiddenLast(bool hiddenLast) -{ - ViewProperties props(viewPropertiesUrl()); - props.setSortHiddenLast(hiddenLast); - - m_model->setSortHiddenLast(hiddenLast); - - Q_EMIT sortHiddenLastChanged(hiddenLast); -} - - QPair DolphinView::pasteInfo() const { const QMimeData *mimeData = QApplication::clipboard()->mimeData(); @@ -1926,12 +1903,6 @@ void DolphinView::applyViewProperties(const ViewProperties& props) Q_EMIT sortFoldersFirstChanged(sortFoldersFirst); } - const bool sortHiddenLast = props.sortHiddenLast(); - if (sortHiddenLast != m_model->sortHiddenLast()) { - m_model->setSortHiddenLast(sortHiddenLast); - Q_EMIT sortHiddenLastChanged(sortHiddenLast); - } - const QList visibleRoles = props.visibleRoles(); if (visibleRoles != m_visibleRoles) { const QList previousVisibleRoles = m_visibleRoles; diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 75c9dd985..e4d779830 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -206,10 +206,6 @@ public: void setSortFoldersFirst(bool foldersFirst); bool sortFoldersFirst() const; - /** Sets a separate sorting with hidden files and folders last (true) or not (false). */ - void setSortHiddenLast(bool hiddenLast); - bool sortHiddenLast() const; - /** Sets the additional information which should be shown for the items. */ void setVisibleRoles(const QList& roles); @@ -474,11 +470,6 @@ Q_SIGNALS: */ void sortFoldersFirstChanged(bool foldersFirst); - /** - * Is emitted if the sorting of hidden files has been changed. - */ - void sortHiddenLastChanged(bool hiddenLast); - /** Is emitted if the additional information shown for this view has been changed. */ void visibleRolesChanged(const QList& current, const QList& previous); @@ -688,12 +679,6 @@ private Q_SLOTS: */ void updateSortFoldersFirst(bool foldersFirst); - /** - * Updates the view properties of the current URL to the - * sorting of hidden files given by \a hiddenLast. - */ - void updateSortHiddenLast(bool hiddenLast); - /** * Indicates in the status bar that the delete operation * of the job \a job has been finished. diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 90109605b..c9bab5f82 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -57,8 +57,6 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view) this, &DolphinViewActionHandler::slotSortOrderChanged); connect(view, &DolphinView::sortFoldersFirstChanged, this, &DolphinViewActionHandler::slotSortFoldersFirstChanged); - connect(view, &DolphinView::sortHiddenLastChanged, - this, &DolphinViewActionHandler::slotSortHiddenLastChanged); connect(view, &DolphinView::visibleRolesChanged, this, &DolphinViewActionHandler::slotVisibleRolesChanged); connect(view, &DolphinView::groupedSortingChanged, @@ -255,10 +253,6 @@ void DolphinViewActionHandler::createActions() sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First")); connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst); - KToggleAction* sortHiddenLast = m_actionCollection->add(QStringLiteral("hidden_last")); - sortHiddenLast->setText(i18nc("@action:inmenu Sort", "Hidden Files Last")); - connect(sortHiddenLast, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortHiddenLast); - // View -> Sort By QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_")); @@ -293,7 +287,6 @@ void DolphinViewActionHandler::createActions() sortByActionMenu->addAction(descendingAction); sortByActionMenu->addSeparator(); sortByActionMenu->addAction(sortFoldersFirst); - sortByActionMenu->addAction(sortHiddenLast); // View -> Additional Information QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_")); @@ -488,7 +481,6 @@ void DolphinViewActionHandler::updateViewActions() slotSortOrderChanged(m_currentView->sortOrder()); slotSortFoldersFirstChanged(m_currentView->sortFoldersFirst()); - slotSortHiddenLastChanged(m_currentView->sortHiddenLast()); slotVisibleRolesChanged(m_currentView->visibleRoles(), QList()); slotGroupedSortingChanged(m_currentView->groupedSorting()); slotSortRoleChanged(m_currentView->sortRole()); @@ -524,12 +516,6 @@ void DolphinViewActionHandler::toggleSortFoldersFirst() m_currentView->setSortFoldersFirst(!sortFirst); } -void DolphinViewActionHandler::toggleSortHiddenLast() -{ - const bool sortHiddenLast = m_currentView->sortHiddenLast(); - m_currentView->setSortHiddenLast(!sortHiddenLast); -} - void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order) { QAction* descending = m_actionCollection->action(QStringLiteral("descending")); @@ -544,11 +530,6 @@ void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst) m_actionCollection->action(QStringLiteral("folders_first"))->setChecked(foldersFirst); } -void DolphinViewActionHandler::slotSortHiddenLastChanged(bool hiddenLast) -{ - m_actionCollection->action(QStringLiteral("hidden_last"))->setChecked(hiddenLast); -} - void DolphinViewActionHandler::toggleVisibleRole(QAction* action) { Q_EMIT actionBeingHandled(); diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h index 6e9b4a432..3f73153ea 100644 --- a/src/views/dolphinviewactionhandler.h +++ b/src/views/dolphinviewactionhandler.h @@ -136,16 +136,6 @@ private Q_SLOTS: */ void slotSortFoldersFirstChanged(bool foldersFirst); - /** - * Switches between showing hidden files last or not. - */ - void toggleSortHiddenLast(); - - /** - * Updates the state of the 'Sort Hidden Last' action. - */ - void slotSortHiddenLastChanged(bool hiddenLast); - /** * Updates the state of the 'Sort by' actions. */ diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 4b8d017c7..1f73f3b33 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -245,19 +245,6 @@ bool ViewProperties::sortFoldersFirst() const return m_node->sortFoldersFirst(); } -void ViewProperties::setSortHiddenLast(bool hiddenLast) -{ - if (m_node->sortHiddenLast() != hiddenLast) { - m_node->setSortHiddenLast(hiddenLast); - update(); - } -} - -bool ViewProperties::sortHiddenLast() const -{ - return m_node->sortHiddenLast(); -} - void ViewProperties::setVisibleRoles(const QList& roles) { if (roles == visibleRoles()) { @@ -366,7 +353,6 @@ void ViewProperties::setDirProperties(const ViewProperties& props) setSortRole(props.sortRole()); setSortOrder(props.sortOrder()); setSortFoldersFirst(props.sortFoldersFirst()); - setSortHiddenLast(props.sortHiddenLast()); setVisibleRoles(props.visibleRoles()); setHeaderColumnWidths(props.headerColumnWidths()); m_node->setVersion(props.m_node->version()); diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h index def8aa738..a9daafc87 100644 --- a/src/views/viewproperties.h +++ b/src/views/viewproperties.h @@ -62,9 +62,6 @@ public: void setSortFoldersFirst(bool foldersFirst); bool sortFoldersFirst() const; - void setSortHiddenLast(bool hiddenLast); - bool sortHiddenLast() const; - /** * Sets the additional information for the current set view-mode. * Note that the additional-info property is the only property where -- cgit v1.3 From e101560f8448470a629e70e78ca3571c222036ff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 9 Aug 2021 02:11:38 +0000 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/dolphinpart.desktop.in | 4 ++++ src/org.kde.dolphin.desktop | 2 ++ src/settings/kcm/kcmdolphingeneral.desktop | 5 +++++ src/settings/kcm/kcmdolphinnavigation.desktop | 5 +++++ src/settings/kcm/kcmdolphinviewmodes.desktop | 5 +++++ src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 6 files changed, 22 insertions(+) (limited to 'src/settings') diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index 619b3c3a8..bc0e342e2 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -17,6 +17,7 @@ Name[eu]=Dolphin ikuspegia Name[fi]=Dolphin-näkymä Name[fr]=Vue de Dolphin Name[gl]=Vista de Dolphin +Name[hi]=डॉल्फ़िन दृश्य Name[hu]=Dolphin nézet Name[ia]=Vista de Dolphin Name[id]=Tampilan Dolphin @@ -87,6 +88,7 @@ Name[fi]=Kuvakkeet Name[fr]=Icônes Name[gl]=Iconas Name[he]=סמלים +Name[hi]=प्रतीक Name[hu]=Ikonok Name[ia]=Icones Name[id]=Ikon @@ -143,6 +145,7 @@ Name[fi]=Tiivis Name[fr]=Concis Name[gl]=Compacta Name[he]=חסכונית +Name[hi]=सघन Name[hu]=Kompakt Name[ia]=Compacte Name[id]=Ringkas @@ -198,6 +201,7 @@ Name[fi]=Yksityiskohdat Name[fr]=Détails Name[gl]=Detalles Name[he]=פרטים +Name[hi]=विवरण Name[hu]=Részletek Name[ia]=Detalios Name[id]=Perincian diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 63509b476..9489ab370 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -17,6 +17,7 @@ Name[fi]=Dolphin Name[fr]=Dolphin Name[gl]=Dolphin Name[he]=Dolphin +Name[hi]=डॉल्फ़िन Name[hu]=Dolphin Name[ia]=Dolphin Name[id]=Dolphin @@ -73,6 +74,7 @@ GenericName[fi]=Tiedostonhallinta GenericName[fr]=Gestionnaire de fichiers GenericName[gl]=Xestor de ficheiros GenericName[he]=מנהל קבצים +GenericName[hi]=फ़ाइल प्रबंधक GenericName[hu]=Fájlkezelő GenericName[ia]=Gerente de file GenericName[id]=Pengelola File diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 9753285fa..8b4e4f4d3 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -16,6 +16,7 @@ Name[fi]=Dolphin – yleiset Name[fr]=Dolphin général Name[gl]=Xerais de Dolphin Name[he]=כללי ב־Dolphin +Name[hi]=डॉल्फ़िन साधारण Name[hu]=Dolphin: Általános Name[ia]=Dolphin General Name[id]=Dolphin Umum @@ -67,6 +68,7 @@ Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia. Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin. Comment[gl]=Este servizo permite configurar opcións xerais de Dolphin. Comment[he]=שרות זה מאפשר את ההגדרה של הגדרות Dolphin הכלליות. +Comment[hi]=यह सेवा साधारण डॉल्फिन सेटिंग्स के विन्यास की अनुमति देती है। Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin általános beállításainak módosítását. Comment[ia]=Iste servicio permitte configuration del preferentias general de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi pengaturan umum Dolphin. @@ -127,6 +129,7 @@ Name[fi]=Yleiset Name[fr]=Général Name[gl]=Xerais Name[he]=כללי +Name[hi]=साधारण Name[hu]=Általános Name[ia]=General Name[id]=Umum @@ -177,6 +180,7 @@ Comment[fi]=Tiedostonhallinnan yleisasetukset Comment[fr]=Configuration des paramètres généraux du gestionnaire de fichiers Comment[gl]=Configurar opcións xerais de xestores de ficheiros. Comment[he]=תצורת ההגדרות הכלליות של מנהל הקבצים +Comment[hi]=साधारण फ़ाइल प्रबंधक सेटिंग्स विन्यस्त करें Comment[hu]=A fájlkezelő általános beállításainak módosítása Comment[ia]=Configura preferentias del gerente general de file Comment[id]=Konfigurasikan pengaturan pengelola file umum @@ -227,6 +231,7 @@ X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[he]=מנהל קבצים +X-KDE-Keywords[hi]=फ़ाइल प्रबंधक X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[id]=pengelola file diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 0ff189a47..dd69975f1 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -16,6 +16,7 @@ Name[fi]=Dolphin – selaus Name[fr]=Navigation avec Dolphin Name[gl]=Navegación de Dolphin Name[he]=ניווט ב־Dolphin +Name[hi]=डॉल्फ़िन संचालन Name[hu]=Dolphin: Navigáció Name[ia]=Navigation de Dolphin Name[id]=Navigasi Dolphin @@ -67,6 +68,7 @@ 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. Comment[he]=שרות זה מאפשר את ההגדרה של הניווט ב־Dolphin. +Comment[hi]=यह सेवा डॉल्फिन संचालन के विन्यास की अनुमति देती है। Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin navigálásának beállítását. Comment[ia]=Iste servicio permitte le configuration del navigation de Dolphin. Comment[id]=Layanan ini memungkinkan konfigurasi navigasi Dolphin. @@ -126,6 +128,7 @@ Name[fi]=Selaus Name[fr]=Navigation Name[gl]=Navegación Name[he]=ניווט +Name[hi]=संचालन Name[hu]=Navigálás Name[ia]=Navigation Name[id]=Navigasi @@ -177,6 +180,7 @@ Comment[fi]=Tiedostonhallinnan selausasetukset Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers Comment[gl]=Configurar a navegación do xestor de ficheiros. Comment[he]=הגדרת הניווט במנהל הקבצים +Comment[hi]=फ़ाइल प्रबंधक संचालन विन्यस्त करें Comment[hu]=A fájlkezelő navigálásának beállítása Comment[ia]=Configura navigation del gerente de file Comment[id]=Konfigurasikan navigasi pengelola file @@ -228,6 +232,7 @@ X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[he]=מנהל קבצים +X-KDE-Keywords[hi]=फ़ाइल प्रबंधक X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[id]=pengelola file diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index f6b0a0a6c..f41b535aa 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -15,6 +15,7 @@ Name[eu]=Dolphin ikuspegi moduak Name[fi]=Dolphin – näkymät Name[fr]=Modes d'affichage de Dolphin Name[gl]=Modos de vista de Dolphin +Name[hi]=डॉल्फ़िन दृश्य मोड Name[hu]=Dolphin: Nézetmódok Name[ia]=Modos de vista de Dolphin Name[id]=Mode Tampilan Dolphin @@ -65,6 +66,7 @@ Comment[eu]=Zerbitzu honek Dolphinen ikuspegi moduak konfiguratzeko balio du. 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. +Comment[hi]=यह सेवा डॉल्फिन दृश्य मोड के विन्यास की अनुमति देती है। Comment[hu]=Ez a szolgáltatás lehetővé teszi a Dolphin nézetmódjainak beállítását. Comment[ia]=Iste servicio permitte configuration del modos de vista de Dolphin Comment[id]=Layanan ini memungkinkan konfigurasi mode tampilan Dolphin. @@ -123,6 +125,7 @@ Name[eu]=Ikuspegi moduak Name[fi]=Näkymät Name[fr]=Modes d'affichage Name[gl]=Modos de vista +Name[hi]=दृश्य मोड्स Name[hu]=Nézetmódok Name[ia]=Modos de vista Name[id]=Mode Tampilan @@ -173,6 +176,7 @@ Comment[eu]=Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak 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. +Comment[hi]=फ़ाइल प्रबंधक दृश्य मोड विन्यस्त करें Comment[hu]=A fájlkezelő nézetmódjainak beállítása Comment[ia]=Configura le modos de vista del gerente de file Comment[id]=Konfigurasikan mode tampilan pengelola file @@ -224,6 +228,7 @@ X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros X-KDE-Keywords[he]=מנהל קבצים +X-KDE-Keywords[hi]=फ़ाइल प्रबंधक X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file X-KDE-Keywords[id]=pengelola file diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 5cffe9aac..26bee0bce 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -18,6 +18,7 @@ Comment[eu]=Bertsio-kontrolerako plugina fitxategi ikuspegietarako 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. +Comment[hi]=फ़ाइल दृश्यों के लिए संस्करण नियंत्रण प्लगइन Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez Comment[ia]=Plugin de controlo de version pro vistas de file Comment[id]=Plugin Kendali Versi untuk Tampilan File -- cgit v1.3 From 696414069907b41f7738e3212ac0d68b58fed1bc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Aug 2021 02:29:46 +0000 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/dolphinpart.desktop.in | 2 +- src/settings/kcm/kcmdolphingeneral.desktop | 2 +- src/settings/kcm/kcmdolphinnavigation.desktop | 4 ++-- src/settings/kcm/kcmdolphinviewmodes.desktop | 2 +- src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/settings') diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in index bc0e342e2..2a121dbe6 100644 --- a/src/dolphinpart.desktop.in +++ b/src/dolphinpart.desktop.in @@ -232,7 +232,7 @@ Name[tr]=Ayrıntılar Name[uk]=Подробиці Name[vi]=Chi tiết Name[x-test]=xxDetailsxx -Name[zh_CN]=详细 +Name[zh_CN]=详情 Name[zh_TW]=詳細模式 Icon=view-list-tree # Dummy diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 8b4e4f4d3..0c37e03f5 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -99,7 +99,7 @@ Comment[tr]=Bu servis genel Dolphin ayarlarını yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати загальні параметри Dolphin. Comment[vi]=Dịch vụ này cho phép cấu hình các thiết lập chung của Dolphin. Comment[x-test]=xxThis service allows configuration of general Dolphin settings.xx -Comment[zh_CN]=此服务允许您配置 Dolphin 的常规设置。 +Comment[zh_CN]=此服务用于配置 Dolphin 的常规设置。 Comment[zh_TW]=此服務允許設定 Dolphin 的一般設定。 [Desktop Entry] diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index dd69975f1..954ad991f 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -99,7 +99,7 @@ Comment[tr]=Bu servis Dolphin gezintisini yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати навігацію у Dolphin. Comment[vi]=Dịch vụ này cho phép cấu hình điều hướng Dolphin. Comment[x-test]=xxThis service allows configuration of the Dolphin navigation.xx -Comment[zh_CN]=此服务允许您配置 Dolphin 的导航。 +Comment[zh_CN]=此服务用于配置 Dolphin 的导航功能。 Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。 [Desktop Entry] @@ -212,7 +212,7 @@ Comment[tr]=Dosya yöneticisi gezintisini yapılandır Comment[uk]=Налаштувати навігацію у менеджері файлів Comment[vi]=Cấu hình điều hướng trình quản lí tệp Comment[x-test]=xxConfigure file manager navigationxx -Comment[zh_CN]=配置文件管理器导航 +Comment[zh_CN]=配置文件管理器导航功能 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index f41b535aa..5bbb0eed5 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -97,7 +97,7 @@ Comment[tr]=Bu servis Dolphin görünüm kiplerini yapılandırmanızı sağlar. Comment[uk]=Ця служба надасть змогу налаштувати режими перегляду Dolphin. Comment[vi]=Dịch vụ này cho phép cấu hình các chế độ xem Dolphin. Comment[x-test]=xxThis service allows configuration of the Dolphin view modes.xx -Comment[zh_CN]=此服务允许您配置 Dolphin 的视图模式。 +Comment[zh_CN]=此服务用于配置 Dolphin 的视图模式。 Comment[zh_TW]=此服務允許設定 Dolphin 的檢視模式。 [Desktop Entry] diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 26bee0bce..b82ac8483 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -49,5 +49,5 @@ Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi Comment[uk]=Додаток керування версіями для панелей перегляду файлів Comment[vi]=Phần cài cắm "Quản lí phiên bản" cho khung xem tệp Comment[x-test]=xxVersion Control Plugin for File Viewsxx -Comment[zh_CN]=文件视图的版本控制插件 +Comment[zh_CN]=文件视图的版本控制系统插件 Comment[zh_TW]=檔案檢視的版本控制外掛程式 -- cgit v1.3