diff -Nru kde-baseapps-4.7.90/CMakeLists.txt kde-baseapps-4.7.95/CMakeLists.txt --- kde-baseapps-4.7.90/CMakeLists.txt 2011-12-02 21:28:38.000000000 +0000 +++ kde-baseapps-4.7.95/CMakeLists.txt 2011-12-21 00:24:38.000000000 +0000 @@ -4,9 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.7.3") +set(KDE_MIN_VERSION "4.7.4") set(SOPRANO_MIN_VERSION "2.5.63") -find_package(KDE4 4.7.3 REQUIRED) +find_package(KDE4 4.7.4 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) diff -Nru kde-baseapps-4.7.90/debian/changelog kde-baseapps-4.7.95/debian/changelog --- kde-baseapps-4.7.90/debian/changelog 2011-12-20 23:52:44.000000000 +0000 +++ kde-baseapps-4.7.95/debian/changelog 2011-12-27 11:56:33.000000000 +0000 @@ -1,3 +1,9 @@ +kde-baseapps (4:4.7.95-0ubuntu1) precise; urgency=low + + * New upstream release candidate + + -- Philip Muškovac Sat, 24 Dec 2011 14:47:46 +0100 + kde-baseapps (4:4.7.90-0ubuntu1) precise; urgency=low * New upstream beta release diff -Nru kde-baseapps-4.7.90/debian/control kde-baseapps-4.7.95/debian/control --- kde-baseapps-4.7.90/debian/control 2011-12-14 14:36:30.000000000 +0000 +++ kde-baseapps-4.7.95/debian/control 2011-12-27 11:56:33.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Sune Vuorela , Fathi Boudra , Armin Berres , Modestas Vainius , George Kiagiadakis , José Manuel Santamaría Lema -Build-Depends: kde-sc-dev-latest (>= 4:4.7.3), +Build-Depends: kde-sc-dev-latest (>= 4:4.7.95), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), libdlrestrictions-dev (>= 0.14), kdelibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.3.0), libqimageblitz-dev (>= 1:0.0.4-2), libxkbfile-dev, Binary files /tmp/02yK5ktO1M/kde-baseapps-4.7.90/doc/dolphin/index.cache.bz2 and /tmp/YeFg9gDKHr/kde-baseapps-4.7.95/doc/dolphin/index.cache.bz2 differ Binary files /tmp/02yK5ktO1M/kde-baseapps-4.7.90/doc/kdepasswd/index.cache.bz2 and /tmp/YeFg9gDKHr/kde-baseapps-4.7.95/doc/kdepasswd/index.cache.bz2 differ Binary files /tmp/02yK5ktO1M/kde-baseapps-4.7.90/doc/kfind/index.cache.bz2 and /tmp/YeFg9gDKHr/kde-baseapps-4.7.95/doc/kfind/index.cache.bz2 differ Binary files /tmp/02yK5ktO1M/kde-baseapps-4.7.90/doc/konqueror/index.cache.bz2 and /tmp/YeFg9gDKHr/kde-baseapps-4.7.95/doc/konqueror/index.cache.bz2 differ diff -Nru kde-baseapps-4.7.90/dolphin/src/CMakeLists.txt kde-baseapps-4.7.95/dolphin/src/CMakeLists.txt --- kde-baseapps-4.7.90/dolphin/src/CMakeLists.txt 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/CMakeLists.txt 2011-12-20 19:10:51.000000000 +0000 @@ -23,6 +23,7 @@ kitemviews/kfileitemlistview.cpp kitemviews/kfileitemlistwidget.cpp kitemviews/kfileitemmodel.cpp + kitemviews/kfileitemmodelfilter.cpp kitemviews/kfileitemmodelrolesupdater.cpp kitemviews/kitemlistcontainer.cpp kitemviews/kitemlistcontroller.cpp @@ -43,6 +44,7 @@ kitemviews/kpixmapmodifier.cpp settings/additionalinfodialog.cpp settings/applyviewpropsjob.cpp + settings/viewmodes/viewmodesettings.cpp settings/viewpropertiesdialog.cpp settings/viewpropsprogressinfo.cpp views/additionalinfoaccessor.cpp @@ -144,6 +146,7 @@ settings/trash/trashsettingspage.cpp settings/viewmodes/dolphinfontrequester.cpp settings/viewmodes/viewsettingspage.cpp + settings/viewmodes/viewmodesettings.cpp settings/viewmodes/viewsettingstab.cpp statusbar/dolphinstatusbar.cpp statusbar/statusbarspaceinfo.cpp @@ -204,6 +207,7 @@ set(kcm_dolphinviewmodes_PART_SRCS settings/kcm/kcmdolphinviewmodes.cpp settings/viewmodes/dolphinfontrequester.cpp + settings/viewmodes/viewmodesettings.cpp settings/viewmodes/viewsettingstab.cpp views/zoomlevelinfo.cpp) diff -Nru kde-baseapps-4.7.90/dolphin/src/dolphinmainwindow.cpp kde-baseapps-4.7.95/dolphin/src/dolphinmainwindow.cpp --- kde-baseapps-4.7.90/dolphin/src/dolphinmainwindow.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/dolphinmainwindow.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -156,6 +156,8 @@ setObjectName("Dolphin#"); m_viewTab.append(ViewTab()); + ViewTab& viewTab = m_viewTab[m_tabIndex]; + viewTab.wasActive = true; // The first opened tab is automatically active KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); undoManager->setUiInterface(new UndoUiInterface()); @@ -177,8 +179,8 @@ setAcceptDrops(true); - m_viewTab[m_tabIndex].splitter = new QSplitter(this); - m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false); + viewTab.splitter = new QSplitter(this); + viewTab.splitter->setChildrenCollapsible(false); setupActions(); @@ -188,9 +190,9 @@ connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar())); connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); - m_viewTab[m_tabIndex].primaryView = createViewContainer(homeUrl, m_viewTab[m_tabIndex].splitter); + viewTab.primaryView = createViewContainer(homeUrl, viewTab.splitter); - m_activeViewContainer = m_viewTab[m_tabIndex].primaryView; + m_activeViewContainer = viewTab.primaryView; connectViewSignals(m_activeViewContainer); DolphinView* view = m_activeViewContainer->view(); m_activeViewContainer->show(); @@ -227,7 +229,7 @@ m_centralWidgetLayout->setSpacing(0); m_centralWidgetLayout->setMargin(0); m_centralWidgetLayout->addWidget(m_tabBar); - m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1); + m_centralWidgetLayout->addWidget(viewTab.splitter, 1); setCentralWidget(centralWidget); setupDockWidgets(); @@ -510,10 +512,10 @@ // provide a split view, if the startup settings are set this way if (GeneralSettings::splitView()) { - const int tabIndex = m_viewTab.count() - 1; - createSecondaryView(tabIndex); - m_viewTab[tabIndex].secondaryView->setActive(true); - m_viewTab[tabIndex].isPrimaryViewActive = false; + const int newTabIndex = m_viewTab.count() - 1; + createSecondaryView(newTabIndex); + viewTab.secondaryView->setActive(true); + viewTab.isPrimaryViewActive = false; } if (focusWidget) { @@ -525,25 +527,21 @@ void DolphinMainWindow::activateNextTab() { - if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { - return; + if (m_viewTab.count() >= 2) { + const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count(); + m_tabBar->setCurrentIndex(tabIndex); } - - const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count(); - m_tabBar->setCurrentIndex(tabIndex); } void DolphinMainWindow::activatePrevTab() { - if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { - return; - } - - int tabIndex = m_tabBar->currentIndex() - 1; - if (tabIndex == -1) { - tabIndex = m_tabBar->count() - 1; + if (m_viewTab.count() >= 2) { + int tabIndex = m_tabBar->currentIndex() - 1; + if (tabIndex == -1) { + tabIndex = m_tabBar->count() - 1; + } + m_tabBar->setCurrentIndex(tabIndex); } - m_tabBar->setCurrentIndex(tabIndex); } void DolphinMainWindow::openInNewTab() @@ -1152,6 +1150,18 @@ } viewTab.splitter->show(); + if (!viewTab.wasActive) { + viewTab.wasActive = true; + + // If the tab has not been activated yet the size of the KItemListView is + // undefined and results in an unwanted animation. To prevent this a + // reloading of the directory gets triggered. + viewTab.primaryView->view()->reload(); + if (viewTab.secondaryView) { + viewTab.secondaryView->view()->reload(); + } + } + setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView : viewTab.secondaryView); } @@ -2165,16 +2175,20 @@ void DolphinMainWindow::createSecondaryView(int tabIndex) { - QSplitter* splitter = m_viewTab[tabIndex].splitter; - const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2; + ViewTab& viewTab = m_viewTab[tabIndex]; + + QSplitter* splitter = viewTab.splitter; + const int newWidth = (viewTab.primaryView->width() - splitter->handleWidth()) / 2; - const DolphinView* view = m_viewTab[tabIndex].primaryView->view(); - m_viewTab[tabIndex].secondaryView = createViewContainer(view->url(), 0); - splitter->addWidget(m_viewTab[tabIndex].secondaryView); + const DolphinView* view = viewTab.primaryView->view(); + viewTab.secondaryView = createViewContainer(view->url(), 0); + splitter->addWidget(viewTab.secondaryView); splitter->setSizes(QList() << newWidth << newWidth); - connectViewSignals(m_viewTab[tabIndex].secondaryView); - m_viewTab[tabIndex].secondaryView->setActive(false); - m_viewTab[tabIndex].secondaryView->show(); + + connectViewSignals(viewTab.secondaryView); + viewTab.secondaryView->setActive(false); + viewTab.secondaryView->resize(newWidth, viewTab.primaryView->height()); + viewTab.secondaryView->show(); } QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const diff -Nru kde-baseapps-4.7.90/dolphin/src/dolphinmainwindow.h kde-baseapps-4.7.95/dolphin/src/dolphinmainwindow.h --- kde-baseapps-4.7.90/dolphin/src/dolphinmainwindow.h 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/dolphinmainwindow.h 2011-12-20 19:10:51.000000000 +0000 @@ -565,8 +565,9 @@ // Members for the tab-handling: struct ViewTab { - ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {} + ViewTab() : isPrimaryViewActive(true), wasActive(false), primaryView(0), secondaryView(0), splitter(0) {} bool isPrimaryViewActive; + bool wasActive; DolphinViewContainer* primaryView; DolphinViewContainer* secondaryView; QSplitter* splitter; diff -Nru kde-baseapps-4.7.90/dolphin/src/dolphinpart.desktop kde-baseapps-4.7.95/dolphin/src/dolphinpart.desktop --- kde-baseapps-4.7.90/dolphin/src/dolphinpart.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/dolphinpart.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -199,12 +199,15 @@ Name[da]=Kompakt Name[de]=Kompakt Name[es]=Compacta +Name[fi]=Tiivis Name[hu]=Kompakt Name[ia]=Compacte Name[kk]=Ықшамды Name[lt]=Kompaktiškas +Name[nb]=Kompakt Name[nds]=Drang Name[nl]=Compact +Name[pa]=ਸੰਖੇਪ Name[pt]=Compacto Name[pt_BR]=Compacto Name[sv]=Kompakt diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemlistview.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemlistview.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemlistview.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemlistview.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -34,7 +34,7 @@ #include #include -#define KFILEITEMLISTVIEW_DEBUG +// #define KFILEITEMLISTVIEW_DEBUG namespace { const int ShortInterval = 50; diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemlistwidget.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemlistwidget.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemlistwidget.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemlistwidget.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -38,7 +38,7 @@ #include #include -//#define KFILEITEMLISTWIDGET_DEBUG +// #define KFILEITEMLISTWIDGET_DEBUG KFileItemListWidget::KFileItemListWidget(QGraphicsItem* parent) : KItemListWidget(parent), @@ -52,7 +52,8 @@ m_pixmapPos(), m_pixmap(), m_scaledPixmapSize(), - m_hoverPixmapRect(), + m_originalPixmapSize(), + m_iconRect(), m_hoverPixmap(), m_textPos(), m_text(), @@ -89,10 +90,10 @@ void KFileItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) { - KItemListWidget::paint(painter, option, widget); - const_cast(this)->triggerCacheRefreshing(); + KItemListWidget::paint(painter, option, widget); + // Draw expansion toggle '>' or 'V' if (m_isDir && !m_expansionArea.isEmpty()) { QStyleOption arrowOption; @@ -156,11 +157,7 @@ QRectF KFileItemListWidget::iconRect() const { const_cast(this)->triggerCacheRefreshing(); - - QRectF bounds = m_hoverPixmapRect; - const qreal margin = styleOption().margin; - bounds.adjust(-margin, -margin, margin, margin); - return bounds; + return m_iconRect; } QRectF KFileItemListWidget::textRect() const @@ -281,7 +278,7 @@ QColor KFileItemListWidget::textColor() const { - if (m_customTextColor.isValid()) { + if (m_customTextColor.isValid() && !isSelected()) { return m_customTextColor; } @@ -427,15 +424,17 @@ Q_ASSERT(values.contains("expansionLevel")); const KItemListStyleOption& option = styleOption(); const int expansionLevel = values.value("expansionLevel", 0).toInt(); - - const qreal widgetHeight = size().height(); - const qreal expansionLevelSize = KIconLoader::SizeSmall; - const qreal x = option.margin + expansionLevel * widgetHeight; - const qreal y = (widgetHeight - expansionLevelSize) / 2; - m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize); - } else { - m_expansionArea = QRectF(); + if (expansionLevel >= 0) { + const qreal widgetHeight = size().height(); + const qreal expansionLevelSize = KIconLoader::SizeSmall; + const qreal x = option.margin + expansionLevel * widgetHeight; + const qreal y = (widgetHeight - expansionLevelSize) / 2; + m_expansionArea = QRectF(x, y, expansionLevelSize, expansionLevelSize); + return; + } } + + m_expansionArea = QRectF(); } void KFileItemListWidget::updatePixmapCache() @@ -463,7 +462,8 @@ if (!updatePixmap && m_dirtyContent) { updatePixmap = m_dirtyContentRoles.isEmpty() || m_dirtyContentRoles.contains("iconPixmap") - || m_dirtyContentRoles.contains("iconName"); + || m_dirtyContentRoles.contains("iconName") + || m_dirtyContentRoles.contains("iconOverlays"); } if (updatePixmap) { @@ -477,7 +477,7 @@ iconName = QLatin1String("unknown"); } m_pixmap = pixmapForIcon(iconName, iconHeight); - m_hoverPixmapRect.setSize(m_pixmap.size()); + m_originalPixmapSize = m_pixmap.size(); } else if (m_pixmap.size() != QSize(iconHeight, iconHeight)) { // A custom pixmap has been applied. Assure that the pixmap // is scaled to the available size. @@ -486,7 +486,7 @@ if (scale) { KPixmapModifier::scale(m_pixmap, QSize(iconHeight, iconHeight)); } - m_hoverPixmapRect.setSize(m_pixmap.size()); + m_originalPixmapSize = m_pixmap.size(); // To simplify the handling of scaling the original pixmap // will be embedded into a square pixmap. @@ -507,7 +507,23 @@ m_pixmap = squarePixmap; } else { - m_hoverPixmapRect.setSize(m_pixmap.size()); + m_originalPixmapSize = m_pixmap.size(); + } + + const QStringList overlays = values["iconOverlays"].toStringList(); + + // Strangely KFileItem::overlays() returns empty string-values, so + // we need to check first whether an overlay must be drawn at all. + // It is more efficient to do it here, as KIconLoader::drawOverlays() + // assumes that an overlay will be drawn and has some additional + // setup time. + foreach (const QString& overlay, overlays) { + if (!overlay.isEmpty()) { + // There is at least one overlay, draw all overlays above m_pixmap + // and cancel the check + KIconLoader::global()->drawOverlays(overlays, m_pixmap, KIconLoader::Desktop); + break; + } } if (m_isCut) { @@ -535,10 +551,19 @@ m_pixmapPos.setY(option.margin); // Center the hover rectangle horizontally and align it on bottom - const qreal x = m_pixmapPos.x() + (m_scaledPixmapSize.width() - m_hoverPixmapRect.width()) / 2.0; - const qreal y = m_pixmapPos.y() + m_scaledPixmapSize.height() - m_hoverPixmapRect.height(); - m_hoverPixmapRect.moveTopLeft(QPointF(x, y)); - + qreal hoverWidth = m_originalPixmapSize.width(); + qreal hoverHeight = m_originalPixmapSize.height(); + if (scaledIconHeight != m_pixmap.height()) { + const qreal scaleFactor = qreal(scaledIconHeight) / qreal(m_pixmap.height()); + hoverWidth *= scaleFactor; + hoverHeight *= scaleFactor; + } + const qreal hoverX = m_pixmapPos.x() + (m_scaledPixmapSize.width() - hoverWidth) / 2.0; + const qreal hoverY = m_pixmapPos.y() + m_scaledPixmapSize.height() - hoverHeight; + m_iconRect = QRectF(hoverX, hoverY, hoverWidth, hoverHeight); + const qreal margin = option.margin; + m_iconRect.adjust(-margin, -margin, margin, margin); + // Prepare the pixmap that is used when the item gets hovered if (isHovered()) { m_hoverPixmap = m_pixmap; @@ -632,9 +657,9 @@ m_text[Name].setTextWidth(maxWidth); m_textPos[Name] = QPointF(option.margin, widgetHeight - textLinesCount * fontHeight - option.margin); m_textRect = QRectF(option.margin + (maxWidth - requiredWidthForName) / 2, - m_textPos[Name].y(), - requiredWidthForName, - m_text[Name].size().height()); + m_textPos[Name].y(), + requiredWidthForName, + textLinesCountForName * fontHeight); // Calculate the position for each additional information qreal y = m_textPos[Name].y() + textLinesCountForName * fontHeight; diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemlistwidget.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemlistwidget.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemlistwidget.h 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemlistwidget.h 2011-12-20 19:10:51.000000000 +0000 @@ -139,8 +139,9 @@ QPixmap m_pixmap; QSize m_scaledPixmapSize; - QRectF m_hoverPixmapRect; - QPixmap m_hoverPixmap; + QSize m_originalPixmapSize; // Size of pixmap before it gets converted to a square pixmap + QRectF m_iconRect; // Cache for KItemListWidget::iconRect() + QPixmap m_hoverPixmap; // Cache for modified m_pixmap when hovering the item QPointF m_textPos[TextIdCount]; QStaticText m_text[TextIdCount]; diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodel.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodel.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodel.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodel.cpp 2011-12-21 00:15:26.000000000 +0000 @@ -28,7 +28,7 @@ #include #include -#define KFILEITEMMODEL_DEBUG +// #define KFILEITEMMODEL_DEBUG KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) : KItemModelBase("name", parent), @@ -40,7 +40,7 @@ m_caseSensitivity(Qt::CaseInsensitive), m_itemData(), m_items(), - m_nameFilter(), + m_filter(), m_filteredItems(), m_requestRole(), m_minimumUpdateIntervalTimer(0), @@ -49,7 +49,7 @@ m_pendingItemsToInsert(), m_pendingEmitLoadingCompleted(false), m_groups(), - m_rootExpansionLevel(-1), + m_rootExpansionLevel(UninitializedRootExpansionLevel), m_expandedUrls(), m_urlsToExpand() { @@ -165,6 +165,24 @@ return m_sortFoldersFirst; } +void KFileItemModel::setShowHiddenFiles(bool show) +{ + KDirLister* dirLister = m_dirLister.data(); + if (dirLister) { + dirLister->setShowingDotFiles(show); + dirLister->emitChanges(); + if (show) { + slotCompleted(); + } + } +} + +bool KFileItemModel::showHiddenFiles() const +{ + const KDirLister* dirLister = m_dirLister.data(); + return dirLister ? dirLister->showingDotFiles() : false; +} + QMimeData* KFileItemModel::createMimeData(const QSet& indexes) const { QMimeData* data = new QMimeData(); @@ -386,11 +404,11 @@ return false; } + KDirLister* dirLister = m_dirLister.data(); const KUrl url = m_itemData.at(index)->item.url(); if (expanded) { m_expandedUrls.insert(url); - KDirLister* dirLister = m_dirLister.data(); if (dirLister) { dirLister->openUrl(url, KDirLister::Keep); return true; @@ -398,6 +416,10 @@ } else { m_expandedUrls.remove(url); + if (dirLister) { + dirLister->stop(url); + } + KFileItemList itemsToRemove; const int expansionLevel = data(index)["expansionLevel"].toInt(); ++index; @@ -479,53 +501,48 @@ void KFileItemModel::setNameFilter(const QString& nameFilter) { - if (m_nameFilter != nameFilter) { - // TODO #1: Assure that expanded items only can get hidden - // if no child item is visible + if (m_filter.pattern() != nameFilter) { + dispatchPendingItemsToInsert(); - // TODO #2: If the user entered a '*' use a regular expression - - m_nameFilter = nameFilter; - - const QString filter = nameFilter.toLower(); + m_filter.setPattern(nameFilter); // Check which shown items from m_itemData must get // hidden and hence moved to m_filteredItems. KFileItemList newFilteredItems; foreach (ItemData* itemData, m_itemData) { - if (!matchesNameFilter(itemData->item, filter)) { - m_filteredItems.append(itemData->item); - newFilteredItems.append(itemData->item); + if (!m_filter.matches(itemData->item)) { + // Only filter non-expanded items as child items may never + // exist without a parent item + if (!itemData->values.value("isExpanded").toBool()) { + newFilteredItems.append(itemData->item); + m_filteredItems.insert(itemData->item); + } } } - if (!newFilteredItems.isEmpty()) { - slotItemsDeleted(newFilteredItems); - } + removeItems(newFilteredItems); // Check which hidden items from m_filteredItems should // get visible again and hence removed from m_filteredItems. KFileItemList newVisibleItems; - for (int i = m_filteredItems.count() - 1; i >= 0; --i) { - const KFileItem item = m_filteredItems.at(i); - if (matchesNameFilter(item, filter)) { + QMutableSetIterator it(m_filteredItems); + while (it.hasNext()) { + const KFileItem item = it.next(); + if (m_filter.matches(item)) { newVisibleItems.append(item); - m_filteredItems.removeAt(i); + m_filteredItems.remove(item); } } - if (!newVisibleItems.isEmpty()) { - slotNewItems(newVisibleItems); - dispatchPendingItemsToInsert(); - } + insertItems(newVisibleItems); } } QString KFileItemModel::nameFilter() const { - return m_nameFilter; + return m_filter.pattern(); } void KFileItemModel::onGroupedSortingChanged(bool current) @@ -657,7 +674,39 @@ void KFileItemModel::slotNewItems(const KFileItemList& items) { - m_pendingItemsToInsert.append(items); + if (m_requestRole[ExpansionLevelRole] && m_rootExpansionLevel >= 0) { + // If the expanding of items is enabled in the model, it might be + // possible that the call dirLister->openUrl(url, KDirLister::Keep) in + // KFileItemModel::setExpanded() results in emitting of the same items + // twice due to the Keep-parameter. This case happens if an item gets + // expanded, collapsed and expanded again before the items could be loaded + // for the first expansion. + foreach (const KFileItem& item, items) { + const int index = m_items.value(item.url(), -1); + if (index >= 0) { + // The items are already part of the model. + return; + } + } + } + + if (m_filter.pattern().isEmpty()) { + m_pendingItemsToInsert.append(items); + } else { + // The name-filter is active. Hide filtered items + // before inserting them into the model and remember + // the filtered items in m_filteredItems. + KFileItemList filteredItems; + foreach (const KFileItem& item, items) { + if (m_filter.matches(item)) { + filteredItems.append(item); + } else { + m_filteredItems.insert(item); + } + } + + m_pendingItemsToInsert.append(filteredItems); + } if (useMaximumUpdateInterval() && !m_maximumUpdateIntervalTimer->isActive()) { // Assure that items get dispatched if no completed() or canceled() signal is @@ -668,11 +717,23 @@ void KFileItemModel::slotItemsDeleted(const KFileItemList& items) { - if (!m_pendingItemsToInsert.isEmpty()) { - insertItems(m_pendingItemsToInsert); - m_pendingItemsToInsert.clear(); + dispatchPendingItemsToInsert(); + + KFileItemList itemsToRemove = items; + if (m_requestRole[ExpansionLevelRole] && m_rootExpansionLevel >= 0) { + // Assure that removing a parent item also results in removing all children + foreach (const KFileItem& item, items) { + itemsToRemove.append(childItems(item)); + } + } + + if (!m_filteredItems.isEmpty()) { + foreach (const KFileItem& item, itemsToRemove) { + m_filteredItems.remove(item); + } } - removeItems(items); + + removeItems(itemsToRemove); } void KFileItemModel::slotRefreshItems(const QList >& items) @@ -691,8 +752,14 @@ QListIterator > it(items); while (it.hasNext()) { const QPair& itemPair = it.next(); - const int index = m_items.value(itemPair.second.url(), -1); + const KFileItem& oldItem = itemPair.first; + const KFileItem& newItem = itemPair.second; + const int index = m_items.value(oldItem.url(), -1); if (index >= 0) { + m_itemData[index]->item = newItem; + m_itemData[index]->values = retrieveData(newItem); + m_items.remove(oldItem.url()); + m_items.insert(newItem.url(), index); indexes.append(index); } } @@ -707,9 +774,9 @@ qSort(indexes); KItemRangeList itemRangeList; - int rangeIndex = 0; - int rangeCount = 1; int previousIndex = indexes.at(0); + int rangeIndex = previousIndex; + int rangeCount = 1; const int maxIndex = indexes.count() - 1; for (int i = 1; i <= maxIndex; ++i) { @@ -729,7 +796,9 @@ itemRangeList.append(KItemRange(rangeIndex, rangeCount)); } - emit itemsChanged(itemRangeList, QSet()); + emit itemsChanged(itemRangeList, m_roles); + + resortAllItems(); } void KFileItemModel::slotClear() @@ -738,6 +807,7 @@ kDebug() << "Clearing all items"; #endif + m_filteredItems.clear(); m_groups.clear(); m_minimumUpdateIntervalTimer->stop(); @@ -745,7 +815,7 @@ m_resortAllItemsTimer->stop(); m_pendingItemsToInsert.clear(); - m_rootExpansionLevel = -1; + m_rootExpansionLevel = UninitializedRootExpansionLevel; const int removedCount = m_itemData.count(); if (removedCount > 0) { @@ -862,7 +932,14 @@ m_groups.clear(); - QList sortedItems = createItemDataList(items); + QList sortedItems; + sortedItems.reserve(items.count()); + foreach (const KFileItem& item, items) { + const int index = m_items.value(item.url(), -1); + if (index >= 0) { + sortedItems.append(m_itemData.at(index)); + } + } sort(sortedItems.begin(), sortedItems.end()); QList indexesToRemove; @@ -901,13 +978,15 @@ ++removedCount; ++targetIndex; } - qDeleteAll(sortedItems); - sortedItems.clear(); // Delete the items for (int i = indexesToRemove.count() - 1; i >= 0; --i) { const int indexToRemove = indexesToRemove.at(i); - delete m_itemData.at(indexToRemove); + ItemData* data = m_itemData.at(indexToRemove); + + m_items.remove(data->item.url()); + + delete data; m_itemData.removeAt(indexToRemove); } @@ -919,7 +998,7 @@ } if (count() <= 0) { - m_rootExpansionLevel = -1; + m_rootExpansionLevel = UninitializedRootExpansionLevel; } itemRanges << KItemRange(removedAtIndex, removedCount); @@ -935,6 +1014,21 @@ ItemData* itemData = new ItemData(); itemData->item = item; itemData->values = retrieveData(item); + itemData->parent = 0; + + const bool determineParent = m_requestRole[ExpansionLevelRole] + && itemData->values["expansionLevel"].toInt() > 0; + if (determineParent) { + KUrl parentUrl = item.url().upUrl(); + parentUrl.adjustPath(KUrl::RemoveTrailingSlash); + const int parentIndex = m_items.value(parentUrl, -1); + if (parentIndex >= 0) { + itemData->parent = m_itemData.at(parentIndex); + } else { + kWarning() << "Parent item not found for" << item.url(); + } + } + itemDataList.append(itemData); } @@ -958,7 +1052,7 @@ Q_ASSERT(m_rootExpansionLevel >= 0); removeItems(expandedItems); - m_rootExpansionLevel = -1; + m_rootExpansionLevel = UninitializedRootExpansionLevel; m_expandedUrls.clear(); } @@ -1047,7 +1141,12 @@ } if (m_requestRole[PathRole]) { - data.insert("path", item.localPath()); + if (item.url().protocol() == QLatin1String("trash")) { + const KIO::UDSEntry udsEntry = item.entry(); + data.insert("path", udsEntry.stringValue(KIO::UDSEntry::UDS_EXTRA)); + } else { + data.insert("path", item.localPath()); + } } if (m_requestRole[IsExpandedRole]) { @@ -1055,17 +1154,31 @@ } if (m_requestRole[ExpansionLevelRole]) { - if (m_rootExpansionLevel < 0 && m_dirLister.data()) { - const QString rootDir = m_dirLister.data()->url().directory(KUrl::AppendTrailingSlash); - m_rootExpansionLevel = rootDir.count('/'); - if (m_rootExpansionLevel == 1) { - // Special case: The root is already reached and no parent is available - --m_rootExpansionLevel; + if (m_rootExpansionLevel == UninitializedRootExpansionLevel && m_dirLister.data()) { + const KUrl rootUrl = m_dirLister.data()->url(); + const QString protocol = rootUrl.protocol(); + const bool forceRootExpansionLevel = (protocol == QLatin1String("trash") || + protocol == QLatin1String("nepomuk") || + protocol.contains(QLatin1String("search"))); + if (forceRootExpansionLevel) { + m_rootExpansionLevel = ForceRootExpansionLevel; + } else { + const QString rootDir = rootUrl.directory(KUrl::AppendTrailingSlash); + m_rootExpansionLevel = rootDir.count('/'); + if (m_rootExpansionLevel == 1) { + // Special case: The root is already reached and no parent is available + --m_rootExpansionLevel; + } } } - const QString dir = item.url().directory(KUrl::AppendTrailingSlash); - const int level = dir.count('/') - m_rootExpansionLevel - 1; - data.insert("expansionLevel", level); + + if (m_rootExpansionLevel == ForceRootExpansionLevel) { + data.insert("expansionLevel", -1); + } else { + const QString dir = item.url().directory(KUrl::AppendTrailingSlash); + const int level = dir.count('/') - m_rootExpansionLevel - 1; + data.insert("expansionLevel", level); + } } if (item.isMimeTypeKnown()) { @@ -1081,13 +1194,10 @@ bool KFileItemModel::lessThan(const ItemData* a, const ItemData* b) const { - const KFileItem& itemA = a->item; - const KFileItem& itemB = b->item; - int result = 0; if (m_rootExpansionLevel >= 0) { - result = expansionLevelsCompare(itemA, itemB); + result = expansionLevelsCompare(a, b); if (result != 0) { // The items have parents with different expansion levels return (sortOrder() == Qt::AscendingOrder) ? result < 0 : result > 0; @@ -1095,8 +1205,8 @@ } if (m_sortFoldersFirst || m_sortRole == SizeRole) { - const bool isDirA = itemA.isDir(); - const bool isDirB = itemB.isDir(); + const bool isDirA = a->item.isDir(); + const bool isDirB = b->item.isDir(); if (isDirA && !isDirB) { return true; } else if (!isDirA && isDirB) { @@ -1104,16 +1214,22 @@ } } + result = sortRoleCompare(a, b); + + return (sortOrder() == Qt::AscendingOrder) ? result < 0 : result > 0; +} + +int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b) const +{ + const KFileItem& itemA = a->item; + const KFileItem& itemB = b->item; + + int result = 0; + switch (m_sortRole) { - case NameRole: { - result = stringCompare(itemA.text(), itemB.text()); - if (result == 0) { - // KFileItem::text() may not be unique in case UDS_DISPLAY_NAME is used - result = stringCompare(itemA.name(m_caseSensitivity == Qt::CaseInsensitive), - itemB.name(m_caseSensitivity == Qt::CaseInsensitive)); - } + case NameRole: + // The name role is handled as default fallback after the switch break; - } case DateRole: { const KDateTime dateTimeA = itemA.time(KFileItem::ModificationTime); @@ -1157,14 +1273,14 @@ result = QString::compare(a->values.value("comment").toString(), b->values.value("comment").toString()); break; - } + } case TagsRole: { result = QString::compare(a->values.value("tags").toString(), b->values.value("tags").toString()); break; - } - + } + case RatingRole: { result = a->values.value("rating").toInt() - b->values.value("rating").toInt(); break; @@ -1174,14 +1290,28 @@ break; } - if (result == 0) { - // It must be assured that the sort order is always unique even if two values have been - // equal. In this case a comparison of the URL is done which is unique in all cases - // within KDirLister. - result = QString::compare(itemA.url().url(), itemB.url().url(), Qt::CaseSensitive); + if (result != 0) { + // The current sort role was sufficient to define an order + return result; } - return (sortOrder() == Qt::AscendingOrder) ? result < 0 : result > 0; + // Fallback #1: Compare the text of the items + result = stringCompare(itemA.text(), itemB.text()); + if (result != 0) { + return result; + } + + // Fallback #2: KFileItem::text() may not be unique in case UDS_DISPLAY_NAME is used + result = stringCompare(itemA.name(m_caseSensitivity == Qt::CaseInsensitive), + itemB.name(m_caseSensitivity == Qt::CaseInsensitive)); + if (result != 0) { + return result; + } + + // Fallback #3: It must be assured that the sort order is always unique even if two values have been + // equal. In this case a comparison of the URL is done which is unique in all cases + // within KDirLister. + return QString::compare(itemA.url().url(), itemB.url().url(), Qt::CaseSensitive); } void KFileItemModel::sort(QList::iterator begin, @@ -1328,10 +1458,10 @@ : QString::compare(a, b, Qt::CaseSensitive); } -int KFileItemModel::expansionLevelsCompare(const KFileItem& a, const KFileItem& b) const +int KFileItemModel::expansionLevelsCompare(const ItemData* a, const ItemData* b) const { - const KUrl urlA = a.url(); - const KUrl urlB = b.url(); + const KUrl urlA = a->item.url(); + const KUrl urlB = b->item.url(); if (urlA.directory() == urlB.directory()) { // Both items have the same directory as parent return 0; @@ -1339,9 +1469,9 @@ // Check whether one item is the parent of the other item if (urlA.isParentOf(urlB)) { - return -1; + return (sortOrder() == Qt::AscendingOrder) ? -1 : +1; } else if (urlB.isParentOf(urlA)) { - return +1; + return (sortOrder() == Qt::AscendingOrder) ? +1 : -1; } // Determine the maximum common path of both items and @@ -1364,17 +1494,37 @@ // Determine the first sub-path after the common path and // check whether it represents a directory or already a file bool isDirA = true; - const QString subPathA = subPath(a, pathA, index, &isDirA); + const QString subPathA = subPath(a->item, pathA, index, &isDirA); bool isDirB = true; - const QString subPathB = subPath(b, pathB, index, &isDirB); + const QString subPathB = subPath(b->item, pathB, index, &isDirB); if (isDirA && !isDirB) { - return -1; + return (sortOrder() == Qt::AscendingOrder) ? -1 : +1; } else if (!isDirA && isDirB) { - return +1; + return (sortOrder() == Qt::AscendingOrder) ? +1 : -1; + } + + // Compare the items of the parents that represent the first + // different path after the common path. + const KUrl parentUrlA(pathA.left(index) + subPathA); + const KUrl parentUrlB(pathB.left(index) + subPathB); + + const ItemData* parentA = a; + while (parentA && parentA->item.url() != parentUrlA) { + parentA = parentA->parent; + } + + const ItemData* parentB = b; + while (parentB && parentB->item.url() != parentUrlB) { + parentB = parentB->parent; } - return stringCompare(subPathA, subPathB); + if (parentA && parentB) { + return sortRoleCompare(parentA, parentB); + } + + kWarning() << "Child items without parent detected:" << a->item.url() << b->item.url(); + return QString::compare(urlA.url(), urlB.url(), Qt::CaseSensitive); } QString KFileItemModel::subPath(const KFileItem& item, @@ -1414,7 +1564,7 @@ // Use the first character of the name as group indication QChar newFirstChar = name.at(0).toUpper(); if (newFirstChar == QLatin1Char('~') && name.length() > 1) { - newFirstChar = name.at(1); + newFirstChar = name.at(1).toUpper(); } if (firstChar != newFirstChar) { @@ -1707,10 +1857,21 @@ return groups; } -bool KFileItemModel::matchesNameFilter(const KFileItem& item, const QString& nameFilter) +KFileItemList KFileItemModel::childItems(const KFileItem& item) const { - const QString itemText = item.text().toLower(); - return itemText.contains(nameFilter); + KFileItemList items; + + int index = m_items.value(item.url(), -1); + if (index >= 0) { + const int parentLevel = m_itemData.at(index)->values.value("expansionLevel").toInt(); + ++index; + while (index < m_itemData.count() && m_itemData.at(index)->values.value("expansionLevel").toInt() > parentLevel) { + items.append(m_itemData.at(index)->item); + ++index; + } + } + + return items; } #include "kfileitemmodel.moc" diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelfilter.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelfilter.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelfilter.cpp 1970-01-01 00:00:00.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelfilter.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -0,0 +1,71 @@ +/*************************************************************************** + * Copyright (C) 2011 by Janardhan Reddy * + * * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#include "kfileitemmodelfilter_p.h" + +#include +#include + +KFileItemModelFilter::KFileItemModelFilter() : + m_useRegExp(false), + m_regExp(0), + m_lowerCasePattern(), + m_pattern() +{ +} + +KFileItemModelFilter::~KFileItemModelFilter() +{ + delete m_regExp; + m_regExp = 0; +} + +void KFileItemModelFilter::setPattern(const QString& filter) +{ + m_pattern = filter; + m_lowerCasePattern = filter.toLower(); + + m_useRegExp = filter.contains('*') || + filter.contains('?') || + filter.contains('['); + if (m_useRegExp) { + if (!m_regExp) { + m_regExp = new QRegExp(); + m_regExp->setCaseSensitivity(Qt::CaseInsensitive); + m_regExp->setMinimal(false); + m_regExp->setPatternSyntax(QRegExp::WildcardUnix); + } + m_regExp->setPattern(filter); + } +} + +QString KFileItemModelFilter::pattern() const +{ + return m_pattern; +} + +bool KFileItemModelFilter::matches(const KFileItem& item) const +{ + if (m_useRegExp) { + return m_regExp->exactMatch(item.text()); + } else { + return item.text().toLower().contains(m_lowerCasePattern); + } +} diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelfilter_p.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelfilter_p.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelfilter_p.h 1970-01-01 00:00:00.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelfilter_p.h 2011-12-20 19:10:51.000000000 +0000 @@ -0,0 +1,70 @@ +/*************************************************************************** + * Copyright (C) 2011 by Janardhan Reddy * + * * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#ifndef KFILEITEMMODELFILTER_H +#define KFILEITEMMODELFILTER_H + +#include +#include + +class KFileItem; +class QRegExp; + +/** + * @brief Allows to check whether an item of the KFileItemModel + * matches with a set filter-string. + * + * Currently the filter is only checked for the KFileItem::text() + * property of the KFileItem, but this might get extended in + * future. + */ +class LIBDOLPHINPRIVATE_EXPORT KFileItemModelFilter +{ + +public: + KFileItemModelFilter(); + virtual ~KFileItemModelFilter(); + + /** + * Sets the pattern that is used for a comparison with the item + * in KFileItemModelFilter::matches(). Per default the pattern + * defines a sub-string. As soon as the pattern contains at least + * a '*', '?' or '[' the pattern represents a regular expression. + */ + void setPattern(const QString& pattern); + QString pattern() const; + + /** + * @return True if the item matches with the pattern defined by + * KFileItemModelFilter::setPattern(). + */ + bool matches(const KFileItem& item) const; + +private: + bool m_useRegExp; // If true, m_regExp is used for filtering, + // otherwise m_lowerCaseFilter is used. + QRegExp* m_regExp; + QString m_lowerCasePattern; // Lowercase version of m_filter for + // faster comparison in matches(). + QString m_pattern; // Property set by setFilter(). +}; +#endif + + diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodel.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodel.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodel.h 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodel.h 2011-12-21 00:15:26.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -41,6 +42,15 @@ * * Also the recursive expansion of sub-directories is supported by * KFileItemModel::setExpanded(). + * + * TODO: In the longterm instead of passing a KDirLister just an URL should + * be passed and a KDirLister used internally. This solves the following issues: + * - The user of the API does not need to decide whether he listens to KDirLister + * or KFileItemModel. + * - It resolves minor conceptual differences between KDirLister and KFileItemModel. + * E.g. there is no way for KFileItemModel to check whether a completed() signal + * will be emitted after newItems() will be send by KDirLister or not (in the case + * of setShowingDotFiles() no completed() signal will get emitted). */ class LIBDOLPHINPRIVATE_EXPORT KFileItemModel : public KItemModelBase { @@ -60,6 +70,9 @@ void setSortFoldersFirst(bool foldersFirst); bool sortFoldersFirst() const; + void setShowHiddenFiles(bool show); + bool showHiddenFiles() const; + /** @reimp */ virtual QMimeData* createMimeData(const QSet& indexes) const; @@ -138,6 +151,13 @@ QString nameFilter() const; signals: + /** + * Is emitted after the loading of a directory has been completed or new + * items have been inserted to an already loaded directory. Usually + * one or more itemsInserted() signals are emitted before loadingCompleted() + * (the only exception is loading an empty directory, where only a + * loadingCompleted() signal gets emitted). + */ void loadingCompleted(); protected: @@ -187,6 +207,7 @@ { KFileItem item; QHash values; + ItemData* parent; }; void insertItems(const KFileItemList& items); @@ -211,7 +232,18 @@ QHash retrieveData(const KFileItem& item) const; + /** + * @return True if the item-data \a a should be ordered before the item-data + * \b. The item-data may have different parent-items. + */ bool lessThan(const ItemData* a, const ItemData* b) const; + + /** + * Helper method for lessThan() and expansionLevelsCompare(): Compares + * the passed item-data using m_sortRole as criteria. Both items must + * have the same parent item, otherwise the comparison will be wrong. + */ + int sortRoleCompare(const ItemData* a, const ItemData* b) const; /** * Sorts the items by using lessThan() as comparison criteria. @@ -245,7 +277,7 @@ * is not sufficient, it is also important to check the hierarchy for having * a correct order like shown in a tree. */ - int expansionLevelsCompare(const KFileItem& a, const KFileItem& b) const; + int expansionLevelsCompare(const ItemData* a, const ItemData* b) const; /** * Helper method for expansionLevelCompare(). @@ -275,9 +307,9 @@ bool isChildItem(int index) const; /** - * @return True if the given item matches with the name filter. + * @return Recursive list of child items that have \a item as upper most parent. */ - static bool matchesNameFilter(const KFileItem& item, const QString& nameFilter); + KFileItemList childItems(const KFileItem& item) const; private: QWeakPointer m_dirLister; @@ -292,8 +324,8 @@ QList m_itemData; QHash m_items; // Allows O(1) access for KFileItemModel::index(const KFileItem& item) - QString m_nameFilter; - KFileItemList m_filteredItems; // Items that got hidden by KFileItemModel::setNameFilter() + KFileItemModelFilter m_filter; + QSet m_filteredItems; // Items that got hidden by KFileItemModel::setNameFilter() bool m_requestRole[RolesCount]; @@ -307,8 +339,18 @@ mutable QList > m_groups; // Stores the smallest expansion level of the root-URL. Is required to calculate - // the "expansionLevel" role in an efficient way. A value < 0 indicates that - // it has not been initialized yet. + // the "expansionLevel" role in an efficient way. A value < 0 indicates a + // special meaning: + enum RootExpansionLevelTypes + { + // m_rootExpansionLevel is uninitialized and must be determined by checking + // the root URL from the KDirLister. + UninitializedRootExpansionLevel = -1, + // All items should be forced to get an expansion level of 0 even if they + // represent child items. This is useful for slaves that provide no parent items + // for child items like e.g. the search IO slaves. + ForceRootExpansionLevel = -2 + }; mutable int m_rootExpansionLevel; // Stores the URLs of the expanded folders. diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -41,7 +41,7 @@ #include #endif -#define KFILEITEMMODELROLESUPDATER_DEBUG +// #define KFILEITEMMODELROLESUPDATER_DEBUG namespace { // Maximum time in ms that the KFileItemModelRolesUpdater @@ -188,7 +188,7 @@ } } else { const bool resolveAll = (m_iconSizeChangedDuringPausing && m_previewShown) || - (m_previewChangedDuringPausing && !m_previewShown) || + m_previewChangedDuringPausing || m_rolesChangedDuringPausing; if (resolveAll) { sortAndResolveAllRoles(); @@ -243,42 +243,7 @@ void KFileItemModelRolesUpdater::slotItemsInserted(const KItemRangeList& itemRanges) { - // If no valid index range is given assume that all items are visible. - // A cleanup will be done later as soon as the index range has been set. - const bool hasValidIndexRange = (m_lastVisibleIndex >= 0); - - if (hasValidIndexRange) { - // Move all current pending visible items that are not visible anymore - // to the pending invisible items. - QSetIterator it(m_pendingVisibleItems); - while (it.hasNext()) { - const KFileItem item = it.next(); - const int index = m_model->index(item); - if (index < m_firstVisibleIndex || index > m_lastVisibleIndex) { - m_pendingVisibleItems.remove(item); - m_pendingInvisibleItems.insert(item); - } - } - } - - int rangesCount = 0; - - foreach (const KItemRange& range, itemRanges) { - rangesCount += range.count; - - // Add the inserted items to the pending visible and invisible items - const int lastIndex = range.index + range.count - 1; - for (int i = range.index; i <= lastIndex; ++i) { - const KFileItem item = m_model->fileItem(i); - if (!hasValidIndexRange || (i >= m_firstVisibleIndex && i <= m_lastVisibleIndex)) { - m_pendingVisibleItems.insert(item); - } else { - m_pendingInvisibleItems.insert(item); - } - } - } - - triggerPendingRolesResolving(rangesCount); + startUpdating(itemRanges); } void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRanges) @@ -313,9 +278,8 @@ void KFileItemModelRolesUpdater::slotItemsChanged(const KItemRangeList& itemRanges, const QSet& roles) { - Q_UNUSED(itemRanges); Q_UNUSED(roles); - // TODO + startUpdating(itemRanges); } void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPixmap& pixmap) @@ -494,6 +458,46 @@ #endif } +void KFileItemModelRolesUpdater::startUpdating(const KItemRangeList& itemRanges) +{ + // If no valid index range is given assume that all items are visible. + // A cleanup will be done later as soon as the index range has been set. + const bool hasValidIndexRange = (m_lastVisibleIndex >= 0); + + if (hasValidIndexRange) { + // Move all current pending visible items that are not visible anymore + // to the pending invisible items. + QSetIterator it(m_pendingVisibleItems); + while (it.hasNext()) { + const KFileItem item = it.next(); + const int index = m_model->index(item); + if (index < m_firstVisibleIndex || index > m_lastVisibleIndex) { + m_pendingVisibleItems.remove(item); + m_pendingInvisibleItems.insert(item); + } + } + } + + int rangesCount = 0; + + foreach (const KItemRange& range, itemRanges) { + rangesCount += range.count; + + // Add the inserted items to the pending visible and invisible items + const int lastIndex = range.index + range.count - 1; + for (int i = range.index; i <= lastIndex; ++i) { + const KFileItem item = m_model->fileItem(i); + if (!hasValidIndexRange || (i >= m_firstVisibleIndex && i <= m_lastVisibleIndex)) { + m_pendingVisibleItems.insert(item); + } else { + m_pendingInvisibleItems.insert(item); + } + } + } + + triggerPendingRolesResolving(rangesCount); +} + void KFileItemModelRolesUpdater::startPreviewJob(const KFileItemList& items) { if (items.isEmpty() || m_paused) { @@ -679,9 +683,8 @@ data = rolesData(item); } - if (mimeTypeChanged || m_clearPreviews) { - data.insert("iconName", item.iconName()); - } + data.insert("iconName", item.iconName()); + if (m_clearPreviews) { data.insert("iconPixmap", QString()); } @@ -715,6 +718,8 @@ data.insert("type", item.mimeComment()); } + data.insert("iconOverlays", item.overlays()); + return data; } @@ -737,7 +742,9 @@ while (it.hasNext()) { const KFileItem item = it.next(); const int index = m_model->index(item); - indexes.append(index); + if (index >= 0) { + indexes.append(index); + } } qSort(indexes); diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h 2011-08-22 13:30:07.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h 2011-12-20 19:10:51.000000000 +0000 @@ -107,12 +107,22 @@ void slotItemsChanged(const KItemRangeList& itemRanges, const QSet& roles); + /** + * Is invoked after a preview has been received successfully. + * @see startPreviewJob() + */ void slotGotPreview(const KFileItem& item, const QPixmap& pixmap); + + /** + * Is invoked after generating a preview has failed. + * @see startPreviewJob() + */ void slotPreviewFailed(const KFileItem& item); /** * Is invoked when the preview job has been finished and * removes the job from the m_previewJobs list. + * @see startPreviewJob() */ void slotPreviewJobFinished(KJob* job); @@ -120,6 +130,19 @@ void resolveNextPendingRoles(); private: + /** + * Updates the roles for the given item ranges. The roles for the currently + * visible items will get updated first. + */ + void startUpdating(const KItemRangeList& itemRanges); + + /** + * Creates previews for the items starting from the first item of the + * given list. + * @see slotGotPreview() + * @see slotPreviewFailed() + * @see slotPreviewJobFinished() + */ void startPreviewJob(const KFileItemList& items); bool hasPendingRoles() const; diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistcontainer.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistcontainer.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistcontainer.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistcontainer.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -33,6 +33,7 @@ #include #include #include +#include #include @@ -279,13 +280,20 @@ { QRect rect = geometry(); + int extra = frameWidth() * 2; + QStyleOption option; + option.initFrom(this); + if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents, &option, this)) { + extra += style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, &option, this); + } + const int widthDec = verticalScrollBar()->isVisible() - ? frameWidth() + style()->pixelMetric(QStyle::PM_ScrollBarExtent) - : frameWidth() * 2; + ? extra + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) + : extra; const int heightDec = horizontalScrollBar()->isVisible() - ? frameWidth() + style()->pixelMetric(QStyle::PM_ScrollBarExtent) - : frameWidth() * 2; + ? extra + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this) + : extra; rect.adjust(0, 0, -widthDec, -heightDec); diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistcontroller.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistcontroller.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistcontroller.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistcontroller.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -30,7 +30,9 @@ #include #include #include +#include #include +#include #include #include @@ -187,7 +189,6 @@ } } - switch (key) { case Qt::Key_Home: index = 0; @@ -219,8 +220,7 @@ if (index + itemsPerRow < itemCount) { // We are not in the last row yet. index += itemsPerRow; - } - else { + } else { // We are either in the last row already, or we are in the second-last row, // and there is no item below the current item. // In the latter case, we jump to the very last item. @@ -251,9 +251,34 @@ m_selectionManager->endAnchoredSelection(); m_selectionManager->setSelected(index, 1, KItemListSelectionManager::Toggle); m_selectionManager->beginAnchoredSelection(index); - break; + } else { + m_keyboardManager->addKeys(event->text()); + } + break; + + case Qt::Key_Menu: { + // Emit the signal itemContextMenuRequested() in case if at least one + // item is selected. Otherwise the signal viewContextMenuRequested() will be emitted. + const QSet selectedItems = m_selectionManager->selectedItems(); + int index = -1; + if (selectedItems.count() >= 2) { + const int currentItemIndex = m_selectionManager->currentItem(); + index = selectedItems.contains(currentItemIndex) + ? currentItemIndex : selectedItems.toList().first(); + } else if (selectedItems.count() == 1) { + index = selectedItems.toList().first(); } + if (index >= 0) { + const QRectF contextRect = m_view->itemContextRect(index); + const QPointF pos(m_view->scene()->views().first()->mapToGlobal(contextRect.bottomRight().toPoint())); + emit itemContextMenuRequested(index, pos); + } else { + emit viewContextMenuRequested(QCursor::pos()); + } + break; + } + default: m_keyboardManager->addKeys(event->text()); return false; @@ -289,8 +314,7 @@ int index; if (searchFromNextItem) { index = m_model->indexForKeyboardSearch(text, (currentIndex + 1) % m_model->count()); - } - else { + } else { index = m_model->indexForKeyboardSearch(text, currentIndex); } if (index >= 0) { @@ -298,6 +322,7 @@ m_selectionManager->clearSelection(); m_selectionManager->setSelected(index, 1); m_selectionManager->beginAnchoredSelection(index); + m_view->scrollToItem(index); } } @@ -336,6 +361,9 @@ m_pressedMousePos = transform.map(event->pos()); m_pressedIndex = m_view->itemAt(m_pressedMousePos); + if (m_pressedIndex >= 0) { + emit itemPressed(m_pressedIndex, event->button()); + } if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) { m_selectionManager->setCurrentItem(m_pressedIndex); @@ -345,13 +373,29 @@ m_selectionTogglePressed = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos); if (m_selectionTogglePressed) { m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); + // The previous anchored selection has been finished already in + // KItemListSelectionManager::setSelected(). We can safely change + // the current item and start a new anchored selection now. + m_selectionManager->setCurrentItem(m_pressedIndex); + m_selectionManager->beginAnchoredSelection(m_pressedIndex); return true; } const bool shiftPressed = event->modifiers() & Qt::ShiftModifier; const bool controlPressed = event->modifiers() & Qt::ControlModifier; - if (m_selectionBehavior == SingleSelection) { + // The previous selection is cleared if either + // 1. The selection mode is SingleSelection, or + // 2. the selection mode is MultiSelection, and *none* of the following conditions are met: + // a) Shift or Control are pressed. + // b) The clicked item is selected already. In that case, the user might want to: + // - start dragging multiple items, or + // - open the context menu and perform an action for all selected items. + const bool shiftOrControlPressed = shiftPressed || controlPressed; + const bool pressedItemAlreadySelected = m_pressedIndex >= 0 && m_selectionManager->isSelected(m_pressedIndex); + const bool clearSelection = m_selectionBehavior == SingleSelection || + (!shiftOrControlPressed && !pressedItemAlreadySelected); + if (clearSelection) { m_selectionManager->clearSelection(); } @@ -375,11 +419,6 @@ if (controlPressed) { m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); m_selectionManager->beginAnchoredSelection(m_pressedIndex); - } else if (event->buttons() & Qt::RightButton) { - // Only clear the selection if a context menu is requested above a non-selected item - if (!m_selectionManager->selectedItems().contains(m_pressedIndex)) { - m_selectionManager->setSelectedItems(QSet() << m_pressedIndex); - } } else if (!shiftPressed || !m_selectionManager->isAnchoredSelectionActive()) { // Select the pressed item and start a new anchored selection m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select); @@ -400,8 +439,6 @@ } if (event->buttons() & Qt::RightButton) { - m_selectionManager->clearSelection(); - const QRectF headerBounds = m_view->headerBoundaries(); if (headerBounds.contains(event->pos())) { emit headerContextMenuRequested(event->screenPos()); @@ -460,6 +497,16 @@ KItemListRubberBand* rubberBand = m_view->rubberBand(); if (rubberBand->isActive()) { QPointF endPos = transform.map(event->pos()); + + // Update the current item. + const int newCurrent = m_view->itemAt(endPos); + if (newCurrent >= 0) { + // It's expected that the new current index is also the new anchor (bug 163451). + m_selectionManager->endAnchoredSelection(); + m_selectionManager->setCurrentItem(newCurrent); + m_selectionManager->beginAnchoredSelection(newCurrent); + } + if (m_view->scrollOrientation() == Qt::Vertical) { endPos.ry() += m_view->scrollOffset(); if (m_view->itemSize().width() < 0) { @@ -483,6 +530,10 @@ return false; } + if (m_pressedIndex >= 0) { + emit itemReleased(m_pressedIndex, event->button()); + } + const bool isAboveSelectionToggle = m_view->isAboveSelectionToggle(m_pressedIndex, m_pressedMousePos); if (isAboveSelectionToggle) { m_selectionTogglePressed = false; @@ -498,18 +549,12 @@ const bool shiftOrControlPressed = event->modifiers() & Qt::ShiftModifier || event->modifiers() & Qt::ControlModifier; - bool clearSelection = !shiftOrControlPressed && event->button() != Qt::RightButton; - KItemListRubberBand* rubberBand = m_view->rubberBand(); if (rubberBand->isActive()) { disconnect(rubberBand, SIGNAL(endPositionChanged(QPointF,QPointF)), this, SLOT(slotRubberBandChanged())); rubberBand->setActive(false); m_oldSelection.clear(); m_view->setAutoScroll(false); - - if (rubberBand->startPosition() != rubberBand->endPosition()) { - clearSelection = false; - } } const QPointF pos = transform.map(event->pos()); @@ -518,11 +563,6 @@ if (index >= 0 && index == m_pressedIndex) { // The release event is done above the same item as the press event - if (clearSelection) { - // Clear the previous selection but reselect the current index - m_selectionManager->setSelectedItems(QSet() << index); - } - if (event->button() & Qt::LeftButton) { bool emitItemActivated = true; if (m_view->isAboveExpansionToggle(index, pos)) { @@ -543,8 +583,6 @@ } else if (event->button() & Qt::MidButton) { emit itemMiddleClicked(index); } - } else if (clearSelection) { - m_selectionManager->clearSelection(); } m_pressedMousePos = QPointF(); diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistcontroller.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistcontroller.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistcontroller.h 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistcontroller.h 2011-12-20 19:10:51.000000000 +0000 @@ -166,6 +166,17 @@ */ void itemUnhovered(int index); + /** + * Is emitted if a mouse-button has been pressed above an item. + */ + void itemPressed(int index, Qt::MouseButton button); + + /** + * Is emitted if a mouse-button has been released above an item. + * It is assured that the signal itemPressed() has been emitted before. + */ + void itemReleased(int index, Qt::MouseButton button); + void itemExpansionToggleClicked(int index); /** diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistheader.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistheader.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistheader.cpp 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistheader.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -176,13 +176,17 @@ const int sortRoleIndex = m_visibleRoles.indexOf(sortRole); if (m_pressedRoleIndex == sortRoleIndex) { // Toggle the sort order - const Qt::SortOrder toggled = (m_model->sortOrder() == Qt::AscendingOrder) ? + const Qt::SortOrder previous = m_model->sortOrder(); + const Qt::SortOrder current = (m_model->sortOrder() == Qt::AscendingOrder) ? Qt::DescendingOrder : Qt::AscendingOrder; - m_model->setSortOrder(toggled); + m_model->setSortOrder(current); + emit sortOrderChanged(current, previous); } else { // Change the sort role - const QByteArray sortRole = m_visibleRoles.at(m_pressedRoleIndex); - m_model->setSortRole(sortRole); + const QByteArray previous = m_model->sortRole(); + const QByteArray current = m_visibleRoles.at(m_pressedRoleIndex); + m_model->setSortRole(current); + emit sortRoleChanged(current, previous); } } diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistheader_p.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistheader_p.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistheader_p.h 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistheader_p.h 2011-12-20 19:10:51.000000000 +0000 @@ -60,6 +60,22 @@ qreal currentWidth, qreal previousWidth); + /** + * Is emitted if the user has changed the sort order by clicking on a + * header item. The sort order of the model has already been adjusted to + * the current sort order. Note that no signal will be emitted if the + * sort order of the model has been changed without user interaction. + */ + void sortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous); + + /** + * Is emitted if the user has changed the sort role by clicking on a + * header item. The sort role of the model has already been adjusted to + * the current sort role. Note that no signal will be emitted if the + * sort role of the model has been changed without user interaction. + */ + void sortRoleChanged(const QByteArray& current, const QByteArray& previous); + protected: virtual void mousePressEvent(QGraphicsSceneMouseEvent* event); virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent* event); diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistselectionmanager.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistselectionmanager.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistselectionmanager.cpp 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistselectionmanager.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -293,15 +293,19 @@ if (currentItem < itemRange.index) { break; } + if (currentItem >= itemRange.index + itemRange.count) { currentItem -= itemRange.count; - } else if (currentItem >= m_model->count()) { + } + + if (currentItem >= m_model->count()) { currentItem = m_model->count() - 1; } } // Calling setCurrentItem would trigger the selectionChanged signal, but we want to // emit it only once in this function -> change the current item manually and emit currentChanged m_currentItem = currentItem; + Q_ASSERT(m_currentItem < m_model->count()); emit currentChanged(m_currentItem, previousCurrent); } diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -35,7 +35,7 @@ m_animation(0) { m_animation = new QPropertyAnimation(this); - m_animation->setDuration(300); + m_animation->setDuration(200); connect(m_animation, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)), this, SLOT(slotAnimationStateChanged(QAbstractAnimation::State,QAbstractAnimation::State))); diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistviewanimation.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistviewanimation.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistviewanimation.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistviewanimation.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -22,16 +22,21 @@ #include "kitemlistview.h" #include +#include #include #include KItemListViewAnimation::KItemListViewAnimation(QObject* parent) : QObject(parent), + m_animationDuration(200), m_scrollOrientation(Qt::Vertical), m_scrollOffset(0), m_animation() { + if (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) { + m_animationDuration = 1; + } } KItemListViewAnimation::~KItemListViewAnimation() @@ -117,7 +122,6 @@ { stop(widget, type); - const int duration = 200; QPropertyAnimation* propertyAnim = 0; switch (type) { @@ -128,7 +132,7 @@ } propertyAnim = new QPropertyAnimation(widget, "pos"); - propertyAnim->setDuration(duration); + propertyAnim->setDuration(m_animationDuration); propertyAnim->setEndValue(newPos); break; } @@ -136,7 +140,7 @@ case CreateAnimation: { propertyAnim = new QPropertyAnimation(widget, "opacity"); propertyAnim->setEasingCurve(QEasingCurve::InQuart); - propertyAnim->setDuration(duration); + propertyAnim->setDuration(m_animationDuration); propertyAnim->setStartValue(0.0); propertyAnim->setEndValue(1.0); break; @@ -145,7 +149,7 @@ case DeleteAnimation: { propertyAnim = new QPropertyAnimation(widget, "opacity"); propertyAnim->setEasingCurve(QEasingCurve::OutQuart); - propertyAnim->setDuration(duration); + propertyAnim->setDuration(m_animationDuration); propertyAnim->setStartValue(1.0); propertyAnim->setEndValue(0.0); break; @@ -158,7 +162,7 @@ } propertyAnim = new QPropertyAnimation(widget, "size"); - propertyAnim->setDuration(duration); + propertyAnim->setDuration(m_animationDuration); propertyAnim->setEndValue(newSize); break; } diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistviewanimation_p.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistviewanimation_p.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistviewanimation_p.h 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistviewanimation_p.h 2011-12-20 19:10:51.000000000 +0000 @@ -69,6 +69,7 @@ private: enum { AnimationTypeCount = 4 }; + int m_animationDuration; Qt::Orientation m_scrollOrientation; qreal m_scrollOffset; QHash m_animation[AnimationTypeCount]; diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistview.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistview.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistview.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistview.cpp 2011-12-21 00:15:26.000000000 +0000 @@ -127,7 +127,7 @@ } } - doLayout(Animation, 0, 0); + doLayout(Animation); onScrollOrientationChanged(orientation, previousOrientation); emit scrollOrientationChanged(orientation, previousOrientation); @@ -159,7 +159,7 @@ } m_sizeHintResolver->clearCache(); - doLayout(Animation, 0, 0); + doLayout(Animation); onItemSizeChanged(itemSize, previousSize); } @@ -181,9 +181,11 @@ m_layouter->setScrollOffset(offset); m_animation->setScrollOffset(offset); - if (!m_layoutTimer->isActive()) { - doLayout(NoAnimation, 0, 0); - } + + // Don't check whether the m_layoutTimer is active: Changing the + // scroll offset must always trigger a synchronous layout, otherwise + // the smooth-scrolling might get jerky. + doLayout(NoAnimation); onScrollOffsetChanged(offset, previousOffset); } @@ -204,7 +206,7 @@ m_header->setPos(-offset, 0); } if (!m_layoutTimer->isActive()) { - doLayout(NoAnimation, 0, 0); + doLayout(NoAnimation); } } @@ -241,7 +243,7 @@ } updateVisibleRolesSizes(); - doLayout(Animation, 0, 0); + doLayout(Animation); onVisibleRolesChanged(roles, previousRoles); } @@ -330,7 +332,7 @@ } m_sizeHintResolver->clearCache(); - doLayout(Animation, 0, 0); + doLayout(Animation); onStyleOptionChanged(option, previousOption); } @@ -437,9 +439,26 @@ return m_layouter->itemRect(index); } +QRectF KItemListView::itemContextRect(int index) const +{ + QRectF contextRect; + + const KItemListWidget* widget = m_visibleItems.value(index); + if (widget) { + contextRect = widget->iconRect() | widget->textRect(); + contextRect.translate(itemRect(index).topLeft()); + } + + return contextRect; +} + void KItemListView::scrollToItem(int index) { - const QRectF viewGeometry = geometry(); + QRectF viewGeometry = geometry(); + if (m_header) { + const qreal headerHeight = m_header->size().height(); + viewGeometry.adjust(0, headerHeight, 0, 0); + } const QRectF currentRect = itemRect(index); if (!viewGeometry.contains(currentRect)) { @@ -489,7 +508,7 @@ if (m_activeTransactions == 0) { onTransactionEnd(); - doLayout(Animation, 0, 0); + doLayout(Animation); } } @@ -510,10 +529,14 @@ m_header->setVisibleRolesWidths(headerRolesWidths()); m_header->setZValue(1); - m_useHeaderWidths = false; - connect(m_header, SIGNAL(visibleRoleWidthChanged(QByteArray,qreal,qreal)), this, SLOT(slotVisibleRoleWidthChanged(QByteArray,qreal,qreal))); + connect(m_header, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)), + this, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder))); + connect(m_header, SIGNAL(sortRoleChanged(QByteArray,QByteArray)), + this, SIGNAL(sortRoleChanged(QByteArray,QByteArray))); + + m_useHeaderWidths = false; m_layouter->setHeaderHeight(m_header->size().height()); } else if (!show && m_header) { @@ -754,7 +777,6 @@ m_layouter->markAsDirty(); if (m_model->count() == count && maximumScrollOffset() > size().height()) { - kDebug() << "Scrollbar required, skipping layout"; const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent); QSizeF layouterSize = m_layouter->size(); if (scrollOrientation() == Qt::Vertical) { @@ -882,7 +904,7 @@ } } - doLayout(NoAnimation, 0, 0); + doLayout(NoAnimation); } void KItemListView::slotItemsChanged(const KItemRangeList& itemRanges, @@ -919,7 +941,7 @@ // The sort-role has been changed which might result // in modified group headers updateVisibleGroupHeaders(); - doLayout(NoAnimation, 0, 0); + doLayout(NoAnimation); } } } @@ -946,7 +968,7 @@ Q_ASSERT(m_visibleGroups.isEmpty()); } - doLayout(Animation, 0, 0); + doLayout(Animation); } void KItemListView::slotSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) @@ -955,7 +977,7 @@ Q_UNUSED(previous); if (m_grouped) { updateVisibleGroupHeaders(); - doLayout(Animation, 0, 0); + doLayout(Animation); } } @@ -965,7 +987,7 @@ Q_UNUSED(previous); if (m_grouped) { updateVisibleGroupHeaders(); - doLayout(Animation, 0, 0); + doLayout(Animation); } } @@ -1039,7 +1061,7 @@ void KItemListView::slotLayoutTimerFinished() { m_layouter->setSize(geometry().size()); - doLayout(Animation, 0, 0); + doLayout(Animation); } void KItemListView::slotRubberBandPosChanged() @@ -1094,7 +1116,7 @@ widget->setVisibleRolesSizes(m_stretchedVisibleRolesSizes); } - doLayout(Animation, 0, 0); + doLayout(Animation); } } @@ -1148,7 +1170,9 @@ // the autoscrolling may not get skipped anymore until a new rubberband is created m_skipAutoScrollForRubberBand = false; - setScrollOffset(scrollOffset() + m_autoScrollIncrement); + const qreal maxVisibleOffset = qMax(qreal(0), maximumScrollOffset() - visibleSize); + const qreal newScrollOffset = qMin(scrollOffset() + m_autoScrollIncrement, maxVisibleOffset); + setScrollOffset(newScrollOffset); // Trigger the autoscroll timer which will periodically call // triggerAutoScrolling() @@ -1234,7 +1258,6 @@ void KItemListView::doLayout(LayoutAnimationHint hint, int changedIndex, int changedCount) { if (m_layoutTimer->isActive()) { - kDebug() << "Stopping layout timer, synchronous layout requested"; m_layoutTimer->stop(); } @@ -1310,7 +1333,8 @@ if (animate && changedCount < 0) { // Items have been deleted, move the created item to the - // imaginary old position. + // imaginary old position. They will get animated to the new position + // later. const QRectF itemRect = m_layouter->itemRect(i - changedCount); if (itemRect.isEmpty()) { const QPointF invisibleOldPos = (scrollOrientation() == Qt::Vertical) @@ -1328,7 +1352,6 @@ if (animate) { const bool itemsRemoved = (changedCount < 0); const bool itemsInserted = (changedCount > 0); - if (itemsRemoved && (i >= changedIndex + changedCount + 1)) { // The item is located after the removed items. Animate the moving of the position. m_animation->start(widget, KItemListViewAnimation::MovingAnimation, newPos); @@ -1364,7 +1387,17 @@ widget->setVisible(true); if (widget->size() != itemBounds.size()) { + // Resize the widget for the item to the changed size. if (animate) { + // If a dynamic item size is used then no animation is done in the direction + // of the dynamic size. + if (m_itemSize.width() <= 0) { + // The width is dynamic, apply the new width without animation. + widget->resize(itemBounds.width(), widget->size().height()); + } else if (m_itemSize.height() <= 0) { + // The height is dynamic, apply the new height without animation. + widget->resize(widget->size().width(), itemBounds.height()); + } m_animation->start(widget, KItemListViewAnimation::ResizeAnimation, itemBounds.size()); } else { widget->resize(itemBounds.size()); diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistview.h kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistview.h --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistview.h 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistview.h 2011-12-20 19:10:51.000000000 +0000 @@ -185,6 +185,18 @@ QRectF itemRect(int index) const; /** + * @return The context rectangle of the item relative to the top/left of + * the currently visible area (see KItemListView::offset()). The + * context rectangle is defined by by the united rectangle of + * the icon rectangle and the text rectangle (see KItemListWidget::iconRect() + * and KItemListWidget::textRect()) and is useful as reference for e.g. aligning + * a tooltip or a context-menu for an item. Note that a context rectangle will + * only be returned for (at least partly) visible items. An empty rectangle will + * be returned for fully invisible items. + */ + QRectF itemContextRect(int index) const; + + /** * Scrolls to the item with the index \a index so that the item * will be fully visible. */ @@ -230,6 +242,24 @@ void maximumItemOffsetChanged(qreal current, qreal previous); void scrollTo(qreal newOffset); + /** + * Is emitted if the user has changed the sort order by clicking on a + * header item (see KItemListView::setHeaderShown()). The sort order + * of the model has already been adjusted to + * the current sort order. Note that no signal will be emitted if the + * sort order of the model has been changed without user interaction. + */ + void sortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous); + + /** + * Is emitted if the user has changed the sort role by clicking on a + * header item (see KItemListView::setHeaderShown()). The sort role + * of the model has already been adjusted to + * the current sort role. Note that no signal will be emitted if the + * sort role of the model has been changed without user interaction. + */ + void sortRoleChanged(const QByteArray& current, const QByteArray& previous); + protected: virtual void initializeItemListWidget(KItemListWidget* item); @@ -324,8 +354,8 @@ KItemListRubberBand* rubberBand() const; - void doLayout(LayoutAnimationHint hint, int changedIndex, int changedCount); - void doGroupHeadersLayout(LayoutAnimationHint hint, int changedIndex, int changedCount); + void doLayout(LayoutAnimationHint hint, int changedIndex = 0, int changedCount = 0); + void emitOffsetChanges(); KItemListWidget* createWidget(int index); @@ -512,7 +542,7 @@ }; template -class LIBDOLPHINPRIVATE_EXPORT KItemListWidgetCreator : public KItemListWidgetCreatorBase +class KItemListWidgetCreator : public KItemListWidgetCreatorBase { public: virtual ~KItemListWidgetCreator(); @@ -552,7 +582,7 @@ }; template -class LIBDOLPHINPRIVATE_EXPORT KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase +class KItemListGroupHeaderCreator : public KItemListGroupHeaderCreatorBase { public: virtual ~KItemListGroupHeaderCreator(); diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistviewlayouter.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistviewlayouter.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistviewlayouter.cpp 2011-11-04 14:33:30.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistviewlayouter.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -24,7 +24,7 @@ #include -#define KITEMLISTVIEWLAYOUTER_DEBUG +// #define KITEMLISTVIEWLAYOUTER_DEBUG KItemListViewLayouter::KItemListViewLayouter(QObject* parent) : QObject(parent), @@ -399,7 +399,16 @@ } if (itemCount > 0) { + // Calculate the maximum y-range of the last row for m_maximumScrollOffset m_maximumScrollOffset = m_itemRects.last().bottom(); + const qreal rowY = m_itemRects.last().y(); + + int index = m_itemRects.count() - 2; + while (index >= 0 && m_itemRects.at(index).bottom() >= rowY) { + m_maximumScrollOffset = qMax(m_maximumScrollOffset, m_itemRects.at(index).bottom()); + --index; + } + m_maximumItemOffset = m_columnCount * m_columnWidth; } else { m_maximumScrollOffset = 0; diff -Nru kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistwidget.cpp kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistwidget.cpp --- kde-baseapps-4.7.90/dolphin/src/kitemviews/kitemlistwidget.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/kitemviews/kitemlistwidget.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -121,11 +121,22 @@ if (isCurrent()) { QStyleOptionViewItemV4 viewItemOption; viewItemOption.initFrom(widget); - viewItemOption.rect = textRect().toRect(); + + const QRect iconBounds = iconRect().toRect(); + const QRect textBounds = textRect().toRect(); + if (iconBounds.bottom() > textBounds.top()) { + viewItemOption.rect = textBounds; + } else { + // See KItemListWidget::drawItemStyleOption(): The selection rectangle + // gets decreased. + viewItemOption.rect = textBounds.adjusted(1, 1, -1, -1); + } + viewItemOption.state = QStyle::State_Enabled | QStyle::State_Item; if (m_selected) { viewItemOption.state |= QStyle::State_Selected; } + viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; style()->drawPrimitive(QStyle::PE_FrameFocusRect, &viewItemOption, painter, widget); } @@ -428,17 +439,14 @@ viewItemOption.state = styleState; viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; - const bool drawMerged = (iconBounds.top() == textBounds.top() && - iconBounds.bottom() == textBounds.bottom()); - - if (drawMerged) { + if (iconBounds.bottom() > textBounds.top()) { viewItemOption.rect = iconBounds | textBounds; widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget); } else { viewItemOption.rect = iconBounds; widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget); - viewItemOption.rect = textBounds.adjusted(2, 2, -2, -2); + viewItemOption.rect = textBounds.adjusted(1, 1, -1, -1); widget->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &viewItemOption, painter, widget); } } diff -Nru kde-baseapps-4.7.90/dolphin/src/panels/folders/folderspanel.cpp kde-baseapps-4.7.95/dolphin/src/panels/folders/folderspanel.cpp --- kde-baseapps-4.7.90/dolphin/src/panels/folders/folderspanel.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/panels/folders/folderspanel.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -36,10 +36,13 @@ #include #include +#include +#include #include #include #include +#include #include #include @@ -73,8 +76,7 @@ if (m_dirLister) { KFileItemModel* model = fileItemModel(); const QSet expandedUrls = model->expandedUrls(); - m_dirLister->setShowingDotFiles(show); - m_dirLister->openUrl(m_dirLister->url(), KDirLister::Reload); + model->setShowHiddenFiles(show); model->setExpanded(expandedUrls); } } @@ -86,7 +88,7 @@ void FoldersPanel::setAutoScrolling(bool enable) { - //m_treeView->setAutoHorizontalScroll(enable); + // TODO: Not supported yet in Dolphin 2.0 FoldersPanelSettings::setAutoScrolling(enable); } @@ -143,7 +145,6 @@ m_dirLister->setMainWindow(window()); m_dirLister->setDelayedMimeTypes(true); m_dirLister->setAutoErrorHandlingEnabled(false, this); - m_dirLister->setShowingDotFiles(FoldersPanelSettings::hiddenFilesShown()); KFileItemListView* view = new KFileItemListView(); view->setWidgetCreator(new KItemListWidgetCreator()); @@ -162,6 +163,7 @@ view->setOpacity(0); KFileItemModel* model = new KFileItemModel(m_dirLister, this); + model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown()); // Use a QueuedConnection to give the view the possibility to react first on the // finished loading. connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()), Qt::QueuedConnection); @@ -177,6 +179,7 @@ connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int))); connect(m_controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF))); connect(m_controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF))); + connect(m_controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*))); // TODO: Check whether it makes sense to make an explicit API for KItemListContainer // to make the background transparent. @@ -208,7 +211,6 @@ const int key = event->key(); if ((key == Qt::Key_Enter) || (key == Qt::Key_Return)) { event->accept(); - //updateActiveView(m_treeView->currentIndex()); } else { Panel::keyPressEvent(event); } @@ -254,6 +256,29 @@ } } +void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) +{ + if (index >= 0) { + KFileItemModel* model = fileItemModel(); + KFileItem destItem = model->fileItem(index); + if (destItem.isNull()) { + destItem = model->rootItem(); + if (destItem.isNull()) { + kWarning() << "No destination item available for drop operation."; + return; + } + } + + QDropEvent dropEvent(event->pos().toPoint(), + event->possibleActions(), + event->mimeData(), + event->buttons(), + event->modifiers()); + + DragAndDropHelper::dropUrls(destItem, &dropEvent); + } +} + void FoldersPanel::slotLoadingCompleted() { if (m_controller->view()->opacity() == 0) { @@ -275,22 +300,6 @@ m_updateCurrentItem = false; } -void FoldersPanel::slotHorizontalScrollBarMoved(int value) -{ - Q_UNUSED(value); - // Disable the auto-scrolling until the vertical scrollbar has - // been moved by the user. - //m_treeView->setAutoHorizontalScroll(false); -} - -void FoldersPanel::slotVerticalScrollBarMoved(int value) -{ - Q_UNUSED(value); - // Enable the auto-scrolling again (it might have been disabled by - // moving the horizontal scrollbar). - //m_treeView->setAutoHorizontalScroll(FoldersPanelSettings::autoScrolling()); -} - void FoldersPanel::startFadeInAnimation() { QPropertyAnimation* anim = new QPropertyAnimation(m_controller->view(), "opacity", this); diff -Nru kde-baseapps-4.7.90/dolphin/src/panels/folders/folderspanel.h kde-baseapps-4.7.95/dolphin/src/panels/folders/folderspanel.h --- kde-baseapps-4.7.90/dolphin/src/panels/folders/folderspanel.h 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/panels/folders/folderspanel.h 2011-12-20 19:10:51.000000000 +0000 @@ -26,6 +26,7 @@ class KDirLister; class KFileItemModel; class KItemListController; +class QGraphicsSceneDragDropEvent; /** * @brief Shows a tree view of the directories starting from @@ -71,13 +72,10 @@ void slotItemMiddleClicked(int index); void slotItemContextMenuRequested(int index, const QPointF& pos); void slotViewContextMenuRequested(const QPointF& pos); + void slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event); void slotLoadingCompleted(); - void slotHorizontalScrollBarMoved(int value); - - void slotVerticalScrollBarMoved(int value); - /** * Increases the opacity of the view step by step until it is fully * opaque. diff -Nru kde-baseapps-4.7.90/dolphin/src/panels/information/informationpanel.cpp kde-baseapps-4.7.95/dolphin/src/panels/information/informationpanel.cpp --- kde-baseapps-4.7.90/dolphin/src/panels/information/informationpanel.cpp 2011-08-07 15:40:34.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/panels/information/informationpanel.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -48,21 +48,13 @@ void InformationPanel::setSelection(const KFileItemList& selection) { - if (!isVisible()) { - return; - } + m_selection = selection; + m_fileItem = KFileItem(); - if (selection.isEmpty() && m_selection.isEmpty()) { - // The selection has not really changed, only the current index. - // QItemSelectionModel emits a signal in this case and it is less - // expensive doing the check this way instead of patching - // DolphinView::emitSelectionChanged(). + if (!isVisible()) { return; } - m_selection = selection; - m_fileItem = KFileItem(); - const int count = selection.count(); if (count == 0) { if (!isEqualToShownUrl(url())) { @@ -357,6 +349,7 @@ connect(m_content, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl))); QVBoxLayout* layout = new QVBoxLayout(this); + layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_content); m_initialized = true; diff -Nru kde-baseapps-4.7.90/dolphin/src/panels/places/placespanel.cpp kde-baseapps-4.7.95/dolphin/src/panels/places/placespanel.cpp --- kde-baseapps-4.7.90/dolphin/src/panels/places/placespanel.cpp 2011-08-07 15:40:34.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/panels/places/placespanel.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -22,6 +22,7 @@ #include #include +#include PlacesPanel::PlacesPanel(QWidget* parent) : KFilePlacesView(parent), @@ -46,10 +47,9 @@ void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent) { - Q_UNUSED(dest); - Q_UNUSED(event); Q_UNUSED(parent); - //DragAndDropHelper::instance().dropUrls(KFileItem(), dest, event, parent); + const KFileItem destItem(KFileItem::Unknown, KFileItem::Unknown, dest); + DragAndDropHelper::dropUrls(destItem, event); } void PlacesPanel::emitExtendedUrlChangedSignal(const KUrl& url) diff -Nru kde-baseapps-4.7.90/dolphin/src/panels/search/searchpanel.cpp kde-baseapps-4.7.95/dolphin/src/panels/search/searchpanel.cpp --- kde-baseapps-4.7.90/dolphin/src/panels/search/searchpanel.cpp 2011-07-27 18:36:38.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/panels/search/searchpanel.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -95,6 +95,7 @@ } delete m_lastSetUrlStatJob; + m_lastSetUrlStatJob = 0; if (isNepomukUrl) { // Reset the current query and disable the facet-widget until diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphingeneral.desktop kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphingeneral.desktop --- kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphingeneral.desktop 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphingeneral.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -292,3 +292,23 @@ Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager +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[fi]=tiedostonhallinta +X-KDE-Keywords[hu]=fájlkezelő +X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[kk]=file manager +X-KDE-Keywords[nb]=filbehandler +X-KDE-Keywords[nds]=Dateipleger +X-KDE-Keywords[nl]=bestandsbeheerder +X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ +X-KDE-Keywords[pt]=gestor de ficheiros +X-KDE-Keywords[pt_BR]=gerenciador de arquivos +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_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop --- kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -42,7 +42,7 @@ Name[mk]=Навигација во Делфин Name[ml]=ഡോള്‍ഫിന്‍ നാവിഗേഷന്‍ Name[ms]=Navigasi Dolphin -Name[nb]=Dolphin navigasjon +Name[nb]=Navigasjon i Dolphin Name[nds]=Dolphin-Navigeren Name[nl]=Dolphin-navigatie Name[nn]=Navigasjon i Dolphin @@ -263,7 +263,7 @@ Comment[mk]=Конфигурирајте ја навигацијата за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ നീക്കങ്ങള്‍ ക്രമീകരിയ്ക്കുക Comment[ms]=Selaraskan tetapan pengurus fail -Comment[nb]=Sett opp filbehandler-navigasjon +Comment[nb]=Sett opp navigasjon i filbehandleren Comment[nds]=De Dateipleger-Navigeren instellen Comment[nl]=Bestandsbeheerdernavigatie configureren Comment[nn]=Set opp navigasjonen i filhandsamaren @@ -292,3 +292,23 @@ Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager +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[fi]=tiedostonhallinta +X-KDE-Keywords[hu]=fájlkezelő +X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[kk]=file manager +X-KDE-Keywords[nb]=filbehandler +X-KDE-Keywords[nds]=Dateipleger +X-KDE-Keywords[nl]=bestandsbeheerder +X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ +X-KDE-Keywords[pt]=gestor de ficheiros +X-KDE-Keywords[pt_BR]=gerenciador de arquivos +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_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphinservices.desktop kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphinservices.desktop --- kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphinservices.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphinservices.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -215,7 +215,7 @@ Comment[mk]=Конфигурирајте ги сервисите за менаџерот на датотеки Comment[ml]=ഫയല്‍ നടത്തിപ്പുകാരന്റെ സേവനങ്ങള്‍ ക്രമീകരിയ്ക്കുക Comment[ms]=Selaraskan tetapan pengurus fail -Comment[nb]=Tilpass filbehandler-tjenester +Comment[nb]=Sett opp tjenester i filbehandleren Comment[nds]=Dateipleger-Deensten instellen Comment[nl]=Bestandsbeheerderservices configureren Comment[nn]=Set opp tenester i filhandsamaren @@ -243,3 +243,23 @@ Comment[zh_CN]=配置文件管理器服务 Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager +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[fi]=tiedostonhallinta +X-KDE-Keywords[hu]=fájlkezelő +X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[kk]=file manager +X-KDE-Keywords[nb]=filbehandler +X-KDE-Keywords[nds]=Dateipleger +X-KDE-Keywords[nl]=bestandsbeheerder +X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ +X-KDE-Keywords[pt]=gestor de ficheiros +X-KDE-Keywords[pt_BR]=gerenciador de arquivos +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_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop --- kde-baseapps-4.7.90/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -165,7 +165,7 @@ Name[es]=Modos de vista Name[et]=Vaaterežiimid Name[eu]=Ikuspegi moduak -Name[fi]=Katso tiloja +Name[fi]=Katselutilat Name[fr]=Modes d'affichage Name[fy]=Werjeftemodus Name[ga]=Móid Amhairc @@ -236,7 +236,7 @@ Comment[es]=Configurar los modos de vista del gestor de archivos Comment[et]=Failihalduri vaaterežiimide seadistamine Comment[eu]=Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak -Comment[fi]=Muokkaa tiedostonhallinnan näkymätiloja +Comment[fi]=Muokkaa tiedostonhallinnan katselutiloja Comment[fr]=Configuration des modes d'affichage du gestionnaire de fichiers Comment[fy]=Triembehear werjeftemodus ynstelle Comment[ga]=Cumraigh amhairc bhainisteoir na gcomhad @@ -290,3 +290,23 @@ Comment[zh_CN]=配置文件管理器视图模式 Comment[zh_TW]=設定檔案管理員檢視模式 X-KDE-Keywords=file manager +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[fi]=tiedostonhallinta +X-KDE-Keywords[hu]=fájlkezelő +X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[kk]=file manager +X-KDE-Keywords[nb]=filbehandler +X-KDE-Keywords[nds]=Dateipleger +X-KDE-Keywords[nl]=bestandsbeheerder +X-KDE-Keywords[nn]=filhandsamar +X-KDE-Keywords[pa]=ਫਾਇਲ ਮੈਨੇਜਰ +X-KDE-Keywords[pt]=gestor de ficheiros +X-KDE-Keywords[pt_BR]=gerenciador de arquivos +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_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewmodesettings.cpp kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewmodesettings.cpp --- kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewmodesettings.cpp 1970-01-01 00:00:00.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewmodesettings.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -0,0 +1,141 @@ +/*************************************************************************** + * Copyright (C) 2011 by Peter Penz * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#include "viewmodesettings.h" + +#include "dolphin_iconsmodesettings.h" +#include "dolphin_detailsmodesettings.h" +#include "dolphin_compactmodesettings.h" + +#define VIEWMODESETTINGS_SET_VALUE(mode, setValue, value) \ + switch (mode) { \ + case ViewModeSettings::IconsMode: IconsModeSettings::setValue(value); break; \ + case ViewModeSettings::CompactMode: CompactModeSettings::setValue(value); break; \ + case ViewModeSettings::DetailsMode: DetailsModeSettings::setValue(value); break; \ + default: Q_ASSERT(false); break; \ + } + +#define VIEWMODESETTINGS_RETURN_VALUE(mode, getValue, type) \ + type value; \ + switch (m_mode) { \ + case IconsMode: value = IconsModeSettings::getValue(); break; \ + case CompactMode: value = CompactModeSettings::getValue(); break; \ + case DetailsMode: value = DetailsModeSettings::getValue(); break; \ + default: Q_ASSERT(false); break; \ + } \ + return value + +ViewModeSettings::ViewModeSettings(ViewMode mode) : + m_mode(mode) +{ +} + +ViewModeSettings::~ViewModeSettings() +{ +} + +void ViewModeSettings::setIconSize(int size) const +{ + VIEWMODESETTINGS_SET_VALUE(m_mode, setIconSize, size); +} + +int ViewModeSettings::iconSize() const +{ + VIEWMODESETTINGS_RETURN_VALUE(m_mode, iconSize, int); +} + +void ViewModeSettings::setPreviewSize(int size) const +{ + VIEWMODESETTINGS_SET_VALUE(m_mode, setPreviewSize, size); +} + +int ViewModeSettings::previewSize() const +{ + VIEWMODESETTINGS_RETURN_VALUE(m_mode, previewSize, int); +} + +void ViewModeSettings::setUseSystemFont(bool flag) +{ + VIEWMODESETTINGS_SET_VALUE(m_mode, setUseSystemFont, flag); +} + +bool ViewModeSettings::useSystemFont() const +{ + VIEWMODESETTINGS_RETURN_VALUE(m_mode, useSystemFont, bool); +} + +void ViewModeSettings::setFontFamily(const QString& fontFamily) +{ + VIEWMODESETTINGS_SET_VALUE(m_mode, setFontFamily, fontFamily); +} + +QString ViewModeSettings::fontFamily() const +{ + VIEWMODESETTINGS_RETURN_VALUE(m_mode, fontFamily, QString); +} + +void ViewModeSettings::setFontSize(qreal fontSize) +{ + VIEWMODESETTINGS_SET_VALUE(m_mode, setFontSize, fontSize); +} + +qreal ViewModeSettings::fontSize() const +{ + VIEWMODESETTINGS_RETURN_VALUE(m_mode, fontSize, qreal); +} + +void ViewModeSettings::setItalicFont(bool italic) +{ + VIEWMODESETTINGS_SET_VALUE(m_mode, setItalicFont, italic); +} + +bool ViewModeSettings::italicFont() const +{ + VIEWMODESETTINGS_RETURN_VALUE(m_mode, italicFont, bool); +} + +void ViewModeSettings::setFontWeight(int fontWeight) +{ + VIEWMODESETTINGS_SET_VALUE(m_mode, setFontWeight, fontWeight); +} + +int ViewModeSettings::fontWeight() const +{ + VIEWMODESETTINGS_RETURN_VALUE(m_mode, fontWeight, int); +} + +void ViewModeSettings::readConfig() +{ + switch (m_mode) { + case ViewModeSettings::IconsMode: IconsModeSettings::self()->readConfig(); break; + case ViewModeSettings::CompactMode: CompactModeSettings::self()->readConfig(); break; + case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->readConfig(); break; + default: Q_ASSERT(false); break; + } +} + +void ViewModeSettings::writeConfig() +{ + switch (m_mode) { + case ViewModeSettings::IconsMode: IconsModeSettings::self()->writeConfig(); break; + case ViewModeSettings::CompactMode: CompactModeSettings::self()->writeConfig(); break; + case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->writeConfig(); break; + default: Q_ASSERT(false); break; + } +} diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewmodesettings.h kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewmodesettings.h --- kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewmodesettings.h 1970-01-01 00:00:00.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewmodesettings.h 2011-12-20 19:10:51.000000000 +0000 @@ -0,0 +1,70 @@ +/*************************************************************************** + * Copyright (C) 2011 by Peter Penz * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#ifndef VIEWMODESETTINGS_H +#define VIEWMODESETTINGS_H + +#include + +/** + * @short Helper class for accessing similar properties of IconsModeSettings, + * CompactModeSettings and DetailsModeSettings. + */ +class ViewModeSettings +{ +public: + enum ViewMode + { + IconsMode, + CompactMode, + DetailsMode + }; + + ViewModeSettings(ViewMode mode); + virtual ~ViewModeSettings(); + + void setIconSize(int size) const; + int iconSize() const; + + void setPreviewSize(int size) const; + int previewSize() const; + + void setUseSystemFont(bool flag); + bool useSystemFont() const; + + void setFontFamily(const QString& fontFamily); + QString fontFamily() const; + + void setFontSize(qreal fontSize); + qreal fontSize() const; + + void setItalicFont(bool italic); + bool italicFont() const; + + void setFontWeight(int fontWeight); + int fontWeight() const; + + void readConfig(); + void writeConfig(); + +private: + ViewMode m_mode; +}; + +#endif diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewsettingstab.cpp kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewsettingstab.cpp --- kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewsettingstab.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewsettingstab.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -34,41 +34,6 @@ #include -template -void apply(int iconSizeValue, int previewSizeValue, const QFont& font, bool useSystemFont) -{ - const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(iconSizeValue); - const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(previewSizeValue); - T::setIconSize(iconSize); - T::setPreviewSize(previewSize); - - T::setUseSystemFont(useSystemFont); - T::setFontFamily(font.family()); - T::setFontSize(font.pointSizeF()); - T::setItalicFont(font.italic()); - T::setFontWeight(font.weight()); - - T::self()->writeConfig(); -} - -template -void load(int* iconSizeValue, int* previewSizeValue, QFont* font, bool* useSystemFont) -{ - const QSize iconSize(T::iconSize(), T::iconSize()); - *iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize); - - const QSize previewSize(T::previewSize(), T::previewSize()); - *previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize); - - *useSystemFont = T::useSystemFont(); - - *font = QFont(T::fontFamily(), qRound(T::fontSize())); - font->setItalic(T::italicFont()); - font->setWeight(T::fontWeight()); - font->setPointSizeF(T::fontSize()); -} - - ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : QWidget(parent), m_mode(mode), @@ -146,26 +111,27 @@ void ViewSettingsTab::applySettings() { - const int defaultSize = m_defaultSizeSlider->value(); - const int previewSize = m_previewSizeSlider->value(); const QFont font = m_fontRequester->currentFont(); const bool useSystemFont = (m_fontRequester->mode() == DolphinFontRequester::SystemFont); - switch (m_mode) { - case IconsMode: + if (m_mode == IconsMode) { IconsModeSettings::setTextWidthIndex(m_textWidthBox->currentIndex()); - apply(defaultSize, previewSize, font, useSystemFont); - break; - case CompactMode: - apply(defaultSize, previewSize, font, useSystemFont); - break; - case DetailsMode: - apply(defaultSize, previewSize, font, useSystemFont); - break; - default: - Q_ASSERT(false); - break; } + + ViewModeSettings settings(viewMode()); + + const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_defaultSizeSlider->value()); + const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_previewSizeSlider->value()); + settings.setIconSize(iconSize); + settings.setPreviewSize(previewSize); + + settings.setUseSystemFont(useSystemFont); + settings.setFontFamily(font.family()); + settings.setFontSize(font.pointSizeF()); + settings.setItalicFont(font.italic()); + settings.setFontWeight(font.weight()); + + settings.writeConfig(); } void ViewSettingsTab::restoreDefaultSettings() @@ -185,31 +151,41 @@ void ViewSettingsTab::loadSettings() { - int iconSizeValue = 0; - int previewSizeValue = 0; - QFont font; - bool useSystemFont = false; - - switch (m_mode) { - case IconsMode: + if (m_mode == IconsMode) { m_textWidthBox->setCurrentIndex(IconsModeSettings::textWidthIndex()); - load(&iconSizeValue, &previewSizeValue, &font, &useSystemFont); - break; - case CompactMode: - load(&iconSizeValue, &previewSizeValue, &font, &useSystemFont); - break; - case DetailsMode: - load(&iconSizeValue, &previewSizeValue, &font, &useSystemFont); - break; - default: - Q_ASSERT(false); - break; - } - - m_defaultSizeSlider->setValue(iconSizeValue); - m_previewSizeSlider->setValue(previewSizeValue); - m_fontRequester->setMode(useSystemFont ? DolphinFontRequester::SystemFont : DolphinFontRequester::CustomFont); + } + + const ViewModeSettings settings(viewMode()); + const QSize iconSize(settings.iconSize(), settings.iconSize()); + m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize)); + + const QSize previewSize(settings.previewSize(), settings.previewSize()); + m_previewSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(previewSize)); + + m_fontRequester->setMode(settings.useSystemFont() + ? DolphinFontRequester::SystemFont + : DolphinFontRequester::CustomFont); + + QFont font(settings.fontFamily(), qRound(settings.fontSize())); + font.setItalic(settings.italicFont()); + font.setWeight(settings.fontWeight()); + font.setPointSizeF(settings.fontSize()); m_fontRequester->setCustomFont(font); } +ViewModeSettings::ViewMode ViewSettingsTab::viewMode() const +{ + ViewModeSettings::ViewMode mode; + + switch (m_mode) { + case ViewSettingsTab::IconsMode: mode = ViewModeSettings::IconsMode; break; + case ViewSettingsTab::CompactMode: mode = ViewModeSettings::CompactMode; break; + case ViewSettingsTab::DetailsMode: mode = ViewModeSettings::DetailsMode; break; + default: Q_ASSERT(false); break; + } + + return mode; +} + + #include "viewsettingstab.moc" diff -Nru kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewsettingstab.h kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewsettingstab.h --- kde-baseapps-4.7.90/dolphin/src/settings/viewmodes/viewsettingstab.h 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/settings/viewmodes/viewsettingstab.h 2011-12-20 19:10:51.000000000 +0000 @@ -21,6 +21,7 @@ #define VIEWSETTINGSTAB_H #include +#include class DolphinFontRequester; class KComboBox; @@ -53,6 +54,8 @@ private: void loadSettings(); + ViewModeSettings::ViewMode viewMode() const; + private: Mode m_mode; QSlider* m_defaultSizeSlider; diff -Nru kde-baseapps-4.7.90/dolphin/src/statusbar/dolphinstatusbar.cpp kde-baseapps-4.7.95/dolphin/src/statusbar/dolphinstatusbar.cpp --- kde-baseapps-4.7.90/dolphin/src/statusbar/dolphinstatusbar.cpp 2011-11-17 20:56:05.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/statusbar/dolphinstatusbar.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -74,6 +74,7 @@ connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int))); connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int))); connect(m_view, SIGNAL(zoomLevelChanged(int,int)), this, SLOT(slotZoomLevelChanged(int,int))); + connect(m_view, SIGNAL(previewsShownChanged(bool)), this, SLOT(slotPreviewsShownChanged(bool))); // Initialize space information m_spaceInfo = new StatusBarSpaceInfo(this); @@ -328,6 +329,13 @@ m_zoomSlider->setValue(current); } +void DolphinStatusBar::slotPreviewsShownChanged(bool shown) +{ + Q_UNUSED(shown); + // The zoom level might be different with/without previews -> update the zoom slider. + m_zoomSlider->setValue(m_view->zoomLevel()); +} + void DolphinStatusBar::updateProgressInfo() { const bool isErrorShown = (m_messageLabel->type() == KonqStatusBarMessageLabel::Error); diff -Nru kde-baseapps-4.7.90/dolphin/src/statusbar/dolphinstatusbar.h kde-baseapps-4.7.95/dolphin/src/statusbar/dolphinstatusbar.h --- kde-baseapps-4.7.90/dolphin/src/statusbar/dolphinstatusbar.h 2011-08-07 15:40:34.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/statusbar/dolphinstatusbar.h 2011-12-20 19:10:51.000000000 +0000 @@ -139,6 +139,7 @@ void showZoomSliderToolTip(int zoomLevel); void slotZoomLevelChanged(int current, int previous); + void slotPreviewsShownChanged(bool shown); void updateProgressInfo(); diff -Nru kde-baseapps-4.7.90/dolphin/src/tests/kfileitemmodeltest.cpp kde-baseapps-4.7.95/dolphin/src/tests/kfileitemmodeltest.cpp --- kde-baseapps-4.7.90/dolphin/src/tests/kfileitemmodeltest.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/tests/kfileitemmodeltest.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -162,14 +162,17 @@ void KFileItemModelTest::testRemoveItems() { m_testDir->createFile("a.txt"); + m_testDir->createFile("b.txt"); m_dirLister->openUrl(m_testDir->url()); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); - QCOMPARE(m_model->count(), 1); + QCOMPARE(m_model->count(), 2); + QVERIFY(isModelConsistent()); m_testDir->removeFile("a.txt"); m_dirLister->updateDirectory(m_testDir->url()); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout)); - QCOMPARE(m_model->count(), 0); + QCOMPARE(m_model->count(), 1); + QVERIFY(isModelConsistent()); } void KFileItemModelTest::testSetData() @@ -579,20 +582,33 @@ QTest::newRow("Sub path: A < B") << "/a/b" << "/a/b/c" << -1; QTest::newRow("Sub path: A > B") << "/a/b/c" << "/a/b" << +1; QTest::newRow("Same level: /a/1 < /a-1/1") << "/a/1" << "/a-1/1" << -1; - QTest::newRow("Same level: /a-/1 > /a/1") << "/a-1/1" << "/a/1" << +1; + QTest::newRow("Same level: /a-1/1 > /a/1") << "/a-1/1" << "/a/1" << +1; QTest::newRow("Different levels: /a/a/1 < /a/a-1") << "/a/a/1" << "/a/a-1" << -1; QTest::newRow("Different levels: /a/a-1 > /a/a/1") << "/a/a-1" << "/a/a/1" << +1; } void KFileItemModelTest::testExpansionLevelsCompare() { + QSKIP("Temporary deactivated as KFileItemModel::ItemData has been extended " + "by a 'parent' member that is required for a correct comparison. For a " + "successful test the item-data of all parents must be available.", SkipAll); + QFETCH(QString, urlA); QFETCH(QString, urlB); QFETCH(int, result); - const KFileItem a(KUrl(urlA), QString(), mode_t(-1)); - const KFileItem b(KUrl(urlB), QString(), mode_t(-1)); - QCOMPARE(m_model->expansionLevelsCompare(a, b), result); + const KFileItem itemA(KUrl(urlA), QString(), mode_t(-1)); + const KFileItem itemB(KUrl(urlB), QString(), mode_t(-1)); + + KFileItemModel::ItemData a; + a.item = itemA; + a.parent = 0; + + KFileItemModel::ItemData b; + b.item = itemB; + b.parent = 0; + + QCOMPARE(m_model->expansionLevelsCompare(&a, &b), result); } void KFileItemModelTest::testIndexForKeyboardSearch() @@ -675,6 +691,10 @@ bool KFileItemModelTest::isModelConsistent() const { + if (m_model->m_items.count() != m_model->m_itemData.count()) { + return false; + } + for (int i = 0; i < m_model->count(); ++i) { const KFileItem item = m_model->fileItem(i); if (item.isNull()) { diff -Nru kde-baseapps-4.7.90/dolphin/src/tests/kitemlistselectionmanagertest.cpp kde-baseapps-4.7.95/dolphin/src/tests/kitemlistselectionmanagertest.cpp --- kde-baseapps-4.7.90/dolphin/src/tests/kitemlistselectionmanagertest.cpp 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/tests/kitemlistselectionmanagertest.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -27,18 +27,28 @@ { public: DummyModel(); + void setCount(int count); virtual int count() const; virtual QHash data(int index) const; + +private: + int m_count; }; DummyModel::DummyModel() : - KItemModelBase() + KItemModelBase(), + m_count(100) +{ +} + +void DummyModel::setCount(int count) { + m_count = count; } int DummyModel::count() const { - return 100; + return m_count; } QHash DummyModel::data(int index) const @@ -48,7 +58,6 @@ } - class KItemListSelectionManagerTest : public QObject { Q_OBJECT @@ -67,24 +76,30 @@ void testAnchoredSelection(); void testChangeSelection_data(); void testChangeSelection(); + void testDeleteCurrentItem_data(); + void testDeleteCurrentItem(); private: void verifySelectionChange(QSignalSpy& spy, const QSet& currentSelection, const QSet& previousSelection) const; KItemListSelectionManager* m_selectionManager; + DummyModel* m_model; }; void KItemListSelectionManagerTest::init() { + m_model = new DummyModel(); m_selectionManager = new KItemListSelectionManager(); - m_selectionManager->setModel(new DummyModel()); + m_selectionManager->setModel(m_model); } void KItemListSelectionManagerTest::cleanup() { - delete m_selectionManager->model(); delete m_selectionManager; m_selectionManager = 0; + + delete m_model; + m_model = 0; } void KItemListSelectionManagerTest::testConstructor() @@ -474,6 +489,36 @@ verifySelectionChange(spySelectionChanged, QSet(), finalSelection); } +void KItemListSelectionManagerTest::testDeleteCurrentItem_data() +{ + QTest::addColumn("oldCurrentItemIndex"); + QTest::addColumn("removeIndex"); + QTest::addColumn("removeCount"); + QTest::addColumn("newCurrentItemIndex"); + + QTest::newRow("Remove before") << 50 << 0 << 10 << 40; + QTest::newRow("Remove after") << 50 << 51 << 10 << 50; + QTest::newRow("Remove exactly current item") << 50 << 50 << 1 << 50; + QTest::newRow("Remove around current item") << 50 << 45 << 10 << 50; + QTest::newRow("Remove all except one item") << 50 << 1 << 99 << 0; +} + +void KItemListSelectionManagerTest::testDeleteCurrentItem() +{ + QFETCH(int, oldCurrentItemIndex); + QFETCH(int, removeIndex); + QFETCH(int, removeCount); + QFETCH(int, newCurrentItemIndex); + + m_selectionManager->setCurrentItem(oldCurrentItemIndex); + + const int newCount = m_model->count() - removeCount; + m_model->setCount(newCount); + m_selectionManager->itemsRemoved(KItemRangeList() << KItemRange(removeIndex, removeCount)); + + QCOMPARE(m_selectionManager->currentItem(), newCurrentItemIndex); +} + void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy& spy, const QSet& currentSelection, const QSet& previousSelection) const diff -Nru kde-baseapps-4.7.90/dolphin/src/views/dolphinfileitemlistwidget.cpp kde-baseapps-4.7.95/dolphin/src/views/dolphinfileitemlistwidget.cpp --- kde-baseapps-4.7.90/dolphin/src/views/dolphinfileitemlistwidget.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/dolphinfileitemlistwidget.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -56,10 +56,10 @@ case KVersionControlPlugin2::AddedVersion: tintColor = Qt::green; break; case KVersionControlPlugin2::RemovedVersion: tintColor = Qt::darkRed; break; case KVersionControlPlugin2::ConflictingVersion: tintColor = Qt::red; break; - case KVersionControlPlugin2::UnversionedVersion: tintColor = Qt::white; break; case KVersionControlPlugin2::IgnoredVersion: tintColor = Qt::white; break; case KVersionControlPlugin2::MissingVersion: tintColor = Qt::red; break; case KVersionControlPlugin2::NormalVersion: + case KVersionControlPlugin2::UnversionedVersion: default: break; } diff -Nru kde-baseapps-4.7.90/dolphin/src/views/dolphinitemlistcontainer.cpp kde-baseapps-4.7.95/dolphin/src/views/dolphinitemlistcontainer.cpp --- kde-baseapps-4.7.90/dolphin/src/views/dolphinitemlistcontainer.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/dolphinitemlistcontainer.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -52,6 +52,7 @@ m_fileItemListView->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); controller()->setView(m_fileItemListView); + updateFont(); updateGridSize(); } @@ -104,23 +105,13 @@ m_zoomLevel = level; + ViewModeSettings settings(viewMode()); if (previewsShown()) { const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(level); - - switch (itemLayout()) { - case KFileItemListView::IconsLayout: IconsModeSettings::setPreviewSize(previewSize); break; - case KFileItemListView::CompactLayout: CompactModeSettings::setPreviewSize(previewSize); break; - case KFileItemListView::DetailsLayout: DetailsModeSettings::setPreviewSize(previewSize); break; - default: Q_ASSERT(false); break; - } + settings.setPreviewSize(previewSize); } else { const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(level); - switch (itemLayout()) { - case KFileItemListView::IconsLayout: IconsModeSettings::setIconSize(iconSize); break; - case KFileItemListView::CompactLayout: CompactModeSettings::setIconSize(iconSize); break; - case KFileItemListView::DetailsLayout: DetailsModeSettings::setIconSize(iconSize); break; - default: Q_ASSERT(false); break; - } + settings.setIconSize(iconSize); } updateGridSize(); @@ -158,6 +149,7 @@ break; } + updateFont(); updateGridSize(); endTransaction(); } @@ -177,26 +169,21 @@ m_fileItemListView->endTransaction(); } +void DolphinItemListContainer::refresh() +{ + ViewModeSettings settings(viewMode()); + settings.readConfig(); + + updateFont(); + updateGridSize(); +} + void DolphinItemListContainer::updateGridSize() { - // Calculate the size of the icon - int iconSize; - if (previewsShown()) { - switch (itemLayout()) { - case KFileItemListView::IconsLayout: iconSize = IconsModeSettings::previewSize(); break; - case KFileItemListView::CompactLayout: iconSize = CompactModeSettings::previewSize(); break; - case KFileItemListView::DetailsLayout: iconSize = DetailsModeSettings::previewSize(); break; - default: Q_ASSERT(false); break; - } - } else { - switch (itemLayout()) { - case KFileItemListView::IconsLayout: iconSize = IconsModeSettings::iconSize(); break; - case KFileItemListView::CompactLayout: iconSize = CompactModeSettings::iconSize(); break; - case KFileItemListView::DetailsLayout: iconSize = DetailsModeSettings::iconSize(); break; - default: Q_ASSERT(false); break; - } - } + const ViewModeSettings settings(viewMode()); + // Calculate the size of the icon + const int iconSize = previewsShown() ? settings.previewSize() : settings.iconSize(); m_zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(QSize(iconSize, iconSize)); KItemListStyleOption styleOption = m_fileItemListView->styleOption(); @@ -236,4 +223,35 @@ m_fileItemListView->setItemSize(QSizeF(itemWidth, itemHeight)); } +void DolphinItemListContainer::updateFont() +{ + KItemListStyleOption styleOption = m_fileItemListView->styleOption(); + + const ViewModeSettings settings(viewMode()); + + QFont font(settings.fontFamily(), qRound(settings.fontSize())); + font.setItalic(settings.italicFont()); + font.setWeight(settings.fontWeight()); + font.setPointSizeF(settings.fontSize()); + + styleOption.font = font; + styleOption.fontMetrics = QFontMetrics(font); + + m_fileItemListView->setStyleOption(styleOption); +} + +ViewModeSettings::ViewMode DolphinItemListContainer::viewMode() const +{ + ViewModeSettings::ViewMode mode; + + switch (itemLayout()) { + case KFileItemListView::IconsLayout: mode = ViewModeSettings::IconsMode; break; + case KFileItemListView::CompactLayout: mode = ViewModeSettings::CompactMode; break; + case KFileItemListView::DetailsLayout: mode = ViewModeSettings::DetailsMode; break; + default: Q_ASSERT(false); break; + } + + return mode; +} + #include "dolphinitemlistcontainer.moc" diff -Nru kde-baseapps-4.7.90/dolphin/src/views/dolphinitemlistcontainer.h kde-baseapps-4.7.95/dolphin/src/views/dolphinitemlistcontainer.h --- kde-baseapps-4.7.90/dolphin/src/views/dolphinitemlistcontainer.h 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/dolphinitemlistcontainer.h 2011-12-20 19:10:51.000000000 +0000 @@ -22,6 +22,7 @@ #include #include +#include #include @@ -63,8 +64,16 @@ void beginTransaction(); void endTransaction(); + /** + * Refreshs the view by reapplying the (changed) viewmode settings. + */ + void refresh(); + private: void updateGridSize(); + void updateFont(); + + ViewModeSettings::ViewMode viewMode() const; private: int m_zoomLevel; diff -Nru kde-baseapps-4.7.90/dolphin/src/views/dolphinview.cpp kde-baseapps-4.7.95/dolphin/src/views/dolphinview.cpp --- kde-baseapps-4.7.90/dolphin/src/views/dolphinview.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/dolphinview.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -132,6 +132,8 @@ m_container->setVisibleRoles(QList() << "name"); m_container->installEventFilter(this); setFocusProxy(m_container); + connect(m_container->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip())); + connect(m_container->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip())); KItemListController* controller = m_container->controller(); controller->setSelectionBehavior(KItemListController::MultiSelection); @@ -144,6 +146,7 @@ connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF))); connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF))); connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF))); + connect(controller, SIGNAL(itemPressed(int,Qt::MouseButton)), this, SLOT(hideToolTip())); connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int))); connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int))); connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*))); @@ -154,6 +157,12 @@ connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted())); } + KItemListView* view = controller->view(); + connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)), + this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder))); + connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)), + this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray))); + KItemListSelectionManager* selectionManager = controller->selectionManager(); connect(selectionManager, SIGNAL(selectionChanged(QSet,QSet)), this, SLOT(slotSelectionChanged(QSet,QSet))); @@ -262,8 +271,7 @@ ViewProperties props(url()); props.setHiddenFilesShown(show); - m_dirLister->setShowingDotFiles(show); - m_dirLister->emitChanges(); + fileItemModel()->setShowHiddenFiles(show); emit hiddenFilesShownChanged(show); } @@ -446,15 +454,9 @@ void DolphinView::refresh() { - const bool oldActivationState = m_active; - const int oldZoomLevel = zoomLevel(); - m_active = true; - + GeneralSettings::self()->readConfig(); + m_container->refresh(); applyViewProperties(); - reload(); - - setActive(oldActivationState); - updateZoomLevel(oldZoomLevel); } void DolphinView::setNameFilter(const QString& nameFilter) @@ -552,9 +554,7 @@ emit urlAboutToBeChanged(url); m_url = url; - if (GeneralSettings::showToolTips()) { - m_toolTipManager->hideToolTip(); - } + hideToolTip(); // It is important to clear the items from the model before // applying the view properties, otherwise expensive operations @@ -732,18 +732,12 @@ void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos) { - if (GeneralSettings::showToolTips()) { - m_toolTipManager->hideToolTip(); - } const KFileItem item = fileItemModel()->fileItem(index); emit requestContextMenu(pos.toPoint(), item, url(), QList()); } void DolphinView::slotViewContextMenuRequested(const QPointF& pos) { - if (GeneralSettings::showToolTips()) { - m_toolTipManager->hideToolTip(); - } emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList()); } @@ -801,8 +795,8 @@ { const KFileItem item = fileItemModel()->fileItem(index); - if (GeneralSettings::showToolTips()) { - QRectF itemRect = m_container->controller()->view()->itemRect(index); + if (GeneralSettings::showToolTips() && QApplication::mouseButtons() == Qt::NoButton) { + QRectF itemRect = m_container->controller()->view()->itemContextRect(index); const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint()); itemRect.moveTo(pos); @@ -815,15 +809,20 @@ void DolphinView::slotItemUnhovered(int index) { Q_UNUSED(index); - if (GeneralSettings::showToolTips()) { - m_toolTipManager->hideToolTip(); - } + hideToolTip(); emit requestItemInfo(KFileItem()); } void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event) { - const KFileItem destItem = fileItemModel()->fileItem(index); + KFileItem destItem = fileItemModel()->fileItem(index); + if (destItem.isNull()) { + destItem = fileItemModel()->rootItem(); + if (destItem.isNull()) { + kWarning() << "No destination item available for drop operation."; + return; + } + } QDropEvent dropEvent(event->pos().toPoint(), event->possibleActions(), @@ -831,7 +830,10 @@ event->buttons(), event->modifiers()); - DragAndDropHelper::dropUrls(destItem, url(), &dropEvent, this); + const QString error = DragAndDropHelper::dropUrls(destItem, &dropEvent); + if (!error.isEmpty()) { + emit errorMessage(error); + } } void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous) @@ -950,6 +952,7 @@ const int currentIndex = m_container->controller()->selectionManager()->currentItem(); if (currentIndex != -1) { KFileItem item = fileItemModel()->fileItem(currentIndex); + Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist KUrl currentItemUrl = item.url(); stream << currentItemUrl; } else { @@ -1045,6 +1048,13 @@ } } +void DolphinView::hideToolTip() +{ + if (GeneralSettings::showToolTips()) { + m_toolTipManager->hideToolTip(); + } +} + void DolphinView::showHoverInformation(const KFileItem& item) { emit requestItemInfo(item); @@ -1100,6 +1110,29 @@ } } +void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous) +{ + Q_UNUSED(previous); + Q_ASSERT(fileItemModel()->sortOrder() == current); + + ViewProperties props(url()); + props.setSortOrder(current); + + emit sortOrderChanged(current); +} + +void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous) +{ + Q_UNUSED(previous); + Q_ASSERT(fileItemModel()->sortRole() == current); + + ViewProperties props(url()); + const Sorting sorting = sortingForSortRole(current); + props.setSorting(sorting); + + emit sortingChanged(sorting); +} + KFileItemModel* DolphinView::fileItemModel() const { return static_cast(m_container->controller()->model()); @@ -1125,9 +1158,23 @@ m_container->beginTransaction(); const ViewProperties props(url()); + KFileItemModel* model = fileItemModel(); const Mode mode = props.viewMode(); if (m_mode != mode) { + // Prevent an animated transition of the position and size of the items when switching + // the view-mode by temporary clearing the model and updating it again after the view mode + // has been modified. + const bool restoreModel = (model->count() > 0); + if (restoreModel) { + const int currentItemIndex = m_container->controller()->selectionManager()->currentItem(); + if (currentItemIndex >= 0) { + m_currentItemUrl = model->fileItem(currentItemIndex).url(); + } + m_selectedUrls = selectedItems().urlList(); + model->clear(); + } + const Mode previousMode = m_mode; m_mode = mode; @@ -1148,17 +1195,18 @@ if (m_container->zoomLevel() != oldZoomLevel) { emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel); } + + if (restoreModel) { + loadDirectory(url()); + } } const bool hiddenFilesShown = props.hiddenFilesShown(); - if (hiddenFilesShown != m_dirLister->showingDotFiles()) { - m_dirLister->setShowingDotFiles(hiddenFilesShown); - m_dirLister->emitChanges(); + if (hiddenFilesShown != model->showHiddenFiles()) { + model->setShowHiddenFiles(hiddenFilesShown); emit hiddenFilesShownChanged(hiddenFilesShown); } - KFileItemModel* model = fileItemModel(); - const bool groupedSorting = props.groupedSorting(); if (groupedSorting != model->groupedSorting()) { model->setGroupedSorting(groupedSorting); @@ -1229,16 +1277,6 @@ KonqOperations::doPaste(this, url); } -void DolphinView::updateZoomLevel(int oldZoomLevel) -{ - Q_UNUSED(oldZoomLevel); - /* const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize()); - if (oldZoomLevel != newZoomLevel) { - m_viewModeController->setZoomLevel(newZoomLevel); - emit zoomLevelChanged(newZoomLevel); - }*/ -} - KUrl::List DolphinView::simplifiedSelectedUrls() const { KUrl::List urls; diff -Nru kde-baseapps-4.7.90/dolphin/src/views/dolphinview.h kde-baseapps-4.7.95/dolphin/src/views/dolphinview.h --- kde-baseapps-4.7.90/dolphin/src/views/dolphinview.h 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/dolphinview.h 2011-12-20 19:10:51.000000000 +0000 @@ -647,6 +647,18 @@ void slotRefreshItems(); /** + * Is invoked when the sort order has been changed by the user by clicking + * on a header item. The view properties of the directory will get updated. + */ + void slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous); + + /** + * Is invoked when the sort role has been changed by the user by clicking + * on a header item. The view properties of the directory will get updated. + */ + void slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous); + + /** * Observes the item with the URL \a url. As soon as the directory * model indicates that the item is available, the item will * get selected and it is assured that the item stays visible. @@ -673,6 +685,8 @@ */ void updateViewState(); + void hideToolTip(); + //void slotUrlChangeRequested(const KUrl& url); private: @@ -695,14 +709,6 @@ void pasteToUrl(const KUrl& url); /** - * Checks whether the current item view has the same zoom level - * as \a oldZoomLevel. If this is not the case, the zoom level - * of the controller is updated and a zoomLevelChanged() signal - * is emitted. - */ - void updateZoomLevel(int oldZoomLevel); - - /** * Returns a list of URLs for all selected items. The list is * simplified, so that when the URLs are part of different tree * levels, only the parent is returned. @@ -757,10 +763,11 @@ QTimer* m_selectionChangedTimer; - KUrl m_currentItemUrl; + KUrl m_currentItemUrl; // Used for making the view to remember the current URL after F5 QPoint m_restoredContentsPosition; KUrl m_createdItemUrl; // URL for a new item that got created by the "Create New..." menu - QList m_selectedUrls; // this is used for making the View to remember selections after F5 + + QList m_selectedUrls; // Used for making the view to remember selections after F5 VersionControlObserver* m_versionControlObserver; diff -Nru kde-baseapps-4.7.90/dolphin/src/views/draganddrophelper.cpp kde-baseapps-4.7.95/dolphin/src/views/draganddrophelper.cpp --- kde-baseapps-4.7.90/dolphin/src/views/draganddrophelper.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/draganddrophelper.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -24,17 +24,18 @@ #include #include #include +#include #include #include -#include -QString DragAndDropHelper::dropUrls(const KFileItem& destItem, - const KUrl& destPath, - QDropEvent* event, - QWidget* widget) +QString DragAndDropHelper::dropUrls(const KFileItem& destItem, QDropEvent* event) { - const bool dropToItem = !destItem.isNull() && (destItem.isDir() || destItem.isDesktopFile()); - const KUrl destination = dropToItem ? destItem.url() : destPath; + Q_ASSERT(!destItem.isNull()); + + const KUrl destination = destItem.url(); + if (!destItem.isWritable()) { + return i18nc("@info:status", "Access denied. Could not write to %1", destination.pathOrUrl()); + } const QMimeData* mimeData = event->mimeData(); if (mimeData->hasFormat("application/x-kde-dndextract")) { @@ -45,14 +46,13 @@ QDBusConnection::sessionBus().call(message); } else { const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); - const int urlsCount = urls.count(); - if (urlsCount == 1 && urls.first() == destination) { - return i18nc("@info:status", "A folder cannot be dropped into itself"); - } else if (dropToItem) { - KonqOperations::doDrop(destItem, destination, event, widget); - } else { - KonqOperations::doDrop(KFileItem(), destination, event, widget); + foreach (const KUrl& url, urls) { + if (url == destination) { + return i18nc("@info:status", "A folder cannot be dropped into itself"); + } } + + KonqOperations::doDrop(destItem, destination, event, QApplication::activeWindow()); } return QString(); diff -Nru kde-baseapps-4.7.90/dolphin/src/views/draganddrophelper.h kde-baseapps-4.7.95/dolphin/src/views/draganddrophelper.h --- kde-baseapps-4.7.90/dolphin/src/views/draganddrophelper.h 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/draganddrophelper.h 2011-12-20 19:10:51.000000000 +0000 @@ -38,17 +38,12 @@ * destination. A context menu with the options * 'Move Here', 'Copy Here', 'Link Here' and * 'Cancel' is offered to the user. - * @param destItem Item of the destination (can be null, see KFileItem::isNull()). - * @param destPath Path of the destination. + * @param destItem Item of the destination. * @param event Drop event. - * @param widget Source widget where the dragging has been started. * @return Error message if dropping is not possible. If an empty string * is returned, the dropping has been successful. */ - static QString dropUrls(const KFileItem& destItem, - const KUrl& destPath, - QDropEvent* event, - QWidget* widget); + static QString dropUrls(const KFileItem& destItem, QDropEvent* event); }; #endif diff -Nru kde-baseapps-4.7.90/dolphin/src/views/renamedialog.cpp kde-baseapps-4.7.95/dolphin/src/views/renamedialog.cpp --- kde-baseapps-4.7.90/dolphin/src/views/renamedialog.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/dolphin/src/views/renamedialog.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -141,22 +141,18 @@ void RenameDialog::slotTextChanged(const QString& newName) { bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String(".")); - if (enable) { - if (m_renameOneItem) { - enable = enable && (newName != m_newName); - } else { - // Assure that the new name contains exactly one # (or a connected sequence of #'s) - const int minSplitCount = 1; - int maxSplitCount = 2; - if (newName.startsWith(QLatin1Char('#'))) { - --maxSplitCount; - } - if (newName.endsWith(QLatin1Char('#'))) { - --maxSplitCount; - } - const int splitCount = newName.split(QLatin1Char('#'), QString::SkipEmptyParts).count(); - enable = enable && (splitCount >= minSplitCount) && (splitCount <= maxSplitCount); + if (enable && !m_renameOneItem) { + // Assure that the new name contains exactly one # (or a connected sequence of #'s) + const int minSplitCount = 1; + int maxSplitCount = 2; + if (newName.startsWith(QLatin1Char('#'))) { + --maxSplitCount; } + if (newName.endsWith(QLatin1Char('#'))) { + --maxSplitCount; + } + const int splitCount = newName.split(QLatin1Char('#'), QString::SkipEmptyParts).count(); + enable = enable && (splitCount >= minSplitCount) && (splitCount <= maxSplitCount); } enableButtonOk(enable); } diff -Nru kde-baseapps-4.7.90/kdepasswd/kcm/kcm_useraccount.desktop kde-baseapps-4.7.95/kdepasswd/kcm/kcm_useraccount.desktop --- kde-baseapps-4.7.90/kdepasswd/kcm/kcm_useraccount.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/kdepasswd/kcm/kcm_useraccount.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -37,7 +37,7 @@ Name[et]=Parool ja kasutaja konto Name[eu]=Pasahitza eta erabiltzailearen kontua Name[fa]=اسم رمز و حساب کاربری -Name[fi]=Salasanat ja käyttäjätilit +Name[fi]=Salasana ja käyttäjätili Name[fr]=Compte utilisateur et mot de passe Name[fy]=Wachtwurd en brûkersbehear Name[ga]=Focal Faire agus Cuntas Úsáideora @@ -103,41 +103,23 @@ Name[zh_CN]=密码和用户信息 Name[zh_TW]=密碼與帳號資訊 X-KDE-Keywords=password;email;name;organization;realname;login image;face; echo mode; -X-KDE-Keywords[ar]=كلمة السر,البريد الإلكتروني,الاسم,المنظمة/الشركة,الاسم الحقيقي,صورة الولوج,الوجه,نمط الصدى -X-KDE-Keywords[be]=Пароль,Электроннай пошта,Імя,Назва,Арганізацыя,Сапраўднае імя,Твар,Малюнак уваходу,password,email,name,organization,realname,login image,face,echo mode -X-KDE-Keywords[bg]=Keywords=парола, е-поща, организация, сметка, потребител, вход, включване, password, email, name, organization, realname, login image, face, echo mode -X-KDE-Keywords[ca]=contrasenya;correu;nom;organització;nom real;imatge de connexió;aspecte;mode d'eco; -X-KDE-Keywords[csb]=parola,e-maila,miono,nôzwëskò,òrganizacëjô,logòwanié,brëkòwnik,miono brëkòwnika,òbrôzk,skarń,gwiôzdczi,wëskrzëniwanié parolów +X-KDE-Keywords[ca]=contrasenya;correu electrònic;nom;organització;nom real;imatge d'inici de sessió;cara;mode d'eco; +X-KDE-Keywords[da]=adgangskode;email;navn;organisation;ægtenavn;login-billede;ansigt;ekko-tilstand; X-KDE-Keywords[de]=Passwort,E-Mail,Name,Organisation,Tatsächlicher Name,Login,Anmeldebild,Bild,Echomodus -X-KDE-Keywords[el]=κωδικός πρόσβασης;email;όνομα;οργανισμός;πραγματικό όνομα;εικόνα σύνδεσης;πρόσωπο; τρόπος εμφάνισης -X-KDE-Keywords[eo]=pasvorto;retpoŝto;nomo;organizaĵo;realnomo;salutbildo;vizaĝo;eĥo moduso; -X-KDE-Keywords[es]=contraseña;correo electrónico;nombre;organización;nombre real;imagen de acceso;cara;modo de eco; -X-KDE-Keywords[et]=parool;email;e-kiri;nimi;organisatsioon;pärisnimi;kasutaja pilt;nägu; echo režiim; -X-KDE-Keywords[fa]=اسم رمز؛ رایانامه؛ نام؛ سازمان؛ نام واقعی؛ تصویر ورود؛ چهره؛ حالت پژواک؛ -X-KDE-Keywords[ga]=focal faire;ríomhphost;ainm;eagras;fíorainm;íomhá logála isteach;aghaidh;mód macalla; -X-KDE-Keywords[he]=סיסמה;דוא"ל;שם;אירגון;שם משתמש;תמונה;פרצוף;password;email;name;organization;realname;login image;face; echo mode; -X-KDE-Keywords[hu]=jelszó;e-mail;név;szervezet;valódi név;bejelentkezési kép;arc;kiírási mód; -X-KDE-Keywords[it]=password,email,nome,organizzazione,nome vero,immagine login,icona login,face,faccia,modo echo,accesso -X-KDE-Keywords[ja]=パスワード;メールアドレス;メール;Eメール;名前;組織;本名;ログイン画像;顔;エコーモード; -X-KDE-Keywords[ko]=비밀번호;암호;이름;조직;로그인 그림 -X-KDE-Keywords[nb]=passord;e-post:navn;organisasjon;fullt navn;innloggingsbilde;ansikt;ekkomodus; -X-KDE-Keywords[nds]=Passwoort;EMail;Nettpost;Naam;Organisatschoon;Reaalnaam;echt Naam;Anmellbild;Loginbild;Gesicht;Echometood; -X-KDE-Keywords[ne]=पासवर्ड;इमेल;नाम;सङ्गठन;वास्तविक नाम;लगइन छवि;मोहडा; प्रतिध्वनि मोड; -X-KDE-Keywords[nl]=wachtwoord,e-mail,organisatie,naam,login,aanmelden,afbeelding,gezicht,echo,asterisk -X-KDE-Keywords[nn]=passord;e-post;namn;organisasjon;fullt namn;innloggingsbilete;ansikt;ekkomodus; -X-KDE-Keywords[pa]=ਪਾਸਵਰਡ,ਈ-ਮੇਲ,ਨਾਂ,ਸੰਗਠਨ,ਅਸਲੀ ਨਾਂ,login image,face,echo mode -X-KDE-Keywords[pt]=senha,e-mail,nome,organização,nome real,imagem de ligação,cara,modo de eco -X-KDE-Keywords[pt_BR]=senha;e-mail;nome;organização;nome real;imagem de login;aparência;modo de eco; -X-KDE-Keywords[sl]=geslo;e-pošta;ime;organizacija;pravo ime;prijavna slika:obraz;način odmeva -X-KDE-Keywords[sr]=password;email;name;organization;realname;login image;face;echo mode;лозинка;е-пошта;име;организација;ехо;режим;лице -X-KDE-Keywords[sr@latin]=password;email;name;organization;realname;login image;face;echo mode;lozinka;e-pošta;ime;organizacija;eho;režim;lice -X-KDE-Keywords[sv]=lösenord;e-post;namn;organisation;verkligt namn;inloggningsbild;bild;ekoläge -X-KDE-Keywords[th]=รหัสผ่าน, อีเมล,ชื่อ,องค์กร,ชื่อจริง,ภาพสำหรับล็อกอิน,ใบหน้า,โหมดแสดงอักษร -X-KDE-Keywords[vi]=mật khẩu,email,tên,tổ chức,tên thật,ảnh đăng nhập,mặt cười,chế độ báo lại -X-KDE-Keywords[wa]=sicret;emile;no;organizåcion;vraiy no;imådje d' elodjaedje;môde esco; +X-KDE-Keywords[fi]=salasana;email;sähköposti;nimi;organisaatio;järjestö;oikea nimi;todellinen nimi;tunnuskuva;kaiutustila;salasanakenttä; +X-KDE-Keywords[hu]=jelszó;e-mail;név;szervezet;valódi név;bejelentkezési kép;arckép;visszajelzési mód; +X-KDE-Keywords[ia]=contrasigno;e-posta;nomine;organization;ver nomine;image de accesso;facie;modo echo; +X-KDE-Keywords[kk]=password;email;name;organization;realname;login image;face; echo mode; +X-KDE-Keywords[nb]=passord;e-post;navn;organisasjon;fullt navn; innloggingsbilde;ansikt;ekkomodus; +X-KDE-Keywords[nds]=Passwoort;Nettpost;Nettpostadress;Afdelen;Organisatschoon;Reaalnaam;Anmell-Bild;Torüchmellen-Bedrief; +X-KDE-Keywords[nl]=wachtwoord;e-mail;naam;organisatie;echte naam;aanmeldafbeelding;gezicht; echomodus; +X-KDE-Keywords[pt]=senha;e-mail;nome;organização;nome verdadeiro;imagem de autenticação;cara;modo de eco; +X-KDE-Keywords[pt_BR]=senha;e-mail;nome;organização;nome verdadeiro;imagem de autenticação;face;modo de eco; +X-KDE-Keywords[sl]=geslo;pošta;ime;organizacija;pravo ime;slika ob prijavi;obraz;način odmeva; +X-KDE-Keywords[sv]=lösenord,e-post,namn,organisation,verkligt namn,inloggning,bild,ansikte,ekoläge +X-KDE-Keywords[uk]=password,email,name,organization,realname,login image,face,echomode,пароль,повідомлення,назва,організація,установа,ім’я,зображення,обличчя,показ пароля X-KDE-Keywords[x-test]=xxpassword;email;name;organization;realname;login image;face; echo mode;xx -X-KDE-Keywords[zh_CN]=password;email;name;organization;realname;login image;face;echo mode;密码;电子邮件;姓名;组织;真实姓名;登陆图像;头像;回显模式 -X-KDE-Keywords[zh_TW]=password;email;name;organization;realname;login image;face;echo mode;密碼;電子郵件;組織;真名;登入圖片;面貌;回音模式 +X-KDE-Keywords[zh_TW]=password;email;name;organization;realname;login image;face; echo mode; Comment=User information such as password, name and email Comment[af]=Gebruiker informasie, soos naam, wagwoord en e-pos Comment[ar]=معلومات عن المستخدم مثل كلمة السر ، الاسم والبريد الإلكتروني @@ -164,7 +146,7 @@ Comment[et]=Kasutajainfo, nt. parool, nimi ja e-posti aadress Comment[eu]=Erabiltzaileari buruzko informazioa; hala nola pasahitza, izena eta helbide elektronikoa. Comment[fa]=استفاده از اطلاعاتی نظیر اسم رمز، نام و رایانامه -Comment[fi]=Käyttäjien tiedot, kuten salasanat, nimet ja sähköpostiosoite +Comment[fi]=Käyttäjätiedot, kuten salasana, nimi ja sähköpostiosoite Comment[fr]=Informations sur l'utilisateur comme le mot de passe, le nom et l'adresse électronique Comment[fy]=Brûkersynformaasje sa as wachtwurd, namme en e-adres Comment[ga]=Eolas pearsanta ar nós focal faire, ainm agus seoladh ríomhphoist diff -Nru kde-baseapps-4.7.90/kdepasswd/kdepasswd.desktop kde-baseapps-4.7.95/kdepasswd/kdepasswd.desktop --- kde-baseapps-4.7.90/kdepasswd/kdepasswd.desktop 2011-07-27 18:36:38.000000000 +0000 +++ kde-baseapps-4.7.95/kdepasswd/kdepasswd.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -31,7 +31,7 @@ Name[et]=Parooli muutmine Name[eu]=Aldatu pasahitza Name[fa]=تغییر اسم رمز -Name[fi]=Vaihda salasanaa +Name[fi]= Name[fr]=Modifier le mot de passe Name[fy]=Wachtwurd wizigje Name[ga]=Athraigh Focal Faire diff -Nru kde-baseapps-4.7.90/konqueror/kfmclient.desktop kde-baseapps-4.7.95/konqueror/kfmclient.desktop --- kde-baseapps-4.7.90/konqueror/kfmclient.desktop 2011-07-27 18:36:38.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/kfmclient.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -6,7 +6,7 @@ Terminal=false InitialPreference=9 NoDisplay=true -StartupNotification=false +X-KDE-StartupNotify=false Name=Konqueror Name[af]=Konqueror Name[ar]=كونكيورر diff -Nru kde-baseapps-4.7.90/konqueror/settings/ebrowsing/ebrowsing.desktop kde-baseapps-4.7.95/konqueror/settings/ebrowsing/ebrowsing.desktop --- kde-baseapps-4.7.90/konqueror/settings/ebrowsing/ebrowsing.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/ebrowsing/ebrowsing.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -158,7 +158,6 @@ Comment[ml]=മെച്ചപ്പെട്ട ബ്രൌസിങ്ങ് ക്രമീകരിയ്ക്കുക Comment[mr]=प्रगत ब्राउजिंग संयोजीत करा Comment[ms]=Konfigur pelayaran lanjutan -Comment[nb]=Tilpass utvidet surfing Comment[nds]=Söökafkörten för't gaue Söken in't Nett inrichten Comment[ne]=बढाइएको ब्राउजिङ कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u het geavanceerd browsen instellen @@ -196,61 +195,19 @@ Comment[zh_TW]=設定增強式瀏覽 X-KDE-Keywords=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts -X-KDE-Keywords[af]=Verbeterde Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts -X-KDE-Keywords[be]=Палепшанае вандраванне,вандраванне,прагляд,Інэтрнэт,ключавыя словы,фільтры,сетка,рухавікі пошуку,машыны пошуку,скароты,Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts -X-KDE-Keywords[bg]=Keywords=съкращения, сърфиране, разширено, уеб, препратка, връзка, хипервръзка, Enhanced Browsing, Browsing, WWW, Internet, Internet Keywords, Internet Filters, Network, Search Engines, Shortcuts -X-KDE-Keywords[ca]=Navegació millorada,Navegació,WWW,Internet,Paraules clau d'Internet,Filtres d'Internet,Xarxa,Motors de recerca,Dreceres -X-KDE-Keywords[cs]=Rozšířené procházení,Procházení,WWW,Internet,Klíčová slova internetu,Internetové filtry,Síť,Zkratky,Vyhledávací stroje -X-KDE-Keywords[csb]=Rozszérzoné przezéranié,przezéranié,WWW,Internet,kluczowé słowa w Internece,filtrë w Internece,séc,szëkôrze,skrodzënë -X-KDE-Keywords[cy]=Pori Uchel,Pori,WWW,Rhyngrwyd,Allweddair Rhyngrwyd,Hidl Rhyngrwyd,Rhwydwaith,Peiriannau Chwilio,Llwybrau Byr -X-KDE-Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgemaskiner,Genveje +X-KDE-Keywords[ca]=Navegació millorada,navegació,WWW,Internet,Filtres d'Internet,Xarxa,Motors de cerca,Dreceres +X-KDE-Keywords[da]=Forbedret browsing,browsing,www,internet,internetfiltre,netværk,søgemaskiner,genveje X-KDE-Keywords[de]=Browsen,Erweitertes Browsen,WWW,Internet,Stichwörter,Filter,Netz,Internetfilter,Suchmaschinen,Kurzbefehle,Netzwerk -X-KDE-Keywords[el]=Εμπλουτισμένη περιήγηση,Περιήγηση,WWW,Διαδίκτυο,Λέξεις κλειδιά διαδικτύου,Φίλτρα διαδικτύου,Δίκτυο,Μηχανές αναζήτησης,Συντομεύσεις -X-KDE-Keywords[eo]=progresintoj,TTT,krozado,WWW,Interreto,filtrilo,reto,serĉiloj,mallongigoj -X-KDE-Keywords[es]=Navegación Mejorada,Navegación,WWW,Internet,Palabras clave de Internet,Filtros de Internet,Red,Motores de búsqueda,Accesos directos -X-KDE-Keywords[et]=Täiustatud lehitsemine,lehitsemine,WWW,internet,interneti võtmesõnad,interneti filtrid,võrk,otsingumootorid,kiirkorraldused -X-KDE-Keywords[eu]=Arakatze hobetua,Arakatzea,WWW,Internet,Interneteko hitz gakoak, Interneteko irakazkiak,Sarea,Bilaketa motorea,Lasterbideak -X-KDE-Keywords[fa]=مرور بهبودیافته، مرور، WWW، اینترنت، کلیدواژه‌های اینترنت، پالایه‌های اینترنت، شبکه، موتورهای جستجو، میان‌برها -X-KDE-Keywords[fi]=Edistynyt selailu,selailu,WWW,Internet,Internet-hakusanat,Internet suodattimet,Verkko,Hakukoneet,Pikavalinnat -X-KDE-Keywords[fr]=navigation avancée,navigation,www,web,internet,mots-clés internet,filtres internet,réseau,moteurs de recherche,raccourcis -X-KDE-Keywords[fy]=avansearre browsen,browsing,blêdzje,blêdzjen,www,ynternet,ynternet kaaiwurden,surfen,ynternetsykwurden,sykmasines,sykmotors, snelskeakels,ynternetfilters,Netwurk,blêdzje avensearre -X-KDE-Keywords[ga]=Brabhsáil Fheabhsaithe,Brabhsáil,WWW,Idirlíon,Eochairfhocail Idirlín,Scagairí Idirlín,Líonra,Innill Chuardaigh,Aicearraí -X-KDE-Keywords[gl]=Navegación Mellorada,Navegación,WWW,Internet,Palabras chave de Internet,Filtros de Internet,Rede,Ferramentas de Procura,Atallos -X-KDE-Keywords[he]=מילות מפתח אינטרנטיות,מסננים אינטרנטיים,רשת,מנועי חיפוש,קיצורי דרך,WWW,גלישה משופרת,גלישה,רשת,אינטרנט,Enhanced Browsing,Browsing,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts -X-KDE-Keywords[hr]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,poboljšano pregledavanje,pregledavanje,ključne riječi,filtri,mreža,tražilice,prečaci -X-KDE-Keywords[hu]=böngészéskönnyítés,böngészés,WWW,internet,internetes kulcsszavak,internetes szűrők,hálózat,keresőszolgáltatók,keresési azonosítók -X-KDE-Keywords[is]=endurbætur,vefskoðun,vafri,flakka,WWW,Internet,Internet leitarorð,net,tenglar,tengill,hlekkur,hlekkir,leitarvél,internet -X-KDE-Keywords[it]=navigazione avanzata,navigazione,WWW,Internet,parole chiave Internet,filtri Internet,rete,scorciatoie,motori di ricerca -X-KDE-Keywords[ja]=拡張ブラウズ,ブラウズ,WWW,インターネット,インターネットキーワード,インターネットフィルタ,ネットワーク,検索エンジン,ショートカット -X-KDE-Keywords[km]=ការ​រុករក​ឲ្យ​កាន់​តែ​ប្រសើរការ​រុករក វើលវ៉ាយវ៉េប អ៊ីនធឺណិត ពាក្យ​គន្លឹះ​អ៊ីនធឺណិត តម្រង​អ៊ីនធឺណិត បណ្ដាញ ម៉ាស៊ីន​ស្វែងរក ផ្លូវ​កាត់ -X-KDE-Keywords[ko]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,확장 브라우징,인터넷 키워드,검색 엔진,바로 가기 -X-KDE-Keywords[lt]=Enhanced Browsing,Išplėstinis naršymas,WWW,voratinklis,Internet,Internetas,Internet Keywords,Interneto raktažodžiai,Internet Filters,Interneto filtrai,Network,tinklas,Search Engines,paieškos stotys,Shortcuts,nuorodos -X-KDE-Keywords[lv]=Uzlabota Pārlūkošana,Pārlūkošana,WWW,Internets,Interneta Atslēgas vārdi,Interneta Filtri,Tīkls,Meklēšanas dzinēji,ĪsinājumIkonas -X-KDE-Keywords[mk]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,унапредено прелистување,Прелистување,Интернет,Клучни Интернет зборови,Интернет филтри,Мрежа,Пребарувачки сервиси,Кратенки -X-KDE-Keywords[nb]=utvidet surfing,surfing,WWW,internett,internettnøkkelord,internettfilter,nettverk,verdensveven,søkemotorer,søking,snarveier -X-KDE-Keywords[nds]=Verbetert Nettkieken,Nettkieken,WWW,Internet,Internet-Slötelwöör,Internet-Filtern,Nettwark,Söökmaschinen,Tastkombinatschonen,Söökafkörten -X-KDE-Keywords[ne]=बढाइएको ब्राउजिङ, ब्राउजिङ, WWW, इन्टरनेट, इन्टरनेट शब्दकुञ्जीहरू, इन्टरनेट फिल्टरहरू, सञ्जाल, खोजी इन्जीनहरू, सर्टकट -X-KDE-Keywords[nl]=geavanceerd browsen,browsing,www,internet,internet keywords,surfen,internetzoektermen,zoekmachines,search engines,snelkoppelingen,internetfilters,Netwerk,verbeterd browsen -X-KDE-Keywords[nn]=utvida surfing,surfing,WWW,internett,internettnøkkelord,internettfilter,nettverk,verdsveven,søkjemotorar,søkjing,snarvegar -X-KDE-Keywords[pa]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,ਇੰਟਰਨੈਟ,ਇੰਟਰਨੈਟ ਸ਼ਬਦ,ਇੰਟਰਨੈਟ ਫਿਲਟਰ, ਨੈਟਵਰਕ -X-KDE-Keywords[pl]=Rozszerzone przeglądanie,przeglądanie,WWW,Internet,słowa kluczowe w Internecie,filtry w Internecie,sieć,przeszukiwarki,skróty -X-KDE-Keywords[pt]=Navegação Melhorada,Navegação,WWW,Internet,Palavras-Chave da Internet,Filtros Internet,Rede,Motores de Busca,Atalhos -X-KDE-Keywords[pt_BR]=Navegação Melhorada,Navegação,WWW,Internet,Palavras-chave Internet, Filtros Internet,Rede,Mecanismos de Busca,Atalhos -X-KDE-Keywords[ro]=navigare avansată,răsfoire,WWW,Internet,cuvinte cheie Internet,filtre Internet,reţea,motoare de căutare,acceleratori -X-KDE-Keywords[sl]=izboljšano brskanje,brskanje,WWW,splet,internet,ključne besede interneta,filtri interneta,omrežje,iskalni stroji,bližnjice -X-KDE-Keywords[sr]=Enhanced Browsing,Browsing,WWW,Интернет,Интернет Keywords,Интернет Filters,Network,Search Engines,Shortcuts,прегледање,мрежа,пречице -X-KDE-Keywords[sr@latin]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,pregledanje,mreža,prečice -X-KDE-Keywords[sv]=Utökad webbläsning,Surfning,WWW,Internet,Internetsökord,Nätverk,Sökmotorer,Internetfilter,Genvägar -X-KDE-Keywords[ta]= அதிகப்படுத்தப்பட்ட உலாவுதல்,உலாவுதல்,WWW,இணைதளம்,இணைய முக்கிய வார்த்தைகள்,இணையதள வடிகட்டிகள்,வலைப்பின்னல்,தேடு இயந்திரங்கள்,குறுக்கு வழிகள் -X-KDE-Keywords[th]=การเรียกดูแบบเพิ่มความสามารถ,การเรียกดู,WWW,อินเทอร์เน็ต,คำค้นทางอินเทอร์เน็ต,ตัวกรองทางอินเทอร์เน็ต,Network,เครื่องมือค้นหา,ทางลัด -X-KDE-Keywords[tr]=Gelişkin Tarama,Tarama,WWW,İnternet,İnternet Anahtar Kelimeleri,İnternet Süzgeçleri,Ağ,Kısayollar,Kısayol tuşları -X-KDE-Keywords[uk]=додаткова навігація,навігація,Browsing,WWW,Інтернет,Тенета,Internet,Мережа,машини пошуку,фільтри Інтернет,посилання -X-KDE-Keywords[uz]=Тезлаштирилган веб-кўриш,Қисқартмалар,WWW,Интернет,Интернет калит сўзлари,Интернет филтерлари,Тармоқ,Қидириш воситаси,Қисқартмалар -X-KDE-Keywords[vi]=Duyệt tăng cường,Duyệt,WWW,Mạng,Internet,Từ khoá Mạng,Bộ lọc Mạng,mạng,Tìm kiếm,Lối tắt -X-KDE-Keywords[wa]=Naiviaedje waibe avancî,naivyî,naiviaedje,betchteu,waibe,WWW,internet,daegntoele,rascourtis waibe,passetes waibe,rantoele,ricwerreces,rascourtis -X-KDE-Keywords[x-test]=xxEnhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcutsxx -X-KDE-Keywords[xh]=Ukhangelo zincwadi olomeleziweyo,Khangela iincwadi,WWW,Amagama angundoqo e Internet,Amacebo okucoca ulwelo e Internet,Umsebenzi womnatha,Iinjini Zophendlo,Iindlela ezimfutshane -X-KDE-Keywords[zh_CN]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,增强浏览,浏览,万维网,互联网,Internet 关键字,Internet 过滤,网络,搜索引擎,快捷方式,快捷方式 -X-KDE-Keywords[zh_TW]=Enhanced Browsing,Browsing,WWW,Internet,Internet Keywords,Internet Filters,Network,Search Engines,Shortcuts,增強瀏覽,瀏覽,網際網路,網路,搜尋引擎,捷徑 +X-KDE-Keywords[fi]=selaimen lisäasetukset,edistynyt selailu,selailu,selaus,WWW,Internet,Internet-suotimet,verkko,hakukoneet,pikavalinnat +X-KDE-Keywords[hu]=Fejlesztett böngészés,Böngészés,WWW,Internet,Internetes szűrők,Hálózat,Keresőmotorok,Gyorsbillentyűk +X-KDE-Keywords[kk]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts +X-KDE-Keywords[nb]=Utvidet surfing,Surfing,WWW,Internett,Internettfiltre,Nettverk,Søkemotorer,Snarveier +X-KDE-Keywords[nl]=Verbeterd browsen,browsen,www,internet,internetfilters,netwerk,zoekmachines,sneltoetsen +X-KDE-Keywords[pt]=Navegação Melhorada,Navegação,WWW,Internet,Filtros da Internet,Rede,Motores de Busca,Atalhos +X-KDE-Keywords[pt_BR]=Navegação melhorada,Navegação,WWW,Internet,Filtros da Internet,Rede,Mecanismos de busca,Atalhos +X-KDE-Keywords[sv]=Förbättrad webbläsning,Webbläsning,WWW,Internet,Internetfilter,Nätverk,Söktjänster,Genvägar +X-KDE-Keywords[uk]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts,додатково,додатковий,інтернет,фільтри,фільтрування,фільтр,мережа,рушій,пошук,рушії пошуку,скорочення,вебскорочення +X-KDE-Keywords[x-test]=xxEnhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcutsxx +X-KDE-Keywords[zh_TW]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.90/konqueror/settings/kio/bookmarks.desktop kde-baseapps-4.7.95/konqueror/settings/kio/bookmarks.desktop --- kde-baseapps-4.7.90/konqueror/settings/kio/bookmarks.desktop 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/kio/bookmarks.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -181,3 +181,23 @@ Comment[zh_CN]=配置书签主页 Comment[zh_TW]=設定書籤首頁 X-KDE-Keywords=Bookmarks +X-KDE-Keywords[ca]=Adreces d'interès +X-KDE-Keywords[cs]=Záložky +X-KDE-Keywords[da]=Bogmærker +X-KDE-Keywords[de]=Lesezeichen +X-KDE-Keywords[fi]=Kirjanmerkit +X-KDE-Keywords[hu]=Könyvjelzők +X-KDE-Keywords[ia]=Marcatores de libro +X-KDE-Keywords[kk]=Бетбелгі +X-KDE-Keywords[nb]=Bokmerker +X-KDE-Keywords[nds]=Leestekens +X-KDE-Keywords[nl]=Bladwijzers +X-KDE-Keywords[nn]=Bokmerke +X-KDE-Keywords[pa]=ਬੁੱਕਮਾਰਕ +X-KDE-Keywords[pt]=Favoritos +X-KDE-Keywords[pt_BR]=Favoritos +X-KDE-Keywords[sl]=Zaznamki +X-KDE-Keywords[sv]=Bokmärken +X-KDE-Keywords[uk]=закладки,закладка +X-KDE-Keywords[x-test]=xxBookmarksxx +X-KDE-Keywords[zh_TW]=Bookmarks diff -Nru kde-baseapps-4.7.90/konqueror/settings/kio/cache.desktop kde-baseapps-4.7.95/konqueror/settings/kio/cache.desktop --- kde-baseapps-4.7.90/konqueror/settings/kio/cache.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/kio/cache.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -197,61 +197,17 @@ Comment[zh_TW]=設定網頁快取設定 X-KDE-Keywords=Cache,History,Browsing History,Ports,Size -X-KDE-Keywords[ar]=الذاكرة المخبئة,التاريخ,تاريخ التصفح,المنافذ,الحجم -X-KDE-Keywords[be]=Кэш,Гісторыя,Гісторыя вандровак,Вандраванне,Парты,Памер,Cache,History,Browsing History,Ports,Size -X-KDE-Keywords[bg]=Keywords=кеш, памет, временни, копия, страница, Cache, History, Browsing History, Ports, Size -X-KDE-Keywords[br]=Krubuilh,istor,furchal an istor,porzhioù,ment -X-KDE-Keywords[ca]=Cau,Historial,Historial de navegació,Ports,Mida -X-KDE-Keywords[cs]=Cache,Historie,Porty,Velikost -X-KDE-Keywords[csb]=cache,historëjô,historëjô przezéraniô,pòrtë,miara -X-KDE-Keywords[cy]=Storfa,Hanes,Hanes Pori,Pyrth,Maint -X-KDE-Keywords[da]=Cache,Historik,Netsøgningshistorik,Porte,Størrelse -X-KDE-Keywords[de]=Cache,Verlauf,History,Ports,Zwischenspeicher, Größe -X-KDE-Keywords[el]=Λανθάνουσα μνήμη,Ιστορικό,Ιστορικό περιήγησης,Θύρες,Μέγεθος -X-KDE-Keywords[eo]=Tenejo,Historio,TTT-umado,Pordoj,Grandeco -X-KDE-Keywords[es]=Caché,Historia,Historia de navegación,Puertos,Tamaño -X-KDE-Keywords[et]=cache,puhver,lehitsemise puhver,pordid,suurus -X-KDE-Keywords[eu]=Katxea,Historia,Arakaketa historia,Atakak,Neurria -X-KDE-Keywords[fa]=نهانگاه، تاریخچه، تاریخچۀ مرور، درگاهها، اندازه -X-KDE-Keywords[fi]=Välimuisti,Historia,Selailuhistoria,Portit,Koko -X-KDE-Keywords[fr]=Cache,historique,navigation de l'historique,ports,taille -X-KDE-Keywords[fy]=cache,lyts ûnthâld,history,Histoarje,grutte,Ynternet -X-KDE-Keywords[ga]=Taisce,Stair,Stair Brabhsála,Poirt,Méid -X-KDE-Keywords[gl]=Caché,Historial,Historial de Navegación,Portos,Tamaño -X-KDE-Keywords[he]=מטמון,היסטוריה,היסטוריית גלישה,יציאות,גודל,Cache,History,Browsing History,Ports,Size -X-KDE-Keywords[hr]=Cache,Pohrana,History,Povijest,Browsing History,Ports,Portovi,Size,Veličina,Povijest pretraživanja -X-KDE-Keywords[hu]=gyorstár,napló,böngészési napló,portok,méret -X-KDE-Keywords[is]=Skyndiminni,Saga,Vafrasaga,Port,Stærð,Cache,History,Browsing History,Ports,Size -X-KDE-Keywords[it]=cache,cronologia,navigazione,cronologia di navigazione,porte,dimensione -X-KDE-Keywords[ja]=キャッシュ,履歴,ブラウズの履歴,ポート,サイズ -X-KDE-Keywords[ka]=ქეში,ისტორია,მიმოხილვის ისტორია,პორტები,ზომა -X-KDE-Keywords[km]=ឃ្លាំង​សម្ងាត់ ប្រវត្តិ ប្រវត្តិ​រុករក ច្រក ទំហំ -X-KDE-Keywords[ko]=Cache,History,Browsing History,Ports,Size,캐시,크기,과거 기록 -X-KDE-Keywords[lt]=Cache,History,Browsing History,Ports,Size, kešas,krepšys,žurnalas,istorija,naršymo žurnalas,naršymo istorija,portai,dydis -X-KDE-Keywords[mk]=Cache,History,Browsing History,Ports,Size,Кеш,Историја,Прелистување на историјата,Портови,Големина -X-KDE-Keywords[nb]=Mellomlager,Historie,Lesehistorie,Porter,Størrelse -X-KDE-Keywords[nds]=Twischenspieker,Vörgeschicht,Browsing History,Porten,Grött -X-KDE-Keywords[ne]=क्यास, इतिहास, ब्राउज इतिहास, पोर्ट, साइज -X-KDE-Keywords[nl]=cache,historie,geschiedenis,grootte,internet -X-KDE-Keywords[nn]=cache,mellomlager,historie,nettlesarhistorie,portar,storleik -X-KDE-Keywords[pa]=ਅਕਾਰ,ਅਤੀਤ,ਝਲਕਾਰਾ,ਕੈਸ਼,ਪੋਰਟ -X-KDE-Keywords[pl]=cache,bufor,historia,historia przeglądania,porty,rozmiar +X-KDE-Keywords[ca]=Memòria cau,Historial,Historial del navegador,Ports,Mida +X-KDE-Keywords[da]=Cache,historik,browserhistorik,porte,størrelse +X-KDE-Keywords[fi]=Välimuisti,Historia,Selaushistoria,Portit,Koko +X-KDE-Keywords[hu]=Gyorsítótár,Előzmények,Böngészési előzmények,Portok,Méret +X-KDE-Keywords[kk]=Cache,History,Browsing History,Ports,Size +X-KDE-Keywords[nb]=Mellomlager,Historie,Nettleserhistorie,Porter,Størrelse +X-KDE-Keywords[nl]=Cache,geschiedenis,browse geschiedenis,poorten,grootte +X-KDE-Keywords[nn]=hurtiglager,historikk,surfehistorikk,portar,storleik X-KDE-Keywords[pt]=Cache,Histórico,Histórico de Navegação,Portos,Tamanho -X-KDE-Keywords[pt_BR]=Cache,Histórico,Histórico de Navegação,Portas,Tamanho -X-KDE-Keywords[ro]=cache,istoric,navigare în istoric,porturi,mărime -X-KDE-Keywords[se]=gaskarájus,historihkka,fierpmádatloganhistorihkka,verráhat,sturrodat -X-KDE-Keywords[sl]=predpomnilnik,zgodovina,zgodovina brskanja,vrata,velikost -X-KDE-Keywords[sr]=Cache,History,Browsing History,Ports,Size,кеш,историјат,портови,величина -X-KDE-Keywords[sr@latin]=Cache,History,Browsing History,Ports,Size,keš,istorijat,portovi,veličina +X-KDE-Keywords[pt_BR]=Cache,Histórico,Histórico de navegação,Portas,Tamanho X-KDE-Keywords[sv]=Cache,Historik,Webbläsningshistorik,Portar,Storlek -X-KDE-Keywords[ta]=தற்காலிக,வரலாறு,உலாவுதலின் வரலாறு,முனையங்கள்,அளவு -X-KDE-Keywords[th]=แคช,ประวัติการใช้,ประวัติการท่องเว็บ,พอร์ต,ขนาด -X-KDE-Keywords[tr]=Arabellek,Tarihçe,Gözatma Tarihçesi,Portlar -X-KDE-Keywords[uk]=кеш,історія, історія навігації,порти,розмір -X-KDE-Keywords[uz]=Кэш,Веб-саҳифалар тариҳи,Тарих,Портлар -X-KDE-Keywords[vi]=Nhớ tạm,Lịch sử,Lịch sử duyệt,Cổng,Cỡ -X-KDE-Keywords[wa]=Muchete,Istwere,Istwere do foytaedje,Pôrts,Grandeu +X-KDE-Keywords[uk]=Cache,History,Browsing History,Ports,Size,кеш,журнал,історія,перегляд,порти,розмір X-KDE-Keywords[x-test]=xxCache,History,Browsing History,Ports,Sizexx -X-KDE-Keywords[xh]=Indawo yokugcina, Imbali, imbali Yokhangelo zincwadi, Amazibuko, Ubungakanani -X-KDE-Keywords[zh_CN]=Cache,History,Browsing History,Ports,Size,缓存,历史,浏览历史,端口,大小 -X-KDE-Keywords[zh_TW]=Cache,History,Browsing History,Ports,Size,快取 +X-KDE-Keywords[zh_TW]=Cache,History,Browsing History,Ports,Size diff -Nru kde-baseapps-4.7.90/konqueror/settings/kio/cookies.desktop kde-baseapps-4.7.95/konqueror/settings/kio/cookies.desktop --- kde-baseapps-4.7.90/konqueror/settings/kio/cookies.desktop 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/kio/cookies.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -155,7 +155,7 @@ Comment[ml]=കുക്കികള്‍ പ്രവര്‍ത്തിയ്ക്കുന്ന രീതി ക്രമീകരിയ്ക്കുക Comment[mr]=कुकीजचे कार्य करण्याजी पध्दत संयोजीत करा Comment[ms]=Konfigur cara cookies berfungsi -Comment[nb]=Tilpass bruken av informasjonskapsler +Comment[nb]=Sett opp bruken av informasjonskapsler Comment[nds]=Instellen, woans de Kookjes funkscheneert Comment[ne]=कुकीको कार्य तरीका कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u het cookiesbeleid instellen @@ -193,61 +193,18 @@ Comment[zh_TW]=設定 cookies 運作方式 X-KDE-Keywords=Cookies,Browsing,Internet,WWW,Network,Policy,Domains -X-KDE-Keywords[ar]=الكعكات,التصفح,الإنترنت,الشبكة العالمية,الشبكة,السياسة,أسماء المجالات -X-KDE-Keywords[be]="Печыва",Вандроўка,Вандраванне,Інтэрнэт,Сетка,Правілы,Домены,Cookies,Browsing,Internet,WWW,Network,Policy,Domains -X-KDE-Keywords[bg]=Keywords=бисквитка, бисквитки, Интернет, сърфиране, сесия, сигурност, Cookies, Browsing, Internet, WWW, Network, Policy, Domains -X-KDE-Keywords[ca]=Galetes,fullejar,Internet,WWW,Xarxa,Política,Dominis -X-KDE-Keywords[cs]=Cookie,Prohlížení,Internet,WWW,Síť,Domény -X-KDE-Keywords[csb]=kùszczi,przezéranié,Internet,WWW,séc,reglë,domenë -X-KDE-Keywords[cy]=Cwcis,Pori,Rhyngrwyd,WWW,Rhwydwaith,Polisi,Parthau -X-KDE-Keywords[da]=Cookier,Netsøgning,Internet,www,Netværk,Politik,Domæner +X-KDE-Keywords[ca]=Galetes,Navegació,Internet,WWW,Xarxa,Polítiques,Dominis +X-KDE-Keywords[da]=Cookies,browsing,internet,www,netværk,politik,domæner X-KDE-Keywords[de]=Cookies,Durchsuchen,Browsen,Surfen,Internet,WWW,Netzwerk,Regelungen,Domains -X-KDE-Keywords[el]=Cookies,Περιήγηση,Διαδίκτυο,WWW,Δίκτυο,Πολιτική,Τομείς -X-KDE-Keywords[eo]=kuketoj,TTT,Interreto,WWW,reto,konduto,retregionoj -X-KDE-Keywords[es]=Cookies,Navegación,Internet,WWW,Red,Política,Dominios -X-KDE-Keywords[et]=küpsised,lehitsemine,Internet,WWW,võrk,reeglid,domeenid -X-KDE-Keywords[eu]=Cookie-ak,Arakaketa,Internet,WWW,Sarea,Arautegia,Domeinuak -X-KDE-Keywords[fa]=کوکیها، مرور، اینترنت، WWW، شبکه، سیاست، دامنه‌ها -X-KDE-Keywords[fi]=Evästeet,Selailu,Internet,WWW,Verkko,Politiikka,Verkkoalueet -X-KDE-Keywords[fr]=Cookies,navigation,internet,WWW,Web,réseau,règle,politique,domaine -X-KDE-Keywords[fy]=Koekjes,blêdzjen,ynternet,www,netwurk,wurkwize,domeinen -X-KDE-Keywords[ga]=Fianán,Brabhsáil,Idirlíon,WWW,Líonra,Polasaí,Fearainn -X-KDE-Keywords[gl]=Cookies,Navegación,Internet,WWW,Rede,Política,Dominios -X-KDE-Keywords[he]=עוגיות,גלישה,אינטרנט,WWW,רשת,מדיניות,תחומים, Cookies,Browsing,Internet,Network,Policy,Domains -X-KDE-Keywords[hr]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,Kolačići,Domene,Mreža,Pravila,Pregledavanje,Pretraživanje -X-KDE-Keywords[hu]=cookie-k,böngészés,internet,WWW,hálózat,házirend,tartományok -X-KDE-Keywords[is]=Smákökur,Flakk,Flakkari,Vafr,Vafri,Vefurinn,Netið,lén -X-KDE-Keywords[it]=cookie,navigazione,Internet,WWW,rete,politica,domini -X-KDE-Keywords[ja]=クッキー,ブラウス,インターネット,WWW,ネットワーク,ポリシー,ドメイン -X-KDE-Keywords[ka]=ქუქები,მიმოხილვა,ინტერნეტი,WWW,ქსელი,პოლისი,დომენები -X-KDE-Keywords[km]=ខូគី ការ​រុករក អ៊ីនធឺណិត វើលវ៉ាយវ៉េប បណ្ដាញ គោលនយោបាយ ដែន -X-KDE-Keywords[ko]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,쿠키,브라우저,인터넷,웹,네트워크,도메인,탐색,찾아가기,탐색기 -X-KDE-Keywords[lt]=Slapukai,Naršymas,Internetas,WWW,Tinklas,Taisyklės,Sritys -X-KDE-Keywords[lv]=Cepumi,Pārlūkošana,Internets,WWW,Tīkls,Politika,Domēni -X-KDE-Keywords[mk]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,Колачиња,Прелистување,Интернет,Мрежа,Политика,Домени -X-KDE-Keywords[nb]=cookies,informasjonskapsler,surfing,internett,WWW,verdensveven,nettverk,praksis,domene -X-KDE-Keywords[nds]=Kookjes,Nettkieken,Internet,WWW,Nettwark,Regel,Domänen -X-KDE-Keywords[ne]=कुकी,ब्राउजिङ, इन्टरनेट, WWW, सञ्जाल, नीति, डोमेन -X-KDE-Keywords[nl]=cookies,browsing,internet,www,netwerk,beleid,domeinen -X-KDE-Keywords[nn]=cookies,informasjonskapslar,surfing,internett,WWW,verdsveven,nettverk,praksis,domene -X-KDE-Keywords[pa]=Cookies,Browsing,Internet,WWW,Network,ਨੀਤੀ, ਡੋਮੇਨ,ਇੰਟਰਨੈਟ -X-KDE-Keywords[pl]=ciasteczka,przeglądanie,Internet,WWW,sieć,zasady,domeny +X-KDE-Keywords[fi]=Evästeet,Selaus,Selailu,Internet,WWW,Verkko,Käytäntö,Käytänne,Verkkoalueet +X-KDE-Keywords[hu]=Sütik,Böngészés,Internet,WWW,Hálózat,Házirend,Tartományok +X-KDE-Keywords[kk]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains +X-KDE-Keywords[nb]=Infokapsler,Nettlesing,Internett,WWW.Nettverk,Praksis,Domener +X-KDE-Keywords[nl]=Cookies,browsen,internet,www,netwerk,beleid,domeinen +X-KDE-Keywords[nn]=informasjonskapslar,surfing,Internett,WWW,nettverk,regler,domener X-KDE-Keywords[pt]=Cookies,Navegação,Internet,WWW,Rede,Política,Domínios X-KDE-Keywords[pt_BR]=Cookies,Navegação,Internet,WWW,Rede,Política,Domínios -X-KDE-Keywords[ro]=cookies,navigare,Internet,WWW,reţea,politici,domenii -X-KDE-Keywords[se]=diehtočoahkku,bláđđen,fierpmádat,WWW,fierbmi,geavat,domeana -X-KDE-Keywords[sl]=piškotki,brskanje,internet,splet,WWW,omrežje,politika,domene -X-KDE-Keywords[sr]=Cookies,Browsing,Интернет,WWW,Network,Policy,Domains,колачићи,прегледање,мрежа,полиса,домени -X-KDE-Keywords[sr@latin]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,kolačići,pregledanje,mreža,polisa,domeni -X-KDE-Keywords[sv]=Kakor,Surfning,Internet,WWW,Nätverk,Policy,Domäner -X-KDE-Keywords[ta]=தற்காலிக நினைவகம்,உலாவுதல்,இணையம்t,WWW,வலைப்பின்னல்,கொள்கை,வலைதளங்கள் -X-KDE-Keywords[th]=คุกกี้,การเรียกดูเว็บเพจ,อินเทอร์เน็ต,WWW,ระบบเครือข่าย,ข้อกำหนด,โดเมน -X-KDE-Keywords[tr]=Çerezler,Tarama,İnternet,WWW,Ağ,Alan -X-KDE-Keywords[uk]=куки,навігація,Internet,Інтернет,WWW,мережа,правила,домени,Тенета -X-KDE-Keywords[uz]=Кукилар,Интернет,WWW,Тармоқ,Қоида,Доменлар -X-KDE-Keywords[vi]=Cookie,Duyệt,Mạng,WWW,mạng,Chính sách,Miền -X-KDE-Keywords[wa]=Coûkes,betchteu,betchtaedje,naiviaedje,Daegntoele,WWW,waibe,rantoele,politike,dominnes +X-KDE-Keywords[sv]=Kakor,Webbläsning,Internet,WWW,Nätverk,Princip,Domäner +X-KDE-Keywords[uk]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,кука,куки,перегляд,інтернет,мережа,правило,правила,домен,домени X-KDE-Keywords[x-test]=xxCookies,Browsing,Internet,WWW,Network,Policy,Domainsxx -X-KDE-Keywords[xh]=Cookies,Khangela iincwadi,Internet,WWW,Umsebenzi womnatha,Inkqubo,Ezongameleyo -X-KDE-Keywords[zh_CN]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,浏览,互联网,万维网,网络,策略,域 -X-KDE-Keywords[zh_TW]=Cookies,Browsing,Internet,WWW,Network,Policy,Domain,瀏覽,網際網路,網路,策略,域名 +X-KDE-Keywords[zh_TW]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains diff -Nru kde-baseapps-4.7.90/konqueror/settings/kio/netpref.desktop kde-baseapps-4.7.95/konqueror/settings/kio/netpref.desktop --- kde-baseapps-4.7.90/konqueror/settings/kio/netpref.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/kio/netpref.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -157,7 +157,7 @@ Comment[ml]=എത്ര സമയം കാത്തുനില്‍ക്കണം എന്നതുപോലുള്ള പൊതുവായുള്ള ശൃംഖലയുമായി ബന്ധപ്പെട്ട മുന്‍ഗണനകള്‍ ക്രമീകരിയ്ക്കുക Comment[mr]=जेनेरिक संजाळ प्राधान्यता, जसे की टाइम-आउट मूल्य संयोजीत करा Comment[ms]=Konfigur keutamaan rangkaian generik, seperti nilai waktu rehat -Comment[nb]=Tilpass generelle nettverksinnstillinger. F.eks. verdier for tidsavbrudd +Comment[nb]=Sett opp generelle nettverksinnstillinger. F.eks. verdier for tidsavbrudd Comment[nds]=Standard-Nettwarkinstellen, as t.B. Tietgrenzen Comment[ne]=समय समाप्ति मान जस्तै जेनेरिक सञ्जाल प्राथमिकता कन्फिगर गर्नुहोस् Comment[nl]=Instellen van algemene netwerkvoorkeuren, zoals tijdslimietwaarden @@ -195,52 +195,16 @@ Comment[zh_TW]=設定一般網路喜好設定，例如逾時值 X-KDE-Keywords=timeout,iopref,netpref,network preferences,ftp -X-KDE-Keywords[be]=Тэрмін чакання,Уласцівасці сеткі,timeout,iopref,netpref,network preferences,ftp -X-KDE-Keywords[bg]=Keywords=просрочка, време, времето, пауза, прекъсване, връзка, timeout, iopref, netpref, network preferences, ftp -X-KDE-Keywords[ca]=temps d'expiració,iopref,netpref,preferències de la xarxa,ftp -X-KDE-Keywords[cs]=časový limit,iopref,netpref,nastavení sítě,ftp -X-KDE-Keywords[csb]=limit czasu, sécowé nastôwë,séc,neta,nastôw wé/wi,ftp -X-KDE-Keywords[da]=timeout,udløb,ioindst,netindst,netværksindstillinger,ftp -X-KDE-Keywords[de]=Zeitlimit,Netzwerkeinstellungen,Ein-/Ausgabemodul-Einstellungen -X-KDE-Keywords[el]=χρονικό όριο,iopref,netpref,προτιμήσεις δικτύου,ftp -X-KDE-Keywords[eo]=tempolimo,enel-preferaĵoj,reto,retpreferaĵoj,ftp -X-KDE-Keywords[es]=tiempo límite,iopref,netpref,preferencias de red,ftp -X-KDE-Keywords[et]=taimaut,aegumine,võrgu seadistused,ftp -X-KDE-Keywords[eu]=denbora-muga,iopref,netpref,sareko hobespenak, ftp -X-KDE-Keywords[fa]=اتمام وقت، iopref، تنظیمات شبکه، قاپ -X-KDE-Keywords[fr]=délai,configuration du réseau,réseau,entrées/sorties,ftp -X-KDE-Keywords[fy]=timeout,iopref,netpref,netwurkfoarkar,tiidslimyt,ftp -X-KDE-Keywords[ga]=timeout,iopref,netpref,sainroghanna líonra,ftp -X-KDE-Keywords[gl]=timeout,iopref,netpref,preferéncias de rede, ftp -X-KDE-Keywords[he]=זמן מוקצב,iopref,netpref,העדפות רשת, timeout,iopref,netpref,network preferences,ftp -X-KDE-Keywords[hr]=timeout,prekoračenje vremena,iopref,netpref,network preferences,postavke mreže,ftp -X-KDE-Keywords[hu]=várakozási idő,iopref,netpref,hálózati beállítások,ftp -X-KDE-Keywords[is]=hámarkstími,iopref,netpref,netstillingar,ftp -X-KDE-Keywords[it]=tempo massimo,timeout,iopref,netpref,rete,preferenze di rete,ftp -X-KDE-Keywords[ja]=タイムアウト, iopref, netpref, ネットワーク設定, ftp -X-KDE-Keywords[km]=អស់​ពេល iopref netpref ចំណូល​ចិត្ត​បណ្ដាញ ftp -X-KDE-Keywords[ko]=timeout,iopref,netpref,network preferences,시간초과,네트워크 설정,ftp -X-KDE-Keywords[lt]=timeout,iopref,netpref,network preferences,ftp,laiko limitas, tinklo pasirinkimai -X-KDE-Keywords[mk]=timeout,iopref,netpref,network preferences,ftp,тајмаут,мрежни параметри -X-KDE-Keywords[nb]=avbruddsverdi,I/U-innstillinger,nettverk,nettverksinnstillinger,ftp -X-KDE-Keywords[nds]=timeout,iopref,netpref,Nettwarkinstellen,ftp,Tietgrenz,aflopen -X-KDE-Keywords[ne]=समय समाप्त, iopref, netpref, सञ्जाल प्राथमिकता, ftp -X-KDE-Keywords[nl]=timeout,iopref,netpref,netwerkvoorkeuren,tijdslimiet,ftp -X-KDE-Keywords[nn]=tidsgrense,IU-oppsett,nettverksinnstillingar,nettverk,nettverksoppsett,ftp -X-KDE-Keywords[pl]=limit czasu, ustawienia sieciowe,sieć,ustawienia we/wy,ftp -X-KDE-Keywords[pt]=tempo-limite,iopref,netpref,configuração da rede,ftp -X-KDE-Keywords[pt_BR]=timeout,iopref,netpref,preferências de rede,ftp -X-KDE-Keywords[ro]=temporizare,iopref,netpref,preferinţe de reţea,ftp -X-KDE-Keywords[sl]=iztek,zakasnitev,iopref,netpref,nastavitve omrežja,ftp -X-KDE-Keywords[sr]=timeout,iopref,netpref,network preferences,ftp,прековреме -X-KDE-Keywords[sr@latin]=timeout,iopref,netpref,network preferences,ftp,prekovreme -X-KDE-Keywords[sv]=tidsgräns,io-inställning,nät-inställning,nätverksinställningar,FTP -X-KDE-Keywords[ta]=நேரம் முடிந்தது,iopref,netpref,வலைதளம் சலுகைகள்,ftp -X-KDE-Keywords[th]=หมดเวลา,iopref,netpref,ปรับแต่งระบบเครือข่าย,ftp -X-KDE-Keywords[tr]=zaman aşımı,ağ tercihleri,iopref,netpref,ftp -X-KDE-Keywords[uk]=тайм-аут,iopref,netpref,параметри мережі,ftp -X-KDE-Keywords[uz]=таймаут,iopref,netpref,тармоқ параметрлари,ftp -X-KDE-Keywords[vi]=thời hạn,iopref,netpref,tuỳ chọn mạng, ftp +X-KDE-Keywords[ca]=temps d'espera,iopref,netpref,preferències de xarxa,ftp +X-KDE-Keywords[da]=tidsudløb,timeout,iopref,netpref,netværksindstillinger,ftp +X-KDE-Keywords[fi]=aikakatkaisu,iopref,netpref,verkkoasetukset,ftp +X-KDE-Keywords[hu]=időtúllépés,iopref,netpref,hálózati beállítások,ftp +X-KDE-Keywords[kk]=timeout,iopref,netpref,network preferences,ftp +X-KDE-Keywords[nb]=tidsavbrudd,iopref,netpref,nettverksoppsett,ftp +X-KDE-Keywords[nl]=timeout,iopref,netpref,netwerk voorkeuren,ftp +X-KDE-Keywords[pt]=tempo-limite,iopref,netpref,preferências de rede,ftp +X-KDE-Keywords[pt_BR]=tempo-limite,iopref,netpref,preferências de rede,ftp +X-KDE-Keywords[sv]=tidsgräns,iopref,netpref,nätverk,inställningar,ftp +X-KDE-Keywords[uk]=timeout,iopref,netpref,network preferences,ftp,очікування,тайм-аут,мережа,параметри,налаштування X-KDE-Keywords[x-test]=xxtimeout,iopref,netpref,network preferences,ftpxx -X-KDE-Keywords[zh_CN]=timeout,iopref,netpref,network preferences,ftp,超时,网络首选项 -X-KDE-Keywords[zh_TW]=timeout,iopref,netpref,network preferences,ftp,作業逾時,網路喜好設定 +X-KDE-Keywords[zh_TW]=timeout,iopref,netpref,network preferences,ftp diff -Nru kde-baseapps-4.7.90/konqueror/settings/kio/proxy.desktop kde-baseapps-4.7.95/konqueror/settings/kio/proxy.desktop --- kde-baseapps-4.7.90/konqueror/settings/kio/proxy.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/kio/proxy.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -162,7 +162,7 @@ Comment[ml]=ഉപയോഗിച്ചിരിയ്ക്കുന്ന പ്രോക്സി സെര്‍വറുകള്‍ ക്രമീകരിയ്ക്കുക Comment[mr]=वापरण्याजोगी प्रॉक्सी सर्वर संयोजीत करा Comment[ms]=Konfigur pelayan proksi yang digunakan -Comment[nb]=Tilpass bruken av mellomtjenere +Comment[nb]=Sett opp mellomtjenere Comment[nds]=De bruukten Proxies instellen Comment[ne]=प्रयोग गरिएको प्रोक्सी सर्भर कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u de Proxy-servers instellen @@ -200,59 +200,17 @@ Comment[zh_TW]=設定使用的代理伺服器 X-KDE-Keywords=Proxy,Proxy server,Firewall,Squid,proxy -X-KDE-Keywords[ar]=الوكيل,خادم الوكيل,الجدار الناري,Squid,الوكيل -X-KDE-Keywords[be]=Проксі,Сервер проксі,Брандмаўэр,проксі,Proxy,Proxy server,Firewall,Squid,proxy -X-KDE-Keywords[bg]=Keywords=прокси, сървър, посредник, Proxy, Proxy server, Firewall, Squid, proxy -X-KDE-Keywords[br]=Proksi,Server proksi,Moger-tan,Squid,proksi X-KDE-Keywords[ca]=Intermediari,Servidor intermediari,Tallafocs,Squid,intermediari -X-KDE-Keywords[csb]=proxy,pòstrzédnik,pòstrzédniczącô serwera,ògniowô scana,Squid -X-KDE-Keywords[cy]=Dirprwy,Gweinydd dirprwyol,Mur gwarchod,Squid,dirprwy -X-KDE-Keywords[da]=Proxy,Proxyserver,Brandmur,Squid,proxy -X-KDE-Keywords[el]=Διαμεσολαβητής,Διαμεσολαβητής,Firewall,Squid,διαμεσολαβητής -X-KDE-Keywords[eo]=Prokurilo,Prokuro-servo,Fajroŝirmilo,Squid -X-KDE-Keywords[es]=Proxy,servidor Proxy,Cortafuegos,Squid,proxy -X-KDE-Keywords[et]=proxy,puhver,puhverserver,tulemüür,squid -X-KDE-Keywords[eu]=Proxya,Proxy zerbitzaria,Firewalla,Squid,proxya -X-KDE-Keywords[fa]=پیشکار، پیشکاری، دیوارۀ آتش، Squid،پیشکار -X-KDE-Keywords[fi]=Välityspalvelin,Palomuuri,Squid -X-KDE-Keywords[fr]=proxy,serveur mandataire,pare-feu,squid -X-KDE-Keywords[fy]=proxy,proxy tsjinner,brânmourre,squid -X-KDE-Keywords[ga]=Seachfhreastalaí,Balla Dóiteáin,Squid -X-KDE-Keywords[gl]=Proxy,Servidor Proxy,Cortafogos,Squid,proxy -X-KDE-Keywords[he]=מתווך,שרת מתווך,Firewall,Squid, Proxy,Proxy server,Squid,proxy -X-KDE-Keywords[hr]=Proxy,Proxy server,Proxy poslužitelj, Firewall,Squid,proxy,Vatrozid -X-KDE-Keywords[hu]=proxy,proxy kiszolgáló,tűzfal,Squid,proxy -X-KDE-Keywords[is]=Eldveggur,Proxy,Proxy server,Firewall,Squid,proxy -X-KDE-Keywords[it]=proxy,server proxy,firewall,Squid -X-KDE-Keywords[ja]=プロキシ,プロキシサーバ,ファイアウォール,Squid,プロキシ -X-KDE-Keywords[ka]=პროქსი,პროქსი სერვერი,ფაირვოლი,Squid,პროქსი -X-KDE-Keywords[km]=ប្រូកស៊ី ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី ជញ្ជាំង​ភ្លើង Squid ប្រូកស៊ី -X-KDE-Keywords[ko]=Proxy,Proxy server,Firewall,Squid,proxy,프록시,방화벽 -X-KDE-Keywords[lt]=Proxy,Proxy server,Firewall,Squid,proxy, proxy serveris,ugniasienė -X-KDE-Keywords[mk]=Proxy,Proxy server,Firewall,Squid,proxy, Прокси,Прокси сервер,Огнен Ѕид,прокси -X-KDE-Keywords[nb]=proxy,mellomtjener,brannmur,squid -X-KDE-Keywords[nds]=Proxy,Proxyserver,Nettdiek,Squid,proxy -X-KDE-Keywords[ne]=प्रोक्सी, प्रोक्सी सर्भर, फायरवाल, स्क्विड, प्रोक्सी -X-KDE-Keywords[nl]=proxy,proxy server,firewall,squid -X-KDE-Keywords[nn]=proxy,mellomtenar,brannmur,squid -X-KDE-Keywords[pa]=Proxy,Proxy server,Firewall,Squid,ਪਰਾਕਸੀ, ਪਰਾਕਸੀ ਸਰਵਰ -X-KDE-Keywords[pl]=proxy,pośrednik,serwer pośredniczący,zapora ogniowa,Squid -X-KDE-Keywords[pt]=Proxy,Servidor proxy,Firewall,Squid,proxy -X-KDE-Keywords[pt_BR]=Proxy,Servidor Proxy,Firewall,Squid,proxy -X-KDE-Keywords[ro]=proxy,server proxy,firewall,squid,zid de foc -X-KDE-Keywords[se]=proxy,gaskabálvá,gaskabálvá,buollinmuvra,squid -X-KDE-Keywords[sl]=posrednik,posredniški strežnik,požarni zid,squid,proxy -X-KDE-Keywords[sr]=Proxy,Proxy server,Firewall,Squid,proxy,прокси,зид -X-KDE-Keywords[sr@latin]=Proxy,Proxy server,Firewall,Squid,proxy,proksi,zid -X-KDE-Keywords[sv]=Proxy,Proxy-server,Brandvägg,Squid,proxy -X-KDE-Keywords[ta]=பதிவாணை,பதிவாணை சேவகன்,ஃபயர்வால்,ஸ்க்யுட்,ப்ராக்சி -X-KDE-Keywords[th]=พร็อกซี,เซิร์ฟเวอร์พร็อกซี,ไฟร์วอลล์,Squid,พร็อกซี -X-KDE-Keywords[tr]=Vekil,Vekil sunucu,Güvenlik duvarı,Squid,proxy -X-KDE-Keywords[uk]=проксі,проксі-сервер,фаєрвол,Squid,proxy -X-KDE-Keywords[uz]=Squid,Прокси,Прокси сервер,Файервол,прокси -X-KDE-Keywords[vi]=Proxy,Ủy nhiệm, Máy phục vụ ủy nhiệm,Tường lửa,Squid,ủy nhiệm -X-KDE-Keywords[wa]=procsi,sierveu procsi,côpe-feu,squid +X-KDE-Keywords[da]=Proxy,Proxy-server,Firewall,Squid,proxy +X-KDE-Keywords[de]=Proxy,Proxy-Server,Firewall,Squid,proxy +X-KDE-Keywords[fi]=Proxy,Välitys,Välityspalvelin,Palomuuri,Squid +X-KDE-Keywords[hu]=Proxy,Proxy kiszolgáló,Tűzfal,Squid,proxy +X-KDE-Keywords[kk]=Proxy,Proxy server,Firewall,Squid,proxy +X-KDE-Keywords[nb]=Mellomtjener,Brannmur,Squid,mellomtjener +X-KDE-Keywords[nl]=Proxy,proxyserver,firewall,squid,proxy +X-KDE-Keywords[pt]=Proxy,servidor proxy,Firewall,Squid,proxy +X-KDE-Keywords[pt_BR]=Proxy,Servidor proxy,Firewall,Squid,proxy +X-KDE-Keywords[sv]=Proxy,Proxyserver,Brandvägg,Squid,proxy +X-KDE-Keywords[uk]=Proxy,Proxy server,Firewall,Squid,proxy,проксі,сервер,проксі-сервер,брандмауер,файрвол X-KDE-Keywords[x-test]=xxProxy,Proxy server,Firewall,Squid,proxyxx -X-KDE-Keywords[xh]=Umntu onegunya lokudsebenzela omnye, umncedisi womntu onegunya,udonga lomlilo,Squid,umntu onegunya lokusebenzela omnye -X-KDE-Keywords[zh_CN]=Proxy,Proxy server,Firewall,Squid,proxy,代理,代理服务器,防火墙 -X-KDE-Keywords[zh_TW]=Proxy,Proxy server,Firewall,Squid,proxy,代理,代理伺服器,防火牆 +X-KDE-Keywords[zh_TW]=Proxy,Proxy server,Firewall,Squid,proxy diff -Nru kde-baseapps-4.7.90/konqueror/settings/kio/smb.desktop kde-baseapps-4.7.95/konqueror/settings/kio/smb.desktop --- kde-baseapps-4.7.90/konqueror/settings/kio/smb.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/kio/smb.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -192,60 +192,17 @@ Comment[zh_TW]=設定您可以瀏覽的 Windows (SMB) 檔案系統 X-KDE-Keywords=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords -X-KDE-Keywords[be]=Кліент SMB,Сетка Windows,Навакольнае асяроддзе,Сетка,асяроддзе,Сервер,Публікацыя,Агульныя файлы,Уваход,Пароль,Паролі,Уліковы запіс,Сесія,SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords -X-KDE-Keywords[bg]=Keywords=самба, споделяне, файлове, принтери, печат, пароли, SMB, SAMBA, SMB client, Windows network, LAN, Network, neighborhood, Server, Broadcast, WINS, Share, Login, Passwords -X-KDE-Keywords[ca]=SMB,SAMBA,Client SMB,Xarxa Windows,LAN,Xarxa,veïnat,servidor,Broadcast,WINS,Compartició,Accés,Contrasenyes -X-KDE-Keywords[cs]=SMB,Samba,SMB klient,Síť Microsoft Windows,LAN,Síť,Okolní počítače,Server,Broadcast,WINS,Share,Login,Hesla -X-KDE-Keywords[csb]=SMB,SAMBA,klient SMB,séc Windows,LAN,môlowô séc,sécowé òkrãże,serwera,rozgłôszanié,WINS,dostónk,logòwanié,parole -X-KDE-Keywords[cy]=SMB,SAMBA,dibynnydd SMB,Rhwydwaith Windows,LAN,Rhwydwaith,cymdogaeth,Gweinydd,Darllediad,WINS,Rhanniad,Mewngofnodi,Cyfrineiriau -X-KDE-Keywords[da]=SMB,Samba,SMB-klient,Windows-netværk,Lan,Netværk,arbejdsgruppe,server,Udsend,WINS,Del,Login,kodeord +X-KDE-Keywords[ca]=SMB,SAMBA,Client SMB client,Xarxa Windows,LAN,Xarxa,veïnat,Servidor,Difusió,WINS,Compartició,Connexió,Contrasenyes +X-KDE-Keywords[da]=SMB,SAMBA,SMB-klient,Windows netværk,LAN,netværk,nabolag,Server,Broadcast,WINS,Share,Login,adgangskoder X-KDE-Keywords[de]=SMB,Samba,SMB-Client,Windows-Netzwerk,LAN,Netzwerk,Netzumgebung,Umgebung,Server,Broadcast,WINS,Freigabe,Anmeldung,Passwörter -X-KDE-Keywords[el]=SMB,SAMBA,Πελάτης SMB,Δίκτυο Windows,LAN,Δίκτυο,γειτονιά,Εξυπηρετητής,Εκπομπή,WINDS,Κοινόχρηστος πόρος,Σύνδεση,Κωδικοί πρόσβασης -X-KDE-Keywords[en_GB]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighbourhood,Server,Broadcast,WINS,Share,Login,Passwords -X-KDE-Keywords[eo]=SMB,Sambo,kliento,Vindozo,reto,LAN,najbaraĵo,servilo,dissendo,WINS,retdosierujo,saluto,pasvorto -X-KDE-Keywords[es]=SMB,SAMBA,Cliente SMB,Red Windows,LAN,Red,entorno,Servidor,Broadcast,WINS,Compartición,Entrada,Acceso,Contraseñas -X-KDE-Keywords[et]=SMB,samba,SMB klient,Windowsi võrk,LAN,võrk,naabrus,server,broadcast,üldlevi,WINS,jagatud ressurss,kasutajanimi,paroolid -X-KDE-Keywords[eu]=SMB,SAMBA,SMB bezeroa,Windows sarea,LAN,Sarea,ingurunea,Zerbitzaria,Broadcast,WINS,Konpartizioa,Saio hasiera,Pasahitza -X-KDE-Keywords[fa]=SMB، SAMBA، کارخواه SMB، شبکۀ ویندوزی، شبکۀ داخلی، شبکه، مجاورت، کارساز، پخش، WINS، مشترک، ورود، اسم‌ رمزها -X-KDE-Keywords[fi]=SMB,SAMBA,SMB-asiakas,Windows verkko,LAN,Verkko,Naapuruus,Palvelin,Jakelu,WINS,Jako,Kirjautuminen,Salasanat -X-KDE-Keywords[fr]=smb,samba,client smb,réseau Windows,lan,réseau local,réseau,voisinage,serveur,broadcast,diffusion,wins,partage,connexion,mot de passe,windows,login -X-KDE-Keywords[fy]=SMB,SAMBA,SMB-client,Windows-netwurk,LAN,netwurk,omwrâld,neighborhood,server,broadcast,WINS,share,Oanmelde,login,wachtwurden,netwurk -X-KDE-Keywords[ga]=SMB,SAMBA,cliant SMB,líonra Windows,LAN,Líonra,comharsanacht,Freastalí,Craoladh,WINS,Comhroinn,Logáil Isteach,Focail Fhaire -X-KDE-Keywords[gl]=SMB,SAMBA,cliente SMB,rede Windows,LAN,Rede,veciñanza,Servidor,Broadcast,WINS,Compartición,Login,Inicio,Contrasinais -X-KDE-Keywords[he]=שיתוף,כניסה למערכת,סיסמאות,WINS,רשת מקומית,רשת,שכנים,שרת,שידור,רשת Windows,תוכנית SMB,SAMBA,SMB, SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords -X-KDE-Keywords[hr]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,SMB klijent,Windows mreža,Mreža,susjedstvo,Poslužitelj,Opća objava,Dijeljenje,Prijava,Lozinke -X-KDE-Keywords[hu]=SMB,Samba,SMB-kliens,Windows-hálózat,LAN,hálózat,környezet,kiszolgáló,broadcast,WINS,megosztás,bejelentkezés,jelszavak -X-KDE-Keywords[is]=Windows net,SMB netdrif,netdrif,net,SMB biðill,Net,nágrenni,þjónn,deild,lykilorð,innskráning -X-KDE-Keywords[it]=SMB,SAMBA,Client SMB,Rete Windows,LAN,Rete,Risorse di rete,Accesso,WINS,Login,Share,Condivisioni,Password,Broadcast,vicini,server,risorse di rete -X-KDE-Keywords[ja]=SMB,SAMBA,SMBクライアント,Windowsネットワーク,LAN,ネットワーク,neighborhood,サーバ,ブロードキャスト,WINS,共有,ログイン,パスワード -X-KDE-Keywords[km]=SMB SAMBA ម៉ាស៊ីន​ភ្ញៀវ SMB បណ្ដាញ​វីនដូ LAN បណ្ដាញ ភាព​នៅ​ក្បែ ម៉ាស៊ីន​បម្រើ ផ្សាយ WINS ការ​ចែក​រំលែក ចូល ពាក្យ​សម្ងាត់ -X-KDE-Keywords[ko]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,삼바,윈도우즈,윈도,삼바 클라이언트,윈도우즈 네트워크,서버,공유 -X-KDE-Keywords[lt]=SMB,SAMBA,SMB client,SMB klientas,Windows network,Windows tinklas,LAN,vietinis tinklas,Network,tinklas,neighborhood,kaiminystė,Server,serveris,Broadcast,transliacija,WINS,Share,bendro naudojimo,bendro naudojimo diskas,Login,Passwords -X-KDE-Keywords[lv]=SMB,SAMBA,SMB klients,Windows tīkls,LAN,Tīkls,kaimiņš,Serveris,Pārraide,WINS,Šāre,Pieteikšanās,Paroles -X-KDE-Keywords[mk]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,клиент,Windows мрежа,Мрежа, соседство,Сервер,Емитување,WINS,Заеднички,Најава,Лозинки -X-KDE-Keywords[nb]=SMB,SAMBA,SMB-klient,Windows-nettverk,LAN,Nettverk,nabolag,tjener,kringkasting,WINS,deling,innlogging,passord,ressurs -X-KDE-Keywords[nds]=SMB,SAMBA,SMB-Client,Windowsnettwark,LAN,Nettwark,Naverschap,Server,Broadcast,Rundroop,WINS,deelt Ressource,anmellen,Passwöör -X-KDE-Keywords[ne]=SMB, SAMBA, SMB क्लाइन्ट,सञ्झ्याल सञ्जाल, LAN, सञ्जाल, छिमेकी, सर्भर, प्रसारण, WINS, बाडँफाट, लगइन, पासवर्ड -X-KDE-Keywords[nl]=SMB,SAMBA,SMB-client,Windows-netwerk,LAN,netwerk,omgeving,neighborhood,server,broadcast,WINS,share,inloggen,login,aanmelden,wachtwoorden,netwerk -X-KDE-Keywords[nn]=SMB,SAMBA,SMB-klient,Windows-nettverk,LAN,nettverk,nabolag,grannelag,tenar,kringkasting,WINS,deling,innlogging,passord,ressurs -X-KDE-Keywords[pa]=SMB,SAMBA,SMB ਕਲਾਂਇਟ,Windows network,LAN,ਨੈਟਵਰਕ,ਗੁਆਂਢੀ, ਸਰਵਰ,Broadcast,WINS,ਸਾਂਝ, ਲਾਗਿੰਨ, ਪਾਸਵਰਡ -X-KDE-Keywords[pl]=SMB,SAMBA,klient SMB,sieć Windows,LAN,sieć lokalna,otoczenie sieciowe,serwer,rozgłoszenie,WINS,zasób,logowanie,hasła -X-KDE-Keywords[pt]=SMB,SAMBA,cliente SMB,rede Windows,Windows,LAN,rede,vizinhança de rede,servidor,difusão,WINS,partilha,login,senhas -X-KDE-Keywords[pt_BR]=SMB,SAMBA,cliente SMB,rede Windows,LAN,Rede,vizinhança,Servidor,Difusão,WINS,Compartilhamento,Login,Senhas -X-KDE-Keywords[ro]=SMB,SAMBA,client SMB,Windows,LAN,reţea,vecinătate,server,difuziune,WINS,partajare,logare,parole -X-KDE-Keywords[se]=SMB,SAMBA,SMB-klienta,Windows-fierpmádat,LAN,fierpmádat,WINS,sisačáliheapmi,beassansánit -X-KDE-Keywords[sl]=SMB,SAMBA,odjemnik SMB,omrežje Windows,LAN,omrežje,omrežna soseščina,oddajanje,WINS,prijava,gesla -X-KDE-Keywords[sr]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Сервер,Broadcast,WINS,Share,Login,Passwords,мрежа,комшилук,дељење,пријава,лозинке -X-KDE-Keywords[sr@latin]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,mreža,komšiluk,deljenje,prijava,lozinke -X-KDE-Keywords[sv]=SMB,SAMBA,SMB-klient,Windowsnätverk,LAN,Nätverk,omgivning,Server,Broadcast,WINS,Utdelning,Lösenord,Inloggning -X-KDE-Keywords[ta]=SMB,SAMBA,SMB உறுப்பினர்,சாளரங்கள் வலைதளம்,LAN,வலைதளம்,பல வலைதளங்கள்,சேவகன்,ஒலிப்பரப்புதல்,WINS,பங்கு,உள்நுழை,கடவுச்சொற்கள் -X-KDE-Keywords[th]=SMB,SAMBA,ไคลเอนต์ SMB,ระบบเครือข่ายของวินโดว์ส,แลน,ระบบเครือข่าย,ที่ใกล้เคียง,เซิร์ฟเวอร์,ถ่ายทอด,WINS,ทรัพยากรใช้ร่วมกัน,ล็อกอิน,รหัสผ่าน -X-KDE-Keywords[tr]=SMB,SAMBA,SMB istemci,Windows ağı,LAN,Ağ,komşular,Giriş,Parola,Paylaşım,WINS,yayın -X-KDE-Keywords[uk]=клієнт SMB,мережа Windows,ЛОМ,LAN,мережа,оточення,SMB,SAMBA,сервер,мережа Windows,ЛОМ,LAN,мережа,оточення,SMB,SAMBA,сервер,трансляція,WINS,спільний ресурс,реєстрація,паролі -X-KDE-Keywords[uz]=SMB,SAMBA,SMB клиенти,Windows тармоғи,LAN,Тармоқ,тармоқ муҳити,Сервер,Broadcast,WINS,Share,Фойдаланувчи,Махфий сўзлар -X-KDE-Keywords[vi]=SMB,SAMBA,khách SMB,mạng Windows,LAN,mạng cục bộ,mạng,hàng xóm,Máy phục vụ,Quảng bá,WINS,Chia xẻ,Đăng nhập,Mật khẩu -X-KDE-Keywords[wa]=SMB,SAMBA,cliyint SMB,rantoele Windows,rantoele locåle,LAN,vijhnaedje rantoele,vijhnaedje,sierveu,broadcast,WINS,pårtaedje,elodjî,elodjaedje,sicret,sicrets +X-KDE-Keywords[fi]=SMB,SAMBA,SMB client,SMB-asiakas,SMB-ohjelma,Windows-verkko,LAN,Verkko,ympäristö,Palvelin,Broadcast,Yleislähetys,WINS,Jako,Kirjautuminen,Salasanat +X-KDE-Keywords[hu]=SMB,SAMBA,SMB kliens,Windows hálózat,LAN,Hálózat,szomszéd,Kiszolgáló,Broadcast,WINS,Megosztás,Bejelentkezés,Jelszavak +X-KDE-Keywords[kk]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords +X-KDE-Keywords[nb]=SMB,SAMBA,SMB-klient,Windows-nettverk,LAN,Nettverk,nabolag,Tjener,Kringkasting,WINS,Ressurs,Login,Passord +X-KDE-Keywords[nl]=SMB,SAMBA,SMB-client,Windows-netwerk,LAN,netwerk,nabije omgeving,server,broadcast,WINS,delen,aanmelden,wachtwoorden +X-KDE-Keywords[pt]=SMB,SAMBA,cliente de SMB,rede Windows,LAN,rede,vizinhança,servidor,difusão,WINS,partilha,conta,senhas +X-KDE-Keywords[pt_BR]=SMB,SAMBA,Cliente de SMB,Rede Windows,LAN,Rede,vizinhança,Servidor,Difusão,WINS,Compartilhamento,Autenticação,Senhas +X-KDE-Keywords[sv]=SMB,SAMBA,SMB klient,Windows nätverk,LAN,Nätverk,grannskap,Server,Utsändning,WINS,Dela,Inloggning,Lösenord +X-KDE-Keywords[uk]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,клієнт,віндоус,віндовс,віндовз,оточення,локальна,сервер,трансляція,ресурс,спільний,пароль,вхід,реєстрація X-KDE-Keywords[x-test]=xxSMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwordsxx -X-KDE-Keywords[xh]=SMB,SAMBA,umxhasi we SMB,umsebenzi womnatha we Window,LAN, Umsebenzi womnatha,ubumelwane,Umncedisi,Usasazo,WINS,Yahlula,Igama elithile, Amagama agqithisiweyo -X-KDE-Keywords[zh_CN]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,局域网,网络,邻居,服务器,广播,共享,登录,密码 -X-KDE-Keywords[zh_TW]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,客戶端程式,Windows 網路,區域網路,網路,網路芳鄰,伺服器,廣播,共享,登入,密碼 +X-KDE-Keywords[zh_TW]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords diff -Nru kde-baseapps-4.7.90/konqueror/settings/kio/useragent.desktop kde-baseapps-4.7.95/konqueror/settings/kio/useragent.desktop --- kde-baseapps-4.7.90/konqueror/settings/kio/useragent.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/kio/useragent.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -191,60 +191,16 @@ Comment[zh_TW]=設定 Konqueror 回報自身狀況的方式 X-KDE-Keywords=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login -X-KDE-Keywords[af]=Gebruiker Agent,Browser,Internet,WWW,Network,agent,bindings,server,login -X-KDE-Keywords[be]=Кліент,Вандроўнік,Сетка,Агент,сервер,уваход,сесія,User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login -X-KDE-Keywords[bg]=Keywords=идентификация, клиент, потребителски, браузър, Интернет, агент, сайт, представяне, User Agent, Browser, Internet, WWW, Network, agent, bindings, server, login -X-KDE-Keywords[ca]=Agent d'usuari,Fullejador,Internet,WWW,Xarxa,agent,lligams,servidor,accés -X-KDE-Keywords[cs]=Uživatelský agent,Prohlížeč,Internet,WWW,Síť,Agent,Vazby,Server,Login,Přihlášení -X-KDE-Keywords[csb]=User Agent,programa brëkòwnika,przezérnik,Internet,WWW,séc,agent,sparłączenia,serwera,login -X-KDE-Keywords[cy]=Asiant y Defnyddiwr,Porwr,Rhyngrwyd,WWW,Rhwydwaith,asiant,rhwymiadau,gweinydd,mewngofnodi -X-KDE-Keywords[da]=Brugeragent,Internet,WWW,Netværk,agent,bindinger,server,login -X-KDE-Keywords[de]=Browserkennung,Internetprogramm,Browser,Internet,WWW,Netzwerk,Server,Zuordnungen,Anmeldung -X-KDE-Keywords[el]=Πράκτορας χρήστη,Περιηγητής,Διαδίκτυο,WWW,Δίκτυο,πράκτορας,bindings,εξυπηρετητής,σύνδεση -X-KDE-Keywords[eo]=uzanto,agento,TTT,Interreto,WWW,reto,asocioj,servilo,saluto -X-KDE-Keywords[es]=Agente de Usuario,Navegador,Internet,WWW,Red,agente,asociaciones,servidor,entrada,acceso -X-KDE-Keywords[et]=kasutajaagent,identifikaator,veebilehitseja,Internet,WWW,võrk,agent,seosed,server,sisselogimine -X-KDE-Keywords[eu]=Erabiltzaile agentea,Arakatzailea,Internet,WWW,sarea,agentea, elkarketak,zerbitzaria,saio-hasiera -X-KDE-Keywords[fa]=عامل کاربر، مرورگر، اینترنت، WWW، شبکه، عامل، مقیدسازیها، کارساز، ورود -X-KDE-Keywords[fi]=Käyttäjäagentti,Selain,Internet,WWW,Verkko,agentti,sidokset,palvelin,kirjautuminen -X-KDE-Keywords[fr]=identité du navigateur,navigateur,WWW,réseau,associations,serveur,connexion,login,internet -X-KDE-Keywords[fy]=user agent,browser,internet,www,netwurk,brûkersagint,agint,biningen,tsjinner,oanmelding -X-KDE-Keywords[ga]=UserAgent,gníomhaire úsáideora,Brabhsálaí,Idirlíon,WWW,Líonra,Gréasán,gníomhaire,ceangail,freastalaí,logáil isteach -X-KDE-Keywords[gl]=Axente de Usuario,User Agent,Navegador,Internet,WWW,Rede,axente,atallos,servidor,login -X-KDE-Keywords[he]=רשת,זיהוי,קישורים,שרת,כניסה למערכת,דפדפן,זיהוי דפדפן,WWW,אינטרנט, User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login -X-KDE-Keywords[hr]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,Korisnički agent,Preglednik,Mreža,povezivanja,poslužitelj,prijava -X-KDE-Keywords[hu]=böngészőtípus,böngésző,internet,WWW,hálózat,azonosító,hozzárendelések,kiszolgáló,bejelentkezés -X-KDE-Keywords[is]=Vafraauðkenning,Auðkennig,Auðkenning Vafra,Vafri,Net,Netið,bindingar,þjónn,innstimplun,innskráning -X-KDE-Keywords[it]=User agent,Navigazione,Browser,Internet,WWW,Rete,agent,collegamenti,server,login,accesso -X-KDE-Keywords[ja]=ユーザエージェント,ブラウザ,インターネット, WWW,ネットワーク,エージェント,バインディング,サーバ,ログイン -X-KDE-Keywords[km]=ភ្នាក់ងារ​អ្នក​ប្រើ កម្មវិធីរុករក អ៊ីនធឺណិត វើលវ៉ាយវ៉េប បណ្ដាញ ភ្នាក់ងារ ការ​ចង ម៉ាស៊ីន​បម្រើ ចូល -X-KDE-Keywords[ko]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,사용자 에이전트,브라우저,네트워크,에이전트,도우미,바인딩,서버,로그인,인터넷 -X-KDE-Keywords[lt]=Naudotojo agentas,User-Agent,Naršyklė,Internet,WWW,Tinklas,agentas,sietis,serveris, registracija -X-KDE-Keywords[lv]=Lietotāja Aģents,Pārlūks,Internets,WWW,Tīkls,aģents,sasaistes,serveris,pieteikšanās -X-KDE-Keywords[mk]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,Кориснички агент,Прелистувач,Интернет,Мрежа,агент,поврзувања,сервер,најава -X-KDE-Keywords[nb]=brukaragent,nettleser,internett,WWW,verdensveven,nettverk,agent,tjener,innlogging -X-KDE-Keywords[nds]=User Agent,Browser,Internet,WWW,Nettwark,agent,bindings,Server,Nettkieker,anmellen -X-KDE-Keywords[ne]=प्रयोगकर्ता एजेन्ट, ब्राउजर, इन्टरनेट, WWW, सञ्जाल, एजेन्ट, बाइन्डिङहरू, सर्भर, लगइन -X-KDE-Keywords[nl]=user agent,browser,internet,www,netwerk,gebruikersagent,agent,bindingen,server,login -X-KDE-Keywords[nn]=brukaragent,nettlesar,internett,WWW,verdsveven,nettverk,agent,tenar,innlogging -X-KDE-Keywords[pa]=WWW,Network,agent,bindings,ਏਜੰਟ,ਸਰਵਰ,ਲਾਗਿੰਨ,ਇੰਟਰਨੈਟ,ਝਲਕਾਰਾ,ਯੂਜ਼ਰ ਏਜੰਟ,ਨੈਟਵਰਕ -X-KDE-Keywords[pl]=User Agent,program użytkownika,przeglądarka,Internet,WWW,sieć,agent,powiązania,serwer,login -X-KDE-Keywords[pt]=Agente do Utilizador,Navegador,Internet,WWW,Rede,Interfaces,Servidor,Autenticação -X-KDE-Keywords[pt_BR]=Agente de Usuário,Navegador,Internet,WWW,Rede,agente,ligações,servidor,login -X-KDE-Keywords[ro]=agent utilizator,User Agent,navigator,browser,Internet,WWW,reţea,agent,asocieri,server,logare -X-KDE-Keywords[se]=geavaheaddjiageanta,fierpmádatlogan,fierpmádat,WWW,interneahtta,fierbmi, ageanta,bálvá,sisačáliheapmi -X-KDE-Keywords[sl]=uporabniški agent,brskalnik,internet,WWW,splet,omrežje,strežnik,prijava -X-KDE-Keywords[sr]=User Агент,Browser,Интернет,WWW,Network,агент,bindings,сервер,login, Мрежа,прегледач,агент,кориснички агент -X-KDE-Keywords[sr@latin]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login, Mreža,pregledač,agent,korisnički agent -X-KDE-Keywords[sv]=Användaragent,Webbläsare,Internet,WWW,Nätverk,agent,bindningar, server,inloggning -X-KDE-Keywords[ta]=பயன்படுத்துபவர் முகவர்,உலாவி,வலைபின்னல்,WWW,வலைதளம்,முகவர்,bindings,சேவகன்,உள்நுழை -X-KDE-Keywords[th]=เครื่องมือของผู้ใช้,เบราว์เซอร์,อินเทอร์เน็ต,WWW,เครือข่าย,เครื่องมือ,การจับคู่,เซิร์ฟเวอร์,ล็อกอิน -X-KDE-Keywords[tr]=Kullanıcı Aracısı,Tarayıcı,İnternet,WWW,Ağ,giriş,sunucu,aracı -X-KDE-Keywords[uk]=агент навігатора,навігатор,Інтернет,WWW,мережа,агент,прив'язки,сервер,реєстрація -X-KDE-Keywords[uz]=User Agent,WWW,agent,bindings,Браузер,Интернет,Тармоқ,сервер -X-KDE-Keywords[vi]=Tác nhân người dùng,Trình duyệt,Mạng,Internet,WWW,mạng,tác nhân,tổ hợp,máy phục vụ,đăng nhập -X-KDE-Keywords[wa]=Idintifiaedje do betchteu,User Agent,adjint d' uzeu,betchteu,Daegntoele,WWW,rantoele,adjint,aloyaedjes,sierveu,elodjaedje +X-KDE-Keywords[ca]=Agent d'usuari,Navagador,Internet,WWW,Xarxa,agent,lligams,servidor,connexió +X-KDE-Keywords[da]=User agent,brugeragent,internet,www,netværk,agent,bindinger,server,login +X-KDE-Keywords[fi]=User Agent,Selaimen tunnistetiedot,Selaimen tunnistus,Selain,Internet,WWW,Verkko,agent,palvelin,kirjautuminen +X-KDE-Keywords[hu]=Böngészőazonosító,Böngésző,Internet,WWW,Hálózat,azonosító,kötések,kiszolgáló,bejelentkezés +X-KDE-Keywords[kk]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login +X-KDE-Keywords[nb]=Brukeragent,Nettleser,Internett,WWW,Nettverk,agent,bindinger,tjener,login +X-KDE-Keywords[nl]=Gebruikersagent,browser,internet,www,netwerk,agent,bindings,server,aanmelden +X-KDE-Keywords[pt]=Agente do Utilizador,Navegador,Internet,WWW,Rede,agente,interfaces,servidor,conta +X-KDE-Keywords[pt_BR]=Agente do usuário,Navegador,Internet,WWW,Rede,agente,interfaces,servidor,conta +X-KDE-Keywords[sv]=Användaragent,Webbläsare,Internet,WWW,Nätverk,agent,bindning,server,inloggning +X-KDE-Keywords[uk]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,агент,перегляд,переглядач,браузер,мережа,прив’язки,прив’язування,сервер,вхід,реєстрація X-KDE-Keywords[x-test]=xxUser Agent,Browser,Internet,WWW,Network,agent,bindings,server,loginxx -X-KDE-Keywords[xh]=Ummeli womsebenzisi,Umkhangeli zincwadi,Internet,WWW,Umsebenzi womnatha,ummeli,izibophelelo,umncedisi,igama elithile -X-KDE-Keywords[zh_CN]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,用户代理,Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,用户代理,浏览,网络,代理,绑定,服务器,登录 -X-KDE-Keywords[zh_TW]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,使用者代理程式,瀏覽器,網際網路,網路,代理程式,伺服器,登入 +X-KDE-Keywords[zh_TW]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login diff -Nru kde-baseapps-4.7.90/konqueror/settings/konq/fileappearance.desktop kde-baseapps-4.7.95/konqueror/settings/konq/fileappearance.desktop --- kde-baseapps-4.7.90/konqueror/settings/konq/fileappearance.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konq/fileappearance.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -196,58 +196,17 @@ Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的外觀 X-KDE-Keywords=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour -X-KDE-Keywords[be]=Кіраўнік файлаў,Перанос словаў,Перанос,Падкрэсліванне,Падкрэслены,Паказваць,Памер,Байты,Шрыфт,Колер,konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour -X-KDE-Keywords[bg]=Keywords=файлове, файл, управление, браузър, мениджър, konqueror, filemanager,word wrap, wrap, underline, display, filesize, bytes, font, color, colour -X-KDE-Keywords[ca]=konqueror,gestor de fitxers, ajust de línia,subratllar,mostrar,mida del fitxer,octets,tipus de lletra,color,colorit -X-KDE-Keywords[cs]=Konqueror,Správce souborů,Zalamování,Podtrhávání,Zobrazení,Velikost souboru,Bajty,Písmo,Barva -X-KDE-Keywords[csb]=konqueror,menadżer lopków,zawijanié wierztów,zawijanié,podsztëchiwanié,wëzdrzatk, miara lopkù,bajtë,fòntë,farwa -X-KDE-Keywords[cy]=konqueror,rheolydd ffeiliau,lapio geiriau,lapio,tanlinellu,dangos,maint ffeil,beitiau,ffont,lliw -X-KDE-Keywords[da]=konqueror,filhåndtering,ordombrydning,ombrydning,understreg,vis,filstørrelse,byte,skrifttype,farve -X-KDE-Keywords[de]=Konqueror,Dateimanager,Zeilenfall,Textumbruch,Unterstreichen,Darstellung,Dateigröße,Schrift,Farbe,Byte -X-KDE-Keywords[el]=konqueror,διαχειριστής αρχείων,αναδίπλωση λέξεων,αναδίπλωση,υπογράμμιση,προβολή,μέγεθος αρχείου,bytes,γραμματοσειρά,χρώμα,χρώμα -X-KDE-Keywords[eo]=konkeranto,dosieradministrilo,vidigi,vidigo,dosiera grandeco,bajto,bitoko,okbitaro,tiparo,koloro -X-KDE-Keywords[es]=konqueror,gestor de ficheros, ajuste de línea,subrayar,mostrar,tamaño de fichero,bytes,tipo de letra,color -X-KDE-Keywords[et]=konqueror,failihaldur,sõnade murdmine,murdmine,allajoonimine,ekraan,faili suurus,baidid,font,värv -X-KDE-Keywords[eu]=konqueror,fitxategi kudeatzailea,itzulbiratu, egokitu,azpimarratu,pantaila,fitxategi tamaina,byteak,letra-tipoa,kolorea -X-KDE-Keywords[fa]=konqueror، مدیر پرونده، سطربندی واژه، سطربندی، خط زیر، نمایش، اندازه پرونده، بایتها، قلم، رنگ، رنگ -X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,sanankatkaisu,alleviivaus,tiedostokoko,tavuja, kirjasin,väri -X-KDE-Keywords[fr]=konqueror,gestionnaire de fichiers,explorateur,retour à la ligne,soulignement,affichage,taille des fichiers,octets,police,couleur -X-KDE-Keywords[fy]=konqueror,filemanager,triembehear,word wrap,rigelôfbreking,ûnderstreakje,display,werjefte,filesize,triemgrutte,bytes,fonts,lettertypen,kleur,color -X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,timfhilleadh focal,timfhilleadh,líne faoi,scáileán,méid comhaid,bearta,cló,clófhoireann,dath -X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,axuste de palabras,axuste,subliñar,mostrar,tamaño de ficheiro,bites,fonte,cor -X-KDE-Keywords[he]=konqueror,מנהל קבצים,גלישת שורות,קו תחתון,תצוגה,גודל קובץ,בתים,גופן,צבע, konqueror,filemanager,word wrap, wrap,underline,display,filesize,bytes,font,color,colour -X-KDE-Keywords[hr]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,upravljač datoteka,omatanje riječi,omatanje,podvlačenje,prikaz,veličina datoteke,bajtovi,font,boja,boje -X-KDE-Keywords[hu]=konqueror,fájlkezelő,szótördelés,tördelés,aláhúzás,képernyő,fájlméret,bájt,betűtípus,szín,színek -X-KDE-Keywords[is]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour, litir,línuskipting,skjár,skjáborð,bæt,litur -X-KDE-Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori -X-KDE-Keywords[ja]=konqueror,ファイルマネージャ,ワードラップ,行の折り返し,下線,表示,ファイルサイズ, バイト,フォント,色,カラー -X-KDE-Keywords[km]=konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ រុំពាក្យ រុំ គូស​បន្ទាត់​ក្រោម បង្ហាញ ទំហំ​ឯកសារ បៃ ពណ៌​ពុម្ពអក្សរ ពណ៌ -X-KDE-Keywords[ko]=konqueror,파일 관리자,밑줄,표시,파일 크기,바이트,글꼴,색 -X-KDE-Keywords[lt]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,failų tvarkyklė, žodžių perkėlimas, perkėlimas, pabraukimas, ekranas, failo dydis, baitai, šriftas,spalva -X-KDE-Keywords[lv]=iekarotājs,failumenedžeris,vārdu apciršana,apciršana,pasvītrojums,ekrāns,failu izmērs,baiti,fonti,krāsas -X-KDE-Keywords[mk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,менаџер на датотеки,прекршување на зборови,прекршување,подвлекување,екран,големина на датотека,бајти,фонт,боја -X-KDE-Keywords[nb]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,filbehandler,tekstbryting,understreket,skjerm,filstørrelse,byter,fonter,farger -X-KDE-Keywords[nds]=Konqueror,Dateipleger,word wrap,ümbreken,ünnerstreken,Dorstellen,Dateigrött,Bytes,Schriftoort, Klöör, Klören -X-KDE-Keywords[ne]=कन्क्वेरर, फाइल प्रबन्धक, शब्द बेर्नुहोस्, बेर्नुहोस्, अधोरेखा, प्रदर्शन गर्नुहोस्, फाइल साइज, बाइट्स, फन्ट, रङ, रङ -X-KDE-Keywords[nl]=konqueror,filemanager,bestandsbeheer,word wrap,regelafbreking,onderstrepen,display,weergave,filesize,bestandsgrootte,bytes,fonts,lettertypen,kleur,color -X-KDE-Keywords[nn]=Konqueror,filhandsamar,tekstbryting,linjebryting,bryting,understrek,vis,filstorleik,byte,skrift,farge -X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰਰ,ਫਾਇਲ ਮੈਨੇਜਰ,ਸ਼ਬਦ ਸਮੇਟੋ,ਸਮੇਟੋ,ਹੇਠਾਂ ਰੇਖਾ,ਫਾਇਲ ਅਕਾਰ,ਬਾਈਟ,ਫੋਂਟ,ਰੰਗ ਝਲਕ -X-KDE-Keywords[pl]=konqueror,menedżer plików,zawijanie wierszy,zawijanie,podkreślenie,wygląd, rozmiar pliku,bajty,czcionki,kolor -X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,mudança de linha,mudança,sublinhado,ecrã,tamanho do ficheiro,bytes,tipo de letra,cor -X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,quebra de linha,quebra,sublinhado,monitor,tamanho de arquivo,bytes,fonte,cor,cor -X-KDE-Keywords[ro]=konqueror,manager de fişiere,limitare cuvînt,limitare,subliniere,afişare,mărime fişier,octeţi,font,culoare -X-KDE-Keywords[se]=Konqueror,fiilagieđahalli,linnjádoaddjin,doaddjin,vuolláisárgu,čájet,fiilasturrodat,stávvalat,fonta,ivdni -X-KDE-Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,prelom vrstic,prelom,podčrta,prikaz,velikost datoteke,bajt,pisava,barva -X-KDE-Keywords[sr]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,преламање текста,преламање,подвлачење,приказ,величина фајла,бајтови,фонт,боја -X-KDE-Keywords[sr@latin]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,prelamanje teksta,prelamanje,podvlačenje,prikaz,veličina fajla,bajtovi,font,boja +X-KDE-Keywords[ca]=konqueror,gestor de fitxers,ajust de paraules,ajust,subratllat,pantalla,mida de fitxer,bytes,tipus de lletra,color +X-KDE-Keywords[da]=konqueror,filhåndtering,ordombrydning,ombrydning,understregning,visning,filstørrelse,bytes,font,skrifttype,farve +X-KDE-Keywords[de]=Konqueror,Dateimanager,Zeilenumbruch,Textumbruch,Unterstreichen,Darstellung,Dateigröße,Schrift,Farbe,Byte +X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,rivitys,alleviivaus,näkymä,näyttö,tiedostokoko,tavuja,tavut,kirjasin,fontti,väri +X-KDE-Keywords[hu]=konqueror,fájlkezelő,szótördelés,tördelés,aláhúzás,megjelenítés,fájlméret,bájtok,betűtípus,szín,szín +X-KDE-Keywords[kk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour +X-KDE-Keywords[nb]=konqueror,filbehandler,ordbryting,bryting,understrek,visning,filstørrelse,byte,skrift,farge +X-KDE-Keywords[nl]=konqueror,bestandsbeheerder,regelafbreken,afbreken,onderstrepen,tonen,bestandsgrootte,bytes,lettertype,kleur,kleur +X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,mudança de linha,mudança,sublinhado,mostrar,tamanho do ficheiro,bytes,tipo de letra,cor +X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,mudança de linha,mudança,sublinhado,mostrar,tamanho do arquivo,bytes,fonte,cor,cores X-KDE-Keywords[sv]=konqueror,filhanterare,radbrytning,understreck,visa,filstorlek,byte,teckensnitt,färg -X-KDE-Keywords[ta]=கான்கொரர்,கோப்பு மேலாளர்,வார்த்தை மடக்கு, மடக்கு,அடிகோடிடு,காட்டு,கோப்பு அளவு,பைட்டுகள்,எழுத்துரு,வண்ணம்,வண்ணம் -X-KDE-Keywords[th]=konqueror,จัดการแฟ้ม,ตัดประโยค,ตัด,ขีดเส้นใต้,แสดงผล,ขนาดแฟ้ม,ไบต์,แบบอักษร,สี -X-KDE-Keywords[tr]=konqueror,dosya yöneticisi,görünüm,dosya boyu,bayt,yazıtipi,renk -X-KDE-Keywords[uk]=konqueror,менеджер файлів, переніс файлів,переніс,підкреслення,дисплей, розмір файлів,байти,шрифт,колір -X-KDE-Keywords[uz]=konqueror,файл бошқарувчиси,word wrap,wrap,тагини чизиш,кўрсатиш,файнинг ҳажми,байтлар,шрифт,ранг -X-KDE-Keywords[vi]=konqueror,trình quản lý tập tin,ngắt dòng văn bản,ngắt dòng,gạch chân,màn hình,cỡ tập tin,số byte,phông chữ,màu,màu sắc +X-KDE-Keywords[uk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,керування,файл,файли,перенесення,рядки,підкреслення,підкреслювання,показ,розмір,байти,шрифт,колір,кольори X-KDE-Keywords[x-test]=xxkonqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colourxx -X-KDE-Keywords[xh]=konqueror,umphathi wefayile,songela amagama,songela, yenza umgca ezantsi,bonisa, ubngakanani befayile,bytes,umgca,umbala,umbala -X-KDE-Keywords[zh_CN]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,文件管理器,自动换行,下划线,显示,文件大小,字节,字体,颜色 -X-KDE-Keywords[zh_TW]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,征服家,檔案管理程式,文字換行,換行,底線,顯示,檔案大小,位元組,字型,顏色 +X-KDE-Keywords[zh_TW]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour diff -Nru kde-baseapps-4.7.90/konqueror/settings/konq/filebehavior.desktop kde-baseapps-4.7.95/konqueror/settings/konq/filebehavior.desktop --- kde-baseapps-4.7.90/konqueror/settings/konq/filebehavior.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konq/filebehavior.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -158,7 +158,7 @@ Comment[ml]=കോണ്‍ക്വറര്‍ ഒരു ഫയലുകളുടെ നടത്തിപ്പുകാരനായി പെരുമാറുന്നതെങ്ങനെയെന്നു് നിങ്ങള്‍ക്കിവിടെ ക്രമീകരിയ്ക്കാം Comment[mr]=कॉन्करर फाइल प्रबंधक नुरूप कसे वागावे ते संयोजीत करू शकता Comment[ms]=Anda boleh konfigur bagaimana Konqueror berkelakuan sebagai pengurus fail di sini -Comment[nb]=Tilpass hvordan Konqueror opptrer som filbehandler +Comment[nb]=Sett opp hvordan Konqueror opptrer som filbehandler Comment[nds]=Hier kannst Du instellen, wodennig sik Konqueror as Dateipleger bedregen schall Comment[ne]=तपाईँले यहाँ कन्क्वेररले फाइल प्रबन्धकलाई गर्ने व्यवहार कन्फिगर गर्न सक्नुहुन्छ Comment[nl]=Hier kunt u het gedrag van Konqueror als bestandsbeheerder instellen @@ -196,54 +196,16 @@ Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的行為 X-KDE-Keywords=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation -X-KDE-Keywords[be]=Кіраўнік файлаў,Парады,Падказкі,Падказкі файлаў,Асобнае акно,Паводзіны,Выкарыстанне памяці,Хатняя тэчка,Сеткавыя аперацыя,Прагэрс,Выкананне,Сметніца,Выдаленне,Выдаліць,Пацверджанне,konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation -X-KDE-Keywords[bg]=Keywords=работен, плот, поведение, място, браузър, прозорец,konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can, -X-KDE-Keywords[ca]=konqueror,gestor de fitxers,kfm,consells,consells del fitxer,finestra separada,expandir finestres,comportament,ús de la memòria, URL d'inici,operacions de xarxa,diàleg de progrés,paperera,esborra,confirmacio -X-KDE-Keywords[cs]=konqueror,správce souborů,kfm,tipy,oddělené okno,chování,využití paměti,domvské URL,síťové operace,průběh,koš,potvrzení -X-KDE-Keywords[csb]=konqueror,menedżer lopków,kfm,podpòwiescë,apartné òkno,nowé òkna,zachòwanié,brëkòwanié pamiãcë,domôcy URl,kòsz,lëstëw pòkrokù,remanié,pòcwierdzenia,cécowé dzéjania -X-KDE-Keywords[da]=konqueror,filhåndtering,kfm,tip,filtip,separat vindue,flere vinduer,opførsel,hukommelsesforbrug,Hjemme-URL,netværksoperationer, fremgangsdialog,affald,slet bekræftelse -X-KDE-Keywords[de]=Konqueror,Dateimanager,kfm,Tipps,Fenster,Verhalten,Persönlicher Ordner,Speicherverwendung,URL,Adressen,Netzwerkoperationen,Fortschrittsanzeige,Mülleimer,Papierkorb,Löschen,Bestätigung -X-KDE-Keywords[el]=konqueror,διαχειριστής αρχείων,kfm,συμβουλές,συμβουλές αρχείων,ξεχωριστό παράθυρο,δημιουργία παραθύρων,συμπεριφορά,συμπεριφορά,χρήση μνήμης,Αρχική URL,λειτουργίες δικτύου,παράθυρο διαλόγου προόδου,κάδος απορριμμάτων,διαγραφή,επιβεβαίωση -X-KDE-Keywords[en_GB]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialogue,wastebin,delete,confirmation -X-KDE-Keywords[eo]=konkeranto,dosieradministrilo,kfm,konsiloj,dosierokonsiloj,aparta fenestro,lanĉitaj fenestroj,konduto,uzata memoro,hejma URLo, retagoj,progresdialogo,rubujo,forigi,konfirmi -X-KDE-Keywords[es]=konqueror,gestor de ficheros,kfm,sugerencias,ventana separada, extender ventanas,comportamiento,uso de memoria, URL de inicio,operaciones de red, diálogo de progreso,papelera,borrar,confirmación -X-KDE-Keywords[et]=konqueror,failihaldur,kfm,vihjed,failide vihjed,eraldi aken,käitumine,mälukasutus,kodukataloog,võrguoperatsioonid,võrgutoimingud,edenemisdialoog,prügikast,kustutamine -X-KDE-Keywords[eu]=konqueror,fitxategi kudeatzailea,kfm,iradokizunak,fitxategi iradokizunak, aparteko leihoa,leihoak hedatu,portaera,memoriaren erabilera,Hasierako URLa,ezabatu, berrespena -X-KDE-Keywords[fa]=konqueror، مدیر پرونده، kfm، نکات، نکات پرونده، پنجرۀ مجزا، پنجره‌های تکثیرشده، رفتار، رفتار، کاربرد حافظه، نشانی وب آغازه، عملیات شبکه، محاورۀ پیشرفت، زباله‌دان، حذف، تأیید -X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,erillinen ikkuna,erityisikkuna,käytös,muistinkäyttö,Koti-URL,kotiosoite,verkkotoiminnot,edistymisdialogi,roskakori,poisto,vahvistus -X-KDE-Keywords[fr]=konqueror,gestionnaire de fichiers,explorateur,kfm,astuces,fenêtre séparée,rafraîchissement des fenêtres,comportement,utilisation de la mémoire,Home URL,URL de démarrage,opérations réseau,fenêtre de progression,corbeille,poubelle,effacer,détruire,suppression,confirmation -X-KDE-Keywords[fy]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,ûnthâld gebrûk, ynternetadres, fuortgong, netwurk hanelingen, finsters fergrutsje, triembehearder, finsterbehearder -X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,kfm,información de ficheiro,fiestra separada,fiestras emerxentes,comportamento,uso da memória,URL de início,operacións en rede,diálogo de progreso,lixo -X-KDE-Keywords[he]=konqueror,מנהל קבצים,kfm,עצות,פירוט לקבצים,חלון נפרד,שימוש בזיכרון,פעולה,כתובת בית, פח זבל, אשפה, סל מחזור, סל מחזור, filemanager,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation -X-KDE-Keywords[hr]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,upravljač datoteka,poseban prozor,ponašanje,upotreba memorije,URL početne stranice,mrežni postupci,dijalog napredovanja,otpad,brisanje,potvrđivanje -X-KDE-Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablakmegnyitás,viselkedés,memóriahasználat,saját URL,hálózati műveletek,állapotjelző ablak,szemétkosár,törlés,megerősítés -X-KDE-Keywords[is]=konqueror,skráastjóri,kfm,ráð,skráarráð,aðskilin gluggi,margfaldast, gluggar,hegðun,minnisnotkun,heimaslóð, netaðgerðir, framvindugluggi, ruslafata,eyða, staðfesta -X-KDE-Keywords[it]=konqueror,filemanager,kfm,trucchi,file,separa finestre,comportamento,memoria utilizzata,home,operazioni di rete,avanzamento,finestra avanzamento,cestino,elimina,cancella,conferme -X-KDE-Keywords[ja]=konqueror,ファイルマネージャ,kfm,ツールチップ,個別ウィンドウ, ポップウィンドウ,挙動,メモリ使用量,ホームURL,ネットワーク操作,進捗ダイアログ,ごみ箱,削除,確認 -X-KDE-Keywords[km]=konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ kfm ព័ត៌មាន​ជំនួយ ព័ត៌មាន​ជំនួយ​ឯកសារ បំបែក​វីនដូ ,បង្កើត​វីនដ,ឥរិយាប ,ឥរិយាប ,ការ​ប្រើ​សត ,URL ដើ ,ប្រតិបត្តិការ​បណ្ដា ,ប្រអប់វឌ្ឍនភា ,ធុង​សំរា ,លុ ,អះអាង -X-KDE-Keywords[ko]=konqueror,파일 관리자,팁,새 창,행동,메모리 사용,홈 URL,네트워크 작업,휴지통 -X-KDE-Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,failų tvarkyklė,patarimai,failų patarimai,langai,atskiri langai, elgesys, elgsena, atminties naudojimas, namų adresas,tinklo operacijos,progreso dialogas,šiukšliadėžė,trinti,patvirtinimas -X-KDE-Keywords[mk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,менаџер на датотеки,совети,совети за датотеки,подели го прозорецот,однесување,користење на меморија,Домашно URL,мрежни операции,дијалог за прогрес,корпа за отпадоци,избриши,потврда -X-KDE-Keywords[nb]=konqueror,filbehandler,kfm,tips,tips om filer,eget vindu,åpne vinduer,oppførsel,minnebruk,hjemmeside på nettet,nettverksoperasjoner,framdriftsviser,papirkurv -X-KDE-Keywords[nds]=Konqueror,Dateipleger,kfm,Tipps,Dateitipps,egen Finster,Finster maken,Bedregen,behaviour,memory,Spiekerverbruuk,Home,Startsiet,Startadress,Nettwark-Akschonen,Vörankamendialoog,Affalltünn,Affall,löschen,Nafraag,nafragen,wegdoon -X-KDE-Keywords[ne]=कन्क्वेरर, फाइल प्रबन्धक, kfm, टिपहरू, फाइल टिप, फरक सञ्झ्याल, स्पवन सञ्झ्याल, व्यवहार,व्यवहार,स्मृति प्रयोग, गृह URL,सञ्जाल सञ्चालन, प्रगति संवाद, रद्दीटोकरी क्यान, मेट्नुहोस्, स्वीकृति -X-KDE-Keywords[nl]=konqueror,filemanager,bestandsbeheerder,kfm,tips,file tips,bestandstips,apart venster,gedrag,geheugengebruik,persoonlijke map,netwerkoperaties,voortgangsdialoog,prullenbak,verwijderen,bevestiging,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation -X-KDE-Keywords[nn]=konqueror,filhandterar,kfm,tips,filtips,eige vindauge,nye vindauge,åtferd,minnebruk,heime-URL,nettverksopersjonar,framdriftsindikator,papirkorg,slett,stadfesting -X-KDE-Keywords[pa]=kfm,ਕੋਨਕਿਉਰਰ,ਫਾਇਲ ਮੈਨੇਜਰ,ਸੰਕੇਤ,ਵੱਖਰਾ ਵਿੰਡੋ,ਵਿਹਾਰ,ਮੈਮੋਰੀ ਵਰਤੋਂ, ਨੈੱਟਵਰਕ ਕਾਰਵਾਈ,ਤਰੱਕੀ ਵਾਰਤਾਲਾਪ,ਰੱਦੀ,ਹਟਾਓ,ਪੁਸ਼ਟੀ,ਘਰ URL,ਸੰਕੇਤ -X-KDE-Keywords[pl]=konqueror,menedżer plików,kfm,podpowiedzi,osobne okno,nowe okna,zachowanie,zużycie pamięci,katalog domowy,kosz,pasek postępu,usuwanie,potwierdzenia,operacje sieciowe -X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base,operações de rede,janela de evolução,caixote do lixo,apagar,confirmação -X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivo de dicas,janelas separadas,janelas unidas,comportamento,comportamento,uso de memória,URL Base,operações de rede,diálogo de progresso,lata de lixo,remoção,confirmação -X-KDE-Keywords[ro]=konqueror,manager de fişiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL personal,operaţii de reţea,dialog de progres,gunoi,ştergere,confirmare -X-KDE-Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namig,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL, omrežne operacije,okno napredka,smeti,brisanje,potrditev -X-KDE-Keywords[sr]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,форе,форе за фајлове,одвојени прозор,понашање,искоришћеност меморије,савети,смеће,мрежне операције -X-KDE-Keywords[sr@latin]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,fore,fore za fajlove,odvojeni prozor,ponašanje,iskorišćenost memorije,saveti,smeće,mrežne operacije -X-KDE-Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,särskilt fönster,visa fönster,beteende,minnesanvändning,hemadress,nätverksåtgärder,förloppsdialogruta,papperskorg,ta bort,bekräftelse -X-KDE-Keywords[ta]=கான்கொரர்,கோப்பு மேலாளர்,kfm,குறிப்புகள்,கோப்பு குறிப்புகள்,தனி சாளரம்,நீள்வட்ட சாளரம்,நடத்தை,நினைவு பயன்பாடு,வீட்டு வலைப்பின்னல்,வலைப்பின்னல் செயல்பாடுகள், வழிமுறை உரையாடல்,குப்பைத்தொட்டி, நீக்கு,உறுதிப்படுத்தல் -X-KDE-Keywords[th]=konqueror ,ตัวจัดการแฟ้ม,kfm,เคล็ดลับ,เคล็ดลับแฟ้ม,หน้าต่างแยกต่างหาก,สร้างหน้าต่างใหม่,พฤติิกรรม,การใช้หน่วยความจำ,ตำแหน่งหลักการทำงานทางเครือข่าย,กล่องแสดงความก้าวหน้า,ถังขยะ,ลบทิ้ง,การยืนยัน -X-KDE-Keywords[tr]=konqueror,dosya yöneticisi,kfm,ipuçları,dosya ipuçları,pencere,davranış,bellek kullanımı,başlangıç,bellek kullanımı,başlangıç adresi,ağ işlemleri,ilerleme penceresi,çöp kutusu -X-KDE-Keywords[uk]=konqueror,менеджер файлів,kfm,підказки,підказки по файлах,окремі вікна,створення вікон,поведінка,використання пам'яті,домашній URL,робота з мережею,вікно поступу,смітник, -X-KDE-Keywords[uz]=konqueror,файл бошқарувчиси,kfm,эслатмалар,файл эслатмалари,алоҳида ойна,spawn windows,хусусиятлар,хотирадан фойдаланиш,Уй URL,тармоқ амаллари,чиқиндилар қутиси,ўчириш,тасдиқлаш -X-KDE-Keywords[vi]=konqueror,trình quản lý tập tin,kfm,gợi ý,tập tin tips,phân cách cửa sổ,tạo cửa sổ khác,ứng xử,cách sử dụng bộ nhớ,URL nhà,thao tác mạng,hộp thoại tiến hành,thùng rác,xoá,xác nhận +X-KDE-Keywords[ca]=konqueror,gestor de fitxers,kfm,consells,consells de fitxers,finestres separades,finestres engendrades,comportament,ús de memòria,URL inicial,operacions de xarxa,diàleg de progrés,paperera,esborrat,confirmació +X-KDE-Keywords[da]=konqueror,filhåndtering,kfm,tips,filtips,separat vindue,affød vinduer,opførsel,hukommelsesforbrug,startside,netværksoperationer,fremgangsdialog,affald kan,slette,bekræftelse +X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,omat ikkunat,erilliset ikkunat,käyttäytyminen,muistinkäyttö,kotiosoite,verkkotoiminnot,edistymisikkuna,roskakori,poista,varmistus,varmista +X-KDE-Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablak létrehozása,működés,működés,memóriahasználat,kezdőlap,hálózati műveletek,folyamatablak,kuka,törlés,megerősítés +X-KDE-Keywords[kk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation +X-KDE-Keywords[nb]=konqueror,filbehandler,kfm,tips,filtips,separat vindu,lag vinduer,oppførsel,minnebruk,hjemme-url,nettverkshandlinger,framdriftsdialog,papirkurv,slett,bekreftelse +X-KDE-Keywords[nl]=konqueror,bestandsbeheerder,kfm,tips,bestandstips,gescheiden venster,vensters afsplitsen,gedrag,geheugengebruik,start-url,netwerkbesturing,voortgangsdialoog,prullenbak,verwijderen,bevestiging +X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas do ficheiro,janela separada,janelas recriadas,comportamento,utilização de memória,URL inicial,operações de rede,janela de evolução,caixote do lixo,remoção,confirmação +X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,dicas do arquivo,janela separada,janelas recriadas,comportamento,utilização de memória,URL inicial,operações de rede,janela de evolução,lixeira,exclusão,confirmação +X-KDE-Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,separata fönster,skapa fönster,beteende,minnesanvändning,Hemwebbadress,nätverksåtgärder,förloppsdialogruta,papperskorg,ta bort,bekräftelse +X-KDE-Keywords[uk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,,network operations,progress dialog,trash can,delete,confirmationфайл,файли,керування,менеджер,підказки,вікно,вікна,контекст,поведінка,пам’ять,використання,домівка,смітник,мережа,дії,операції,поступ,вилучити,вилучення,підтвердження,погодження X-KDE-Keywords[x-test]=xxkonqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmationxx -X-KDE-Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,文件管理器,提示,文件提示,拆分窗口,新开窗口,行为,内存使用,家 URL,网络操作,进度对话框,回收站,删除,确认 -X-KDE-Keywords[zh_TW]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,征服家,檔案管理程式,密訣,檔案密訣,分離視窗,產生視窗,行為,記憶體使用量,家 URL,網路操作,進度對話盒,資源回收桶,刪除,確認 +X-KDE-Keywords[zh_TW]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation diff -Nru kde-baseapps-4.7.90/konqueror/settings/konq/webappearance.desktop kde-baseapps-4.7.95/konqueror/settings/konq/webappearance.desktop --- kde-baseapps-4.7.90/konqueror/settings/konq/webappearance.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konq/webappearance.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -197,58 +197,17 @@ Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的外觀 X-KDE-Keywords=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour -X-KDE-Keywords[be]=Кіраўнік файлаў,Перанос словаў,Перанос,Падкрэсліванне,Падкрэслены,Паказваць,Памер,Байты,Шрыфт,Колер,konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour -X-KDE-Keywords[bg]=Keywords=файлове, файл, управление, браузър, мениджър, konqueror, filemanager,word wrap, wrap, underline, display, filesize, bytes, font, color, colour -X-KDE-Keywords[ca]=konqueror,gestor de fitxers, ajust de línia,subratllar,mostrar,mida del fitxer,octets,tipus de lletra,color,colorit -X-KDE-Keywords[cs]=Konqueror,Správce souborů,Zalamování,Podtrhávání,Zobrazení,Velikost souboru,Bajty,Písmo,Barva -X-KDE-Keywords[csb]=konqueror,menadżer lopków,zawijanié wierztów,zawijanié,podsztëchiwanié,wëzdrzatk, miara lopkù,bajtë,fòntë,farwa -X-KDE-Keywords[cy]=konqueror,rheolydd ffeiliau,lapio geiriau,lapio,tanlinellu,dangos,maint ffeil,beitiau,ffont,lliw -X-KDE-Keywords[da]=konqueror,filhåndtering,ordombrydning,ombrydning,understreg,vis,filstørrelse,byte,skrifttype,farve -X-KDE-Keywords[de]=Konqueror,Dateimanager,Zeilenfall,Textumbruch,Unterstreichen,Darstellung,Dateigröße,Schrift,Farbe,Byte -X-KDE-Keywords[el]=konqueror,διαχειριστής αρχείων,αναδίπλωση λέξεων,αναδίπλωση,υπογράμμιση,προβολή,μέγεθος αρχείου,bytes,γραμματοσειρά,χρώμα,χρώμα -X-KDE-Keywords[eo]=konkeranto,dosieradministrilo,vidigi,vidigo,dosiera grandeco,bajto,bitoko,okbitaro,tiparo,koloro -X-KDE-Keywords[es]=konqueror,gestor de ficheros, ajuste de línea,subrayar,mostrar,tamaño de fichero,bytes,tipo de letra,color -X-KDE-Keywords[et]=konqueror,failihaldur,sõnade murdmine,murdmine,allajoonimine,ekraan,faili suurus,baidid,font,värv -X-KDE-Keywords[eu]=konqueror,fitxategi kudeatzailea,itzulbiratu, egokitu,azpimarratu,pantaila,fitxategi tamaina,byteak,letra-tipoa,kolorea -X-KDE-Keywords[fa]=konqueror، مدیر پرونده، سطربندی واژه، سطربندی، خط زیر، نمایش، اندازه پرونده، بایتها، قلم، رنگ، رنگ -X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,sanankatkaisu,alleviivaus,tiedostokoko,tavuja, kirjasin,väri -X-KDE-Keywords[fr]=konqueror,gestionnaire de fichiers,explorateur,retour à la ligne,soulignement,affichage,taille des fichiers,octets,police,couleur -X-KDE-Keywords[fy]=konqueror,filemanager,triembehear,word wrap,rigelôfbreking,ûnderstreakje,display,werjefte,filesize,triemgrutte,bytes,fonts,lettertypen,kleur,color -X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,timfhilleadh focal,timfhilleadh,líne faoi,scáileán,méid comhaid,bearta,cló,clófhoireann,dath -X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,axuste de palabras,axuste,subliñar,mostrar,tamaño de ficheiro,bites,fonte,cor -X-KDE-Keywords[he]=konqueror,מנהל קבצים,גלישת שורות,קו תחתון,תצוגה,גודל קובץ,בתים,גופן,צבע, konqueror,filemanager,word wrap, wrap,underline,display,filesize,bytes,font,color,colour -X-KDE-Keywords[hr]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,upravljač datoteka,omatanje riječi,omatanje,podvlačenje,prikaz,veličina datoteke,bajtovi,font,boja,boje -X-KDE-Keywords[hu]=konqueror,fájlkezelő,szótördelés,tördelés,aláhúzás,képernyő,fájlméret,bájt,betűtípus,szín,színek -X-KDE-Keywords[is]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour, litir,línuskipting,skjár,skjáborð,bæt,litur -X-KDE-Keywords[it]=konqueror,filemanager,a capo,sottolineatura,schermo,dimensione file,byte,caratteri,colori -X-KDE-Keywords[ja]=konqueror,ファイルマネージャ,ワードラップ,行の折り返し,下線,表示,ファイルサイズ, バイト,フォント,色,カラー -X-KDE-Keywords[km]=konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ រុំពាក្យ រុំ គូស​បន្ទាត់​ក្រោម បង្ហាញ ទំហំ​ឯកសារ បៃ ពណ៌​ពុម្ពអក្សរ ពណ៌ -X-KDE-Keywords[ko]=konqueror,파일 관리자,밑줄,표시,파일 크기,바이트,글꼴,색 -X-KDE-Keywords[lt]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,failų tvarkyklė, žodžių perkėlimas, perkėlimas, pabraukimas, ekranas, failo dydis, baitai, šriftas,spalva -X-KDE-Keywords[lv]=iekarotājs,failumenedžeris,vārdu apciršana,apciršana,pasvītrojums,ekrāns,failu izmērs,baiti,fonti,krāsas -X-KDE-Keywords[mk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,менаџер на датотеки,прекршување на зборови,прекршување,подвлекување,екран,големина на датотека,бајти,фонт,боја -X-KDE-Keywords[nb]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,filbehandler,tekstbryting,understreket,skjerm,filstørrelse,byter,fonter,farger -X-KDE-Keywords[nds]=Konqueror,Dateipleger,word wrap,ümbreken,ünnerstreken,Dorstellen,Dateigrött,Bytes,Schriftoort, Klöör, Klören -X-KDE-Keywords[ne]=कन्क्वेरर, फाइल प्रबन्धक, शब्द बेर्नुहोस्, बेर्नुहोस्, अधोरेखा, प्रदर्शन गर्नुहोस्, फाइल साइज, बाइट्स, फन्ट, रङ, रङ -X-KDE-Keywords[nl]=konqueror,filemanager,bestandsbeheer,word wrap,regelafbreking,onderstrepen,display,weergave,filesize,bestandsgrootte,bytes,fonts,lettertypen,kleur,color -X-KDE-Keywords[nn]=Konqueror,filhandsamar,tekstbryting,linjebryting,bryting,understrek,vis,filstorleik,byte,skrift,farge -X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰਰ,ਫਾਇਲ ਮੈਨੇਜਰ,ਸ਼ਬਦ ਸਮੇਟੋ,ਸਮੇਟੋ,ਹੇਠਾਂ ਰੇਖਾ,ਫਾਇਲ ਅਕਾਰ,ਬਾਈਟ,ਫੋਂਟ,ਰੰਗ ਝਲਕ -X-KDE-Keywords[pl]=konqueror,menedżer plików,zawijanie wierszy,zawijanie,podkreślenie,wygląd, rozmiar pliku,bajty,czcionki,kolor -X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,mudança de linha,mudança,sublinhado,ecrã,tamanho do ficheiro,bytes,tipo de letra,cor -X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,quebra de linha,quebra,sublinhado,monitor,tamanho de arquivo,bytes,fonte,cor,cor -X-KDE-Keywords[ro]=konqueror,manager de fişiere,limitare cuvînt,limitare,subliniere,afişare,mărime fişier,octeţi,font,culoare -X-KDE-Keywords[se]=Konqueror,fiilagieđahalli,linnjádoaddjin,doaddjin,vuolláisárgu,čájet,fiilasturrodat,stávvalat,fonta,ivdni -X-KDE-Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,prelom vrstic,prelom,podčrta,prikaz,velikost datoteke,bajt,pisava,barva -X-KDE-Keywords[sr]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,преламање текста,преламање,подвлачење,приказ,величина фајла,бајтови,фонт,боја -X-KDE-Keywords[sr@latin]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,prelamanje teksta,prelamanje,podvlačenje,prikaz,veličina fajla,bajtovi,font,boja +X-KDE-Keywords[ca]=konqueror,gestor de fitxers,ajust de paraules,ajust,subratllat,pantalla,mida de fitxer,bytes,tipus de lletra,color +X-KDE-Keywords[da]=konqueror,filhåndtering,ordombrydning,ombrydning,understregning,visning,filstørrelse,bytes,font,skrifttype,farve +X-KDE-Keywords[de]=Konqueror,Dateimanager,Zeilenumbruch,Textumbruch,Unterstreichen,Darstellung,Dateigröße,Schrift,Farbe,Byte +X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,rivitys,alleviivaus,näkymä,näyttö,tiedostokoko,tavuja,tavut,kirjasin,fontti,väri +X-KDE-Keywords[hu]=konqueror,fájlkezelő,szótördelés,tördelés,aláhúzás,megjelenítés,fájlméret,bájtok,betűtípus,szín,szín +X-KDE-Keywords[kk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour +X-KDE-Keywords[nb]=konqueror,filbehandler,ordbryting,bryting,understrek,visning,filstørrelse,byte,skrift,farge +X-KDE-Keywords[nl]=konqueror,bestandsbeheerder,regelafbreken,afbreken,onderstrepen,tonen,bestandsgrootte,bytes,lettertype,kleur,kleur +X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,mudança de linha,mudança,sublinhado,mostrar,tamanho do ficheiro,bytes,tipo de letra,cor +X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,mudança de linha,mudança,sublinhado,mostrar,tamanho do arquivo,bytes,fonte,cor,cores X-KDE-Keywords[sv]=konqueror,filhanterare,radbrytning,understreck,visa,filstorlek,byte,teckensnitt,färg -X-KDE-Keywords[ta]=கான்கொரர்,கோப்பு மேலாளர்,வார்த்தை மடக்கு, மடக்கு,அடிகோடிடு,காட்டு,கோப்பு அளவு,பைட்டுகள்,எழுத்துரு,வண்ணம்,வண்ணம் -X-KDE-Keywords[th]=konqueror,จัดการแฟ้ม,ตัดประโยค,ตัด,ขีดเส้นใต้,แสดงผล,ขนาดแฟ้ม,ไบต์,แบบอักษร,สี -X-KDE-Keywords[tr]=konqueror,dosya yöneticisi,görünüm,dosya boyu,bayt,yazıtipi,renk -X-KDE-Keywords[uk]=konqueror,менеджер файлів, переніс файлів,переніс,підкреслення,дисплей, розмір файлів,байти,шрифт,колір -X-KDE-Keywords[uz]=konqueror,файл бошқарувчиси,word wrap,wrap,тагини чизиш,кўрсатиш,файнинг ҳажми,байтлар,шрифт,ранг -X-KDE-Keywords[vi]=konqueror,trình quản lý tập tin,ngắt dòng văn bản,ngắt dòng,gạch chân,màn hình,cỡ tập tin,số byte,phông chữ,màu,màu sắc +X-KDE-Keywords[uk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,керування,файл,файли,перенесення,рядки,підкреслення,підкреслювання,показ,розмір,байти,шрифт,колір,кольори X-KDE-Keywords[x-test]=xxkonqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colourxx -X-KDE-Keywords[xh]=konqueror,umphathi wefayile,songela amagama,songela, yenza umgca ezantsi,bonisa, ubngakanani befayile,bytes,umgca,umbala,umbala -X-KDE-Keywords[zh_CN]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,文件管理器,自动换行,下划线,显示,文件大小,字节,字体,颜色 -X-KDE-Keywords[zh_TW]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,征服家,檔案管理程式,文字換行,換行,底線,顯示,檔案大小,位元組,字型,顏色 +X-KDE-Keywords[zh_TW]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour diff -Nru kde-baseapps-4.7.90/konqueror/settings/konq/webbehavior.desktop kde-baseapps-4.7.95/konqueror/settings/konq/webbehavior.desktop --- kde-baseapps-4.7.90/konqueror/settings/konq/webbehavior.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konq/webbehavior.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -159,7 +159,7 @@ Comment[ml]=കോണ്‍ക്വറര്‍ ഒരു ഫയലുകളുടെ നടത്തിപ്പുകാരനായി പെരുമാറുന്നതെങ്ങനെയെന്നു് നിങ്ങള്‍ക്കിവിടെ ക്രമീകരിയ്ക്കാം Comment[mr]=कॉन्करर फाइल प्रबंधक नुरूप कसे वागावे ते संयोजीत करू शकता Comment[ms]=Anda boleh konfigur bagaimana Konqueror berkelakuan sebagai pengurus fail di sini -Comment[nb]=Tilpass hvordan Konqueror opptrer som filbehandler +Comment[nb]=Sett opp hvordan Konqueror opptrer som filbehandler Comment[nds]=Hier kannst Du instellen, wodennig sik Konqueror as Dateipleger bedregen schall Comment[ne]=तपाईँले यहाँ कन्क्वेररले फाइल प्रबन्धकलाई गर्ने व्यवहार कन्फिगर गर्न सक्नुहुन्छ Comment[nl]=Hier kunt u het gedrag van Konqueror als bestandsbeheerder instellen @@ -197,59 +197,16 @@ Comment[zh_TW]=您可以在這裡設定 Konqueror 做為檔案管理程式的行為 X-KDE-Keywords=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, -X-KDE-Keywords[be]=Кіраўнік файлаў,Карысныя парады,Падказкі,Падказкі файлаў,Асобнае акно,Паводзіны,Выкарыстанне памяці,Хатняя тэчка,konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, -X-KDE-Keywords[bg]=Keywords=работен, плот, поведение, място, браузър, прозорец, konqueror, filemanager, kfm, tips, file tips, separate window, spawn windows, behavior, behaviour, memory usage, Home URL, -X-KDE-Keywords[ca]=konqueror,gestor de fitxers,kfm,consells,consells del fitxer,finestra separada,expandir finestres,comportament,ús de la memòria, URL d'inici, -X-KDE-Keywords[cs]=Konqueror,Správce souborů,Kfm,Tipy,Souborové tipy,Rozdílné okno, Chování,Spotřeba paměti,Domovské URL,Domovský adresář -X-KDE-Keywords[csb]=konqueror,menedżer lopków,kfm,wskôzë,wëdowédzô ò lopkù,apartné òkno, wiele òknów,zachòwanié,brëkòwanié pamiãcë,domôcy URL -X-KDE-Keywords[cy]=konqueror,rheolydd ffeiliau,kfm,cyngor,cyngor ffeiliau,ffenestr gwahan,taenu ffenestri,ymddygiad,defnydd cof,URL Cartref -X-KDE-Keywords[da]=konqueror,filhåndtering,kfm,tip,filtip,separat vindue,flere vinduer,opførsel,hukommelsesforbrug,Hjemme-URL, -X-KDE-Keywords[de]=Konqueror,Dateimanager,kfm,Tipps,Fenster,Verhalten,Persönlicher Ordner,Speicherverwendung -X-KDE-Keywords[el]=konqueror,διαχειριστής αρχείων,kfm,πληροφορίες,πληροφορίες αρχείων,ξεχωριστό παράθυρο,πολλαπλασιασμός παραθύρων,συμπεριφορά,συμπεριφορά,χρήση μνήμης,URL σπιτιού, -X-KDE-Keywords[eo]=dosieradministrilo,separata fenestro,uzata memoro -X-KDE-Keywords[es]=konqueror,gestor de ficheros,kfm,sugerencias,ventana separada, extender ventanas,comportamiento,uso de memoria, URl de inicio, -X-KDE-Keywords[et]=konqueror,failihaldur,kfm,vihjed,failide vihjed,eraldi aken,käitumine,mälukasutus,kodukataloog -X-KDE-Keywords[eu]=konqueror,fitxategi kudeatzailea,kfm,iradokizunak,fitxategi iradokizunak, aparteko leihoa,leihoak hedatu,portaera,memoriaren erabilera,Hasierako URLa, -X-KDE-Keywords[fa]=konqueror، مدیر پرونده، kfm، نکات، نکات پرونده، پنجرۀ مجزا، پنجره‌های تکثیرشده، رفتار، رفتار، کاربرد حافظه، نشانی وب آغازه، -X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,erillinen ikkuna,käytös,muistinkäyttö,Koti-URL -X-KDE-Keywords[fr]=konqueror,gestionnaire de fichiers,explorateur,kfm,astuces,fenêtre séparée,rafraîchissement des fenêtres,comportement,utilisation de la mémoire,Home URL,URL de démarrage -X-KDE-Keywords[fy]=konqueror,filemanager,kfm,tips,knopinfo,arktippen,gedrach,ûnthâldgebrûk,thús,persoanlike map, -X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,kfm,leideanna,leideanna comhaid,fuinneog ar leith,sceith fuinneoga,oibriú,úsáid chuimhne,URL Baile, -X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,kfm,consellos de ficheiro,fiestra separada,fiestras emerxentes,comportamento,uso da memoria,URL Persoal, -X-KDE-Keywords[he]=konqueror,מנהל קבצים,kfm,עצות,פירוט לקבצים,חלון נפרד,שימוש בזיכרון,פעולה,כתובת בית, konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL -X-KDE-Keywords[hr]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,upravljač datoteka,savjeti datoteka,posebni prozor,pojavljujući prozor,ponašanje,upotreba memorije,URL početne stranice -X-KDE-Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablakgenerálás,viselkedés,memóriahasználat,saját URL, -X-KDE-Keywords[is]=konqueror,skráastjóri,kfm,ráð,skráarráð,aðskilin gluggi,margfaldast, gluggar,hegðun,minnisnotkun,heimaslóð, -X-KDE-Keywords[it]=konqueror,filemanager,kfm,trucchi,file,separa finestre,comportamento,memoria utilizzata,home -X-KDE-Keywords[ja]=konqueror,ファイルマネージャ,kfm,ツールチップ,個別ウィンドウ, ポップウィンドウ,挙動,メモリ使用量,ホームURL -X-KDE-Keywords[km]=Konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ kfm ព័ត៌មាន​ជំនួយ ព័ត៌មាន​ជំនួយ​ឯកសារ បំបែក​បង្អួច បង្កើត​បង្អួច ឥរិយាបថ ឥរិយាបថ ការ​ប្រើ​សតិ URL ដើម -X-KDE-Keywords[ko]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,행동,홈 URL,팁,창 -X-KDE-Keywords[lt]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, failų tvarkyklė, kfm, patarimai, atskiri langai, elgesys, elgsena, atminties naudojimas, namų adresas -X-KDE-Keywords[lv]=iekarotājs,failumenedžeris,kfm,padoms,failu padomi,atsevišķs logs,spawn windows,izturēšanās,atmiņas izmantošana,Mājas URL, -X-KDE-Keywords[mk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,менаџер на датотеки,совети,совети за датотеки,подели го прозорецот, однесување,користење на меморија,Домашно URL, -X-KDE-Keywords[nb]=konqueror,filemanager,kfm,tips,file tips,separate vinduer,filbehandler,fil,adskilte vindu,delte vinduer,oppførsel,minnebruk,hjemme-nettadresse -X-KDE-Keywords[nds]=Konqueror,Dateipleger,kfm,Tipps,Tooltips,egen Finster,Finstern maken,Bedregen,Spiekerverbruuk,Startadress -X-KDE-Keywords[ne]=कन्क्वेरर, फाइल प्रबन्धक, kfm, टिपहरू, फाइल टिपहरू, फरक सञ्झ्याल, स्पवन सञ्झ्यालहरू, व्यवहार, स्मृति प्रयोग,गृह URL, -X-KDE-Keywords[nl]=konqueror,filemanager,kfm,tips,knopinfo,tooltips,gedrag,geheugengebruik,home,persoonlijke map, -X-KDE-Keywords[nn]=Konqueror,filhandsamar,KFM,tips,filtips,eige vindauge,nye vindauge,åtferd,minnebruk,heime-URL -X-KDE-Keywords[pa]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,ਫਾਇਲ ਮੈਨੇਜਰ,ਸੰਕੇਤ,ਵੱਖਰਾ ਵਿੰਡੋ,ਵਿਹਾਰ,ਮੈਮੋਰੀ ਵਰਤੋਂ,ਕੋਨਕਿਉਰਰ -X-KDE-Keywords[pl]=konqueror,menedżer plików,kfm,wskazówki,informacja o pliku,osobne okno, mnożące się okna,zachowanie,zużycie zasobów pamięci,odnośnik do kartoteki domowej -X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base, -X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivo de dicas,janela separada,janelas unidas,comportamento,comportamento,uso de memória,URL Base, -X-KDE-Keywords[ro]=konqueror,manager de fişiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL Acasă -X-KDE-Keywords[se]=konqueror,fiilagieđahalli,kfm,rávvagat,fiilarávvagat,iežaš láse,ođđa láset,láhtten,muitugeavaheapmi,ruoktu-URL -X-KDE-Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL -X-KDE-Keywords[sr]=konqueror,filemanager,kfm,форе,форе за фајлове,одвојени прозор,spawn прозори,понашање,искоришћеност меморије,Home URL, -X-KDE-Keywords[sr@latin]=konqueror,filemanager,kfm,fore,fore za fajlove,odvojeni prozor,spawn prozori,ponašanje,iskorišćenost memorije,Home URL, -X-KDE-Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,särskilt fönster,visa fönster,beteende,minnesanvändning,hemadress -X-KDE-Keywords[ta]=கான்கொரர்,கோப்பு மேலாளர்,kfm,குறிப்புகள்,கோப்பு குறிப்புகள்,தனி சாளரம்,நீள்வட்ட சாளரம்,நடத்தை,நினைவு பயன்பாடு,வீட்டு வலைப்பின்னல், -X-KDE-Keywords[th]=Konqueror ,จัดการแฟ้ม,kfm,เคล็ดลับ,เคล็ดลับแฟ้ม,แยกหน้าต่าง,หน้าต่างเปิดใหม่,พฤติกรรม,การใช้หน่วยความจำ,ตำแหน่งหลัก, -X-KDE-Keywords[tr]=konqueror,dosya yöneticisi,kfm,ipuçları,dosya,pencere,davranış,bellek kullanımı,başlangıç -X-KDE-Keywords[uk]=konqueror,менеджер файлів,kfm,підказки,підказки по файлах,створення вікон,поведінка,використання пам'яті,домашній URL -X-KDE-Keywords[uz]=konqueror,файл бошқарувчиси,kfm,эслатмалар,файл эслатмалари,алоҳида ойна,spawn windows,хусусиятлар,хотирадан фойдаланиш,Уй URL -X-KDE-Keywords[vi]=konqueror,trình quản lý tập tin,kfm,gợi ý,gợi ý tập tin,phân cách cửa sổ,tạo cửa sổ khác,ứng xử,cách sử dụng bộ nhớ,URL nhà, -X-KDE-Keywords[wa]=konqueror,manaedjeu d' fitchîs,kfm,racsegnes,racsegnes so les fitchîs,dispårtis purneas,dujhance,eployaedje del memwere,hårdêye måjhon, +X-KDE-Keywords[ca]=konqueror,gestor de fitxers,kfm,consells,consells de fitxers,finestres separades,finestres engendrades,comportament,ús de memòria,URL inicial +X-KDE-Keywords[da]=konqueror,filhåndtering,kfm,tips,filtips,separat vindue,affød vinduer,opførsel,hukommelsesforbrug,startside, +X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,omat ikkunat,erilliset ikkunat,käyttäytyminen,muistinkäyttö,kotiosoite, +X-KDE-Keywords[hu]=konqueror,fájlkezelő,kfm,tippek,fájltippek,külön ablak,ablak létrehozása,működés,működés,memóriahasználat,kezdőlap, +X-KDE-Keywords[kk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, +X-KDE-Keywords[nb]=konqueror,filbehandler,kfm,tips,filtips,separat vindu,lag vinduer,oppførsel,minnebruk,hjemme-url, +X-KDE-Keywords[nl]=konqueror,bestandsbeheerder,kfm,tips,bestandstips,gescheiden venster,vensters afsplitsen,gedrag,geheugengebruik,start-url +X-KDE-Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,janelas recriadas,comportamento,utilização de memória,URL inicial, +X-KDE-Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,dicas de arquivos,janela separada,janelas recriadas,comportamento,utilização de memória,URL inicial, +X-KDE-Keywords[sv]=konqueror,filhanterare,kfm,tips,filtips,separata fönster,skapa fönster,beteende,minnesanvändning,Hemwebbadress +X-KDE-Keywords[uk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,файл,файли,керування,менеджер,підказки,вікно,вікна,контекст,поведінка,пам’ять,використання,домівка X-KDE-Keywords[x-test]=xxkonqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,xx -X-KDE-Keywords[xh]=konqueror,umphathi wefayile,kfm,amancam, ifayile amancam,yahlula i window,yenza,windows, ukuziphatha,usebenziso lwenkumbulo,Ekhaya URL, -X-KDE-Keywords[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,文件管理器,提示,文件提示,拆分窗口,新开窗口,行为,内存使用,家 URL, -X-KDE-Keywords[zh_TW]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,征服家,檔案管理程式,檔案密訣,分離視窗,產生視窗,行為,記憶體使用量,家 URL, +X-KDE-Keywords[zh_TW]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, diff -Nru kde-baseapps-4.7.90/konqueror/settings/konqhtml/css/kcmcss.desktop kde-baseapps-4.7.95/konqueror/settings/konqhtml/css/kcmcss.desktop --- kde-baseapps-4.7.90/konqueror/settings/konqhtml/css/kcmcss.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konqhtml/css/kcmcss.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -157,7 +157,7 @@ Comment[ml]=വെബിലെ താളുകള്‍ കാണിയ്ക്കാനുപയോഗിയ്ക്കുന്ന സ്റ്റൈല്‍ഷീറ്റുകള്‍ ക്രമീകരിയ്ക്കുക Comment[mr]=वेब पान प्रस्तुत करण्या करीता उपयोगजोगी स्टाइलशीट संयोजीत करा Comment[ms]=Konfigur lembaran gaya yang digunakan untuk merealisasikan laman web -Comment[nb]=Tilpass stilsett for visning av nettsider +Comment[nb]=Sett opp stilsett for visning av nettsider Comment[nds]=De Stilvörlaag instellen, de för't Wiesen vun Nettsieden bruukt warrt Comment[ne]=रेन्डर वेब पृष्ठहरू प्रयोग गर्ने शैलीपाना कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u de stijlbladen instellen die gebruikt worden voor de weergave van webpagina's @@ -195,61 +195,20 @@ Comment[zh_TW]=設定用來顯示網頁的樣式表單 X-KDE-Keywords=CSS,HTML,style,stylesheet,accessibility -X-KDE-Keywords[be]=Стыль,табліца стыляў,даступнасць,CSS,HTML,style,stylesheet,accessibility -X-KDE-Keywords[bg]=Keywords=стил, стилове, страници, достъпност, CSS, HTML, style, stylesheet, accessibility -X-KDE-Keywords[br]=CSS,HTML,giz,folenn c'hiz,haezadusted -X-KDE-Keywords[ca]=CSS,HTML,estil,full d'estil,accessibilitat -X-KDE-Keywords[cs]=CSS,HTML,styl,style,stylesheet,zpřístupnění -X-KDE-Keywords[csb]=CSS,HTML,sztél,bòga sztélu,przëstãpnosc -X-KDE-Keywords[cy]=CSS,HTML,ardull,dalen arddull,hygyrchedd -X-KDE-Keywords[da]=CSS,HTML,stil,stilark,tilgængelighed +X-KDE-Keywords[ca]=CSS,HTML,estil,fulles d'estil,accessibilitat +X-KDE-Keywords[da]=CSS,HTML,stil,stylesheet,stilark,tilgængelighed,accessibility X-KDE-Keywords[de]=CSS,HTML,Stylesheet,Stilvorlagen,Zugangshilfen -X-KDE-Keywords[el]=CSS,HTML,στυλ,φύλλο στυλ,προσιτότητα -X-KDE-Keywords[eo]=CSS,HTML,stilo,stildifino,alirebleco -X-KDE-Keywords[es]=CSS,HTML,estilo,hoja de estilo,accesibilidad -X-KDE-Keywords[et]=CSS,HTML,stiil,laaditabel -X-KDE-Keywords[eu]=CSS,HTML,estiloa,estilo orria,erabilerraztasuna -X-KDE-Keywords[fa]=CSS، زنگام، سبک، صفحه سبک، دستیابی‌پذیری -X-KDE-Keywords[fi]=CSS,HTML,tyyli,tyylimäärittely,esteettömyys -X-KDE-Keywords[fr]=css,html,style,feuille de style,accessibilité -X-KDE-Keywords[fy]=CSS,HTML,styl,stylblêd,tagonklikens,stylblêden -X-KDE-Keywords[ga]=CSS,HTML,stíl,stílbhileog,inrochtaineacht -X-KDE-Keywords[gl]=CSS,HTML,estilo,follas de estilo,acesibilidade -X-KDE-Keywords[he]=CSS,HTML,סגנון,גיליון סגנון,נגישות,style,stylesheet,accessibility -X-KDE-Keywords[hr]=CSS,HTML,style,stylesheet,accessibility,stil,stilsko oblikovanje,pristupačnost -X-KDE-Keywords[hu]=CSS,HTML,stílus,stíluslap,elérhetőség -X-KDE-Keywords[is]=CSS,HTML,stíll,stílblað,aðgengi,aðgengilegheit,aðgangur -X-KDE-Keywords[it]=CSS,HTML,stile,fogli di stile,stylesheet,accessibilità -X-KDE-Keywords[ja]=CSS,HTML,スタイル,スタイルシート,アクセシビリティ -X-KDE-Keywords[km]=CSS HTML រចនាប័ទ្ម​ សន្លឹក​រចនាប័ទ្ម មធ្យោបាយ​ងាយ​ស្រួល -X-KDE-Keywords[ko]=CSS,HTML,스타일,stylesheet,accessibility,접근성,스타일시트 -X-KDE-Keywords[lt]=CSS,HTML,style,stylesheet,accessibility,stilius,stiliaus aprašymas -X-KDE-Keywords[lv]=CSS,HTML,stils,stilusaraksts,pieejamība -X-KDE-Keywords[mk]=CSS,HTML,style,stylesheet,accessibility,стил,страница,дизајн,пристапност +X-KDE-Keywords[fi]=CSS,HTML,style,tyyli,stylesheet,tyylisivu,esteettömyys +X-KDE-Keywords[hu]=CSS,HTML,stílus,stíluslap,akadálymentesítés +X-KDE-Keywords[kk]=CSS,HTML,style,stylesheet,accessibility X-KDE-Keywords[nb]=CSS,HTML,stil,stilsett,tilgjengelighet -X-KDE-Keywords[nds]=CSS,HTML,Stil,Stilvörlaag,Behinnerte -X-KDE-Keywords[ne]=सीएसएस, एचटीएमएल, शैली, शैलीपाना, पहुँचता -X-KDE-Keywords[nl]=CSS,HTML,stijl,stylesheet,toegankelijkheid,stijlbladen -X-KDE-Keywords[nn]=CSS,HTML,stilsett,tilgjenge,brukarstilsett -X-KDE-Keywords[pa]=CSS,HTML,ਸਟਾਇਲ,stylesheet,accessibility -X-KDE-Keywords[pl]=CSS,HTML,styl,arkusz stylu,dostępność -X-KDE-Keywords[pt]=CSS,HTML,estilo,stylesheet,acessibilidade -X-KDE-Keywords[pt_BR]=CSS,HTML,estilo,folha de estilo,acessibilidade -X-KDE-Keywords[ro]=CSS,HTML,stil,foi de stil,accesibilitate -X-KDE-Keywords[se]=CSS,HTML,stiila,stiilaárka -X-KDE-Keywords[sl]=CSS,HTML,slog,slogovne predloge,dostopnost -X-KDE-Keywords[sr]=CSS,HTML,style,stylesheet,accessibility,стил,опис стила,приступачност -X-KDE-Keywords[sr@latin]=CSS,HTML,style,stylesheet,accessibility,stil,opis stila,pristupačnost +X-KDE-Keywords[nds]=CSS,HTML,Stil,Stilvörlaag,Toganghülp +X-KDE-Keywords[nl]=CSS,HTML,stijl,stijlblad,toegankelijkheid +X-KDE-Keywords[pt]=CSS,HTML,estilo,stylesheet,folha de estilo,acessibilidade +X-KDE-Keywords[pt_BR]=CSS,HTML,estilo,planilha,folha de estilo,acessibilidade X-KDE-Keywords[sv]=CSS,HTML,stil,stilmall,handikappstöd -X-KDE-Keywords[ta]=CSS,HTML,பாணிe,விரிப்பட்டியல்,அணுகல் -X-KDE-Keywords[tr]=CSS,HTML,style,stil,stylesheet,erişim,erişilebilirlik -X-KDE-Keywords[uk]=CSS,HTML,стиль,таблиця стилів,доступність -X-KDE-Keywords[uz]=CSS,HTML,услуб,stylesheet,қулайликлар -X-KDE-Keywords[vi]=CSS,HTML,kiểu dáng,kiểu dáng mẫu,khả năng truy cập -X-KDE-Keywords[wa]=CSS,HTML,stîle,pådje di stîle,accessibilité +X-KDE-Keywords[uk]=CSS,HTML,style,stylesheet,accessibility,стиль,таблиця,стилів,доступність,можливості X-KDE-Keywords[x-test]=xxCSS,HTML,style,stylesheet,accessibilityxx -X-KDE-Keywords[xh]=CSS,HTML,uhlobo,ikhasi lohlobo oluthile,unikezelo -X-KDE-Keywords[zh_CN]=CSS,HTML,style,stylesheet,accessibility,风格,样式表,辅助功能 -X-KDE-Keywords[zh_TW]=CSS,HTML,style,stylesheet,accessibility,風格,風格表單,可用性 +X-KDE-Keywords[zh_TW]=CSS,HTML,style,stylesheet,accessibility Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_appearance.desktop kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_appearance.desktop --- kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_appearance.desktop 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_appearance.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -147,7 +147,7 @@ Comment[mai]=वेब पृष्ठ कहिना देखाओल जाए बिन्यस्त करू Comment[mk]=Конфигурирајте како да се прикажуваат веб-страниците Comment[ml]=വെബ്താളുകള്‍ പ്രദര്‍ശിപ്പിയ്ക്കേണ്ടതെങ്ങനെയന്നു് ക്രമീകരിയ്ക്കുക -Comment[nb]=Tilpass hvordan nettsider vises +Comment[nb]=Sett opp hvordan nettsider vises Comment[nds]=Instellen, wodennig Nettsieden wiest warrt Comment[nl]=Hier kunt u instellen hoe webpagina's te tonen Comment[nn]=Oppsett av nettsidevising @@ -176,61 +176,19 @@ Comment[zh_CN]=配置如何显示网页 Comment[zh_TW]=設定如何顯示網頁 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding -X-KDE-Keywords[be]=Вандроўнік,Сеціва,Шрыфт,Знаказборы,Знаказбор,konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding -X-KDE-Keywords[bg]=Keywords=уеб, шрифтове, страници, браузър, Интернет, konqueror, kfm, browser, html, web, www, fonts, charsets, character sets, encoding -X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletra,caràcters.jocs de caràcters,codificació -X-KDE-Keywords[cs]=Konqueror,Kfm,Prohlížeč,HTML,Web,WWW,Písma,Znakové sady,Kódování -X-KDE-Keywords[csb]=konqueror,kfm,przezérnik,html,séc www,zestôw merków,kòdowanié -X-KDE-Keywords[cy]=konqueror,kfm,porydd,html,gwe,www,ffontiau,setiau nodau,amgodiad -X-KDE-Keywords[da]=konqueror,kfm,browser,HTML,net,www,skrifttyper,tegnsæt,indkodning +X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletres,joc de caràcters,jocs de caràcters,codificació +X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,fonts,tegnsæt,indkodning X-KDE-Keywords[de]=Konqueror,kfm,Browser,HTML,Web,WWW,Schriften,Zeichensätze,Kodierung -X-KDE-Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,γραμματοσειρές,σύνολα χαρακτήρων,σύνολα χαρακτήρων,κωδικοποίηση -X-KDE-Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro,kursilo,ligo,referenco,bildo,signaro,kodo -X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,mapas de caracteres,codificación -X-KDE-Keywords[et]=konqueror,kfm,veebilehitseja,html,veeb,www,fondid,kooditabel,kodeering -X-KDE-Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,letra-tipoak,karaktere-multzoak, karaktere hobespenak,kodeketa -X-KDE-Keywords[fa]=konqueror،kfm، مرورگر، زنگام، وب، www،قلمها، نویسه‌گان، نویسه‌گان،کدبندی -X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,merkistöt,koodaus -X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,couleurs,java,javascript,curseur,liens,images,jeu de caractères,caractères,codage,encodage -X-KDE-Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,fonts,lettertypen,tekensets,karaktersamling,kodearring,ynternet -X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clónna,clófhoirne,tacair charachtair,ionchódú -X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,carácteres,conxunto de carácteres,codificación -X-KDE-Keywords[he]=konqueror,kfm,דפדפן,html,web,www,אינטרנט,browser,web,fonts,charsets,character sets,encoding, גופנים,מערכי תווים,קידוד -X-KDE-Keywords[hr]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,preglednik,fontovi,kodiranje,kodiranje zakova -X-KDE-Keywords[hu]=Konqueror,kfm,böngésző,HTML,web,WWW,betűtípusok,karakterkészletek,betűkészletek,kódolás -X-KDE-Keywords[is]=vafri,vefur,vefurinn,vefsíður,letur,litir,kóðun,stafatafla, bendill,myndir,www,html,stafir -X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,colori,set di caratteri,charset,codifica -X-KDE-Keywords[ja]=konqueror,kfm,ブラウザ,html,web,ウェブ,www,フォント,文字,文字セット,色,カラー,エンコーディング -X-KDE-Keywords[km]=konqueror kfm កម្មវិធី​រុករក​បណ្ដាញ html បណ្ដាញ វើលវ៉ាយវ៉េប ពុម្ព​អក្សរ សំណុំ​តួ​អក្សរ សំណុំ​តួ​អក្សរការអ៊ិនកូដ -X-KDE-Keywords[ko]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,브라우저,웹,글꼴,색,색깔,자바,자바 스크립트,연결,그림,글자셋,문자셋,인코딩 -X-KDE-Keywords[lt]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,charsets,character sets,encodingsets,encoding,narašymas,html,tinklalapis,tinklapis,www,šriftai,spalvos,simbolių rinkiniai,koduotė -X-KDE-Keywords[lv]=iekarotājs,kfm,pārlūks,html,web,www,fonti,krāsojums,krāsas,java,javaskripts,kursors,saites,attēli,simbolukomplekti,simbolu komplekti,kodējums -X-KDE-Keywords[mk]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,прелистувач,веб,фонтови,знаковни множества,кодирање -X-KDE-Keywords[nb]=konqueror,kfm,nettleser,html,nettet,www,veven,verdensveven,Internett,skriftyper,skrifter,koding,tegnsett,tegnkoding -X-KDE-Keywords[nds]=Konqueror,kfm,Nettkieker,browser,HTML,web,www,Schriftoorden,Tekensetten,Koderen -X-KDE-Keywords[ne]=कन्क्वेरर,kfm, ब्राउजर,html, वेब,www, फन्टहरू, चारसेटहरू, क्यारेक्टर सेट, सङ्केतन -X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,fonts,lettertypen,tekensets,karakterverzamelingen,codering,encoding,internet -X-KDE-Keywords[nn]=Konqueror,KFM,nettlesar,HTML,verdsveven,WWW,skrifter,teiknsett,koding,teiknkoding -X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰਰ,kfm,ਝਲਕਾਰਾ,html,web,www,ਫੋਂਟ, ਅੱਖਰ-ਸੈਟ, ਅੱਖਰ ਸੈਟ, ਇੰਕੋਡਿੰਗ -X-KDE-Keywords[pl]=konqueror,kfm,przeglądarka,html,sieć www,zestawy znaków,kodowanie -X-KDE-Keywords[pt]=konqueror,kfm,navegador,html,web,www,tipos de letra,fontes,cores,java,javascript,cursor,ligações,imagens,charsets,mapas de caracteres,codificação -X-KDE-Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,fontes,charsets,conjuntos de caracteres,codificação -X-KDE-Keywords[ro]=konqueror,kfm,navigator,browser,html,web,www,fonturi,culori,java,javascript,cursor,legături,imagini,set de caractere,codare -X-KDE-Keywords[se]=Konqueror,kfm,fierpmádatlogan,html,web,www,fonttat,mearkarájut,koden -X-KDE-Keywords[sl]=konqueror,kfm,brskalnik,html,splet,www,pisave,nabori znakov,znakovni nabori,kodiranje -X-KDE-Keywords[sr]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,К-освајач,прегледач,ХТМЛ,фонтови,скупови знакова,кодирање -X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,K-osvajač,pregledač,HTML,fontovi,skupovi znakova,kodiranje -X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,färger,java,javaskript,länkar,bilder,kodning,teckenuppsättningar -X-KDE-Keywords[ta]=கான்கொரர், கோப்பு மேலாளர், html,வலை, www,எழுத்துரு, எழுத்தமைப்பு முறை,எழுத்தமைப்பு முறை, குறியீடு முறை -X-KDE-Keywords[th]=konqueror ,kfm,เบราว์เซอร์,html,เว็บ,www,แบบอักษร,อักขระ,ชุดอักขระ,การเข้ารหัส -X-KDE-Keywords[tr]=konqueror,kfm,tarayıcı,html,web,www,yazı tipleri,kodlama -X-KDE-Keywords[uk]=konqueror,kfm,навігатор,html,шрифти,Тенета,www,набори символів,кодування -X-KDE-Keywords[uz]=konqueror,kfm,html,www,браузер,веб,шрифтлар,белгилар тўплами,кодлаш усули -X-KDE-Keywords[vi]=konqueror,kfm,trình duyệt,html,Mạng,www,phông chữ,bộ ký tự,bảng ký tự,mã ký tự -X-KDE-Keywords[wa]=konqueror,kfm,betchteu,html,waibe,www,fontes,ecôdaedjes,ecôdaedje +X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,merkistöt,merkistö,koodaus +X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,karakterkészletek,karakterkészletek,kódolás +X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding +X-KDE-Keywords[nb]=konqueror,kfm,nettleser,html,vev,www,skrifter,tegnsett,tegnkoding +X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,lettertypen,tekensets,codering +X-KDE-Keywords[pt]=konqueror,kfm,navegador,HTML,Web,WWW,tipos de letra,codificações,codificações de caracteres,codificação +X-KDE-Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,fontes,codificações,codificações de caracteres,codificação +X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,charsets,character sets,encoding +X-KDE-Keywords[uk]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,перегляд,переглядач,браузер,мережа,шрифти,кольори,курсор,посилання,зображення,символи,набір,кодування,символ,набори X-KDE-Keywords[x-test]=xxkonqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encodingxx -X-KDE-Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web,www,imigca, amaqela abasebenzisi,encoding -X-KDE-Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,浏览器,网页,字体,字符集,编码 -X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,征服家,字元,字元集,編碼,瀏覽器,字型,網頁 +X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_behavior.desktop kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_behavior.desktop --- kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_behavior.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_behavior.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -156,7 +156,7 @@ Comment[ml]=ബ്രൌസ‌ര്‍ പെരുമാറ്റം ക്രമീകരിയ്ക്കുക Comment[mr]=वेब वर्तन संयोजीत करा Comment[ms]=Konfigur kalakuan pelayar -Comment[nb]=Tilpass nettleserens oppførsel +Comment[nb]=Sett opp nettleserens oppførsel Comment[nds]=Dat Bedregen vun den Nettkieker instellen Comment[ne]=ब्राउजरको व्यवहार कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u het gedrag van de webbrowser instellen @@ -193,62 +193,19 @@ Comment[zh_CN]=配置浏览器行为 Comment[zh_TW]=設定瀏覽器行為 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding -X-KDE-Keywords[be]=Вандроўнік,Сеціва,Шрыфты,Колеры,Сцэнар,Курсор,Спасылкі,Відарысы,Малюнкі,Знаказбор,Знаказборы,konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding -X-KDE-Keywords[bg]=Keywords=браузър, страници, Интернет, уеб, konqueror,kfm, browser, html, web, www, fonts, colours, colors, java, javascript, cursor, links, images, charsets, character sets, encoding -X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletra,colorits,colors,java,javascript,cursor,enllaços,imatges,caràcters,joc de caràcters,codificació -X-KDE-Keywords[cs]=Konqueror,Kfm,Prohlížeč,HTML,Web,WWW,Písma,Barvy,Java,JavaScript, Kurzor,Odkazy,Obrázky,Znakové sady,Kódování -X-KDE-Keywords[csb]=konqueror,kfm,przezérnik,html,séc www,fòntë,farwë,java,javascript,kùrsor,lënczi,òbrôzczi,zestôw merków,kòdowanié -X-KDE-Keywords[cy]=konqueror,kfm,porydd,html,gw?,www,ffontiau,lliwiau,java,javascript,cyrchydd,cysylltiadau,delweddau,setiau nodau,nod,amgodiad -X-KDE-Keywords[da]=konqueror,kfm,browser,HTML,net,skrifttyper,farver,java,javascript,markør,henvisninger,billeder,tegnsæt,indkodning -X-KDE-Keywords[de]=Konqueror,Kfm,Browser,HTML,Web,WWW,Schriften,Farben,Java,JavaScript,Cursor,Links,Verknüpfungen,Bilder,Zeichensätze,Encoding -X-KDE-Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,γραμματοσειρές,χρώματα,χρώματα,java,javascript,δρομέας,δεσμοί,εικόνες,σύνολα χαρακτήρων,σύνολα χαρακτήρων,κωδικοποίηση -X-KDE-Keywords[en_GB]=konqueror,kfm,browser,html,web,www,fonts,colours,java,javascript,cursor,links,images,charsets,character sets,encoding -X-KDE-Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro,kursilo,ligo,referenco,bildo,signaro,kodo -X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,colores,java,javascript,cursor,enlaces,imágenes,mapas de caracteres,codificación -X-KDE-Keywords[et]=konqueror,kfm,veebilehitseja,brauser,html,veeb,www,fondid,värvid,java,javascript,kursor,viidad,lingid,pildid,kooditabel,kodeering -X-KDE-Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,letra-tipoak,koloreak,java,javascript,kurtsorea,linkak,irudiak,karaktere-multzoak,karaktereen hobespenak,kodeketa -X-KDE-Keywords[fa]=konqueror، kfm، مرورگر، زنگام، وب، www، قلمها، رنگها، رنگها، جاوا، جاوااسکریپت، مکان‌نما، پیوندها، تصاویر، نوسه‌گان، نویسه‌گان، کدبندی -X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,värit,java,javascript,osoitin,linkit,kuvat,merkistöt,koodaus -X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,couleurs,java,javascript,curseur,liens,images,jeu de caractères,caractères,codage,encodage -X-KDE-Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,fonts,lettertypen,kleuren,java,javascript,javaskript,cursor,links,rinnerke,skeakels,ôfbyldingen,charsets,tekensets,karaktersamling,kodearring,ynternet -X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clófhoirne,clónna,dathanna,java,javascript,cúrsóir,naisc,nascanna,íomhánna,tacair charachtair,ionchódú -X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,cores,java,javascript,ponteiro,ligazóns,imaxes,carácteres,conxunto de carácteres,codificación -X-KDE-Keywords[he]=גופנים,צבעים,JavaScript,Java,ג'אווה,מצביע,קישורים,תמונות,מערכי תווים,קידוד,WWW,רשת, HTML,דפדפן,KFM,Konqueror, kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links, images,charsets,character sets,encoding -X-KDE-Keywords[hr]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,preglednik,fontovi,boja,boje,pokazivač,veze,slike,znakovi,kodiranje,kodiranje zakova -X-KDE-Keywords[hu]=Konqueror,KFM,böngésző,HTML,web,WWW,betűtípusok,színek,Java,JavaScript,egérmutató,linkek,képek,karakterkészletek,kódolás -X-KDE-Keywords[is]=vafri,vefur,vefurinn,vefsíður,letur,litir,kóðun,stafatafla,bendill,myndir,www,html,stafir -X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,colori,java,javascript,cursore,collegamenti,link,immagini,set di caratteri,charset,codifica -X-KDE-Keywords[ja]=konqueror,kfm,ブラウザ,html,web,ウェブ,www,フォント,色,色,java,javascript,カーソル,リンク,画像,文字セット,文字セット,エンコーディング -X-KDE-Keywords[km]=konqueror kfm កម្មវិធី​រុករក html បណ្ដាញ វើលវ៉ាយវ៉េប ពុម្ពអក្សរ ពណ៌ ពណ៌ java javascriptទស្សន៍​ទ្រនិច តំណ រូបភាព សំណុំ​តួ​អក្សរ សំណុំ​តួ​អក្សរ ការ​អ៊ិនកូដ -X-KDE-Keywords[ko]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,브라우저,웹,글꼴,색,색깔,자바,자바 스크립트,연결,그림,글자셋,문자셋,인코딩 -X-KDE-Keywords[lt]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,narašymas,html,tinklalapis,tinklapis,www,šriftai,koloritai,spalvos,,java,java scebarijus,žymeklis,nuorodos,paveikslai,simboliai,koduotė,simbolių rinkinys -X-KDE-Keywords[lv]=iekarotājs,kfm,pārlūks,html,web,www,fonti,krāsojums,krāsas,java,javaskripts,kursors,saites,attēli,simbolukomplekti,simbolu komplekti,kodējums -X-KDE-Keywords[mk]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,прелистувач,веб,фонтови,бои,курсор,врски,слики,знаковни множества,кодирање -X-KDE-Keywords[nb]=konqueror,kfm,nettleser,html,nettet,www,veven,verdensveven,skriftyper,farger,java,javaskript,markør,tegnsett,koding,bilde,skriptspråk,Internett -X-KDE-Keywords[nds]=Konqueror,kfm,Browser,Nettkieker,HTML,web,www,Schriftoorden,Klören,Klöör,Java,JavaScript,Cursor,Links,Biller,Tekensett,Tekensetten,Koderen -X-KDE-Keywords[ne]=कन्क्वेरर, kfm, ब्राउजर,html, वेब,www, फन्ट, रङ, रङहरू, जाभा, जाभास्क्रिप्ट, कर्सर, लिङ्क, छवि, चारसेट, क्यारेक्टर सेट, सङ्केतन -X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,fonts,lettertypen,kleuren,,java,,javascript,cursor,links,koppelingen,afbeeldingen,charsets,tekensets,tekenverzamelingen,codering,internet -X-KDE-Keywords[nn]=Konqueror,KFM,nettlesar,HTML,verdsveven,WWW,skrifter,fargar,Java,JavaScript,skriptspråk,Internett,peikar,lenkjer,bilete,teiknsett,koding,teiknkoding -X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰਰ,kfm,ਝਲਕਾਰਾ,html,web,www,ਫੋਂਟ, ਰੰਗ, ਜਾਵਾ, ਜਾਵਾ ਸਕ੍ਰਿਪਟ, ਕਰਸਰ, ਸਬੰਧ, ਚਿੱਤਰ, ਅੱਖਰ-ਸੈਟ, ਇੰਕੋਡਿੰਗ -X-KDE-Keywords[pl]=konqueror,kfm,przeglądarka,html,sieć www,czcionki,kolory,java,javascript,kursor,linki,odnośniki,obrazki,zestawy znaków,kodowanie -X-KDE-Keywords[pt]=konqueror,kfm,navegador,html,web,www,tipos de letra,fontes,cores,java,javascript,cursor,ligações,imagens,charsets,mapas de caracteres,codificação -X-KDE-Keywords[pt_BR]=Konqueror,kfm,navegador,html,web,www,fontes,cores,cores,java,javascript, cursor,ligações,imagens,charsets,conjuntos de caracteres,codificação -X-KDE-Keywords[ro]=konqueror,kfm,navigator,browser,html,web,www,font,culori,java,javascript,cursor,legături,imagini,set de caractere,codare -X-KDE-Keywords[se]=konqueror,kfm,fierpmádatlogan,html,web,WWW,fonttat,ivnnit,java,javascript,seaván,liŋkkat,govat,mearkarájut,koden -X-KDE-Keywords[sl]=konqueror,kfm,brskalnik,html,splet,www,pisave,barve,java,javascript,kurzor,povezave,slike,nabori znakov,znakovni nabori,kodiranje -X-KDE-Keywords[sr]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,прегледач,веб,фонтови,боје,показивач,везе,слике,скупови знакова,кодирање -X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,pregledač,veb,fontovi,boje,pokazivač,veze,slike,skupovi znakova,kodiranje -X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,färger,java,javaskript,länkar,bilder,kodning,teckenuppsättningar -X-KDE-Keywords[ta]=கான்கொரர்,kfm,உலாவி,html,வலை,www,எழுத்துருக்கள்,வண்ணங்கள்,வண்ணங்கள்,ஜாவா,ஜாவா எழுத்துரு,நிலைக்காட்டி,இணைப்புகள்,பிம்பங்கள்,charsets,சொல் அமைப்புகள்,குறியீடு -X-KDE-Keywords[th]=konqueror ,kfm,เบราว์เซอร์,html,เว็บ,www,แบบอักษร,สี,จาวา,จาวาสคริปต์,เคอร์เซอร์,ลิงค์,ภาพ,ชุดรหัสอักขระ,ชุดรหัสอักขระ,การเข้ารหัส -X-KDE-Keywords[tr]=konqueror,kfm,tarayıcı,html,web,www,yazı tipleri,renkler,java,javascript,karakter,karakter seti,kodlama,bağlantılar,resimler,imleç -X-KDE-Keywords[uk]=konqueror,kfm,навігатор,html,шрифти,web,Тенета,кольори,java,javascript,курсор,www,посилання,зображення,набори символів,кодування -X-KDE-Keywords[uz]=konqueror,kfm,html,www,браузер,веб,шрифтлар,белгилар тўплами,кодлаш усули,java,javascript,боғлар,курсор,ранглар -X-KDE-Keywords[vi]=konqueror,kfm,trình duyệt,html,Mạng,www,phông chữ,màu sắc,màu,java,javascript,con trỏ,liên kết,ảnh,bộ ký tự,tập ký tự,mã ký tự -X-KDE-Keywords[wa]=konqueror,kfm,betchteu,html,waibe,www,fontes,coleurs,java,javascript,cursoe,loyéns,imådjes,ecôdaedjes +X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletres,colors,java,javascript,cursor,enllaços,imatges,joc de caràcters,joc de caràcters,codificació +X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,fonts,skrifttyper,farver,java,javascript,cursor,markør,links,billeder,tegnsæt,indkodning +X-KDE-Keywords[de]=Konqueror,Kfm,Browser,HTML,Web,WWW,Schriften,Farben,Java,JavaScript,Cursor,Links,Verknüpfungen,Bilder,Zeichensätze,Kodierung +X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,värit,java,javascript,osoitin,linkit,kuvat,merkistöt,merkistö,koodaus +X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,színek,színek,java,javascript,kurzor,hivatkozások,képek,karakterkódolások,karakterkódolások,kódolás +X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding +X-KDE-Keywords[nb]=konqueror,kfm,nettleser,html,vev,www,skrifter,farger,java,javascript,markør,lenker,bilder,tegnsett,tegnkoding +X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,lettertypen,tekensets,kleuren,java,javascript,cursor,koppelingen,tekensets,codering +X-KDE-Keywords[pt]=konqueror,kfm,navegador,HTML,Web,WWW,cores,Java,Javascript,cursor,ligações,imagens,codificações,codificações de caracteres,codificação +X-KDE-Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,fontes,cores,java,javascript,cursor,links,imagens,codificações,codificações de caracteres,codificação +X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,färger,java, javascript,markör,länkar,bilder,teckenuppsättningar,kodning +X-KDE-Keywords[uk]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,java,javascript,перегляд,переглядач,браузер,мережа,джава,ява,скрипт,шрифти,кольори,курсор,посилання,зображення,символи,набір,кодування,символ,набори X-KDE-Keywords[x-test]=xxkonqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encodingxx -X-KDE-Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web,www,imigca,imibala,imibala,java,okushicilelwe phantsi kwe java,isalatisi,amakhonkco,imifanekiso,icharsets,amaqela abasebenzi, encoding -X-KDE-Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,浏览,字体,颜色,光标,链接,图像,字符集,编码 -X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,瀏覽,字型,色彩,顏色,游標,連結,影像,字元,字集,編碼 +X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_general.desktop kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_general.desktop --- kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_general.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_general.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -129,7 +129,7 @@ Comment[mk]=Конфигурирајте го општото однесување на Konqueror Comment[ml]=കോണ്‍ക്വററിന്റെ പൊതുവായ പെരുമാറ്റം ക്രമീകരിയ്ക്കുക Comment[mr]=सामान्य कॉन्करर वर्तन संयोजीत करा -Comment[nb]=Tilpass Konquerors generelle oppførsel +Comment[nb]=Sett opp Konquerors generelle oppførsel Comment[nds]=Allmeen dat Bedregen vun Konqueror instellen Comment[nl]=Algemeen gedrag van Konqueror instellen Comment[nn]=Sett opp generell Konqueror-åtferd @@ -161,40 +161,22 @@ Comment[zh_CN]=配置 Konqueror 的常规行为 Comment[zh_TW]=設定 Konqueror 一般行為 X-KDE-Keywords=konqueror,tabs -X-KDE-Keywords[ar]=الألسنة,كونكيورر -X-KDE-Keywords[bg]=konqueror,tabs,подпрозорци X-KDE-Keywords[ca]=konqueror,pestanyes -X-KDE-Keywords[csb]=konqueror,załóżczi -X-KDE-Keywords[de]=konqueror,unterfenster -X-KDE-Keywords[el]=Konqueror,καρτέλες -X-KDE-Keywords[eo]=konkeranto,langetoj -X-KDE-Keywords[es]=konqueror,solapas -X-KDE-Keywords[et]=konqueror,kaardid -X-KDE-Keywords[fa]=konqueror، تبها -X-KDE-Keywords[ga]=Konqueror,cluaisíní -X-KDE-Keywords[he]=konqueror,לשוניות -X-KDE-Keywords[hu]=Konqueror,tabulátorok -X-KDE-Keywords[it]=konqueror,tab,schede -X-KDE-Keywords[ja]=konqueror,タブ -X-KDE-Keywords[km]=konqueror ផ្ទាំង -X-KDE-Keywords[ko]=konqueror,탭 -X-KDE-Keywords[nb]=Konqueror,faner -X-KDE-Keywords[nds]=Konqueror,Paneels -X-KDE-Keywords[ne]=कन्क्वेरर, ट्याब +X-KDE-Keywords[cs]=konqueror,karty +X-KDE-Keywords[da]=konqueror,faneblade +X-KDE-Keywords[de]=Konqueror,Unterfenster +X-KDE-Keywords[fi]=konqueror,välilehdet +X-KDE-Keywords[hu]=konqueror,lapok +X-KDE-Keywords[ia]=konqueror,schedas +X-KDE-Keywords[kk]=konqueror,tabs +X-KDE-Keywords[nb]=konqueror,faner X-KDE-Keywords[nl]=konqueror,tabbladen -X-KDE-Keywords[nn]=konqueror,faner -X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰੋਰ,ਟੈਬਾਂ -X-KDE-Keywords[pt]=Konqueror,páginas +X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰੋਰ,ਟੈਬ +X-KDE-Keywords[pt]=konqueror,páginas X-KDE-Keywords[pt_BR]=konqueror,abas -X-KDE-Keywords[sl]=konqueror,zavihki -X-KDE-Keywords[sr]=Konqueror,tabs,језичак,језичци -X-KDE-Keywords[sr@latin]=Konqueror,tabs,jezičak,jezičci -X-KDE-Keywords[sv]=Konqueror, flikar -X-KDE-Keywords[th]=konqueror,แท็บ -X-KDE-Keywords[vi]=konqueror,thẻ -X-KDE-Keywords[wa]=konqueror,linwetes +X-KDE-Keywords[sv]=konqueror,flikar +X-KDE-Keywords[uk]=konqueror,tabs,вкладка,вкладки X-KDE-Keywords[x-test]=xxkonqueror,tabsxx -X-KDE-Keywords[zh_CN]=konqueror,tabs,标签页 -X-KDE-Keywords[zh_TW]=Konqueror,tabs,分頁 +X-KDE-Keywords[zh_TW]=konqueror,tabs Categories=Qt;KDE; diff -Nru kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_java_js.desktop kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_java_js.desktop --- kde-baseapps-4.7.90/konqueror/settings/konqhtml/khtml_java_js.desktop 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/konqhtml/khtml_java_js.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -158,7 +158,7 @@ Comment[ml]=ജാവയുടെയും ജാവാസ്ക്രിപ്റ്റിന്റെയും പെരുമാറ്റം ക്രമീകരിയ്ക്കുക Comment[mr]=जावा व जावास्क्रिप्ट वर्तन संयोजीत करा Comment[ms]=Konfigur kelakuan Java dan JavaScript -Comment[nb]=Tilpasninger Java og JavaScript +Comment[nb]=Innstillinger for Java og JavaScript Comment[nds]=Dat Bedregen vun Java un JavaSkript instellen Comment[ne]=जाभा र जाभा स्क्रिप्टकको व्यवहार कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u het gedrag van Java en JavaScript instellen @@ -195,61 +195,19 @@ Comment[zh_CN]=配置 Java 和 JavaScript 的行为 Comment[zh_TW]=設定 Java 與 JavaScript 的行為 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,java,javascript -X-KDE-Keywords[be]=Вандроўнік,Сеціва,Сцэнар,konqueror,kfm,browser,html,web,www,java,javascript -X-KDE-Keywords[bg]=Keywords=Джава, Джава скрипт, скрипт, konqueror, kfm, browser, html, web, www, java, javascript -X-KDE-Keywords[br]=konqueror,kfm,furcher,html,web,gwiad,java,javascript X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,java,javascript -X-KDE-Keywords[cs]=Konqueror,Kfm,Prohlížeč,HTML,Web,WWW,Java,JavaScript -X-KDE-Keywords[csb]=konqueror,kfm,przezérnik,html,séc www,www,java,javascript -X-KDE-Keywords[cy]=konqueror,kfm,porydd,html,gwe,www,java,javascript -X-KDE-Keywords[da]=konqueror,kfm,browser,HTML,net,www,java,javascript +X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,java,javascript X-KDE-Keywords[de]=Konqueror,kfm,Browser,HTML,Web,WWW,Java,JavaScript -X-KDE-Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,java,javascript -X-KDE-Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro,kursilo,ligo,referenco,bildo,signaro,kodo -X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,wwwjava,javascript -X-KDE-Keywords[et]=konqueror,kfm,veebilehitseja,brauser,html,veeb,www,java,javascript -X-KDE-Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,java,javascript -X-KDE-Keywords[fa]=konqueror، kfm، مرورگر، زنگام، وب، www، جاوا، جاوااسکریپت X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,java,javascript -X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,couleurs,java,javascript,curseur,liens,images,jeu de caractères,caractères,codage,encodage -X-KDE-Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,java,javaskript,ynternet -X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,java,javascript -X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,java,javascript -X-KDE-Keywords[he]=konqueror,kfm,דפדפן,html,אינטרנט,www,java,javascript,ג'אווה, browser,web,www,java,javascript -X-KDE-Keywords[hr]=konqueror,kfm,browser,html,web,www,java,javascript,preglednik -X-KDE-Keywords[hu]=Konqueror,kfm,böngésző,HTML,web,WWW,Java,Javascript -X-KDE-Keywords[is]=konqueror,kfm,browser,html,web,www,java,javascript,vafri -X-KDE-Keywords[ja]=konqueror,kfm,ブラウザ,html,web,ウェブ,www,java,javascript -X-KDE-Keywords[km]=konqueror kfm កម្មវិធី​រុករក html បណ្ដាញ វើលវ៉ាយវ៉េប java javascript -X-KDE-Keywords[ko]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,브라우저,웹,글꼴,색,색깔,자바,자바 스크립트,연결,그림,글자셋,문자셋,인코딩 -X-KDE-Keywords[lt]=konqueror,kfm,browser,html,web,www,java,javascript, naršyklė,tinklalapiai, žiniatinklis -X-KDE-Keywords[lv]=iekarotājs,kfm,pārlūks,html,web,www,java,javaskripts -X-KDE-Keywords[mk]=konqueror,kfm,browser,html,web,www,java,javascript,прелистувач,веб -X-KDE-Keywords[nb]=konqueror,kfm,html,nettet,www,java,javascript,nettleser,Internett -X-KDE-Keywords[nds]=Konqueror,kfm,browser,Nettkieker,HTML,web,www,Java,JavaScript -X-KDE-Keywords[ne]=कन्क्वेरर, kfm, ब्राउजर, html, वेब, www, जाभा, जाभास्क्रिप्ट -X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,java,javascript,internet -X-KDE-Keywords[nn]=Konqueror,KFM,nettlesar,HTML,verdsveven,WWW,Java,JavaScript -X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰਰ,kfm,ਝਲਕਾਰਾ,html,web,www,java,javascript,ਜਾਵਾ -X-KDE-Keywords[pl]=konqueror,kfm,przeglądarka,html,sieć www,www,java,javascript -X-KDE-Keywords[pt]=konqueror,kfm,navegador,html,web,www,java,javascript -X-KDE-Keywords[pt_BR]=konqueror,kfm,navegador,html,web,WWW,java,javascript -X-KDE-Keywords[ro]=konqueror,kfm,navigator,browser,html,web,www,java,javascript -X-KDE-Keywords[se]=konqueror,kfm,fierpmádatlogan,html,web,www,java,javascript -X-KDE-Keywords[sl]=konqueror,kfm,brskalnik,html,splet,www,java,javascript -X-KDE-Keywords[sr]=konqueror,kfm,browser,html,web,www,java,javascript,К-освајач,прегледач,ХТМЛ,Мрежа,јава,јаваскрипт -X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,java,javascript,K-osvajač,pregledač,HTML,Web,Java,JavaScript -X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,färger,java,javaskript,länkar,bilder,kodning,teckenuppsättningar -X-KDE-Keywords[ta]=கான்கொரர்,kfm,உலாவி,html,வலை,www,ஜாவா,ஜாவா எழுத்தாக்கம் -X-KDE-Keywords[th]=konqueror ,kfm,เบราว์เซอร์,html,เว็บ,www,จาวา,จาวาสคริปต์ -X-KDE-Keywords[tr]=konqueror,kfm,tarayıcı,html,web,www,java,javascript -X-KDE-Keywords[uk]=konqueror,kfm,навігатор,html,web,Тенета,java,javascript,www -X-KDE-Keywords[uz]=konqueror,kfm,браузер,html,веб,www,java,javascript -X-KDE-Keywords[vi]=konqueror,kfm,trình duyệt,html,Mạng,www,java,javascript -X-KDE-Keywords[wa]=konqueror,kfm,betchteu,html,waibe,waibes,www,java,javascript +X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,java,javascript +X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,java,javascript +X-KDE-Keywords[nb]=konqueror,kfm,nettleser,html,vev,www,java,javascript +X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,java,javascript +X-KDE-Keywords[pt]=konqueror,kfm,navegador,HTML,Web,WWW,Java,Javascript +X-KDE-Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,java,javascript +X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,web,www,java,javascript +X-KDE-Keywords[uk]=konqueror,kfm,browser,html,web,www,java,javascript,перегляд,переглядач,браузер,мережа,джава,ява,скрипт X-KDE-Keywords[x-test]=xxkonqueror,kfm,browser,html,web,www,java,javascriptxx -X-KDE-Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web, www,java,okushicilelwe phantsi kwe java -X-KDE-Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,java,javascript,浏览器 -X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,java,javascript,征服家,瀏覽器,網頁 +X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,java,javascript Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.90/konqueror/settings/performance/kcmkonqyperformance.desktop kde-baseapps-4.7.95/konqueror/settings/performance/kcmkonqyperformance.desktop --- kde-baseapps-4.7.90/konqueror/settings/performance/kcmkonqyperformance.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/performance/kcmkonqyperformance.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -155,7 +155,7 @@ Comment[ml]=കോണ്‍ക്വററിന്റെ പ്രകടനം മെച്ചപ്പെടുത്താവുന്ന സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക Comment[mr]=कॉन्करर कायर्क्षमता वाढविण्याकरीता संयोजना संयोजीत करा Comment[ms]=Konfigur seting yang meningkatkan prestasi Konqueror -Comment[nb]=Tilpass innstillinger som kan forbedre Konquerors ytelse +Comment[nb]=Innstillinger som kan forbedre Konquerors ytelse Comment[nds]=Mit disse Instellen kannst Du de Leisten vun Konqueror verbetern Comment[ne]=कन्क्वेरर सम्पादन सुधार गर्न सक्ने सेटिङ कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u instellingen kiezen die de prestaties van Konqueror verbeteren @@ -192,52 +192,18 @@ Comment[zh_TW]=可增進 Konqueror 效能的設定 X-KDE-Keywords=konqueror,reuse,preloading -X-KDE-Keywords[be]=Папярэдняя загрузка,konqueror,reuse,preloading -X-KDE-Keywords[bg]=Keywords=предварително, зареждане, използване, повторно, konqueror, reuse, preloading -X-KDE-Keywords[ca]=konqueror,torna a emprar,carrega prèviament -X-KDE-Keywords[cs]=konqueror,využití,preload -X-KDE-Keywords[csb]=konqueror,brëkòwanié znowa,wstãpné wczëtanié -X-KDE-Keywords[cy]=konqueror,ailddefnyddio,cynlwytho -X-KDE-Keywords[da]=konqueror,genbrug,forudindlæsning -X-KDE-Keywords[de]=konqueror,wiederverwenden -X-KDE-Keywords[el]=konqueror,επαναχρησιμοποίηση,προφόρτωση -X-KDE-Keywords[eo]=konkeranto,antaŭŝarĝi -X-KDE-Keywords[et]=konqueror,taaskasutamine,eellaadimine -X-KDE-Keywords[eu]=konqueror,berrerabili,prekargatu -X-KDE-Keywords[fa]=konqueror، استفادۀ مجدد، پیش‌بارگذاری -X-KDE-Keywords[fi]=konqueror,reuse,esilataus -X-KDE-Keywords[fr]=konqueror,réutilisation,préchargement -X-KDE-Keywords[fy]=konqueror,hergebûk,foarútlade -X-KDE-Keywords[ga]=konqueror,athúsáid,réamhluchtú -X-KDE-Keywords[gl]=konqueror,reuso,precarga -X-KDE-Keywords[he]=konqueror,שימוש חוזר,טעינה מקדימה,reuse,preloading -X-KDE-Keywords[hr]=konqueror,reuse,preloading,ponovna upotreba,prethodno učitavanje -X-KDE-Keywords[hu]=konqueror,ujrafelhasználás,előtöltés -X-KDE-Keywords[it]=konqueror,riutilizzo,precaricamento,prestazioni,preloading -X-KDE-Keywords[ja]=konqueror,再使用,事前読み込み -X-KDE-Keywords[km]=konqueror ប្រើ​ម្ដង​ទៀត ផ្ទុក​ជាមុន -X-KDE-Keywords[ko]=konqueror,재사용,미리 읽기 -X-KDE-Keywords[lv]=iekarotājs,reuse,priekšielāde -X-KDE-Keywords[mk]=konqueror,reuse,preloading,користи,повторно користи,предвчитување +X-KDE-Keywords[ca]=konqueror,tornar a usar,precàrrega +X-KDE-Keywords[da]=konqueror,genbrug,preloading,forudindlæsning +X-KDE-Keywords[fi]=konqueror,uudelleenkäyttö,esilataus +X-KDE-Keywords[hu]=konqueror,újrafelhasználás,gyorsbetöltés +X-KDE-Keywords[ia]=konqueror,reusa,precargante +X-KDE-Keywords[kk]=konqueror,reuse,preloading X-KDE-Keywords[nb]=konqueror,gjenbruk,forhåndslasting -X-KDE-Keywords[nds]=Konqueror,wedder bruken,vörladen -X-KDE-Keywords[ne]=विजय/प्राप्ति, पुन: प्रयोग, पूर्व-लोडिङ -X-KDE-Keywords[nl]=konqueror,hergebruik,preloading -X-KDE-Keywords[nn]=Konqueror,gjenbruk,førehandslasting -X-KDE-Keywords[pa]=konqueror,reuse,preloading, ਕੋਨਕਿਉਰਰ, ਮੁੜ ਲੋਡ -X-KDE-Keywords[pl]=konqueror,ponowne użycie,wstępne wczytywanie -X-KDE-Keywords[pt]=konqueror,reutilização,pré-carregamento -X-KDE-Keywords[pt_BR]=konqueror,reuso,pré-carregamento -X-KDE-Keywords[ro]=konqueror,reutilizare,preîncărcare -X-KDE-Keywords[sl]=konqueror,recikliranje,prednalaganje -X-KDE-Keywords[sr]=konqueror,reuse,preloading,К-освајач,поновно коришћење,предучитавање -X-KDE-Keywords[sr@latin]=konqueror,reuse,preloading,K-osvajač,ponovno korišćenje,predučitavanje +X-KDE-Keywords[nl]=konqueror,hergebruik,voorladen +X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰੋਰ,ਮੁੜ-ਵਰਤੋਂ,ਮੁੜ-ਲੋਡਕਰਨਾ +X-KDE-Keywords[pt]=konqueror,reutilizar,pré-carregamento +X-KDE-Keywords[pt_BR]=konqueror,reutilizar,pré-carregamento X-KDE-Keywords[sv]=konqueror,återanvändning,förladdning -X-KDE-Keywords[ta]=கான்கொரர்,திரும்ப பயன்படுத்து,முன்ஏற்றுதல் -X-KDE-Keywords[th]=konqueror ,นำมาใช้ใหม่,เตรียมโหลดไว้ก่อน -X-KDE-Keywords[tr]=konqueror,yeniden kullanım,ön yükleme -X-KDE-Keywords[uk]=konqueror,повторне використання,попереднє завантаження -X-KDE-Keywords[vi]=konqueror,tái sử dụng,tải về sẵn +X-KDE-Keywords[uk]=konqueror,reuse,preloading,повторне,використання,попереднє,завантаження X-KDE-Keywords[x-test]=xxkonqueror,reuse,preloadingxx -X-KDE-Keywords[zh_CN]=konqueror,reuse,preloading,重用,预加载 -X-KDE-Keywords[zh_TW]=konqueror,reuse,preloading,重用,預先載入 +X-KDE-Keywords[zh_TW]=konqueror,reuse,preloading diff -Nru kde-baseapps-4.7.90/konqueror/settings/performance/kcmperformance.desktop kde-baseapps-4.7.95/konqueror/settings/performance/kcmperformance.desktop --- kde-baseapps-4.7.90/konqueror/settings/performance/kcmperformance.desktop 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/settings/performance/kcmperformance.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -154,7 +154,7 @@ Comment[ml]=കെഡിഇയുടെ പ്രകടനം മെച്ചപ്പെടുത്താവുന്ന സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക Comment[mr]=KDE कायर्क्षमता वाढविण्याकरीता संयोजना संयोजीत करा Comment[ms]=Konfigur seting yang boleh meningkatkan prestasi KDE -Comment[nb]=Tilpass instillinger som kan forbedre KDEs ytelse +Comment[nb]=Innstillinger som kan forbedre KDEs ytelse Comment[nds]=Mit disse Instellen kannst Du de Leisten vun KDE verbetern Comment[ne]=केडीई कार्यसम्पादन सुधार गर्न सक्ने सेटिङ कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u instellingen kiezen die de prestaties van KDE kunnen verbeteren @@ -191,57 +191,17 @@ Comment[zh_TW]=可增進 KDE 效能的設定 X-KDE-Keywords=performance,speed,memory,improve -X-KDE-Keywords[be]=Хуткасць працы,Прадукцыйнасць,Хуткасць,Памяць,Палепшыць,Паляпшэнне,performance,speed,memory,improve -X-KDE-Keywords[bg]=Keywords=производителност, памет, скорост, подобряване, подобрение, performance, speed, memory, improve X-KDE-Keywords[ca]=rendiment,velocitat,memòria,millora -X-KDE-Keywords[cs]=výkon,rychlost,paměť,zlepšení -X-KDE-Keywords[csb]=spòrosc, chùtkòsc, pamiãc,zlepszenié -X-KDE-Keywords[cy]=perfformiad,cyflymder,cof,gwella -X-KDE-Keywords[da]=ydelse,hastighed,hukommelse,forbedre +X-KDE-Keywords[da]=ydelse,hastighed,hukommelse,forbedr X-KDE-Keywords[de]=leistung,geschwindigkeit,speichern,optimieren -X-KDE-Keywords[el]=απόδοση,ταχύτητα,μνήμη,βελτίωση -X-KDE-Keywords[eo]=potenco,rapideco,memoro,plibonigo,plibonigi -X-KDE-Keywords[es]=rendimiento,velocidad,memoria,mejora -X-KDE-Keywords[et]=jõudlus,kiirus,mälu,parandamine -X-KDE-Keywords[eu]=performantzia,abiadura,memoria,hobetu -X-KDE-Keywords[fa]=کارایی، سرعت، حافظه، بهبود -X-KDE-Keywords[fi]=suorituskyky, nopeus, muisti, parannus -X-KDE-Keywords[fr]=performances,vitesse,mémoire,améliorer -X-KDE-Keywords[fy]=fluggens,prestaasjes,ûnthâld,ferbetterje -X-KDE-Keywords[ga]=oibriú,luas,cuimhne,feabhsaigh,feabhsú -X-KDE-Keywords[gl]=rendemento,velocidade,memoria,mellora -X-KDE-Keywords[he]=ביצועים,מהירות,זיכרון,שיפור, performance,speed,memory,improve -X-KDE-Keywords[hr]=performance,speed,memory,improve,performanse,brzina,memorija,unaprijediti -X-KDE-Keywords[hu]=teljesítmény,sebesség,memória,hangolás -X-KDE-Keywords[it]=prestazioni,velocità,memoria,migliora -X-KDE-Keywords[ja]=パフォーマンス,速度,メモリ,改善 -X-KDE-Keywords[km]=ដំណើរ​ការ ល្បឿន សតិ បង្កើន -X-KDE-Keywords[ko]=성능,속도,메모리,향상 -X-KDE-Keywords[lt]=performance,speed,memory,improve,veikimas,greitis,atmintis,pagerinti -X-KDE-Keywords[lv]=veiktspēja,ātrums,atmiņa,uzlabot -X-KDE-Keywords[mk]=performance,speed,memory,improve,перформанси,брзина,меморија,подобри -X-KDE-Keywords[nb]=ytelse,hastighet,minne,forbedre -X-KDE-Keywords[nds]=Leisten,performance,Gauheit,Spieker,verbetern -X-KDE-Keywords[ne]=कार्यसम्पादन,गति, स्मृति, सुधार -X-KDE-Keywords[nl]=snelheid,prestaties,geheugen,verbeteren -X-KDE-Keywords[nn]=yting,fart,minne,forbetra -X-KDE-Keywords[pa]=performance,speed,memory,improve, ਪਰਦਰਸ਼ਨ, ਗਤੀ, ਮੈਮੋਰੀ, ਸੁਧਾਰ -X-KDE-Keywords[pl]=wydajność,szybkość,pamięć,polepszenie -X-KDE-Keywords[pt]=performance,velocidade,memória,melhorar -X-KDE-Keywords[pt_BR]=performance,velocidade,memória,aumento -X-KDE-Keywords[ro]=performanţă,viteză,memorie,îmbunătăţire -X-KDE-Keywords[se]=buktu,leahttu,muitu,buoridit -X-KDE-Keywords[sl]=zmogljivost,hitrost,pomnilnik,izboljšanje -X-KDE-Keywords[sr]=performance,speed,memory,improve,перформансе,брзина,меморија,побољшање -X-KDE-Keywords[sr@latin]=performance,speed,memory,improve,performanse,brzina,memorija,poboljšanje +X-KDE-Keywords[fi]=suorituskyky,nopeus,muisti,paranna,parannus +X-KDE-Keywords[hu]=teljesítmény,sebesség,memória,fejlesztés +X-KDE-Keywords[kk]=performance,speed,memory,improve +X-KDE-Keywords[nb]=ytelse,fart,minne,forbedre +X-KDE-Keywords[nl]=prestatie,snelheid,geheugen,verbeteren +X-KDE-Keywords[pt]=performance,velocidade,memória,melhoria +X-KDE-Keywords[pt_BR]=desempenho,velocidade,memória,melhoria X-KDE-Keywords[sv]=prestanda,hastighet,minne,förbättra -X-KDE-Keywords[ta]=செயல்திறன்,வேகம்,நினைவகம்,முன்னேற்றம் -X-KDE-Keywords[th]=ประสิทธิภาพ,ความเร็ว,หน่วยความจำ,ปรับปรุง -X-KDE-Keywords[tr]=performans,hız,bellek,geliştirme -X-KDE-Keywords[uk]=швидкодія,швидкість,пам'ять,покращення -X-KDE-Keywords[uz]=унумдорлик,тезлик,хотира,ошириш -X-KDE-Keywords[vi]=hiệu năng,tốc độ,bộ nhớ,nâng cao -X-KDE-Keywords[wa]=performance,performances,roedeu,radisté,rade,abeye,memwere,amidrer +X-KDE-Keywords[uk]=performance,speed,memory,improve,швидкодія,швидкість,пам’ять,покращення,покращити X-KDE-Keywords[x-test]=xxperformance,speed,memory,improvexx -X-KDE-Keywords[zh_CN]=performance,speed,memory,improve,性能,速度,内存,提高 -X-KDE-Keywords[zh_TW]=performance,speed,memory,improve,效能,速度,記憶體,增進 +X-KDE-Keywords[zh_TW]=performance,speed,memory,improve diff -Nru kde-baseapps-4.7.90/konqueror/sidebar/history_module/kcmhistory.desktop kde-baseapps-4.7.95/konqueror/sidebar/history_module/kcmhistory.desktop --- kde-baseapps-4.7.90/konqueror/sidebar/history_module/kcmhistory.desktop 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/sidebar/history_module/kcmhistory.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -193,62 +193,17 @@ Comment[zh_CN]=配置历史侧边栏 Comment[zh_TW]=設定歷史紀錄邊列 X-KDE-Keywords=history,expire -X-KDE-Keywords[be]=Гісторыя,Састарэлая,history,expire -X-KDE-Keywords[bg]=Keywords=история, сърфиране, срок, изтичане, history, expire -X-KDE-Keywords[ca]=historial,expira -X-KDE-Keywords[cs]=historie,vypršení -X-KDE-Keywords[csb]=historëjô,wëgasëwanié -X-KDE-Keywords[cy]=hanes,daw i ben -X-KDE-Keywords[da]=historik,udløbe -X-KDE-Keywords[de]=History,Verlauf -X-KDE-Keywords[el]=ιστορικό,λήξη -X-KDE-Keywords[eo]=historio,malvalidiĝi -X-KDE-Keywords[es]=historial,expirar -X-KDE-Keywords[et]=ajalugu,aegumine -X-KDE-Keywords[eu]=historia,iraungi -X-KDE-Keywords[fa]=تاریخچه، انقضا -X-KDE-Keywords[fi]=historia,umpeenmeno -X-KDE-Keywords[fr]=historique,expiration -X-KDE-Keywords[fy]=histoarje,ferrinne -X-KDE-Keywords[ga]=stair,caite,as feidhm -X-KDE-Keywords[gl]=historial,caducar -X-KDE-Keywords[he]=היסטוריה,תפוגה,history,expire -X-KDE-Keywords[hr]=history,expire,povijest,istek -X-KDE-Keywords[hu]=napló,lejárás -X-KDE-Keywords[is]=Saga,útrunnið,history -X-KDE-Keywords[it]=cronologia,scadenza -X-KDE-Keywords[ja]=履歴,失効 -X-KDE-Keywords[km]=ប្រវត្តិ ផុត​កំណត់ -X-KDE-Keywords[ko]=과거 기록,만료 -X-KDE-Keywords[lt]=history,expire, istorija,pasibaigti -X-KDE-Keywords[lv]=vēsture,beigties -X-KDE-Keywords[mk]=history,expire,историја,истекува -X-KDE-Keywords[ms]=sejarah, luput -X-KDE-Keywords[nb]=historie,utløper -X-KDE-Keywords[nds]=Vörgeschicht,aflopen -X-KDE-Keywords[ne]=इतिहास, म्याद समाप्त -X-KDE-Keywords[nl]=geschiedenis,verloop -X-KDE-Keywords[nn]=historie,utgår -X-KDE-Keywords[pa]=expire,ਅਤੀਤ -X-KDE-Keywords[pl]=historia,wygasanie -X-KDE-Keywords[pt]=histórico,expirar -X-KDE-Keywords[pt_BR]=histórico,expirar -X-KDE-Keywords[ro]=istoric,expirare -X-KDE-Keywords[ru]=history,expire,журнал -X-KDE-Keywords[se]=historihkka,boarásnuvvat -X-KDE-Keywords[sl]=zgodovina,potek,poteče -X-KDE-Keywords[sr]=history,expire,историјат,истицање -X-KDE-Keywords[sr@latin]=history,expire,istorijat,isticanje +X-KDE-Keywords[ca]=historial,venciment +X-KDE-Keywords[da]=historik,udløb +X-KDE-Keywords[fi]=historia,vanhentuminen +X-KDE-Keywords[hu]=előzmények,lejárat +X-KDE-Keywords[kk]=history,expire +X-KDE-Keywords[nb]=historie,utdatere +X-KDE-Keywords[nl]=geschiedenis,verlopen +X-KDE-Keywords[pt]=histórico,expiração +X-KDE-Keywords[pt_BR]=histórico,expiração X-KDE-Keywords[sv]=historik,utgå -X-KDE-Keywords[ta]=வரலாறு,முடிந்தது -X-KDE-Keywords[th]=ประวัติการใช้,หมดอายุ -X-KDE-Keywords[tr]=geçmiş -X-KDE-Keywords[uk]=історія,закінчення терміну,втрата чинності -X-KDE-Keywords[uz]=тарих,муддати ўтиш -X-KDE-Keywords[vi]=lịch sử,hết hạn -X-KDE-Keywords[wa]=istwere,espirer,espiraedje +X-KDE-Keywords[uk]=history,expire,журнал,старий,застарівання,вилучення X-KDE-Keywords[x-test]=xxhistory,expirexx -X-KDE-Keywords[xh]=imbali,ephelelwa lixesha -X-KDE-Keywords[zh_CN]=history,expire,历史,过期 -X-KDE-Keywords[zh_TW]=history,expire,歷史紀錄,過期 +X-KDE-Keywords[zh_TW]=history,expire Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.90/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp kde-baseapps-4.7.95/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp --- kde-baseapps-4.7.90/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp 2011-08-07 15:40:34.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -517,7 +517,7 @@ // All items are in m_ptrdictSubDirs, so look it up fast Q3PtrList *itemList; KonqSidebarTreeItem * item; - lookupItems(m_ptrdictSubDirs, fileItem, item, itemList); + lookupItems(m_dictSubDirs, fileItem.url().url( KUrl::RemoveTrailingSlash ), item, itemList); while(item) { removeSubDir( item ); diff -Nru kde-baseapps-4.7.90/konqueror/src/konqmainwindow.cpp kde-baseapps-4.7.95/konqueror/src/konqmainwindow.cpp --- kde-baseapps-4.7.90/konqueror/src/konqmainwindow.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/src/konqmainwindow.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -4223,6 +4223,7 @@ } actionCollection()->action( "quit" )->setEnabled( true ); + actionCollection()->action( "link" )->setEnabled( false ); } void KonqMainWindow::disableActionsNoView() diff -Nru kde-baseapps-4.7.90/konqueror/src/konqpixmapprovider.cpp kde-baseapps-4.7.95/konqueror/src/konqpixmapprovider.cpp --- kde-baseapps-4.7.90/konqueror/src/konqpixmapprovider.cpp 2011-07-27 18:36:39.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/src/konqpixmapprovider.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -63,7 +63,7 @@ if ( it != iconMap.end() ) { icon = it.value(); if ( !icon.isEmpty() ) - return icon; + return icon; } if ( url.url().isEmpty() ) { @@ -95,35 +95,31 @@ { iconMap.clear(); const QStringList list = kc.readPathEntry( key, QStringList() ); - QStringList::ConstIterator it = list.begin(); - QString url, icon; - while ( it != list.end() ) { - url = (*it); - if ( ++it == list.end() ) - break; - icon = (*it); - iconMap.insert( KUrl( url ), icon ); - - ++it; + QStringList::const_iterator it = list.begin(); + QStringList::const_iterator itEnd = list.end(); + while ( it != itEnd ) { + const QString url (*it); + if ( (++it) == itEnd ) + break; + const QString icon (*it); + iconMap.insert( KUrl( url ), icon ); + ++it; } } // only saves the cache for the given list of items to prevent the cache // from growing forever. void KonqPixmapProvider::save( KConfigGroup& kc, const QString& key, - const QStringList& items ) + const QStringList& items ) { QStringList list; - QStringList::ConstIterator it = items.begin(); - QMap::const_iterator mit; - while ( it != items.end() ) { - mit = iconMap.constFind( KUrl(*it) ); - if ( mit != iconMap.constEnd() ) { - list.append( mit.key().url() ); - list.append( mit.value() ); - } - - ++it; + QStringList::const_iterator itEnd = items.end(); + for (QStringList::const_iterator it = items.begin(); it != itEnd; ++it) { + QMap::const_iterator mit = iconMap.constFind( KUrl(*it) ); + if ( mit != iconMap.constEnd() ) { + list.append( mit.key().url() ); + list.append( mit.value() ); + } } kc.writePathEntry( key, list ); } @@ -132,14 +128,13 @@ const QString& iconName ) { KUrl u; - if ( !isHost ) u = hostOrURL; + if ( !isHost ) + u = hostOrURL; - for ( QMap::iterator it = iconMap.begin(); - it != iconMap.end(); - ++it ) + QMap::iterator itEnd = iconMap.end(); + for ( QMap::iterator it = iconMap.begin(); it != itEnd; ++it ) { KUrl url( it.key() ); - if ( !url.protocol().startsWith( "http" ) ) continue; if ( ( isHost && url.host() == hostOrURL ) || ( !isHost && url.host() == u.host() && url.path() == u.path() ) ) { @@ -162,7 +157,7 @@ QPixmap KonqPixmapProvider::loadIcon( const QString& icon, int size ) { if ( size <= KIconLoader::SizeSmall ) - return SmallIcon( icon, size ); + return SmallIcon( icon, size ); return KIconLoader::global()->loadIcon( icon, KIconLoader::Panel, size ); } diff -Nru kde-baseapps-4.7.90/konqueror/src/konqview.cpp kde-baseapps-4.7.95/konqueror/src/konqview.cpp --- kde-baseapps-4.7.90/konqueror/src/konqview.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/konqueror/src/konqview.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -218,9 +218,6 @@ void KonqView::switchView( KonqViewFactory &viewFactory ) { //kDebug(); - if ( m_pPart ) - m_pPart->widget()->hide(); - KParts::ReadOnlyPart *oldPart = m_pPart; m_pPart = m_pKonqFrame->attach( viewFactory ); // creates the part diff -Nru kde-baseapps-4.7.90/nsplugins/khtml_plugins.desktop kde-baseapps-4.7.95/nsplugins/khtml_plugins.desktop --- kde-baseapps-4.7.90/nsplugins/khtml_plugins.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/nsplugins/khtml_plugins.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -197,63 +197,19 @@ Comment[zh_CN]=配置浏览器插件 Comment[zh_TW]=設定瀏覽器外掛程式 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,plugins -X-KDE-Keywords[be]=Вандроўнік,Сеціва,Шрыфты,Утулкі,konqueror,kfm,browser,html,web,www,fonts,plugins -X-KDE-Keywords[bg]=Keywords=приставки, настройване, браузър, уеб, шрифтове, Интернет, приставка, модул, konqueror, kfm, browser, html, web, www, fonts, plugins -X-KDE-Keywords[br]=konqueror,kfm,furcher,html,web,gwiad,livioù,java,javascript -X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletra,connectors -X-KDE-Keywords[cs]=Konqueror,Kfm,Prohlížeč,HTML,Web,WWW,Písma,Moduly -X-KDE-Keywords[csb]=konqueror,kfm,przezérnik,html,séc,www,fòntë,wtëkôczë -X-KDE-Keywords[cy]=konqueror,kfm,porwr,porydd,html,gwe,www,wynebfathau,ffontiau,ategion -X-KDE-Keywords[da]=konqueror,kfm,browser,html,net,www,skrifttyper,plugin +X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletres,connectors +X-KDE-Keywords[da]=konqueror,kfm,browser,html,web,www,fonts,plugins,skrifttyper X-KDE-Keywords[de]=Konqueror,kfm,Browser,HTML,Web,WWW,Schriften,Plugins -X-KDE-Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,γραμματοσειρές,πρόσθετα -X-KDE-Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro, kursilo,ligo,referenco,bildo,signaro,kodo -X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,complementos -X-KDE-Keywords[et]=konqueror,kfm,veebilehitseja,brauser,html,veeb,www,fondid,pluginad -X-KDE-Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,letra-tipoak,pluginak -X-KDE-Keywords[fa]=konqueror، kfm، مرورگر، html، وب، www، قلمها، وصله‌ها -X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,liitännäiset -X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,plugins,modules externes -X-KDE-Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,fonts,lettertypen,plugins,internet,ynternet,netscape plugins -X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,idirlíon,www,clófhoirne,breiseáin -X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,plugins -X-KDE-Keywords[he]=konqueror,kfm,דפדפן,html,web,www,אינטרנט,גופנים,תוספים, fonts,plugins -X-KDE-Keywords[hr]=konqueror,kfm,preglednik,html,web,www,fontovi,dodaci,mreža -X-KDE-Keywords[hu]=Konqueror,kfm,böngésző,HTML,web,WWW,betűtípusok,bővítőmodulok -X-KDE-Keywords[is]=konqueror,kfm,flakkari,html,web,www,letur,íforrit,vefur -X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,plugin -X-KDE-Keywords[ja]=konqueror,kfm,ブラウザ,html,web,ウェブ,www,フォント,プラグイン -X-KDE-Keywords[km]=konqueror kfm កម្មវិធី​រុករក html បណ្ដាញ វើលវ៉ាយវេប ពុម្ព​អក្សរ កម្មវិធី​ជំនួយ -X-KDE-Keywords[ko]=konqueror,브라우저,html,웹,글꼴,플러그인 -X-KDE-Keywords[lt]=konqueror,kfm,browser,html,web,www,fonts,plugins. naršyklė,tinklalapiai,šriftai,priedai -X-KDE-Keywords[lv]=iekarotājs,kfm,pārlūks,html,web,www,fonti,spraudņi -X-KDE-Keywords[mk]=konqueror,kfm,browser,html,web,www,fonts,plugins, прелистувач,веб,фонтови,приклучоци -X-KDE-Keywords[ms]=konqueror,kfm,pelayar,html,web,www,font,plugin -X-KDE-Keywords[nb]=Konqueror,KFM,nettleser,HTML,verdensveven,WWW,Internett,skrifter,programtillegg -X-KDE-Keywords[nds]=Konqueror,kfm,Nettkieker,HTML,web,www,Schriftoorden,Plugins -X-KDE-Keywords[ne]=कन्क्वेरर,kfm, ब्राउजर,html, वेब,www, फन्ट, प्लगइन -X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,fonts,lettertypen,plugins,internet,netscape plugins -X-KDE-Keywords[nn]=Konqueror,KFM,nettlesar,HTML,verdsveven,WWW,skrifter,programtillegg -X-KDE-Keywords[pa]=konqueror,kfm,browser,html,web,www,ਫੋਂਟ,ਪਲੱਗਇਨ,ਕੋਨਕਿਉਰਰ,ਝਲਕਾਰਾ,ਵੈਬ -X-KDE-Keywords[pl]=konqueror,kfm,przeglądarka,html,sieć,www,czcionki,wtyczki -X-KDE-Keywords[pt]=konqueror,kfm,navegador,HTML,web,WWW,tipos de letra,'plugins' -X-KDE-Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,fontes,plugins -X-KDE-Keywords[ro]=konqueror,kfm,navigator,html,web,www,fonturi,module -X-KDE-Keywords[se]=konqueror,kfm,fierpmádatlogan,html,web,www,fonttat,lassemoduvllat -X-KDE-Keywords[sl]=konqueror,kfm,brskalnik,html,splet,web,pisave,www,vstavki -X-KDE-Keywords[sr]=konqueror,kfm,browser,html,web,www,fonts,plugins,К-освајач,прегледач,ХТМЛ,Мрежа,фонтови,прикључци -X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,fonts,plugins,K-osvajač,pregledač,HTML,Web,fontovi,priključci -X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,insticksprogram -X-KDE-Keywords[ta]=கான்கொரர், கோப்பு மேலாளர், மேலோடி, உலாவி, html, இணையம், வலையம், வலை, எழுத்துரு, www, செருகல்கள் -X-KDE-Keywords[th]=konqueror ,kfm,เบราว์เซอร์,html,เว็บ,www,แบบอักษร,ปลั๊กอิน -X-KDE-Keywords[tr]=konqueror,kfm,browser,html,web,www,yazıtipleri,eklentiler,tarayıcı -X-KDE-Keywords[uk]=konqueror,kfm,навігатор,html,тенета,www,шрифти,втулки -X-KDE-Keywords[uz]=konqueror,kfm,html,www,браузер,веб,шрифтлар,плагинлар -X-KDE-Keywords[vi]=konqueror,kfm,trình duyệt,html,Mạng;www,phông chữ,bổ sung -X-KDE-Keywords[wa]=konqueror,kfm,foyteuse,betchteu,html,waibe,www,fontes,tchôke-divins +X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,liitännäiset +X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,bővítmények +X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,fonts,plugins +X-KDE-Keywords[nb]=konqueror,kfm,nettleser,html,vev,www,skrifter,programtillegg +X-KDE-Keywords[nl]=konqueror,kfm,browser,html,web,www,lettertypen,plug-ins +X-KDE-Keywords[pt]=konqueror,kfm,navegador,HTML,Web,WWW,tipos de letra,plugins +X-KDE-Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,fontes,plug-ins +X-KDE-Keywords[sv]=konqueror,kfm,webbläsare,html,web,www,teckensnitt,insticksprogram +X-KDE-Keywords[uk]=konqueror,kfm,browser,html,web,www,fonts,plugins,перегляд,браузер,переглядач,мережа,шрифти,додатки X-KDE-Keywords[x-test]=xxkonqueror,kfm,browser,html,web,www,fonts,pluginsxx -X-KDE-Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web, www,imigca,iplagi ezingaphakathi -X-KDE-Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,plugins,浏览器,字体,插件 -X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,plugins,征服家,瀏覽器,網頁,字型,外掛程式 +X-KDE-Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,plugins Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.90/plasma/applets/folderview/folderview.cpp kde-baseapps-4.7.95/plasma/applets/folderview/folderview.cpp --- kde-baseapps-4.7.90/plasma/applets/folderview/folderview.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/plasma/applets/folderview/folderview.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -71,8 +71,8 @@ #include #include #include +#include -#include "dirlister.h" #include "dialog.h" #include "folderviewadapter.h" #include "iconwidget.h" @@ -378,11 +378,11 @@ m_model->setDynamicSortFilter(m_sortColumn != -1); m_model->sort(m_sortColumn != -1 ? m_sortColumn : KDirModel::Name, Qt::AscendingOrder); - DirLister *lister = new DirLister(this); - lister->setDelayedMimeTypes(true); - lister->setAutoErrorHandlingEnabled(false, 0); + m_dirLister = new DirLister(this); + m_dirLister->setDelayedMimeTypes(true); + m_dirLister->setAutoErrorHandlingEnabled(false, 0); - m_dirModel->setDirLister(lister); + m_dirModel->setDirLister(m_dirLister); if (!m_url.isValid()) { @@ -403,10 +403,21 @@ cg.writeEntry("url", m_url); } - // TODO: 4.3 Check if the URL is a remote URL, and if it is check the network status - // and display a message saying it's not available, instead of trying to open - // the URL and waiting for the job to time out. - lister->openUrl(m_url); + if (!m_url.isLocalFile()) { + //If host is connected to the network and url is remote, list the remote files + connect(Solid::Networking::notifier(), SIGNAL(shouldConnect()), this, + SLOT(networkAvailable()), Qt::UniqueConnection); + //Check if network is not in the "Connected" state + if (Solid::Networking::status() != Solid::Networking::Connected) { + //FIXME: Remove the comment when KDE 4.9 development starts + //QString networkStatus(i18n("Network is not reachable")); + //showMessage(KIcon("dialog-warning"), networkStatus, Plasma::ButtonOk); + return; + } + } else { + disconnect(Solid::Networking::notifier(), 0, this, 0); + m_dirLister->openUrl(m_url); + } createActions(); @@ -436,6 +447,13 @@ */ } +void FolderView::networkAvailable() +{ + if (!m_url.isLocalFile()) { + m_dirLister->openUrl(m_url); + } +} + void FolderView::configChanged() { KConfigGroup cg = config(); @@ -1362,21 +1380,26 @@ void FolderView::dragEnterEvent(QGraphicsSceneDragDropEvent *event) { - const QString appletMimeType = static_cast(scene())->appletMimeType(); - event->setAccepted(isContainment() && immutability() == Plasma::Mutable && - event->mimeData()->hasFormat(appletMimeType)); + if (isContainment()) { + Containment::dragEnterEvent(event); + } } void FolderView::dragMoveEvent(QGraphicsSceneDragDropEvent *event) { - const QString appletMimeType = static_cast(scene())->appletMimeType(); - event->setAccepted(isContainment() && event->mimeData()->hasFormat(appletMimeType)); + if (isContainment()) { + QGraphicsItem *item = scene()->itemAt(event->scenePos()); + if (item == m_iconView) { + event->setAccepted(true); + } else { + Containment::dragMoveEvent(event); + } + } } void FolderView::dropEvent(QGraphicsSceneDragDropEvent *event) { - const QString appletMimeType = static_cast(scene())->appletMimeType(); - if (isContainment() && event->mimeData()->hasFormat(appletMimeType)) { + if (isContainment()) { Containment::dropEvent(event); } } @@ -1669,6 +1692,9 @@ } actions.append(m_itemActions->preferredOpenWithAction(QString())); if (m_url.protocol() == "trash") { + KConfig trashConfig("trashrc", KConfig::SimpleConfig); + m_actionCollection.action("empty_trash")->setEnabled(!trashConfig.group("Status") + .readEntry("Empty", true)); actions.append(m_actionCollection.action("empty_trash")); } diff -Nru kde-baseapps-4.7.90/plasma/applets/folderview/folderview.h kde-baseapps-4.7.95/plasma/applets/folderview/folderview.h --- kde-baseapps-4.7.90/plasma/applets/folderview/folderview.h 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/plasma/applets/folderview/folderview.h 2011-12-20 19:10:51.000000000 +0000 @@ -35,6 +35,7 @@ #include #include "iconview.h" +#include "dirlister.h" #include "ui_folderviewFilterConfig.h" #include "ui_folderviewDisplayConfig.h" @@ -145,6 +146,7 @@ private slots: void setTitleText(); + void networkAvailable(); private: void updatePasteAction(); @@ -206,6 +208,7 @@ int m_numTextLines; IconView::Flow m_flow; QBasicTimer m_delayedSaveTimer; + DirLister *m_dirLister; }; diff -Nru kde-baseapps-4.7.90/plasma/applets/folderview/plasma-applet-folderview.desktop kde-baseapps-4.7.95/plasma/applets/folderview/plasma-applet-folderview.desktop --- kde-baseapps-4.7.90/plasma/applets/folderview/plasma-applet-folderview.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.7.95/plasma/applets/folderview/plasma-applet-folderview.desktop 2011-12-20 19:10:51.000000000 +0000 @@ -91,6 +91,7 @@ Comment[es]=Mostrar el contenido de las carpetas Comment[et]=Kataloogide sisu näitamine Comment[eu]=Bistaratu karpeten edukia +Comment[fi]=Näyttää kansion sisällön Comment[hu]=Megjeleníti a mappák tartalmát Comment[ia]=Monstra le contentos de dossieres Comment[is]=Sýna innihald mappa @@ -99,6 +100,7 @@ Comment[nb]=Vis mappers innhold Comment[nds]=Den Inholt vun Ornern wiesen Comment[nl]=Toon de inhoud van mappen +Comment[pa]=ਫੋਲਡਰਾਂ ਦੀ ਸਮੱਗਰੀ ਵੇਖਾਓ Comment[pt]=Mostrar o conteúdo das pastas Comment[pt_BR]=Mostra o conteúdo das pastas Comment[ro]=Afișează conținutul dosarelor diff -Nru kde-baseapps-4.7.90/plasma/applets/folderview/proxymodel.cpp kde-baseapps-4.7.95/plasma/applets/folderview/proxymodel.cpp --- kde-baseapps-4.7.90/plasma/applets/folderview/proxymodel.cpp 2011-07-27 18:36:39.000000000 +0000 +++ kde-baseapps-4.7.95/plasma/applets/folderview/proxymodel.cpp 2011-12-20 19:10:51.000000000 +0000 @@ -145,6 +145,7 @@ return false; } +#include bool ProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { const KDirModel *dirModel = static_cast(sourceModel()); @@ -161,6 +162,11 @@ } } + if (left.column() == KDirModel::ModifiedTime) { + return dirModel->data(left, KDirModel::FileItemRole).value().time(KFileItem::ModificationTime) < + dirModel->data(right, KDirModel::FileItemRole).value().time(KFileItem::ModificationTime); + } + const QString name1 = dirModel->data(left).toString(); const QString name2 = dirModel->data(right).toString();