diff -Nru kde-baseapps-4.7.97/CMakeLists.txt kde-baseapps-4.8.0/CMakeLists.txt --- kde-baseapps-4.7.97/CMakeLists.txt 2012-01-03 19:37:21.000000000 +0000 +++ kde-baseapps-4.8.0/CMakeLists.txt 2012-01-18 18:07:34.000000000 +0000 @@ -6,7 +6,7 @@ #search packages used by KDE set(KDE_MIN_VERSION "4.7.97") set(SOPRANO_MIN_VERSION "2.5.63") -find_package(KDE4 4.7.97 REQUIRED) +find_package(KDE4 4.8.0 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) diff -Nru kde-baseapps-4.7.97/debian/changelog kde-baseapps-4.8.0/debian/changelog --- kde-baseapps-4.7.97/debian/changelog 2012-01-06 12:37:51.000000000 +0000 +++ kde-baseapps-4.8.0/debian/changelog 2012-01-25 15:37:07.000000000 +0000 @@ -1,3 +1,10 @@ +kde-baseapps (4:4.8.0-0ubuntu1) precise; urgency=low + + * New upstream release + * Add kubuntu_25_dolphin_keys.diff from branch + + -- Jonathan Riddell Thu, 19 Jan 2012 12:01:22 +0000 + kde-baseapps (4:4.7.97-0ubuntu1) precise; urgency=low * New upstream release candidate diff -Nru kde-baseapps-4.7.97/debian/patches/kubuntu_25_dolphin_keys.diff kde-baseapps-4.8.0/debian/patches/kubuntu_25_dolphin_keys.diff --- kde-baseapps-4.7.97/debian/patches/kubuntu_25_dolphin_keys.diff 1970-01-01 00:00:00.000000000 +0000 +++ kde-baseapps-4.8.0/debian/patches/kubuntu_25_dolphin_keys.diff 2012-01-25 15:37:07.000000000 +0000 @@ -0,0 +1,23 @@ +commit 84a9cc4bf6e9decc4c102102c4b04162369eb0fe +Author: Frank Reininghaus +Date: Mon Jan 23 19:28:21 2012 +0100 + + Make sure that Control+click toggles the selection state + + This commit fixes a regression caused by the recent commit + 9f711b5f2e1d1fd856cd6b033e6adb96f9b46d8a. + BUG: 292250 + +diff --git a/dolphin/src/kitemviews/kitemlistcontroller.cpp b/dolphin/src/kitemviews/kitemlistcontroller.cpp +index 0f22d70..560d160 100644 +--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp ++++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp +@@ -471,7 +471,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const + (!shiftOrControlPressed && !pressedItemAlreadySelected); + if (clearSelection) { + m_selectionManager->clearSelection(); +- } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) { ++ } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) { + // The user might want to start dragging multiple items, but if he clicks the item + // in order to trigger it instead, the other selected items must be deselected. + // However, we do not know yet what the user is going to do. diff -Nru kde-baseapps-4.7.97/debian/patches/series kde-baseapps-4.8.0/debian/patches/series --- kde-baseapps-4.7.97/debian/patches/series 2012-01-04 14:55:19.000000000 +0000 +++ kde-baseapps-4.8.0/debian/patches/series 2012-01-25 15:37:07.000000000 +0000 @@ -5,3 +5,4 @@ kubuntu_18_fix_systemsettings_about_me.diff kubuntu_19_install_flash.diff kubuntu_24_folderview_livecd_directory.diff +kubuntu_25_dolphin_keys.diff Binary files /tmp/vmdW99tFNC/kde-baseapps-4.7.97/doc/dolphin/index.cache.bz2 and /tmp/tV24yVVU9Z/kde-baseapps-4.8.0/doc/dolphin/index.cache.bz2 differ Binary files /tmp/vmdW99tFNC/kde-baseapps-4.7.97/doc/kdepasswd/index.cache.bz2 and /tmp/tV24yVVU9Z/kde-baseapps-4.8.0/doc/kdepasswd/index.cache.bz2 differ Binary files /tmp/vmdW99tFNC/kde-baseapps-4.7.97/doc/kfind/index.cache.bz2 and /tmp/tV24yVVU9Z/kde-baseapps-4.8.0/doc/kfind/index.cache.bz2 differ Binary files /tmp/vmdW99tFNC/kde-baseapps-4.7.97/doc/konqueror/index.cache.bz2 and /tmp/tV24yVVU9Z/kde-baseapps-4.8.0/doc/konqueror/index.cache.bz2 differ diff -Nru kde-baseapps-4.7.97/dolphin/src/dolphincontextmenu.cpp kde-baseapps-4.8.0/dolphin/src/dolphincontextmenu.cpp --- kde-baseapps-4.7.97/dolphin/src/dolphincontextmenu.cpp 2011-11-17 20:56:04.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/dolphincontextmenu.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -159,10 +159,10 @@ void DolphinContextMenu::slotRemoveActionTriggered() { const KActionCollection* collection = m_mainWindow->actionCollection(); - if (m_shiftPressed) { - collection->action("delete")->trigger(); - } else { + if (moveToTrash()) { collection->action("move_to_trash")->trigger(); + } else { + collection->action("delete")->trigger(); } } @@ -449,7 +449,7 @@ return action; } -KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() +KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const { if (!m_selectedItemsProperties) { m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems); @@ -541,13 +541,12 @@ void DolphinContextMenu::updateRemoveAction() { const KActionCollection* collection = m_mainWindow->actionCollection(); - const bool moveToTrash = selectedItemsProperties().isLocal() && !m_shiftPressed; // Using m_removeAction->setText(action->text()) does not apply the &-shortcut. // This is only done until the original action has been shown at least once. To // bypass this issue, the text and &-shortcut is applied manually. const QAction* action = 0; - if (moveToTrash) { + if (moveToTrash()) { action = collection->action("move_to_trash"); m_removeAction->setText(i18nc("@action:inmenu", "&Move to Trash")); } else { @@ -558,4 +557,9 @@ m_removeAction->setShortcuts(action->shortcuts()); } +bool DolphinContextMenu::moveToTrash() const +{ + return selectedItemsProperties().isLocal() && !m_shiftPressed; +} + #include "dolphincontextmenu.moc" diff -Nru kde-baseapps-4.7.97/dolphin/src/dolphincontextmenu.h kde-baseapps-4.8.0/dolphin/src/dolphincontextmenu.h --- kde-baseapps-4.7.97/dolphin/src/dolphincontextmenu.h 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/dolphincontextmenu.h 2012-01-18 18:07:34.000000000 +0000 @@ -139,7 +139,7 @@ QAction* createPasteAction(); - KFileItemListProperties& selectedItemsProperties(); + KFileItemListProperties& selectedItemsProperties() const; /** * Returns the file item for m_baseUrl. @@ -170,10 +170,18 @@ /** * Updates m_removeAction to represent the 'Delete'-action if the shift-key - * has been pressed. Otherwise it represents the 'Move to Trash'-action. + * has been pressed or the selection is not local. Otherwise it represents + * the 'Move to Trash'-action. */ void updateRemoveAction(); + /** + * @return True if no shift key has been pressed and the selection represents + * only local files. + * @see updateRemoveAction(), slotRemoveActionTriggered() + */ + bool moveToTrash() const; + private: struct Entry { @@ -201,7 +209,7 @@ KFileItem* m_baseFileItem; /// File item for m_baseUrl KFileItemList m_selectedItems; - KFileItemListProperties* m_selectedItemsProperties; + mutable KFileItemListProperties* m_selectedItemsProperties; int m_context; KonqCopyToMenu m_copyToMenu; diff -Nru kde-baseapps-4.7.97/dolphin/src/dolphin.desktop kde-baseapps-4.8.0/dolphin/src/dolphin.desktop --- kde-baseapps-4.7.97/dolphin/src/dolphin.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/dolphin.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -174,7 +174,7 @@ GenericName[tg]=Мудири файлҳо GenericName[th]=เครื่องมือจัดการแฟ้ม GenericName[tr]=Dosya Yönetici -GenericName[ug]=ھۆججەت باشقۇرغۇچ +GenericName[ug]=ھۆججەت باشقۇرغۇ GenericName[uk]=Менеджер файлів GenericName[uz]=Fayl boshqaruvchisi GenericName[uz@cyrillic]=Файл бошқарувчиси diff -Nru kde-baseapps-4.7.97/dolphin/src/dolphinmainwindow.cpp kde-baseapps-4.8.0/dolphin/src/dolphinmainwindow.cpp --- kde-baseapps-4.7.97/dolphin/src/dolphinmainwindow.cpp 2011-12-20 19:10:51.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/dolphinmainwindow.cpp 2012-01-10 14:14:25.000000000 +0000 @@ -1024,6 +1024,14 @@ } } +void DolphinMainWindow::goHome(Qt::MouseButtons buttons) +{ + // The default case (left button pressed) is handled in goHome(). + if (buttons == Qt::MidButton) { + openNewTab(GeneralSettings::self()->homeUrl()); + } +} + void DolphinMainWindow::compareFiles() { // The method is only invoked if exactly 2 files have @@ -1690,7 +1698,8 @@ KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection()); connect(upAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons))); - KStandardAction::home(this, SLOT(goHome()), actionCollection()); + KAction* homeAction = KStandardAction::home(this, SLOT(goHome()), actionCollection()); + connect(homeAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goHome(Qt::MouseButtons))); // setup 'Tools' menu KAction* showFilterBar = actionCollection()->addAction("show_filter_bar"); diff -Nru kde-baseapps-4.7.97/dolphin/src/dolphinmainwindow.h kde-baseapps-4.8.0/dolphin/src/dolphinmainwindow.h --- kde-baseapps-4.7.97/dolphin/src/dolphinmainwindow.h 2011-12-20 19:10:51.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/dolphinmainwindow.h 2012-01-10 14:14:25.000000000 +0000 @@ -301,6 +301,11 @@ */ void goUp(Qt::MouseButtons buttons); + /** + * Open the home URL in a new tab + */ + void goHome(Qt::MouseButtons buttons); + /** Opens Kompare for 2 selected files. */ void compareFiles(); diff -Nru kde-baseapps-4.7.97/dolphin/src/dolphinpart.desktop kde-baseapps-4.8.0/dolphin/src/dolphinpart.desktop --- kde-baseapps-4.7.97/dolphin/src/dolphinpart.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/dolphinpart.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -179,7 +179,7 @@ Name[tg]=Нишонаҳо Name[th]=ไอคอน Name[tr]=Simgeler -Name[ug]=سىنبەلگەلەر +Name[ug]=سىنبەلگىلەر Name[uk]=Піктограми Name[uz]=Nishonchalar Name[uz@cyrillic]=Нишончалар @@ -196,6 +196,7 @@ [Desktop Action compact] Name=Compact Name[ca]=Compacte +Name[ca@valencia]=Compacte Name[da]=Kompakt Name[de]=Kompakt Name[es]=Compacta @@ -204,17 +205,25 @@ Name[ga]=Dlúth Name[hu]=Kompakt Name[ia]=Compacte +Name[it]=Compatta Name[kk]=Ықшамды Name[km]=តូច​ល្មម Name[lt]=Kompaktiškas +Name[lv]=Kompakts Name[nb]=Kompakt Name[nds]=Drang Name[nl]=Compact Name[pa]=ਸੰਖੇਪ +Name[pl]=Kompaktowo Name[pt]=Compacto Name[pt_BR]=Compacto Name[sl]=Strnjeno +Name[sr]=Сажето +Name[sr@ijekavian]=Сажето +Name[sr@ijekavianlatin]=Sažeto +Name[sr@latin]=Sažeto Name[sv]=Kompakt +Name[ug]=ئىخچام Name[uk]=Компактний Name[x-test]=xxCompactxx Name[zh_CN]=简洁视图 diff -Nru kde-baseapps-4.7.97/dolphin/src/dolphinviewcontainer.cpp kde-baseapps-4.8.0/dolphin/src/dolphinviewcontainer.cpp --- kde-baseapps-4.7.97/dolphin/src/dolphinviewcontainer.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/dolphinviewcontainer.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -373,6 +373,11 @@ void DolphinViewContainer::slotItemActivated(const KFileItem& item) { + // It is possible to activate items on inactive views by + // drag & drop operations. Assure that activating an item always + // results in an active view. + m_view->setActive(true); + KUrl url = item.targetUrl(); if (item.isDir()) { diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemlistwidget.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemlistwidget.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemlistwidget.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemlistwidget.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -79,6 +79,7 @@ if (m_layout != layout) { m_layout = layout; m_dirtyLayout = true; + updateAdditionalInfoTextColor(); update(); } } diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodel.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodel.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodel.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodel.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -63,7 +63,7 @@ Q_ASSERT(dirLister); connect(dirLister, SIGNAL(canceled()), this, SLOT(slotCanceled())); - connect(dirLister, SIGNAL(completed()), this, SLOT(slotCompleted())); + connect(dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted())); connect(dirLister, SIGNAL(newItems(KFileItemList)), this, SLOT(slotNewItems(KFileItemList))); connect(dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SLOT(slotItemsDeleted(KFileItemList))); connect(dirLister, SIGNAL(refreshItems(QList >)), this, SLOT(slotRefreshItems(QList >))); @@ -183,6 +183,20 @@ return dirLister ? dirLister->showingDotFiles() : false; } +void KFileItemModel::setShowFoldersOnly(bool enabled) +{ + KDirLister* dirLister = m_dirLister.data(); + if (dirLister) { + dirLister->setDirOnlyMode(enabled); + } +} + +bool KFileItemModel::showFoldersOnly() const +{ + KDirLister* dirLister = m_dirLister.data(); + return dirLister ? dirLister->dirOnlyMode() : false; +} + QMimeData* KFileItemModel::createMimeData(const QSet& indexes) const { QMimeData* data = new QMimeData(); @@ -1188,12 +1202,8 @@ if (forceRootExpansionLevel) { m_rootExpansionLevel = ForceRootExpansionLevel; } else { - const QString rootDir = rootUrl.directory(KUrl::AppendTrailingSlash); + const QString rootDir = rootUrl.path(KUrl::AddTrailingSlash); m_rootExpansionLevel = rootDir.count('/'); - if (m_rootExpansionLevel == 1) { - // Special case: The root is already reached and no parent is available - --m_rootExpansionLevel; - } } } @@ -1201,7 +1211,7 @@ data.insert("expansionLevel", -1); } else { const QString dir = item.url().directory(KUrl::AppendTrailingSlash); - const int level = dir.count('/') - m_rootExpansionLevel - 1; + const int level = dir.count('/') - m_rootExpansionLevel; data.insert("expansionLevel", level); } } diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodel.h kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodel.h --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodel.h 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodel.h 2012-01-18 18:07:34.000000000 +0000 @@ -73,6 +73,13 @@ void setShowHiddenFiles(bool show); bool showHiddenFiles() const; + /** + * If set to true, only folders are shown as items of the model. Files + * are ignored. + */ + void setShowFoldersOnly(bool enabled); + bool showFoldersOnly() const; + /** @reimp */ virtual QMimeData* createMimeData(const QSet& indexes) const; diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -33,7 +33,7 @@ #include #include -// Required includes for subDirectoriesCount(): +// Required includes for subItemsCount(): #ifdef Q_WS_WIN #include #else @@ -72,7 +72,9 @@ m_pendingVisibleItems(), m_pendingInvisibleItems(), m_previewJobs(), - m_resolvePendingRolesTimer(0) + m_resolvePendingRolesTimer(0), + m_changedItemsTimer(0), + m_changedItems() { Q_ASSERT(model); @@ -95,6 +97,13 @@ m_resolvePendingRolesTimer->setInterval(1); m_resolvePendingRolesTimer->setSingleShot(true); connect(m_resolvePendingRolesTimer, SIGNAL(timeout()), this, SLOT(resolvePendingRoles())); + + // Use a timer to prevent that each call of slotItemsChanged() results in a synchronous + // resolving of the roles. Postpone the resolving until no update has been done for 2 seconds. + m_changedItemsTimer = new QTimer(this); + m_changedItemsTimer->setInterval(2000); + m_changedItemsTimer->setSingleShot(true); + connect(m_changedItemsTimer, SIGNAL(timeout()), this, SLOT(resolveChangedItems())); } KFileItemModelRolesUpdater::~KFileItemModelRolesUpdater() @@ -270,9 +279,14 @@ // Most probably a directory change is done. Clear all pending items // and also kill all ongoing preview-jobs. resetPendingRoles(); + + m_changedItems.clear(); + m_changedItemsTimer->stop(); } else { // Remove all items from m_pendingVisibleItems and m_pendingInvisibleItems - // that are not part of the model anymore. + // that are not part of the model anymore. The items from m_changedItems + // don't need to be handled here, removed items are just skipped in + // resolveChangedItems(). for (int i = 0; i <= 1; ++i) { QSet& pendingItems = (i == 0) ? m_pendingVisibleItems : m_pendingInvisibleItems; QMutableSetIterator it(pendingItems); @@ -290,7 +304,22 @@ const QSet& roles) { Q_UNUSED(roles); - startUpdating(itemRanges); + + if (m_changedItemsTimer->isActive()) { + // A call of slotItemsChanged() has been done recently. Postpone the resolving + // of the roles until the timer has exceeded. + foreach (const KItemRange& itemRange, itemRanges) { + int index = itemRange.index; + for (int count = itemRange.count; count > 0; --count) { + m_changedItems.insert(m_model->fileItem(index)); + ++index; + } + } + } else { + // No call of slotItemsChanged() has been done recently, resolve the roles now. + startUpdating(itemRanges); + } + m_changedItemsTimer->start(); } void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPixmap& pixmap) @@ -470,6 +499,26 @@ #endif } +void KFileItemModelRolesUpdater::resolveChangedItems() +{ + if (m_changedItems.isEmpty()) { + return; + } + + KItemRangeList itemRanges; + + QSetIterator it(m_changedItems); + while (it.hasNext()) { + const KFileItem& item = it.next(); + const int index = m_model->index(item); + if (index >= 0) { + itemRanges.append(KItemRange(index, 1)); + } + } + + startUpdating(itemRanges); +} + void KFileItemModelRolesUpdater::startUpdating(const KItemRangeList& itemRanges) { // If no valid index range is given assume that all items are visible. @@ -721,7 +770,7 @@ if ((getSizeRole || getIsExpandableRole) && item.isDir() && item.isLocalFile()) { const QString path = item.localPath(); - const int count = subDirectoriesCount(path); + const int count = subItemsCount(path); if (count >= 0) { if (getSizeRole) { data.insert("size", KIO::filesize_t(count)); @@ -777,16 +826,22 @@ return itemList; } -int KFileItemModelRolesUpdater::subDirectoriesCount(const QString& path) const +int KFileItemModelRolesUpdater::subItemsCount(const QString& path) const { const bool countHiddenFiles = m_model->showHiddenFiles(); + const bool showFoldersOnly = m_model->showFoldersOnly(); #ifdef Q_WS_WIN QDir dir(path); - QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot | QDir::System; + QDir::Filters filters = QDir::NoDotAndDotDot | QDir::System; if (countHiddenFiles) { filters |= QDir::Hidden; } + if (showFoldersOnly) { + filters |= QDir::Dirs; + } else { + filters |= QDir::AllEntries; + } return dir.entryList(filters).count(); #else // Taken from kdelibs/kio/kio/kdirmodel.cpp @@ -808,7 +863,10 @@ continue; } } - ++count; + + if (!showFoldersOnly || dirEntry->d_type == DT_DIR) { + ++count; + } } ::closedir(dir); } diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h 2012-01-18 18:07:34.000000000 +0000 @@ -126,6 +126,13 @@ void resolvePendingRoles(); void resolveNextPendingRoles(); + /** + * Resolves items that have not been resolved yet after the change has been + * notified by slotItemsChanged(). Is invoked if the m_changedItemsTimer + * exceeds. + */ + void resolveChangedItems(); + private: /** * Updates the roles for the given item ranges. The roles for the currently @@ -157,7 +164,10 @@ KFileItemList sortedItems(const QSet& items) const; - int subDirectoriesCount(const QString& path) const; + /** + * @return The number of items of the path \a path. + */ + int subItemsCount(const QString& path) const; private: // Property for setPaused()/isPaused(). @@ -189,6 +199,14 @@ QList m_previewJobs; QTimer* m_resolvePendingRolesTimer; + + // When downloading or copying large files, the slot slotItemsChanged() + // will be called periodically within a quite short delay. To prevent + // a high CPU-load by generating e.g. previews for each notification, the update + // will be postponed until no file change has been done within a longer period + // of time. + QTimer* m_changedItemsTimer; + QSet m_changedItems; }; #endif diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistcontainer.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontainer.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistcontainer.cpp 2011-12-20 19:10:51.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontainer.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -173,7 +173,7 @@ QGraphicsScene* scene = static_cast(viewport())->scene(); if (previous) { scene->removeItem(previous); - disconnect(current, SIGNAL(scrollOrientationChanged(Qt::Orientation,Qt::Orientation)), this, SLOT(slotScrollOrientationChanged(Qt::Orientation,Qt::Orientation))); + disconnect(previous, SIGNAL(scrollOrientationChanged(Qt::Orientation,Qt::Orientation)), this, SLOT(slotScrollOrientationChanged(Qt::Orientation,Qt::Orientation))); disconnect(previous, SIGNAL(scrollOffsetChanged(qreal,qreal)), this, SLOT(updateScrollOffsetScrollBar())); disconnect(previous, SIGNAL(maximumScrollOffsetChanged(qreal,qreal)), this, SLOT(updateScrollOffsetScrollBar())); disconnect(previous, SIGNAL(itemOffsetChanged(qreal,qreal)), this, SLOT(updateItemOffsetScrollBar())); diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistcontroller.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistcontroller.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -1,5 +1,6 @@ /*************************************************************************** * Copyright (C) 2011 by Peter Penz * + * Copyright (C) 2012 by Frank Reininghaus * * * * Based on the Itemviews NG project from Trolltech Labs: * * http://qt.gitorious.org/qt-labs/itemviews-ng * @@ -41,7 +42,9 @@ KItemListController::KItemListController(QObject* parent) : QObject(parent), + m_singleClickActivation(KGlobalSettings::singleClick()), m_selectionTogglePressed(false), + m_clearSelectionIfItemsAreNotDragged(false), m_selectionBehavior(NoSelection), m_model(0), m_view(0), @@ -142,6 +145,16 @@ return m_autoActivationTimer->interval(); } +void KItemListController::setSingleClickActivation(bool singleClick) +{ + m_singleClickActivation = singleClick; +} + +bool KItemListController::singleClickActivation() const +{ + return m_singleClickActivation; +} + bool KItemListController::showEvent(QShowEvent* event) { Q_UNUSED(event); @@ -227,12 +240,68 @@ case Qt::Key_Up: updateKeyboardAnchor(); - index = previousRowIndex(); + index = previousRowIndex(index); break; case Qt::Key_Down: updateKeyboardAnchor(); - index = nextRowIndex(); + index = nextRowIndex(index); + break; + + case Qt::Key_PageUp: + if (m_view->scrollOrientation() == Qt::Horizontal) { + // The new current index should correspond to the first item in the current column. + int newIndex = qMax(index - 1, 0); + while (newIndex != index && m_view->itemRect(newIndex).topLeft().y() < m_view->itemRect(index).topLeft().y()) { + index = newIndex; + newIndex = qMax(index - 1, 0); + } + m_keyboardAnchorIndex = index; + m_keyboardAnchorPos = keyboardAnchorPos(index); + } else { + const qreal currentItemBottom = m_view->itemRect(index).bottomLeft().y(); + const qreal height = m_view->geometry().height(); + + // The new current item should be the first item in the current + // column whose itemRect's top coordinate is larger than targetY. + const qreal targetY = currentItemBottom - height; + + updateKeyboardAnchor(); + int newIndex = previousRowIndex(index); + do { + index = newIndex; + updateKeyboardAnchor(); + newIndex = previousRowIndex(index); + } while (m_view->itemRect(newIndex).topLeft().y() > targetY && newIndex != index); + } + break; + + case Qt::Key_PageDown: + if (m_view->scrollOrientation() == Qt::Horizontal) { + // The new current index should correspond to the last item in the current column. + int newIndex = qMin(index + 1, m_model->count() - 1); + while (newIndex != index && m_view->itemRect(newIndex).topLeft().y() > m_view->itemRect(index).topLeft().y()) { + index = newIndex; + newIndex = qMin(index + 1, m_model->count() - 1); + } + m_keyboardAnchorIndex = index; + m_keyboardAnchorPos = keyboardAnchorPos(index); + } else { + const qreal currentItemTop = m_view->itemRect(index).topLeft().y(); + const qreal height = m_view->geometry().height(); + + // The new current item should be the last item in the current + // column whose itemRect's bottom coordinate is smaller than targetY. + const qreal targetY = currentItemTop + height; + + updateKeyboardAnchor(); + int newIndex = nextRowIndex(index); + do { + index = newIndex; + updateKeyboardAnchor(); + newIndex = nextRowIndex(index); + } while (m_view->itemRect(newIndex).bottomLeft().y() < targetY && newIndex != index); + } break; case Qt::Key_Enter: @@ -369,7 +438,9 @@ } if (m_view->isAboveExpansionToggle(m_pressedIndex, m_pressedMousePos)) { + m_selectionManager->endAnchoredSelection(); m_selectionManager->setCurrentItem(m_pressedIndex); + m_selectionManager->beginAnchoredSelection(m_pressedIndex); return true; } @@ -400,6 +471,13 @@ (!shiftOrControlPressed && !pressedItemAlreadySelected); if (clearSelection) { m_selectionManager->clearSelection(); + } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) { + // The user might want to start dragging multiple items, but if he clicks the item + // in order to trigger it instead, the other selected items must be deselected. + // However, we do not know yet what the user is going to do. + // -> remember that the user pressed an item which had been selected already and + // clear the selection in mouseReleaseEvent(), unless the items are dragged. + m_clearSelectionIfItemsAreNotDragged = true; } if (!shiftPressed) { @@ -492,7 +570,12 @@ // done on the mouse-press event, but when using the selection-toggle on a // selected item the dragged item is not selected yet. m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Toggle); + } else { + // A selected item has been clicked to drag all selected items + // -> the selection should not be cleared when the mouse button is released. + m_clearSelectionIfItemsAreNotDragged = false; } + startDragging(); } } @@ -566,6 +649,14 @@ if (index >= 0 && index == m_pressedIndex) { // The release event is done above the same item as the press event + if (m_clearSelectionIfItemsAreNotDragged) { + // A selected item has been clicked, but no drag operation has been started + // -> clear the rest of the selection. + m_selectionManager->clearSelection(); + m_selectionManager->setSelected(m_pressedIndex, 1, KItemListSelectionManager::Select); + m_selectionManager->beginAnchoredSelection(m_pressedIndex); + } + if (event->button() & Qt::LeftButton) { bool emitItemActivated = true; if (m_view->isAboveExpansionToggle(index, pos)) { @@ -577,7 +668,7 @@ } else if (shiftOrControlPressed) { // The mouse click should only update the selection, not trigger the item emitItemActivated = false; - } else if (!KGlobalSettings::singleClick()) { + } else if (!m_singleClickActivation) { emitItemActivated = false; } if (emitItemActivated) { @@ -590,6 +681,7 @@ m_pressedMousePos = QPointF(); m_pressedIndex = -1; + m_clearSelectionIfItemsAreNotDragged = false; return false; } @@ -598,7 +690,7 @@ const QPointF pos = transform.map(event->pos()); const int index = m_view->itemAt(pos); - bool emitItemActivated = !KGlobalSettings::singleClick() && + bool emitItemActivated = !m_singleClickActivation && (event->button() & Qt::LeftButton) && index >= 0 && index < m_model->count(); if (emitItemActivated) { @@ -914,7 +1006,7 @@ const QPixmap pixmap = m_view->createDragPixmap(selectedItems); drag->setPixmap(pixmap); - drag->exec(Qt::CopyAction); + drag->exec(Qt::MoveAction | Qt::CopyAction | Qt::LinkAction, Qt::CopyAction); } KItemListWidget* KItemListController::hoveredWidget() const @@ -959,24 +1051,23 @@ } } -int KItemListController::nextRowIndex() const +int KItemListController::nextRowIndex(int index) const { - const int currentIndex = m_selectionManager->currentItem(); if (m_keyboardAnchorIndex < 0) { - return currentIndex; + return index; } const int maxIndex = m_model->count() - 1; - if (currentIndex == maxIndex) { - return currentIndex; + if (index == maxIndex) { + return index; } // Calculate the index of the last column inside the row of the current index - int lastColumnIndex = currentIndex; + int lastColumnIndex = index; while (keyboardAnchorPos(lastColumnIndex + 1) > keyboardAnchorPos(lastColumnIndex)) { ++lastColumnIndex; if (lastColumnIndex >= maxIndex) { - return currentIndex; + return index; } } @@ -997,19 +1088,18 @@ return nextRowIndex; } -int KItemListController::previousRowIndex() const +int KItemListController::previousRowIndex(int index) const { - const int currentIndex = m_selectionManager->currentItem(); - if (m_keyboardAnchorIndex < 0 || currentIndex == 0) { - return currentIndex; + if (m_keyboardAnchorIndex < 0 || index == 0) { + return index; } // Calculate the index of the first column inside the row of the current index - int firstColumnIndex = currentIndex; + int firstColumnIndex = index; while (keyboardAnchorPos(firstColumnIndex - 1) < keyboardAnchorPos(firstColumnIndex)) { --firstColumnIndex; if (firstColumnIndex <= 0) { - return currentIndex; + return index; } } diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistcontroller.h kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.h --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistcontroller.h 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.h 2012-01-18 18:07:34.000000000 +0000 @@ -104,6 +104,15 @@ void setAutoActivationDelay(int delay); int autoActivationDelay() const; + /** + * If set to true, the signals itemActivated() and itemsActivated() are emitted + * after a single-click of the left mouse button. If set to false, a double-click + * is required. Per default the setting from KGlobalSettings::singleClick() is + * used. + */ + void setSingleClickActivation(bool singleClick); + bool singleClickActivation() const; + virtual bool showEvent(QShowEvent* event); virtual bool hideEvent(QHideEvent* event); virtual bool keyPressEvent(QKeyEvent* event); @@ -229,16 +238,16 @@ void updateKeyboardAnchor(); /** - * @return Index for the next row based on the current index. - * If there is no next row the current index will be returned. + * @return Index for the next row based on \a index. + * If there is no next row \a index will be returned. */ - int nextRowIndex() const; + int nextRowIndex(int index) const; /** - * @return Index for the previous row based on the current index. - * If there is no previous row the current index will be returned. + * @return Index for the previous row based on \a index. + * If there is no previous row \a index will be returned. */ - int previousRowIndex() const; + int previousRowIndex(int index) const; /** * Helper method for updateKeyboardAnchor(), previousRowIndex() and nextRowIndex(). @@ -249,7 +258,9 @@ qreal keyboardAnchorPos(int index) const; private: + bool m_singleClickActivation; bool m_selectionTogglePressed; + bool m_clearSelectionIfItemsAreNotDragged; SelectionBehavior m_selectionBehavior; KItemModelBase* m_model; KItemListView* m_view; diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistselectionmanager.h kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistselectionmanager.h --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistselectionmanager.h 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistselectionmanager.h 2012-01-18 18:07:34.000000000 +0000 @@ -92,7 +92,7 @@ KItemModelBase* m_model; friend class KItemListController; // Calls setModel() - friend class KItemListView; // Calls itemsInserted() and itemsRemoved() + friend class KItemListView; // Calls itemsInserted(), itemsRemoved() and itemsMoved() friend class KItemListSelectionManagerTest; }; diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp 2011-12-20 19:10:51.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistsmoothscroller.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -19,6 +19,7 @@ #include "kitemlistsmoothscroller_p.h" +#include #include #include #include @@ -35,7 +36,8 @@ m_animation(0) { m_animation = new QPropertyAnimation(this); - m_animation->setDuration(200); + const int duration = (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) ? 1 : 100; + m_animation->setDuration(duration); connect(m_animation, SIGNAL(stateChanged(QAbstractAnimation::State,QAbstractAnimation::State)), this, SLOT(slotAnimationStateChanged(QAbstractAnimation::State,QAbstractAnimation::State))); @@ -100,7 +102,6 @@ } const qreal endOffset = currentOffset - distance; - if (m_smoothScrolling || animRunning) { qreal startOffset = currentOffset; if (animRunning) { @@ -109,6 +110,11 @@ // assures that animation proceeds even in cases where new end-offset are triggered // within a very short timeslots. startOffset += (endOffset - currentOffset) * 1000 / (m_animation->duration() * 60); + if (currentOffset < endOffset) { + startOffset = qMin(startOffset, endOffset); + } else { + startOffset = qMax(startOffset, endOffset); + } } m_animation->stop(); diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistview.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistview.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistview.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistview.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -355,20 +355,55 @@ return; } - if (m_model->count() > 0) { - prepareLayoutForIncreasedItemCount(rect.size(), LayouterSize); + const QSizeF newSize = rect.size(); + if (m_itemSize.isEmpty()) { + // The item size is dynamic: + // Changing the geometry does not require to do an expensive + // update of the visible-roles sizes, only the stretched sizes + // need to be adjusted to the new size. + updateStretchedVisibleRolesSizes(); + + if (m_useHeaderWidths) { + QSizeF dynamicItemSize = m_layouter->itemSize(); + + if (m_itemSize.width() < 0) { + const qreal requiredWidth = visibleRolesSizesWidthSum(); + if (newSize.width() > requiredWidth) { + dynamicItemSize.setWidth(newSize.width()); + } + const qreal headerWidth = qMax(newSize.width(), requiredWidth); + m_header->resize(headerWidth, m_header->size().height()); + } + + if (m_itemSize.height() < 0) { + const qreal requiredHeight = visibleRolesSizesHeightSum(); + if (newSize.height() > requiredHeight) { + dynamicItemSize.setHeight(newSize.height()); + } + // TODO: KItemListHeader is not prepared for vertical alignment + } + + m_layouter->setItemSize(dynamicItemSize); + } + + // Triggering a synchronous layout is fine from a performance point of view, + // as with dynamic item sizes no moving animation must be done. + m_layouter->setSize(newSize); + doLayout(Animation); } else { - m_layouter->setSize(rect.size()); - } + // The item size is not dynamic and most probably the geometry change results + // in animated position changes of the items. Trigger an asynchronous relayout + // with m_layoutTimer to prevent performance bottlenecks. + if (m_model->count() > 0) { + prepareLayoutForIncreasedItemCount(newSize, LayouterSize); + } else { + m_layouter->setSize(newSize); + } - if (!m_layoutTimer->isActive()) { - m_layoutTimer->start(); + if (!m_layoutTimer->isActive()) { + m_layoutTimer->start(); + } } - - // Changing the geometry does not require to do an expensive - // update of the visible-roles sizes, only the stretched sizes - // need to be adjusted to the new size. - updateStretchedVisibleRolesSizes(); } int KItemListView::itemAt(const QPointF& pos) const @@ -389,6 +424,10 @@ bool KItemListView::isAboveSelectionToggle(int index, const QPointF& pos) const { + if (!m_enabledSelectionToggles) { + return false; + } + const KItemListWidget* widget = m_visibleItems.value(index); if (widget) { const QRectF selectionToggleRect = widget->selectionToggleRect(); @@ -703,34 +742,6 @@ return m_visibleItems.values(); } -void KItemListView::resizeEvent(QGraphicsSceneResizeEvent* event) -{ - QGraphicsWidget::resizeEvent(event); - if (m_itemSize.isEmpty() && m_useHeaderWidths) { - QSizeF dynamicItemSize = m_layouter->itemSize(); - const QSizeF newSize = event->newSize(); - - if (m_itemSize.width() < 0) { - const qreal requiredWidth = visibleRolesSizesWidthSum(); - if (newSize.width() > requiredWidth) { - dynamicItemSize.setWidth(newSize.width()); - } - const qreal headerWidth = qMax(newSize.width(), requiredWidth); - m_header->resize(headerWidth, m_header->size().height()); - } - - if (m_itemSize.height() < 0) { - const qreal requiredHeight = visibleRolesSizesHeightSum(); - if (newSize.height() > requiredHeight) { - dynamicItemSize.setHeight(newSize.height()); - } - // TODO: KItemListHeader is not prepared for vertical alignment - } - - m_layouter->setItemSize(dynamicItemSize); - } -} - void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges) { updateVisibleRolesSizes(itemRanges); @@ -777,15 +788,23 @@ } m_layouter->markAsDirty(); - if (m_model->count() == count && maximumScrollOffset() > size().height()) { - const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent); - QSizeF layouterSize = m_layouter->size(); - if (scrollOrientation() == Qt::Vertical) { - layouterSize.rwidth() -= scrollBarExtent; - } else { - layouterSize.rheight() -= scrollBarExtent; + if (m_model->count() == count && m_activeTransactions == 0) { + // Check whether a scrollbar is required to show the inserted items. In this case + // the size of the layouter will be decreased before calling doLayout(): This prevents + // an unnecessary temporary animation due to the geometry change of the inserted scrollbar. + const bool verticalScrollOrientation = (scrollOrientation() == Qt::Vertical); + const bool decreaseLayouterSize = ( verticalScrollOrientation && maximumScrollOffset() > size().height()) || + (!verticalScrollOrientation && maximumScrollOffset() > size().width()); + if (decreaseLayouterSize) { + const int scrollBarExtent = style()->pixelMetric(QStyle::PM_ScrollBarExtent); + QSizeF layouterSize = m_layouter->size(); + if (verticalScrollOrientation) { + layouterSize.rwidth() -= scrollBarExtent; + } else { + layouterSize.rheight() -= scrollBarExtent; + } + m_layouter->setSize(layouterSize); } - m_layouter->setSize(layouterSize); } if (!hasMultipleRanges) { @@ -869,7 +888,14 @@ m_layouter->markAsDirty(); if (!hasMultipleRanges) { + // The decrease-layout-size optimization in KItemListView::slotItemsInserted() + // assumes an updated geometry. If items are removed during an active transaction, + // the transaction will be temporary deactivated so that doLayout() triggers a + // geometry update if necessary. + const int activeTransactions = m_activeTransactions; + m_activeTransactions = 0; doLayout(Animation, index, -count); + m_activeTransactions = activeTransactions; } } diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistview.h kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistview.h --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistview.h 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistview.h 2012-01-18 18:07:34.000000000 +0000 @@ -286,9 +286,6 @@ QList visibleItemListWidgets() const; - /** @reimp */ - virtual void resizeEvent(QGraphicsSceneResizeEvent* event); - protected slots: virtual void slotItemsInserted(const KItemRangeList& itemRanges); virtual void slotItemsRemoved(const KItemRangeList& itemRanges); diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistwidget.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistwidget.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kitemlistwidget.cpp 2011-12-20 19:10:51.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistwidget.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -28,6 +28,7 @@ #include +#include #include #include #include @@ -119,26 +120,25 @@ } if (isCurrent()) { - QStyleOptionViewItemV4 viewItemOption; - viewItemOption.initFrom(widget); + QStyleOptionFocusRect focusRectOption; + focusRectOption.initFrom(widget); const QRect iconBounds = iconRect().toRect(); const QRect textBounds = textRect().toRect(); if (iconBounds.bottom() > textBounds.top()) { - viewItemOption.rect = textBounds; + focusRectOption.rect = textBounds; } else { // See KItemListWidget::drawItemStyleOption(): The selection rectangle // gets decreased. - viewItemOption.rect = textBounds.adjusted(1, 1, -1, -1); + focusRectOption.rect = textBounds.adjusted(1, 1, -1, -1); } - viewItemOption.state = QStyle::State_Enabled | QStyle::State_Item; + focusRectOption.state = QStyle::State_Enabled | QStyle::State_Item | QStyle::State_KeyboardFocusChange; if (m_selected) { - viewItemOption.state |= QStyle::State_Selected; + focusRectOption.state |= QStyle::State_Selected; } - viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; - style()->drawPrimitive(QStyle::PE_FrameFocusRect, &viewItemOption, painter, widget); + style()->drawPrimitive(QStyle::PE_FrameFocusRect, &focusRectOption, painter, widget); } if (m_hoverOpacity > 0.0) { @@ -244,7 +244,8 @@ if (!m_hoverAnimation) { m_hoverAnimation = new QPropertyAnimation(this, "hoverOpacity", this); - m_hoverAnimation->setDuration(200); + const int duration = (KGlobalSettings::graphicEffectsLevel() == KGlobalSettings::NoEffects) ? 1 : 200; + m_hoverAnimation->setDuration(duration); connect(m_hoverAnimation, SIGNAL(finished()), this, SLOT(slotHoverAnimationFinished())); } m_hoverAnimation->stop(); @@ -438,6 +439,7 @@ viewItemOption.initFrom(widget); viewItemOption.state = styleState; viewItemOption.viewItemPosition = QStyleOptionViewItemV4::OnlyOne; + viewItemOption.showDecorationSelected = true; if (iconBounds.bottom() > textBounds.top()) { viewItemOption.rect = iconBounds | textBounds; diff -Nru kde-baseapps-4.7.97/dolphin/src/kitemviews/kpixmapmodifier.cpp kde-baseapps-4.8.0/dolphin/src/kitemviews/kpixmapmodifier.cpp --- kde-baseapps-4.7.97/dolphin/src/kitemviews/kpixmapmodifier.cpp 2011-11-04 14:33:30.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kpixmapmodifier.cpp 2012-01-10 14:14:25.000000000 +0000 @@ -362,10 +362,10 @@ 0, 0, 0, 0, 0, 0, scaledPixmap.width(), scaledPixmap.height()); pixmap = scaledPixmap; } else { - pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::FastTransformation); + pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); } #else - pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::FastTransformation); + pixmap = pixmap.scaled(scaledSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); #endif } diff -Nru kde-baseapps-4.7.97/dolphin/src/panels/folders/folderspanel.cpp kde-baseapps-4.8.0/dolphin/src/panels/folders/folderspanel.cpp --- kde-baseapps-4.7.97/dolphin/src/panels/folders/folderspanel.cpp 2011-12-20 19:10:51.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/panels/folders/folderspanel.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -140,7 +140,6 @@ // This assures that no performance and memory overhead is given when the TreeView is not // used at all (see FoldersPanel::setUrl()). m_dirLister = new KDirLister(); - m_dirLister->setDirOnlyMode(true); m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(window()); m_dirLister->setDelayedMimeTypes(true); @@ -163,6 +162,7 @@ view->setOpacity(0); KFileItemModel* model = new KFileItemModel(m_dirLister, this); + model->setShowFoldersOnly(true); model->setShowHiddenFiles(FoldersPanelSettings::hiddenFilesShown()); // Use a QueuedConnection to give the view the possibility to react first on the // finished loading. @@ -174,6 +174,7 @@ m_controller->setModel(model); m_controller->setSelectionBehavior(KItemListController::SingleSelection); m_controller->setAutoActivationDelay(750); + m_controller->setSingleClickActivation(true); connect(m_controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int))); connect(m_controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int))); diff -Nru kde-baseapps-4.7.97/dolphin/src/settings/dolphin_compactmodesettings.kcfg kde-baseapps-4.8.0/dolphin/src/settings/dolphin_compactmodesettings.kcfg --- kde-baseapps-4.7.97/dolphin/src/settings/dolphin_compactmodesettings.kcfg 2011-08-07 15:40:34.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/settings/dolphin_compactmodesettings.kcfg 2012-01-18 18:07:34.000000000 +0000 @@ -30,11 +30,11 @@ - KIconLoader::SizeMedium + KIconLoader::SizeSmall - KIconLoader::SizeHuge + KIconLoader::SizeLarge diff -Nru kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphingeneral.desktop kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphingeneral.desktop --- kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphingeneral.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphingeneral.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -236,7 +236,7 @@ Comment[el]=Ρύθμιση γενικών επιλογών διαχείρισης αρχείων Comment[en_GB]=Configure general file manager settings Comment[eo]=Agordi la ĝeneralan dosieradministrilon -Comment[es]=Configurar las preferencias gestor de archivos +Comment[es]=Configurar las preferencias del gestor de archivos Comment[et]=Failihalduri üldiste seadistuste seadistamine Comment[eu]=Konfiguratu fitxategi kudeatzailearen ezarpen orokorrak Comment[fi]=Muokkaa tiedostonhallinnan yleisasetuksia @@ -293,6 +293,7 @@ Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers +X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager @@ -302,17 +303,25 @@ X-KDE-Keywords[ga]=bainisteoir comhad X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[kk]=file manager X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ +X-KDE-Keywords[lv]=failu pārvaldnieks 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[pl]=menedżer plików X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos X-KDE-Keywords[sl]=upravljalnik datotek +X-KDE-Keywords[sr]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavian]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavianlatin]=file manager,menadžer fajlova +X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx +X-KDE-Keywords[zh_CN]=file manager,文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop --- kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -293,6 +293,7 @@ Comment[zh_TW]=設定檔案管理員導覽 X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers +X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager @@ -302,17 +303,25 @@ X-KDE-Keywords[ga]=bainisteoir comhad X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[kk]=file manager X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ +X-KDE-Keywords[lv]=failu pārvaldnieks 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[pl]=menedżer plików X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos X-KDE-Keywords[sl]=upravljalnik datotek +X-KDE-Keywords[sr]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavian]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavianlatin]=file manager,menadžer fajlova +X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx +X-KDE-Keywords[zh_CN]=file manager,文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphinservices.desktop kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphinservices.desktop --- kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphinservices.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphinservices.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -187,7 +187,7 @@ Comment[el]=Ρύθμιση υπηρεσιών διαχείρισης αρχείων Comment[en_GB]=Configure file manager services Comment[eo]=Agordi la dosieradministrilajn servojn -Comment[es]=Configurar las preferencias gestor de archivos +Comment[es]=Configurar las preferencias del gestor de archivos Comment[et]=Failihalduri teenuste seadistamine Comment[eu]=Konfiguratu fitxategi-kudeatzaile zerbitzuak Comment[fi]=Muokkaa tiedostonhallinnan palveluita @@ -244,6 +244,7 @@ Comment[zh_TW]=設定檔案管理員服務 X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers +X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager @@ -253,17 +254,25 @@ X-KDE-Keywords[ga]=bainisteoir comhad X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[kk]=file manager X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ +X-KDE-Keywords[lv]=failu pārvaldnieks 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[pl]=menedżer plików X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos X-KDE-Keywords[sl]=upravljalnik datotek +X-KDE-Keywords[sr]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavian]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavianlatin]=file manager,menadžer fajlova +X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx +X-KDE-Keywords[zh_CN]=file manager,文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop --- kde-baseapps-4.7.97/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -291,6 +291,7 @@ Comment[zh_TW]=設定檔案管理員檢視模式 X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers +X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager @@ -300,17 +301,25 @@ X-KDE-Keywords[ga]=bainisteoir comhad X-KDE-Keywords[hu]=fájlkezelő X-KDE-Keywords[ia]=gerente de file +X-KDE-Keywords[it]=gestore dei file X-KDE-Keywords[kk]=file manager X-KDE-Keywords[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ +X-KDE-Keywords[lv]=failu pārvaldnieks 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[pl]=menedżer plików X-KDE-Keywords[pt]=gestor de ficheiros X-KDE-Keywords[pt_BR]=gerenciador de arquivos X-KDE-Keywords[sl]=upravljalnik datotek +X-KDE-Keywords[sr]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavian]=file manager,менаџер фајлова +X-KDE-Keywords[sr@ijekavianlatin]=file manager,menadžer fajlova +X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx +X-KDE-Keywords[zh_CN]=file manager,文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff -Nru kde-baseapps-4.7.97/dolphin/src/tests/CMakeLists.txt kde-baseapps-4.8.0/dolphin/src/tests/CMakeLists.txt --- kde-baseapps-4.7.97/dolphin/src/tests/CMakeLists.txt 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/tests/CMakeLists.txt 2012-01-18 18:07:34.000000000 +0000 @@ -1,6 +1,8 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BUILD_DIR}/.. ${KDE4_INCLUDES} ) +# needed on windows to correctly use the files from dolphinprivate +add_definitions(-DLIBDOLPHINPRIVATE_EXPORT=) # KItemListSelectionManagerTest set(kitemlistselectionmanagertest_SRCS kitemlistselectionmanagertest.cpp diff -Nru kde-baseapps-4.7.97/dolphin/src/tests/kfileitemmodeltest.cpp kde-baseapps-4.8.0/dolphin/src/tests/kfileitemmodeltest.cpp --- kde-baseapps-4.7.97/dolphin/src/tests/kfileitemmodeltest.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/tests/kfileitemmodeltest.cpp 2012-01-10 14:14:25.000000000 +0000 @@ -552,6 +552,11 @@ QCOMPARE(spyItemsMoved.count(), 1); QCOMPARE(spyItemsMoved.takeFirst().at(1).value >(), QList() << 1 << 2 << 0 << 4 << 3); + QSKIP("2 tests of testSorting() are temporary deactivated as in KFileItemModel resortAllItems() " + "always emits a itemsMoved() signal. Before adjusting the tests think about probably introducing " + "another signal", SkipSingle); + // Internal note: Check comment in KFileItemModel::resortAllItems() for details. + // In 'Sort by Size' mode, folders are always first -> changing 'Sort Folders First' does not resort the model m_model->setSortFoldersFirst(true); QCOMPARE(m_model->sortRole(), QByteArray("size")); diff -Nru kde-baseapps-4.7.97/dolphin/src/views/dolphinitemlistcontainer.cpp kde-baseapps-4.8.0/dolphin/src/views/dolphinitemlistcontainer.cpp --- kde-baseapps-4.7.97/dolphin/src/views/dolphinitemlistcontainer.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/views/dolphinitemlistcontainer.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -52,6 +52,7 @@ m_fileItemListView->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); controller()->setView(m_fileItemListView); + updateAutoActivationDelay(); updateFont(); updateGridSize(); } @@ -174,6 +175,10 @@ ViewModeSettings settings(viewMode()); settings.readConfig(); + beginTransaction(); + + m_fileItemListView->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); + updateAutoActivationDelay(); updateFont(); updateGridSize(); @@ -183,6 +188,8 @@ << "imagethumbnail" << "jpegthumbnail"); m_fileItemListView->setEnabledPlugins(plugins); + + endTransaction(); } void DolphinItemListContainer::updateGridSize() @@ -247,6 +254,12 @@ m_fileItemListView->setStyleOption(styleOption); } +void DolphinItemListContainer::updateAutoActivationDelay() +{ + const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1; + controller()->setAutoActivationDelay(delay); +} + ViewModeSettings::ViewMode DolphinItemListContainer::viewMode() const { ViewModeSettings::ViewMode mode; diff -Nru kde-baseapps-4.7.97/dolphin/src/views/dolphinitemlistcontainer.h kde-baseapps-4.8.0/dolphin/src/views/dolphinitemlistcontainer.h --- kde-baseapps-4.7.97/dolphin/src/views/dolphinitemlistcontainer.h 2011-12-20 19:10:51.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/views/dolphinitemlistcontainer.h 2012-01-18 18:07:34.000000000 +0000 @@ -73,6 +73,12 @@ void updateGridSize(); void updateFont(); + /** + * Updates the auto activation delay of the itemlist controller + * dependent on the 'autoExpand' setting from the general settings. + */ + void updateAutoActivationDelay(); + ViewModeSettings::ViewMode viewMode() const; private: diff -Nru kde-baseapps-4.7.97/dolphin/src/views/dolphinviewactionhandler.cpp kde-baseapps-4.8.0/dolphin/src/views/dolphinviewactionhandler.cpp --- kde-baseapps-4.7.97/dolphin/src/views/dolphinviewactionhandler.cpp 2011-11-17 20:56:05.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/views/dolphinviewactionhandler.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -195,6 +195,7 @@ } KToggleAction* showInGroups = m_actionCollection->add("show_in_groups"); + showInGroups->setIcon(KIcon("view-group")); showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); connect(showInGroups, SIGNAL(triggered(bool)), this, SLOT(toggleGroupedSorting(bool))); diff -Nru kde-baseapps-4.7.97/dolphin/src/views/dolphinview.cpp kde-baseapps-4.8.0/dolphin/src/views/dolphinview.cpp --- kde-baseapps-4.7.97/dolphin/src/views/dolphinview.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/views/dolphinview.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -137,9 +137,6 @@ KItemListController* controller = m_container->controller(); controller->setSelectionBehavior(KItemListController::MultiSelection); - if (GeneralSettings::autoExpandFolders()) { - controller->setAutoActivationDelay(750); - } connect(controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int))); connect(controller, SIGNAL(itemsActivated(QSet)), this, SLOT(slotItemsActivated(QSet))); connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int))); diff -Nru kde-baseapps-4.7.97/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp kde-baseapps-4.8.0/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp --- kde-baseapps-4.7.97/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp 2011-09-26 09:43:17.000000000 +0000 +++ kde-baseapps-4.8.0/dolphin/src/views/versioncontrol/versioncontrolobserver.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -195,7 +195,7 @@ UpdateItemStatesThread* thread = m_updateItemStatesThread; m_updateItemStatesThread = 0; // The thread deletes itself automatically (see updateItemStates()) - if (!m_plugin) { + if (!m_plugin || !thread) { return; } diff -Nru kde-baseapps-4.7.97/kdepasswd/kcm/kcm_useraccount.desktop kde-baseapps-4.8.0/kdepasswd/kcm/kcm_useraccount.desktop --- kde-baseapps-4.7.97/kdepasswd/kcm/kcm_useraccount.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/kdepasswd/kcm/kcm_useraccount.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -104,25 +104,34 @@ Name[zh_TW]=密碼與帳號資訊 X-KDE-Keywords=password;email;name;organization;realname;login image;face; echo mode; X-KDE-Keywords[ca]=contrasenya;correu electrònic;nom;organització;nom real;imatge d'inici de sessió;cara;mode d'eco; +X-KDE-Keywords[ca@valencia]=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[de]=Passwort,E-Mail,Name,Organisation,Tatsächlicher Name,Anmeldebild,Gesicht,Echomodus X-KDE-Keywords[es]=contraseña;correo;nombre;organización;nombre real;imagen de inicio;cara; modo de eco; X-KDE-Keywords[et]=parool;e-post;nimi;organisatsioon;tegelik nimi;sisselogimispilt;nägu;echo režiim; X-KDE-Keywords[fi]=salasana;email;sähköposti;nimi;organisaatio;järjestö;oikea nimi;todellinen nimi;tunnuskuva;kaiutustila;salasanakenttä; X-KDE-Keywords[ga]=focal faire;ríomhphost;ainm;eagras;fíorainm;íomhá logála isteach;aghaidh;mód macalla; 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[it]=password;email;posta elettronica;nome;organizzazione;nome vero;immagine di login;face;modalità echo X-KDE-Keywords[kk]=password;email;name;organization;realname;login image;face; echo mode; X-KDE-Keywords[km]=ពាក្យសម្ងាត់;អ៊ីមែល;ឈ្មោះ;ស្ថាប័ន;ឈ្មោះ​ពិត;រូបភាព​ចូល;មុខមាត់; របៀប​អេកូ; +X-KDE-Keywords[lv]=parole;e-pasts;vārds;organizācija;īstais vārds;pieteikšanās attēls;seja; atbalss režīms; 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[pl]=hasło;email;nazwa;organizacja;rzeczywista nazwa;obraz loginu;twarz; tryb echo; 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[sr]=password;email;name;organization;realname;login image;face; echo mode;лозинка;е‑пошта;име;организација;пуно име;пријавна слика;лице;ехо +X-KDE-Keywords[sr@ijekavian]=password;email;name;organization;realname;login image;face; echo mode;лозинка;е‑пошта;име;организација;пуно име;пријавна слика;лице;ехо +X-KDE-Keywords[sr@ijekavianlatin]=password;email;name;organization;realname;login image;face; echo mode;lozinka;e‑pošta;ime;organizacija;puno ime;prijavna slika;lice;eho +X-KDE-Keywords[sr@latin]=password;email;name;organization;realname;login image;face; echo mode;lozinka;e‑pošta;ime;organizacija;puno ime;prijavna slika;lice;eho 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; Comment=User information such as password, name and email Comment[af]=Gebruiker informasie, soos naam, wagwoord en e-pos @@ -174,7 +183,7 @@ Comment[ko]=암호, 이름, 전자우편 주소 같은 개인 정보 Comment[ku]=Agahiyên bikarhêneran yên wekî nasnav, nav û epeyam Comment[lt]=Naudotojo informacija, tokia, kaip slaptažodis, vardas ir e. pašto adresas -Comment[lv]=Lietotāja informācija kā parole, vārds un e-pasts +Comment[lv]=Lietotāja informācija, piemēram, parole, vārds un e-pasts Comment[mai]=प्रयोक्ता सूचना जहिना जे पासवर्ड, नाम आओर ई-मेल Comment[mk]=Кориснички информации како лозинка, име и е-пошта Comment[ml]=അടയാളവാക്കു്, പേരു്, ഇമെയില്‍ തുടങ്ങി ഉപയോക്താവിനെക്കുറിച്ചുള്ള വിവരം diff -Nru kde-baseapps-4.7.97/konq-plugins/adblock/plugin_adblock.desktop kde-baseapps-4.8.0/konq-plugins/adblock/plugin_adblock.desktop --- kde-baseapps-4.7.97/konq-plugins/adblock/plugin_adblock.desktop 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/adblock/plugin_adblock.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -39,6 +39,7 @@ Name[pt_BR]=Adblock Name[ro]=Adblock Name[ru]=Adblock +Name[sk]=Adblock Name[sl]=Adblock Name[sr]=Адблок Name[sr@ijekavian]=Адблок diff -Nru kde-baseapps-4.7.97/konq-plugins/akregator/akregator_konqfeedicon.desktop kde-baseapps-4.8.0/konq-plugins/akregator/akregator_konqfeedicon.desktop --- kde-baseapps-4.7.97/konq-plugins/akregator/akregator_konqfeedicon.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/akregator/akregator_konqfeedicon.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -98,6 +98,7 @@ Comment[pt_BR]=Exibe um ícone na barra de status se a página possui uma fonte de notícias Comment[ro]=Afișează o pictogramă în bara de stare dacă pagina conține un flux Comment[ru]=Отображает значок в строке состояния если текущая страница содержит ленту новостей +Comment[sk]=Pokiaľ stránka obsahuje kanál, zobrazí ikonu v stavovej lište Comment[sl]=V vrstici stanja prikaže ikono, če stran vsebuje vir novic Comment[sr]=Ако страница садржи довод, икона се приказује у траци стања Comment[sr@ijekavian]=Ако страница садржи довод, икона се приказује у траци стања diff -Nru kde-baseapps-4.7.97/konq-plugins/autorefresh/autorefresh.desktop kde-baseapps-4.8.0/konq-plugins/autorefresh/autorefresh.desktop --- kde-baseapps-4.7.97/konq-plugins/autorefresh/autorefresh.desktop 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/autorefresh/autorefresh.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -49,11 +49,12 @@ Name[pt_BR]=Atualizar automaticamente Name[ro]=Reîmprospătare automată Name[ru]=Автообновление +Name[sk]=&Automatická obnova Name[sl]=Samodejno osveževanje -Name[sr]=Аутоосвежавање -Name[sr@ijekavian]=Аутоосвјежавање -Name[sr@ijekavianlatin]=Autoosvježavanje -Name[sr@latin]=Autoosvežavanje +Name[sr]=Аутоматско освежавање +Name[sr@ijekavian]=Аутоматско освјежавање +Name[sr@ijekavianlatin]=Automatsko osvježavanje +Name[sr@latin]=Automatsko osvežavanje Name[sv]=Automatisk uppdatering Name[tg]=Худнавсозӣ Name[th]=เรียกปรับปรุงอัตโนมัติ @@ -72,7 +73,7 @@ Comment[ca@valencia]=Connector de refresc automàtic Comment[cs]=Automaticky obnovit modul Comment[da]=Automatisk genindlæsning af sider -Comment[de]=Aktualisierungsmodul +Comment[de]=Modul für automatische Aktualisierung Comment[el]=Πρόσθετο αυτόματης ανανέωσης Comment[en_GB]=Auto Refresh plugin Comment[es]=Complemento de refresco automático @@ -109,10 +110,10 @@ Comment[ru]=Модуль автообновления Comment[sk]=Samočinne obnoviť modul Comment[sl]=Vstavek za samodejno osveževanje -Comment[sr]=Прикључак аутоосвежавања -Comment[sr@ijekavian]=Прикључак аутоосвјежавања -Comment[sr@ijekavianlatin]=Priključak autoosvježavanja -Comment[sr@latin]=Priključak autoosvežavanja +Comment[sr]=Прикључак аутоматског освежавања +Comment[sr@ijekavian]=Прикључак аутоматског освјежавања +Comment[sr@ijekavianlatin]=Priključak automatskog osvježavanja +Comment[sr@latin]=Priključak automatskog osvežavanja Comment[sv]=Insticksprogram för automatisk uppdatering Comment[tg]=Плагини худнавсозӣ Comment[th]=ส่วนเสริมเรียกปรับปรุงอัตโนมัติ diff -Nru kde-baseapps-4.7.97/konq-plugins/imagerotation/imageconverter.desktop kde-baseapps-4.8.0/konq-plugins/imagerotation/imageconverter.desktop --- kde-baseapps-4.7.97/konq-plugins/imagerotation/imageconverter.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/imagerotation/imageconverter.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -20,7 +20,7 @@ X-KDE-Submenu[et]=Teisendamine X-KDE-Submenu[eu]=Bihurtu hona X-KDE-Submenu[fa]=تبدیل به -X-KDE-Submenu[fi]=Muunna muotoa +X-KDE-Submenu[fi]=Muunna muotoon X-KDE-Submenu[fr]=Convertir en X-KDE-Submenu[ga]=Tiontaigh Go X-KDE-Submenu[gl]=Converter en @@ -249,6 +249,7 @@ Name[pt_BR]=TIFF Name[ro]=TIFF Name[ru]=TIFF +Name[sk]=TIFF Name[sl]=TIFF Name[sr]=ТИФФ Name[sr@ijekavian]=ТИФФ diff -Nru kde-baseapps-4.7.97/konq-plugins/imagerotation/jpegorient.desktop kde-baseapps-4.8.0/konq-plugins/imagerotation/jpegorient.desktop --- kde-baseapps-4.7.97/konq-plugins/imagerotation/jpegorient.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/imagerotation/jpegorient.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -117,15 +117,15 @@ Name[ru]=Повернуть по часовой стрелке Name[sk]=Otočiť v smere hodin Name[sl]=Zavrti v smeri urinega kazalca -Name[sr]=Ротирај у смеру казаљке -Name[sr@ijekavian]=Ротирај у смјеру казаљке -Name[sr@ijekavianlatin]=Rotiraj u smjeru kazaljke -Name[sr@latin]=Rotiraj u smeru kazaljke +Name[sr]=Окрени у смеру казаљке сата +Name[sr@ijekavian]=Окрени у смјеру казаљке сата +Name[sr@ijekavianlatin]=Okreni u smjeru kazaljke sata +Name[sr@latin]=Okreni u smeru kazaljke sata Name[sv]=Rotera medurs Name[tg]=Баргардондани соатӣ Name[th]=หมุนตามเข็มนาฬิกา Name[tr]=Saat Yönünde Çevir -Name[ug]=ئوڭغا ئايلاندۇر +Name[ug]=سائەت ئىسترېلكىسى يۆنىلىشىدە چۆرگىلىتىش Name[uk]=Обернути за годинниковою стрілкою Name[vi]=Xoay xuôi chiều Name[wa]=Tourner dins l' sins des aweyes @@ -183,15 +183,15 @@ Name[ru]=Повернуть против часовой стрелки Name[sk]=Otočiť proti smeru hodin Name[sl]=Zavrti v nasprotni smeri urinega kazalca -Name[sr]=Ротирај супротно смеру казаљке -Name[sr@ijekavian]=Ротирај супротно смјеру казаљке -Name[sr@ijekavianlatin]=Rotiraj suprotno smjeru kazaljke -Name[sr@latin]=Rotiraj suprotno smeru kazaljke +Name[sr]=Окрени супротно смеру казаљке сата +Name[sr@ijekavian]=Окрени супротно смјеру казаљке сата +Name[sr@ijekavianlatin]=Okreni suprotno smjeru kazaljke sata +Name[sr@latin]=Okreni suprotno smeru kazaljke sata Name[sv]=Rotera moturs Name[tg]=Баргардондани ғайри соатӣ Name[th]=หมุนทวนเข็มนาฬิกา Name[tr]=Saat Yönünün Tersine Çevir -Name[ug]=سائەت ئىستىرېلكىسىغا قارشى يۆنىلىشتە ئايلاندۇرىدۇ +Name[ug]=سائەت ئىسترېلكىسىغا قارشى يۆنىلىشتە ئايلاندۇرىدۇ Name[uk]=Обернути проти годинникової стрілки Name[vi]=Xoay ngược chiều Name[wa]=Tourner dins l' sins contraire des aweyes @@ -265,7 +265,7 @@ Name[tg]=Гардонидани амудӣ Name[th]=พลิกกลับทางแนวตั้ง Name[tr]=Dikey Olarak Çevir -Name[ug]=بويىغا ئايلاندۇر +Name[ug]=تىك يۆنىلىشتە چۆرگىلىتىش Name[uk]=Віддзеркалити вертикально Name[vi]=Lật dọc Name[wa]=Ratourner d' astampé @@ -334,7 +334,7 @@ Name[tg]=Гардонидани уфуқӣ Name[th]=พลิกกลับทางแนวนอน Name[tr]=Yatay Olarak Çevir -Name[ug]=توغرىسىغا ئايلاندۇر +Name[ug]=توغرىسىغا چۆرگىلىتىش Name[uk]=Віддзеркалити горизонтально Name[vi]=Lật ngang Name[wa]=Ratourner di coutchî diff -Nru kde-baseapps-4.7.97/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop kde-baseapps-4.8.0/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop --- kde-baseapps-4.7.97/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop 2011-07-27 18:36:38.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -114,8 +114,8 @@ Comment[sk]=Rýchly spôsob ako zmeniť nastavenie KHTML Comment[sl]=Hiter način za spreminjanje nastavitev KHTML Comment[sr]=Брз начин да измените поставке КХТМЛ‑а -Comment[sr@ijekavian]=Брз начин да измените поставке КХТМЛ‑а -Comment[sr@ijekavianlatin]=Brz način da izmenite postavke KHTML‑a +Comment[sr@ijekavian]=Брз начин да измијените поставке КХТМЛ‑а +Comment[sr@ijekavianlatin]=Brz način da izmijenite postavke KHTML‑a Comment[sr@latin]=Brz način da izmenite postavke KHTML‑a Comment[sv]=Ett snabbt sätt att ändra KHTML-inställningarna Comment[tg]=Роҳи тезтарин барои иваз кардани танзимоти KHTML diff -Nru kde-baseapps-4.7.97/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop kde-baseapps-4.8.0/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop --- kde-baseapps-4.7.97/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -106,6 +106,7 @@ Comment[pt_BR]=Uma forma fácil de gerar uma galeria de imagens em HTML Comment[ro]=O cale rapidă de a genera o galerie de imagini HTML Comment[ru]=Легкий способ создать галерею изображений в HTML +Comment[sk]=Jednoduchý spôsob ako vytvoriť HTML galériu obrázkov Comment[sl]=Preprost način za ustvaritev galerije slik HTML Comment[sr]=Лак начин да направите ХТМЛ галерију слика Comment[sr@ijekavian]=Лак начин да направите ХТМЛ галерију слика diff -Nru kde-baseapps-4.7.97/konq-plugins/microformat/mf_konqmficon.desktop kde-baseapps-4.8.0/konq-plugins/microformat/mf_konqmficon.desktop --- kde-baseapps-4.7.97/konq-plugins/microformat/mf_konqmficon.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/microformat/mf_konqmficon.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -97,6 +97,7 @@ Comment[pt_BR]=Exibe um ícone na barra de status se a página contém um microformato Comment[ro]=Afișează o pictogramă în bara de stare dacă pagina conține un microformat Comment[ru]=Отображает значок в строке состояния, если страница содержит микроформат +Comment[sk]=Pokiaľ stránka obsahuje mikro-formát, zobrazí ikonu v stavovej lište Comment[sl]=V vrstici stanja prikaže ikono, če spletna stran vsebuje mikroformat Comment[sr]=Приказује икону у траци стања ако страница садржи микроформат Comment[sr@ijekavian]=Приказује икону у траци стања ако страница садржи микроформат diff -Nru kde-baseapps-4.7.97/konq-plugins/minitools/minitoolsplugin.desktop kde-baseapps-4.8.0/konq-plugins/minitools/minitoolsplugin.desktop --- kde-baseapps-4.7.97/konq-plugins/minitools/minitoolsplugin.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/minitools/minitoolsplugin.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -54,8 +54,8 @@ Name[sk]=Bookmarklets (favelet) Name[sl]=Skripti v zaznamkih Name[sr]=Обележивачићи -Name[sr@ijekavian]=Обележивачићи -Name[sr@ijekavianlatin]=Obeleživačići +Name[sr@ijekavian]=Обиљеживачићи +Name[sr@ijekavianlatin]=Obilježivačići Name[sr@latin]=Obeleživačići Name[sv]=Småbokmärken Name[tg]=Хатчӯбҳо diff -Nru kde-baseapps-4.7.97/konq-plugins/rellinks/plugin_rellinks.desktop kde-baseapps-4.8.0/konq-plugins/rellinks/plugin_rellinks.desktop --- kde-baseapps-4.7.97/konq-plugins/rellinks/plugin_rellinks.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/rellinks/plugin_rellinks.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -55,10 +55,10 @@ Name[ru]=Связи между документами Name[sk]=Vzťahy dokumentu Name[sl]=Povezave med dokumenti -Name[sr]=Односи документа -Name[sr@ijekavian]=Односи документа -Name[sr@ijekavianlatin]=Odnosi dokumenta -Name[sr@latin]=Odnosi dokumenta +Name[sr]=Релације документа +Name[sr@ijekavian]=Релације документа +Name[sr@ijekavianlatin]=Relacije dokumenta +Name[sr@latin]=Relacije dokumenta Name[sv]=Dokumentförhållanden Name[tg]=Муносибатҳои ҳуҷҷат Name[th]=ความสัมพันธ์ของเอกสาร @@ -112,10 +112,10 @@ Comment[ru]=Отображает связи документа Comment[sk]=Zobrazí dokument, vzťahy dokumentu Comment[sl]=Prikaže povezave med dokumenti -Comment[sr]=Приказује односе документа -Comment[sr@ijekavian]=Приказује односе документа -Comment[sr@ijekavianlatin]=Prikazuje odnose dokumenta -Comment[sr@latin]=Prikazuje odnose dokumenta +Comment[sr]=Приказује релације документа +Comment[sr@ijekavian]=Приказује релације документа +Comment[sr@ijekavianlatin]=Prikazuje relacije dokumenta +Comment[sr@latin]=Prikazuje relacije dokumenta Comment[sv]=Visar dokumentförhållanden för ett dokument Comment[tg]=Муносибатҳои ҳуҷҷат нишон медиҳад Comment[th]=แสดงความสัมพันธ์ระหว่างเอกสารกับเอกสาร diff -Nru kde-baseapps-4.7.97/konq-plugins/searchbar/searchbar.cpp kde-baseapps-4.8.0/konq-plugins/searchbar/searchbar.cpp --- kde-baseapps-4.7.97/konq-plugins/searchbar/searchbar.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/searchbar/searchbar.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -400,9 +400,9 @@ //kDebug() << "Found search engines:" << m_searchEngines; KConfigGroup config = KConfigGroup(KGlobal::config(), "SearchBar"); - m_searchMode = (SearchModes) config.readEntry("Mode", (int) UseSearchProvider); - m_currentEngine = config.readEntry("CurrentEngine", - m_searchEngines.isEmpty() ? QString::fromLatin1("google") : m_searchEngines.first()); + m_searchMode = (SearchModes) config.readEntry("Mode", static_cast(UseSearchProvider)); + const QString defaultSearchEngine ((m_searchEngines.isEmpty() ? QString::fromLatin1("google") : m_searchEngines.first())); + m_currentEngine = config.readEntry("CurrentEngine", defaultSearchEngine); m_suggestionEnabled = config.readEntry("SuggestionEnabled", true); m_searchCombo->setSuggestionEnabled(m_suggestionEnabled); diff -Nru kde-baseapps-4.7.97/konq-plugins/searchbar/searchbar.desktop kde-baseapps-4.8.0/konq-plugins/searchbar/searchbar.desktop --- kde-baseapps-4.7.97/konq-plugins/searchbar/searchbar.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konq-plugins/searchbar/searchbar.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -66,7 +66,7 @@ Name[tg]=Панели ҷустуҷӯӣ Name[th]=แถบการค้นหา Name[tr]=Arama Çubuğu -Name[ug]=ئىزدەش بالداق +Name[ug]=ئىزدەش بالدىقى Name[uk]=Панель пошуку Name[wa]=Båre di cweraedje Name[x-test]=xxSearch Barxx @@ -111,16 +111,17 @@ Comment[pt_BR]=Fornece uma caixa de texto para fácil acesso aos mecanismos de busca como o Google. Comment[ro]=Furnizează o căsuță de text pentru acces ușor la motoare de căutare cum ar fi Google. Comment[ru]=Поле ввода для отправки запросов к поисковым машинам типа Google. +Comment[sk]=Pre jednoduchší prístup k vyhľadávačom poskytuje textové pole, ako je napríklad Google. Comment[sl]=Besedilno polje za lažji dostop do iskalnikov, kot je Google. -Comment[sr]=Омогућава поље за унос текста за лакши приступ претраживачима попут Гугла. -Comment[sr@ijekavian]=Омогућава поље за унос текста за лакши приступ претраживачима попут Гугла. -Comment[sr@ijekavianlatin]=Omogućava polje za unos teksta za lakši pristup pretraživačima poput Googlea. -Comment[sr@latin]=Omogućava polje za unos teksta za lakši pristup pretraživačima poput Googlea. +Comment[sr]=Даје поље за унос текста за лакши приступ претраживачима попут Гугла. +Comment[sr@ijekavian]=Даје поље за унос текста за лакши приступ претраживачима попут Гугла. +Comment[sr@ijekavianlatin]=Daje polje za unos teksta za lakši pristup pretraživačima poput Googlea. +Comment[sr@latin]=Daje polje za unos teksta za lakši pristup pretraživačima poput Googlea. Comment[sv]=Visar en textruta för enklare åtkomst av söktjänster som Google. Comment[tg]=Барои ҷустуҷӯӣ кардан дар Интернет, масалан ба воситаи Google, сатри ҷустуҷӯӣ дастрас мекунад. Comment[th]=แสดงกล่องข้อความเพื่อเรียกใช้บริการค้นหาคล้ายของกูเกิลได้ง่ายขึ้น Comment[tr]=Google gibi arama motorloruna kolayca ulaşmak için yazı kutususu sağlar. -Comment[ug]=گۇگىلغا ئوخشاش ئىزدەش موتورىنى زىيارەت قىلىشقا قولايلىق تېكىست رامكىسى بىلەن تەمىنلەيدۇ. +Comment[ug]=گۇگىلغا ئوخشاش ئىزدەش ماتورىنى زىيارەت قىلىشقا قۇلايلىق تېكىست رامكىسى بىلەن تەمىنلەيدۇ. Comment[uk]=Надає прямий доступ до пошукових систем таких, як Google. Comment[wa]=Dene ene boesse di tecse po moussî pus åjheymint dins des moteurs di cweraedje come Google. Comment[x-test]=xxProvides a text box for easier access to search engines like Google.xx diff -Nru kde-baseapps-4.7.97/konqueror/client/kfmclient.cpp kde-baseapps-4.8.0/konqueror/client/kfmclient.cpp --- kde-baseapps-4.7.97/konqueror/client/kfmclient.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/client/kfmclient.cpp 2012-01-10 14:14:25.000000000 +0000 @@ -344,8 +344,7 @@ kDebug() << url << "mimetype=" << mimetype; needInstance(); - if (url.protocol().startsWith(QLatin1String("http")) || - url.protocol() == QLatin1String("file")) + if (url.protocol().startsWith(QLatin1String("http"))) { KConfig config(QLatin1String("kfmclientrc")); KConfigGroup generalGroup(&config, "General"); diff -Nru kde-baseapps-4.7.97/konqueror/Home.desktop kde-baseapps-4.8.0/konqueror/Home.desktop --- kde-baseapps-4.7.97/konqueror/Home.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/Home.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -87,7 +87,7 @@ Name[tg]=Компютер Name[th]=พื้นที่ส่วนตัว Name[tr]=Ev Klasörü -Name[ug]=باش بەت +Name[ug]=ماكان Name[uk]=Домівка Name[uz]=Uy Name[uz@cyrillic]=Уй diff -Nru kde-baseapps-4.7.97/konqueror/profile_tabbedbrowsing.desktop kde-baseapps-4.8.0/konqueror/profile_tabbedbrowsing.desktop --- kde-baseapps-4.7.97/konqueror/profile_tabbedbrowsing.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/profile_tabbedbrowsing.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -18,7 +18,7 @@ Name[csb]=Przezéranié kartama Name[cy]=Pori Tabiedig Name[da]=Fanebladssøgning -Name[de]=Browsing mit Unterfenstern +Name[de]=Browsen mit Unterfenstern Name[el]=Περιήγηση με καρτέλες Name[en_GB]=Tabbed Browsing Name[eo]=Langeta foliumado @@ -82,7 +82,7 @@ Name[tg]=Намоиши тирезагӣ Name[th]=ท่องเว็บแบบใช้แท็บ Name[tr]=Sekmeli Tarama -Name[ug]=بەتكۈچلۈك توركۆرگۈ +Name[ug]=بەتكۈچلۈك كۆرۈش Name[uk]=Навігація з вкладками Name[uz]=Tabli veb koʻrish Name[uz@cyrillic]=Табли веб кўриш diff -Nru kde-baseapps-4.7.97/konqueror/profile_webbrowsing.desktop kde-baseapps-4.8.0/konqueror/profile_webbrowsing.desktop --- kde-baseapps-4.7.97/konqueror/profile_webbrowsing.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/profile_webbrowsing.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -17,7 +17,7 @@ Name[csb]=Przezéranié netë Name[cy]=Pori'r W? Name[da]=Webbrowsing -Name[de]=Webbrowser +Name[de]=Browsen im Web Name[el]=Περιήγηση ιστού Name[en_GB]=Web Browsing Name[eo]=Reta foliumado @@ -81,7 +81,7 @@ Name[tg]=Намоиш интернетӣ Name[th]=เรียกดูหน้าเว็บ Name[tr]=Web Tarama -Name[ug]=توركۆرگۈ +Name[ug]=تور كۆرۈش Name[uk]=Навігація інтернетом Name[uz]=Veb koʻrish Name[uz@cyrillic]=Веб кўриш diff -Nru kde-baseapps-4.7.97/konqueror/settings/ebrowsing/ebrowsing.desktop kde-baseapps-4.8.0/konqueror/settings/ebrowsing/ebrowsing.desktop --- kde-baseapps-4.7.97/konqueror/settings/ebrowsing/ebrowsing.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/ebrowsing/ebrowsing.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -92,7 +92,7 @@ Name[tg]=Миёнбурҳои интернетӣ Name[th]=ทางลัดเว็บ Name[tr]=Web Kısayolları -Name[ug]=تور قىسقا يولى +Name[ug]=تور تېزلەتمىسى Name[uk]=Вебскорочення Name[uz]=Veb-qisqartmalari Name[uz@cyrillic]=Веб-қисқартмалари @@ -197,6 +197,7 @@ X-KDE-Keywords=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts X-KDE-Keywords[ca]=Navegació millorada,navegació,WWW,Internet,Filtres d'Internet,Xarxa,Motors de cerca,Dreceres +X-KDE-Keywords[ca@valencia]=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[es]=Navegación mejorada,Navegación,WWW,Internet,Filtros de Internet,Red,Motores de búsqueda,Accesos rápidos @@ -205,15 +206,23 @@ X-KDE-Keywords[ga]=Brabhsáil Fheabhsaithe,Brabhsáil,WWW,Gréasán,Idirlíon,Scagairí Idirlín,Líonra,Innill Chuardaigh,Aicearraí 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[ia]=Navigation avantiate, Navigation,WWW,Internet,Filtros de Internet,Rete, Motores de cerca,Vias breve +X-KDE-Keywords[it]=Navigazione avanzata,navigazione,WWW,Internet,filtri Internet,rete,motori di ricerca,scorciatoie X-KDE-Keywords[kk]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts X-KDE-Keywords[km]=ការ​រកមើល​ដែល​បាន​ធ្វើ​ឲ្យ​ប្រសើរ ការ​រកមើល WWW អ៊ីនធឺណិត តម្រង​អ៊ីនធឺណិត បណ្ដាញ ម៉ាស៊ីន​ស្វែងរក ផ្លូវកាត់ +X-KDE-Keywords[lv]=Uzlabota pārlūkošana,pārlūkošana,WWW,internets,interneta filtri,tīkls,meklēšanas dzinēji,saīnes 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[pl]=Ulepszone przeglądanie,Przeglądanie,WWW,Internet,Filtry internetowe,Sieć,Wyszukiwarki,Silniki wyszukiwania,Skróty 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[sr]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts,побољшано прегледање,прегледање,веб,интернет,филтери,мрежа,претраживачи,пречице +X-KDE-Keywords[sr@ijekavian]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts,побољшано прегледање,прегледање,веб,интернет,филтери,мрежа,претраживачи,пречице +X-KDE-Keywords[sr@ijekavianlatin]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts,poboljšano pregledanje,pregledanje,veb,internet,filteri,mreža,pretraživači,prečice +X-KDE-Keywords[sr@latin]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts,poboljšano pregledanje,pregledanje,veb,internet,filteri,mreža,pretraživači,prečice 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_CN]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts,增强浏览,浏览,互联网,互联网过滤,网络,搜索引擎,快捷方式 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.97/konqueror/settings/kio/bookmarks.desktop kde-baseapps-4.8.0/konqueror/settings/kio/bookmarks.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/bookmarks.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/bookmarks.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -182,6 +182,7 @@ Comment[zh_TW]=設定書籤首頁 X-KDE-Keywords=Bookmarks X-KDE-Keywords[ca]=Adreces d'interès +X-KDE-Keywords[ca@valencia]=Adreces d'interés X-KDE-Keywords[cs]=Záložky X-KDE-Keywords[da]=Bogmærker X-KDE-Keywords[de]=Lesezeichen @@ -191,17 +192,26 @@ X-KDE-Keywords[ga]=Leabharmharcanna X-KDE-Keywords[hu]=Könyvjelzők X-KDE-Keywords[ia]=Marcatores de libro +X-KDE-Keywords[it]=Segnalibri X-KDE-Keywords[kk]=Бетбелгі X-KDE-Keywords[km]=ចំណាំ +X-KDE-Keywords[lv]=Grāmatzīmes 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[pl]=Zakładki X-KDE-Keywords[pt]=Favoritos X-KDE-Keywords[pt_BR]=Favoritos X-KDE-Keywords[sl]=Zaznamki +X-KDE-Keywords[sr]=Bookmarks,обележивачи +X-KDE-Keywords[sr@ijekavian]=Bookmarks,обиљеживачи +X-KDE-Keywords[sr@ijekavianlatin]=Bookmarks,obilježivači +X-KDE-Keywords[sr@latin]=Bookmarks,obeleživači X-KDE-Keywords[sv]=Bokmärken +X-KDE-Keywords[ug]=خەتكۈشلەر X-KDE-Keywords[uk]=закладки,закладка X-KDE-Keywords[x-test]=xxBookmarksxx +X-KDE-Keywords[zh_CN]=Bookmarks,书签 X-KDE-Keywords[zh_TW]=Bookmarks diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/cache.desktop kde-baseapps-4.8.0/konqueror/settings/kio/cache.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/cache.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/cache.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -73,7 +73,7 @@ Name[oc]=Escondedor Name[or]=କ୍ୟାଶେ Name[pa]=ਕੈਸ਼ -Name[pl]=Bufor +Name[pl]=Pamięć podręczna Name[pt]=Cache Name[pt_BR]=Cache Name[ro]=Cache @@ -166,7 +166,7 @@ Comment[nn]=Oppsett av vevmellomlager Comment[or]=ୱେବ କ୍ୟାଶେ ସଂରଚନାକୁ ବିନ୍ୟାସ କରନ୍ତୁ Comment[pa]=ਵੈੱਬ ਕੈਸ਼ ਸੈਟਿੰਗ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja ustawień bufora (cache'a) +Comment[pl]=Konfiguruj ustawienia pamięci podręcznej sieci Comment[pt]=Configuração das opções da 'cache' da Web Comment[pt_BR]=Configura as opções de cache da Internet Comment[ro]=Configurează setările cache-ului web @@ -198,21 +198,31 @@ X-KDE-Keywords=Cache,History,Browsing History,Ports,Size X-KDE-Keywords[ca]=Memòria cau,Historial,Historial del navegador,Ports,Mida +X-KDE-Keywords[ca@valencia]=Memòria cau,Historial,Historial del navegador,Ports,Mida X-KDE-Keywords[da]=Cache,historik,browserhistorik,porte,størrelse +X-KDE-Keywords[de]=Cache,Verlauf,History,Ports,Zwischenspeicher,Größe X-KDE-Keywords[es]=Caché,Historial,Ver historial,Puertos,Tamaño X-KDE-Keywords[et]=Puhver,Ajalugu,Sirvimisajalugu,Pordid,Suurus X-KDE-Keywords[fi]=Välimuisti,Historia,Selaushistoria,Portit,Koko X-KDE-Keywords[ga]=Taisce,Stair,Stair Brabhsála,Poirt,Méid X-KDE-Keywords[hu]=Gyorsítótár,Előzmények,Böngészési előzmények,Portok,Méret X-KDE-Keywords[ia]=Cache,Historia,Historia de navigation,Portos,Grandor +X-KDE-Keywords[it]=Cache,cronologia,cronologia di navigazione,porte,dimensione X-KDE-Keywords[kk]=Cache,History,Browsing History,Ports,Size X-KDE-Keywords[km]=ឃ្លាំង​សម្ងាត់ ប្រវត្តិ ប្រវត្តិ​ការ​រកមើល ច្រក ទំហំ +X-KDE-Keywords[lv]=Kešatmiņa,vēsture,pārlūkošanas vēsture,porti,izmērs 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[pl]=Pamięć podręczna,Historia,Historia przeglądania,Porty,Rozmiar 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[sr]=Cache,History,Browsing History,Ports,Size,кеш,историјат,прегледање,портови,величина +X-KDE-Keywords[sr@ijekavian]=Cache,History,Browsing History,Ports,Size,кеш,историјат,прегледање,портови,величина +X-KDE-Keywords[sr@ijekavianlatin]=Cache,History,Browsing History,Ports,Size,keš,istorijat,pregledanje,portovi,veličina +X-KDE-Keywords[sr@latin]=Cache,History,Browsing History,Ports,Size,keš,istorijat,pregledanje,portovi,veličina X-KDE-Keywords[sv]=Cache,Historik,Webbläsningshistorik,Portar,Storlek X-KDE-Keywords[uk]=Cache,History,Browsing History,Ports,Size,кеш,журнал,історія,перегляд,порти,розмір X-KDE-Keywords[x-test]=xxCache,History,Browsing History,Ports,Sizexx +X-KDE-Keywords[zh_CN]=Cache,History,Browsing History,Ports,Size,缓存,历史,浏览历史,端口,大小 X-KDE-Keywords[zh_TW]=Cache,History,Browsing History,Ports,Size diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/cookies.desktop kde-baseapps-4.8.0/konqueror/settings/kio/cookies.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/cookies.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/cookies.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -194,6 +194,7 @@ X-KDE-Keywords=Cookies,Browsing,Internet,WWW,Network,Policy,Domains X-KDE-Keywords[ca]=Galetes,Navegació,Internet,WWW,Xarxa,Polítiques,Dominis +X-KDE-Keywords[ca@valencia]=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[es]=Cookies,Navegación,Internet,WWW,Red,Política,Dominios @@ -202,14 +203,22 @@ X-KDE-Keywords[ga]=Fianáin,Brabhsáil,Idirlíon,WWW,Gréasán,Líonra,Polasaí,Fearainn X-KDE-Keywords[hu]=Sütik,Böngészés,Internet,WWW,Hálózat,Házirend,Tartományok X-KDE-Keywords[ia]=Cookies,Navigation,Internet,WWW,Rete,Politica,Dominios +X-KDE-Keywords[it]=Cookie,navigazione,Internet,WWW,rete,politica,domini X-KDE-Keywords[kk]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains X-KDE-Keywords[km]=ខូគី ការ​រកមើល អ៊ីនធឺណិត WWW បណ្ដាញ គោលនយោបាយ ដែន +X-KDE-Keywords[lv]=Sīkdatnes,Pārlūkošana,Internets,WWW,Tīkls,Politika,Domēni 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[pl]=Ciasteczka,Przeglądanie,Internet,WWW,Sieć,Polityka,Domeny 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[sr]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,колачићи,прегледање,Интернет,веб,мрежа,смерница,домени +X-KDE-Keywords[sr@ijekavian]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,колачићи,прегледање,Интернет,веб,мрежа,смерница,домени +X-KDE-Keywords[sr@ijekavianlatin]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,kolačići,pregledanje,Internet,veb,mreža,smernica,domeni +X-KDE-Keywords[sr@latin]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,kolačići,pregledanje,Internet,veb,mreža,smernica,domeni 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[zh_CN]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,浏览,互联网,网络,策略,域名 X-KDE-Keywords[zh_TW]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/kproxydlg.cpp kde-baseapps-4.8.0/konqueror/settings/kio/kproxydlg.cpp --- kde-baseapps-4.7.97/konqueror/settings/kio/kproxydlg.cpp 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/kproxydlg.cpp 2012-01-18 18:07:34.000000000 +0000 @@ -219,7 +219,7 @@ } else { manEdit->setText(urlStr); } - + if (spinBox && portNum > -1) { spinBox->setValue(portNum); } @@ -252,6 +252,7 @@ connect(mUi.systemProxyRadioButton, SIGNAL(toggled(bool)), mUi.systemProxyGroupBox, SLOT(setVisible(bool))); #else mUi.autoDetectButton->setVisible(false); + connect(mUi.systemProxyRadioButton, SIGNAL(clicked()), SLOT(slotChanged())); #endif // signals and slots connections diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/kproxydlg.ui kde-baseapps-4.8.0/konqueror/settings/kio/kproxydlg.ui --- kde-baseapps-4.7.97/konqueror/settings/kio/kproxydlg.ui 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/kproxydlg.ui 2012-01-18 18:07:34.000000000 +0000 @@ -123,9 +123,6 @@ - - false - <qt>Attempt automatic discovery of the environment variables used for setting system wide proxy information.<p> This feature works by searching for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY.</qt> diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/netpref.desktop kde-baseapps-4.8.0/konqueror/settings/kio/netpref.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/netpref.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/netpref.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -119,7 +119,7 @@ Comment[csb]=Kònfigùracëjô sécowëch nastôwów jakno np. limitu czasu Comment[cy]=Ffurfweddu dewisiadau rhwydwaith generig, fel gwerthoedd goramser Comment[da]=Generelle netværksindstillinger såsom værdier for tidsudløb -Comment[de]=Einfache Netzwerkeinstellungen vornehmen wie z. B. Zeitüberschreitungen +Comment[de]=Allgemeine Netzwerkeinstellungen vornehmen, wie z. B. Werte für Zeitüberschreitungen Comment[el]=Ρύθμιση γενικών προτιμήσεων δικτύου, όπως τιμές χρονικών ορίων Comment[en_GB]=Configure generic network preferences, like timeout values Comment[eo]=Agordi la ĝeneralajn retopciojn, kiel tempolimojn ktp. @@ -151,7 +151,7 @@ Comment[ko]=제한 시간 값 같이 일반 네트워크에서 기본이 되는 값 설정하기 Comment[ku]=Vebijêrkên torê generîk ên wekî nirxên demajoyê veava bike Comment[lt]=Konfigūruoti bendrus tinklo pasirinkimus, tokius, kaip laiko limitai -Comment[lv]=Konfigurē pamata tīkla iestatījumus, kā noildzes vērtības +Comment[lv]=Konfigurē pamata tīkla iestatījumus, piem., noildzes vērtības Comment[mai]=जेनेरिक नेटवर्क प्राथमिकतासभ, जहिना टाइम-आउट मूल्यसभ केँ- बिन्यस्त करू Comment[mk]=Конфигурирајте ги општите мрежни параметри, како тајмаут вредности Comment[ml]=എത്ര സമയം കാത്തുനില്‍ക്കണം എന്നതുപോലുള്ള പൊതുവായുള്ള ശൃംഖലയുമായി ബന്ധപ്പെട്ട മുന്‍ഗണനകള്‍ ക്രമീകരിയ്ക്കുക @@ -196,19 +196,30 @@ X-KDE-Keywords=timeout,iopref,netpref,network preferences,ftp X-KDE-Keywords[ca]=temps d'espera,iopref,netpref,preferències de xarxa,ftp +X-KDE-Keywords[ca@valencia]=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[de]=Zeitlimit,Zeitüberschreitung,Netzwerkeinstellungen,Ein-/Ausgabemodul-Einstellungen,FTP +X-KDE-Keywords[es]=tiempo de espera,iopref,netpref,preferencias de red,ftp X-KDE-Keywords[et]=aegumine,iopref,netpref,võrk,eelistused,ftp X-KDE-Keywords[fi]=aikakatkaisu,iopref,netpref,verkkoasetukset,ftp X-KDE-Keywords[ga]=timeout,iopref,netpref,sainroghanna líonra,ftp X-KDE-Keywords[hu]=időtúllépés,iopref,netpref,hálózati beállítások,ftp X-KDE-Keywords[ia]=expiration,iopref,prefderete,rete,preferentias,ftp +X-KDE-Keywords[it]=scadenza,iopref,netpref,preference di rete,ftp X-KDE-Keywords[kk]=timeout,iopref,netpref,network preferences,ftp X-KDE-Keywords[km]=អស់​ពេល iopref netpref ចំណូលចិត្ត​បណ្ដាញ ftp +X-KDE-Keywords[lv]=noildze,io iestat,tīkla iestat,tīkla iestatījumi,ftp X-KDE-Keywords[nb]=tidsavbrudd,iopref,netpref,nettverksoppsett,ftp X-KDE-Keywords[nl]=timeout,iopref,netpref,netwerk voorkeuren,ftp +X-KDE-Keywords[pl]=czas oczekiwania,iopref,netpref,ustawienia sieci,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[sr]=timeout,iopref,netpref,network preferences,ftp,прековреме,мрежне поставке,ФТП +X-KDE-Keywords[sr@ijekavian]=timeout,iopref,netpref,network preferences,ftp,прековреме,мрежне поставке,ФТП +X-KDE-Keywords[sr@ijekavianlatin]=timeout,iopref,netpref,network preferences,ftp,prekovreme,mrežne postavke,FTP +X-KDE-Keywords[sr@latin]=timeout,iopref,netpref,network preferences,ftp,prekovreme,mrežne postavke,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 diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/proxy.desktop kde-baseapps-4.8.0/konqueror/settings/kio/proxy.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/proxy.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/proxy.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -201,6 +201,7 @@ X-KDE-Keywords=Proxy,Proxy server,Firewall,Squid,proxy X-KDE-Keywords[ca]=Intermediari,Servidor intermediari,Tallafocs,Squid,intermediari +X-KDE-Keywords[ca@valencia]=Intermediari,Servidor intermediari,Tallafocs,Squid,intermediari X-KDE-Keywords[da]=Proxy,Proxy-server,Firewall,Squid,proxy X-KDE-Keywords[de]=Proxy,Proxy-Server,Firewall,Squid,proxy X-KDE-Keywords[es]=Proxy,Servidor proxy,Cortafuegos,Squid,proxy @@ -209,13 +210,21 @@ X-KDE-Keywords[ga]=Seachfhreastalaí,Balla Dóiteáin,Squid X-KDE-Keywords[hu]=Proxy,Proxy kiszolgáló,Tűzfal,Squid,proxy X-KDE-Keywords[ia]=Proxy,Servitor de Proxy,Talia Foco,Squid,proxy +X-KDE-Keywords[it]=Proxy,server proxy,firewall,squid,proxy X-KDE-Keywords[kk]=Proxy,Proxy server,Firewall,Squid,proxy X-KDE-Keywords[km]=ប្រូកស៊ី ម៉ាស៊ីន​បម្រើ​ប្រូកស៊ី ជញ្ជាំង​ភ្លើង Squid ប្រូកស៊ី +X-KDE-Keywords[lv]=Starpniekserveris,Ugunsmūris,Squid,Starpniekserveris X-KDE-Keywords[nb]=Mellomtjener,Brannmur,Squid,mellomtjener X-KDE-Keywords[nl]=Proxy,proxyserver,firewall,squid,proxy +X-KDE-Keywords[pl]=Pośrednik,Serwer pośrednika,Zapora sieciowa,Squid,pośrednik X-KDE-Keywords[pt]=Proxy,servidor proxy,Firewall,Squid,proxy X-KDE-Keywords[pt_BR]=Proxy,Servidor proxy,Firewall,Squid,proxy +X-KDE-Keywords[sr]=Proxy,Proxy server,Firewall,Squid,proxy,прокси,Сквид,заштитни зид +X-KDE-Keywords[sr@ijekavian]=Proxy,Proxy server,Firewall,Squid,proxy,прокси,Сквид,заштитни зид +X-KDE-Keywords[sr@ijekavianlatin]=Proxy,Proxy server,Firewall,Squid,proxy,proksi,Squid,zaštitni zid +X-KDE-Keywords[sr@latin]=Proxy,Proxy server,Firewall,Squid,proxy,proksi,Squid,zaštitni zid 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[zh_CN]=Proxy,Proxy server,Firewall,Squid,proxy,代理,代理服务器,防火墙 X-KDE-Keywords[zh_TW]=Proxy,Proxy server,Firewall,Squid,proxy diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/smb.desktop kde-baseapps-4.8.0/konqueror/settings/kio/smb.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/smb.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/smb.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -150,7 +150,7 @@ Comment[ko]=윈도 (SMB) 파일 시스템 탐색 설정 Comment[ku]=Di avakirina pergalên pelan ên Windowsê (Samba) ku dikarî bibînî de tê bikaranîn Comment[lt]=Naudokite tai norėdami nustatyti kurias Windows (SMB) failų sistemas Jūs galėsite naršyti -Comment[lv]=Lietojiet, lai norādītu kuras windows (SMB) failu sistēmas jūs varietpārlūkot +Comment[lv]=Lietojiet, lai norādītu, kuras windows (SMB) failu sistēmas jūs varat pārlūkot Comment[mai]=बिन्यस्त करब क' लेल इस्तेमाल करू जे कओन सँ विंडोज फाइलसिस्टम (SMB) अहाँ ब्राउज कए सकैत छी. Comment[mk]=Користете го за да конфигурирате кои windows (SMB) датотечни системи можете да ги прелистувате Comment[ml]=നിങ്ങള്‍ക്കു് പരതാവുന്ന ജാലക (എസ്എംബി) ഫയല്‍ സിസ്റ്റങ്ങള്‍ ഏതെല്ലാമാണെന്നു് ക്രമീകരിയ്ക്കാന്‍ ഉപയോഗിയ്ക്കുന്നു @@ -193,20 +193,30 @@ X-KDE-Keywords=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords X-KDE-Keywords[ca]=SMB,SAMBA,Client SMB client,Xarxa Windows,LAN,Xarxa,veïnat,Servidor,Difusió,WINS,Compartició,Connexió,Contrasenyes +X-KDE-Keywords[ca@valencia]=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[de]=SMB,Samba,SMB-Client,Windows-Netzwerk,LAN,Netzwerk,Netzumgebung,Netzwerkumgebung,Umgebung,Server,Broadcast,WINS,Freigabe,Anmeldung,Passwörter +X-KDE-Keywords[es]=SMB,SAMBA,Cliente SMB,red Windows,LAN,Red,entorno de red,Servidor,Redifusión,WINS,Compartir,Inicio de sesión,Contraseñas X-KDE-Keywords[et]=SMB,SAMBA,SMB klient,Windowsi võrk,LAN,Võrk,naabrus,Server,Leviedastus,Broadcast,WINS,Jagatud ressurss,Sisselogimine,Paroolid 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[ga]=SMB,SAMBA,cliant SMB,líonra Windows,LAN,Líonra,comharsanacht,Freastalaí,Craoladh,WINS,Comhroinn,Logáil Isteach,Focail Fhaire 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[ia]=SMB,SAMBA,Cliente SMB,rete de Windows,LAN,rete,vicinitate,Servitor,Transmission,WINS,Compartite,Authentication,Contrasignos +X-KDE-Keywords[it]=SMB,SAMBA,client SMB,rete di Windows,LAN,Rete,vicinanza,Server,Broadcast,WINS,Share,Login,Password X-KDE-Keywords[kk]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords X-KDE-Keywords[km]=SMB SAMBA ម៉ាស៊ីន​ភ្ញៀវ SMB បណ្ដាញ​វីនដូ LAN បណ្ដាញ ក្បែរៗ ម៉ាស៊ីន​បម្រើ ផ្សាយ WINS ចែករំលែក ចូល ពាក្យសម្ងាត់ +X-KDE-Keywords[lv]=SMB,SAMBA,SMB klients,Windows tīkls,LAN,Tīkls,tīkla apkaime,Serveris,Apraide,WINS,Koplietojums,Pieteikšanās,Paroles 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[pl]=SMB,SAMBA,Klient SMB,Sieć Windows, LAN,Sieć,otoczenie,Serwer,Broadcast,WINS,Udostępnianie,Współdzielenie,Login,Hasła 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[sr]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,СМБ,Самба,СМБ клијент,виндоуз мрежа,ЛАН,мрежа,суседство,сервер,емитовање,ВИНС,дељење,пријава,лозинка +X-KDE-Keywords[sr@ijekavian]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,СМБ,Самба,СМБ клијент,виндоуз мрежа,ЛАН,мрежа,суседство,сервер,емитовање,ВИНС,дељење,пријава,лозинка +X-KDE-Keywords[sr@ijekavianlatin]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,SMB,Samba,SMB klijent,windows mreža,LAN,mreža,susedstvo,server,emitovanje,WINS,deljenje,prijava,lozinka +X-KDE-Keywords[sr@latin]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,SMB,Samba,SMB klijent,windows mreža,LAN,mreža,susedstvo,server,emitovanje,WINS,deljenje,prijava,lozinka 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[zh_CN]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,SMB 客户端,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.97/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop kde-baseapps-4.8.0/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop 2011-07-27 18:36:38.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -76,7 +76,7 @@ Name[tg]=UADescription (Firefox 2.0 дар версияи ҷорӣ) Name[th]=UADescription (ไฟร์ฟอกซ์ 2.0 บนระบบปัจจุบัน) Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 2.0) -Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان Firefox 2.0) +Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان ئوتۈلكە 2.0) Name[uk]=UADescription (Firefox 2.0 на поточній) Name[wa]=Idintifiaedje do betchteu (Firefox 2.0 sol sistinme do moumint) Name[x-test]=xxUADescription (Firefox 2.0 on current)xx diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop kde-baseapps-4.8.0/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -63,7 +63,7 @@ Name[tg]=UADescription (Firefox 3.0 дар версияи ҷорӣ) Name[th]=UADescription (ไฟร์ฟอกซ์ 3.0 บนระบบปัจจุบัน) Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 3.0) -Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان Firefox 3.0) +Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان ئوتۈلكە 3.0) Name[uk]=UADescription (Firefox 3.0 на поточній) Name[wa]=Idintifiaedje do betchteu (Firefox 3.0 sol sistinme do moumint) Name[x-test]=xxUADescription (Firefox 3.0 on current)xx diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop kde-baseapps-4.8.0/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2011-07-27 18:36:38.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -57,7 +57,7 @@ Name[tg]=UADescription (Firefox 3.6 дар версияи ҷорӣ) Name[th]=UADescription (ไฟร์ฟอกซ์ 3.6 บนระบบปัจจุบัน) Name[tr]=Kullanıcı Uygulaması Tanımı (geçerli işletim sistemi üzerinde Firefox 3.6) -Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان Firefox 3.6) +Name[ug]=خېرىدار تەرەپ چۈشەندۈرۈشى (يەرلىك كومپيۇتېردا ئىجرا قىلىنىدىغان ئوتۈلكە 3.6) Name[uk]=UADescription (Firefox 3.6 на поточній) Name[wa]=Idintifiaedje do betchteu (Firefox 3.6 sol sistinme do moumint) Name[x-test]=xxUADescription (Firefox 3.6 on current)xx diff -Nru kde-baseapps-4.7.97/konqueror/settings/kio/useragent.desktop kde-baseapps-4.8.0/konqueror/settings/kio/useragent.desktop --- kde-baseapps-4.7.97/konqueror/settings/kio/useragent.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/kio/useragent.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -117,7 +117,7 @@ Comment[csb]=Kònfigùracëjô ôrtu przedstôwianiô sã Konquerora Comment[cy]=Ffurfweddu'r ffordd y mae Konqueror yn adrodd ei hun Comment[da]=Indstil hvordan Konqueror rapporterer sig selv -Comment[de]=Kennungen für Konqueror als Webbrowser festlegen +Comment[de]=Kennungen festlegen, mit der sich Konqueror ausgibt Comment[el]=Ρυθμίστε τον τρόπο με τον οποίο αναφέρεται ο Konqueror Comment[en_GB]=Configure the way Konqueror reports itself Comment[eo]=Agordi kiel Konkeranto prezentiĝas @@ -149,7 +149,7 @@ Comment[ko]=Konqueror가 자신을 보고하는 방법 설정 Comment[ku]=Pergala raporkirina Konquerorê ava bike Comment[lt]=Čia galite nustatyti, kaip Konqueror save identifikuoja -Comment[lv]=Norādiet kā Konqueror identificēt sevi +Comment[lv]=Norādiet, kā Konqueror sevi identificēt Comment[mai]=कान्करर अपने अहाँ केँ जे रूपेँ रिपोट करैत अछि वहिना बिन्यस्त करू Comment[mk]=Конфигурирајте го начинот на кој Konqueror се пријавува себе си Comment[ml]=കോണ്‍ക്വറര്‍ സ്വയം തിരിച്ചറിയുന്ന രീതി ക്രമീകരിയ്ക്കുക @@ -192,19 +192,30 @@ X-KDE-Keywords=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login X-KDE-Keywords[ca]=Agent d'usuari,Navagador,Internet,WWW,Xarxa,agent,lligams,servidor,connexió +X-KDE-Keywords[ca@valencia]=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[de]=Browserkennung,Internetprogramm,Browser,Internet,WWW,Netzwerk,Server,Zuordnungen,Anmeldung +X-KDE-Keywords[es]=Agente de usuario,Navegador,Internet,WWW,Red,agente,bindings,servidor,inicio de sesión X-KDE-Keywords[et]=Identifikaator,Brauser,Internet,WWW,Võrk,identifikaator,seosed,server,sisselogimine X-KDE-Keywords[fi]=User Agent,Selaimen tunnistetiedot,Selaimen tunnistus,Selain,Internet,WWW,Verkko,agent,palvelin,kirjautuminen 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[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[ia]=Agente usator,Navigator,Internet,WWW,Rete.agente,ligamines,servitor,authentication +X-KDE-Keywords[it]=Identificazione del browser,browser,Internet,WWW,rete,agente,binding,server,login X-KDE-Keywords[kk]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login X-KDE-Keywords[km]=ភ្នាក់ងារ​អ្នកប្រើ កម្មវិធី​រុករក អ៊ីនធឺណិត WWW បណ្ដាញ ភ្នាក់ងារ ការ​ចង ម៉ាស៊ីន​បម្រើ ចូល +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[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[pl]=Agent użytkownika,Przeglądarka,Internet,WWW,Sieć,agent, powiązania,serwer,login 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[sr]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,кориснички агент,прегледач,Интернет,веб,мрежа,агент,свезе,сервер,пријава +X-KDE-Keywords[sr@ijekavian]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,кориснички агент,прегледач,Интернет,веб,мрежа,агент,свезе,сервер,пријава +X-KDE-Keywords[sr@ijekavianlatin]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,korisnički agent,pregledač,Internet,veb,mreža,agent,sveze,server,prijava +X-KDE-Keywords[sr@latin]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,korisnički agent,pregledač,Internet,veb,mreža,agent,sveze,server,prijava 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[zh_CN]=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.97/konqueror/settings/konq/fileappearance.desktop kde-baseapps-4.8.0/konqueror/settings/konq/fileappearance.desktop --- kde-baseapps-4.7.97/konqueror/settings/konq/fileappearance.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konq/fileappearance.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -91,7 +91,7 @@ Name[tg]=Намуди зоҳирӣ Name[th]=รูปลักษณ์ Name[tr]=Görünüm -Name[ug]=قىياپەت +Name[ug]=كۆرۈنۈشى Name[uk]=Вигляд Name[uz]=Tashqi koʻrinish Name[uz@cyrillic]=Ташқи кўриниш @@ -152,7 +152,7 @@ Comment[ko]=Konqueror의 파일 관리자로서의 모양 설정 Comment[ku]=Ji virê xuyakirina Konquerorê a wekî rêvebera pelan ava bike Comment[lt]=Čia galite nustatyti, kaip atrodo Konqueror kaip failų tvarkyklė -Comment[lv]=Šeit jūs varat konfigurēt Konqueror failu pārlūkošanas režīma izskatu +Comment[lv]=Šeit varat konfigurēt Konqueror failu pārlūkošanas režīma izskatu Comment[mai]=अहाँ बिन्यस्त कए सकैत छी जे कान्करर एतय फाइल प्रबंधक जहिना काज करै Comment[mk]=Конфигурирајте го изгледот на Konqueror како менаџер на датотеки Comment[ml]=നിങ്ങള്‍ക്കു് കോണ്‍ക്വറര്‍ ഒരു ഫയലുകളുടെ നടത്തിപ്പുകാരനാകുമ്പോള്‍ എങ്ങനെ കാണാം എന്നതിവിടെ ക്രമീകരിയ്ക്കാം @@ -197,20 +197,30 @@ X-KDE-Keywords=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour 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[ca@valencia]=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[es]=konqueror,gestor de archivos,ajuste de palabra,ajuste,subrayado,pantalla,tamaño de archivo,bytes,tipo de letra,color X-KDE-Keywords[et]=konqueror,failihaldur,reamurdmine,allajoonimine,kuvamine,failisuurus,baidid,font,värv X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,rivitys,alleviivaus,näkymä,näyttö,tiedostokoko,tavuja,tavut,kirjasin,fontti,väri 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[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[ia]=konqueror,gerente de file, torno de parolas, torno,sublinea,monstra,grandor de file,bytes,font,color,color +X-KDE-Keywords[it]=konqueror,gestore dei file,a capo automatico,sottolinea,mostra,dimensione dei file,byte,carattere,colore X-KDE-Keywords[kk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour X-KDE-Keywords[km]=konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ ការ​រុំ​ពាក្យ រុំ គូស​បន្ទាត់​ក្រោម ទិដ្ឋភាព ទំហំ​ឯកសារ បៃ ពុម្ពអក្សរ ពណ៌ ពណ៌ +X-KDE-Keywords[lv]=konqueror,failu pārvaldnieks,vārdu aplaušana,aplaušana,pasvītrojums,displejs,failu izmērs,baiti,fonts,krāsa 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[pl]=konqueror,menadżer plików,zawijanie słów,zawijanie,podkreślenie,wyświetlanie,rozmiar pliku, bajty,czcionka,kolor,barwa 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[sr]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,К‑освајач,менаџер фајлова,прелом речи,прелом,подвучено,приказ,величина фајла,бајтови,фонт,боја +X-KDE-Keywords[sr@ijekavian]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,К‑освајач,менаџер фајлова,прелом речи,прелом,подвучено,приказ,величина фајла,бајтови,фонт,боја +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,K‑osvajač,menadžer fajlova,prelom reči,prelom,podvučeno,prikaz,veličina fajla,bajtovi,font,boja +X-KDE-Keywords[sr@latin]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,K‑osvajač,menadžer fajlova,prelom reči,prelom,podvučeno,prikaz,veličina fajla,bajtovi,font,boja X-KDE-Keywords[sv]=konqueror,filhanterare,radbrytning,understreck,visa,filstorlek,byte,teckensnitt,färg 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[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 diff -Nru kde-baseapps-4.7.97/konqueror/settings/konq/filebehavior.desktop kde-baseapps-4.8.0/konqueror/settings/konq/filebehavior.desktop --- kde-baseapps-4.7.97/konqueror/settings/konq/filebehavior.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konq/filebehavior.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -152,7 +152,7 @@ Comment[ko]=Konqueror의 파일 관리자로서의 행동 설정 Comment[ku]=Ji virê tevgera Konquerorê a wekî rêvebera pelan ava bike Comment[lt]=Čia galite nustatyti, kaip elgiasi Konqueror – failų tvarkyklė -Comment[lv]=Šeit jūs varat konfigurēt Konqueror failu pārlūkošanas režīma izturēšanos +Comment[lv]=Šeit varat konfigurēt Konqueror failu pārlūkošanas režīma izturēšanos Comment[mai]=अहाँ बिन्यस्त कए सकैत छी जे कान्करर एतय फाइल प्रबंधक कए जहिना काज करै Comment[mk]=Конфигурирајте го однесувањето на Konqueror како менаџер на датотеки Comment[ml]=കോണ്‍ക്വറര്‍ ഒരു ഫയലുകളുടെ നടത്തിപ്പുകാരനായി പെരുമാറുന്നതെങ്ങനെയെന്നു് നിങ്ങള്‍ക്കിവിടെ ക്രമീകരിയ്ക്കാം @@ -197,19 +197,30 @@ 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[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[ca@valencia]=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[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[es]=konqueror,gestor de archivos,kfm,consejos,consejos sobre archivos,separar ventanas,lanzar 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,soovitused,eraldi aken,aknad,käitumine,mälukasutus,Kodu,URL,võrguoperatsioonid,edenemine,dialoog,prügikast,kustutamine,kinnitus 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[ga]=konqueror,bainisteoir comhad,kfm,leideanna,leideanna comhaid,fuinneog ar leith,sceith fuinneoga,oibriú,úsáid chuimhne,URL Baile,oibríochtaí líonra,dialóg dul chun cinn,bruscar,scrios,deimhniú,dearbhú 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[ia]=konqueror,gerente de file,kfm,suggestiones,fenestra separate,fenestras generate,comportamento,comportamento,uso de memoria.URL domo,operationes de rete,dialogo de progression. corbe,dele,confirmation +X-KDE-Keywords[it]=konqueror,gestore dei file,kfm,suggerimenti,suggerimenti dei file,finestra separata,apri finestre,comportamento,uso della memoria,indirizzo home,operazioni di rete,finestra di dialogo avanzamento,cestino,annulla,conferma 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[km]=konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ kfm ព័ត៌មាន​ជំនួយ ព័ត៌មាន​ជំនួយ​ពី​ឯកសារ ញែក​បង្អួច បង្កើត​បង្អួច ឥរិយាបថ ឥរិយាបថ ការ​ប្រើប្រាស់​អង្គ​ចងចាំ URL ដើម ប្រតិបត្តិការ​បណ្ដាញ ប្រអប់​វឌ្ឍនភាព ធុង​សំរាម លុប ការ​អះអាង +X-KDE-Keywords[lv]=konqueror,failu pārlūks,kfm,ieteikumi,failu ieteikumi,atsevišķs logs,izveidot logus,izturēšanās,atmiņas izmantojums,Mājas URL,tīkla operācijas,progresa dialoglogs,atkritumu tvertne,dzēst,apstiprināšana 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[pl]=konqueror,menadżer plików,kfm,tips,podpowiedzi plików, osobne okno,wywołane okna,zachowanie,wykorzystanie pamięci, Domowy adres URL,operacje sieciowe,okno dialogowe postępu,kosz,śmietnik,usuń,potwierdzenie 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[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@ijekavian]=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@ijekavianlatin]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,network operations,progress dialog,trash can,delete,confirmation,K‑osvajač,menadžer fajlova,KFM,saveti,oblačići,zasebni prozor,ponašanje,memorija,domaći URL,mrežni postupci,dijalog napretka,smeće,brisanje,potvrda +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,K‑osvajač,menadžer fajlova,KFM,saveti,oblačići,zasebni prozor,ponašanje,memorija,domaći URL,mrežni postupci,dijalog napretka,smeće,brisanje,potvrda 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,文件管理器,提示,文件提示,独立窗口,子窗口,行为,内存使用率,主文件夹,网络操作,进度对话框,回收站,删除,确认 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.97/konqueror/settings/konq/webappearance.desktop kde-baseapps-4.8.0/konqueror/settings/konq/webappearance.desktop --- kde-baseapps-4.7.97/konqueror/settings/konq/webappearance.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konq/webappearance.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -92,7 +92,7 @@ Name[tg]=Намуди зоҳирӣ Name[th]=รูปลักษณ์ Name[tr]=Görünüm -Name[ug]=قىياپەت +Name[ug]=كۆرۈنۈشى Name[uk]=Вигляд Name[uz]=Tashqi koʻrinish Name[uz@cyrillic]=Ташқи кўриниш @@ -153,7 +153,7 @@ Comment[ko]=Konqueror의 파일 관리자로서의 모양 설정 Comment[ku]=Ji virê xuyakirina Konquerorê a wekî rêvebera pelan ava bike Comment[lt]=Čia galite nustatyti, kaip atrodo Konqueror kaip failų tvarkyklė -Comment[lv]=Šeit jūs varat konfigurēt Konqueror failu pārlūkošanas režīma izskatu +Comment[lv]=Šeit varat konfigurēt Konqueror failu pārlūkošanas režīma izskatu Comment[mai]=अहाँ बिन्यस्त कए सकैत छी जे कान्करर एतय फाइल प्रबंधक जहिना काज करै Comment[mk]=Конфигурирајте го изгледот на Konqueror како менаџер на датотеки Comment[ml]=നിങ്ങള്‍ക്കു് കോണ്‍ക്വറര്‍ ഒരു ഫയലുകളുടെ നടത്തിപ്പുകാരനാകുമ്പോള്‍ എങ്ങനെ കാണാം എന്നതിവിടെ ക്രമീകരിയ്ക്കാം @@ -198,20 +198,30 @@ X-KDE-Keywords=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour 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[ca@valencia]=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[es]=konqueror,gestor de archivos,ajuste de palabra,ajuste,subrayado,pantalla,tamaño de archivo,bytes,tipo de letra,color X-KDE-Keywords[et]=konqueror,failihaldur,reamurdmine,allajoonimine,kuvamine,failisuurus,baidid,font,värv X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,rivitys,alleviivaus,näkymä,näyttö,tiedostokoko,tavuja,tavut,kirjasin,fontti,väri 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[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[ia]=konqueror,gerente de file, torno de parolas, torno,sublinea,monstra,grandor de file,bytes,font,color,color +X-KDE-Keywords[it]=konqueror,gestore dei file,a capo automatico,sottolinea,mostra,dimensione dei file,byte,carattere,colore X-KDE-Keywords[kk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour X-KDE-Keywords[km]=konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ ការ​រុំ​ពាក្យ រុំ គូស​បន្ទាត់​ក្រោម ទិដ្ឋភាព ទំហំ​ឯកសារ បៃ ពុម្ពអក្សរ ពណ៌ ពណ៌ +X-KDE-Keywords[lv]=konqueror,failu pārvaldnieks,vārdu aplaušana,aplaušana,pasvītrojums,displejs,failu izmērs,baiti,fonts,krāsa 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[pl]=konqueror,menadżer plików,zawijanie słów,zawijanie,podkreślenie,wyświetlanie,rozmiar pliku, bajty,czcionka,kolor,barwa 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[sr]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,К‑освајач,менаџер фајлова,прелом речи,прелом,подвучено,приказ,величина фајла,бајтови,фонт,боја +X-KDE-Keywords[sr@ijekavian]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,К‑освајач,менаџер фајлова,прелом речи,прелом,подвучено,приказ,величина фајла,бајтови,фонт,боја +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,K‑osvajač,menadžer fajlova,prelom reči,prelom,podvučeno,prikaz,veličina fajla,bajtovi,font,boja +X-KDE-Keywords[sr@latin]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,K‑osvajač,menadžer fajlova,prelom reči,prelom,podvučeno,prikaz,veličina fajla,bajtovi,font,boja X-KDE-Keywords[sv]=konqueror,filhanterare,radbrytning,understreck,visa,filstorlek,byte,teckensnitt,färg 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[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 diff -Nru kde-baseapps-4.7.97/konqueror/settings/konq/webbehavior.desktop kde-baseapps-4.8.0/konqueror/settings/konq/webbehavior.desktop --- kde-baseapps-4.7.97/konqueror/settings/konq/webbehavior.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konq/webbehavior.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -153,7 +153,7 @@ Comment[ko]=Konqueror의 파일 관리자로서의 행동 설정 Comment[ku]=Ji virê tevgera Konquerorê a wekî rêvebera pelan ava bike Comment[lt]=Čia galite nustatyti, kaip elgiasi Konqueror – failų tvarkyklė -Comment[lv]=Šeit jūs varat konfigurēt Konqueror failu pārlūkošanas režīma izturēšanos +Comment[lv]=Šeit varat konfigurēt Konqueror failu pārlūkošanas režīma izturēšanos Comment[mai]=अहाँ बिन्यस्त कए सकैत छी जे कान्करर एतय फाइल प्रबंधक कए जहिना काज करै Comment[mk]=Конфигурирајте го однесувањето на Konqueror како менаџер на датотеки Comment[ml]=കോണ്‍ക്വറര്‍ ഒരു ഫയലുകളുടെ നടത്തിപ്പുകാരനായി പെരുമാറുന്നതെങ്ങനെയെന്നു് നിങ്ങള്‍ക്കിവിടെ ക്രമീകരിയ്ക്കാം @@ -198,19 +198,30 @@ X-KDE-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 de fitxers,finestres separades,finestres engendrades,comportament,ús de memòria,URL inicial +X-KDE-Keywords[ca@valencia]=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[de]=Konqueror,Dateimanager,kfm,Tipps,Fenster,Verhalten,Persönlicher Ordner,Speicherverwendung +X-KDE-Keywords[es]=konqueror,gestor de archivos,kfm,consejos,consejos sobre archivos,separar ventanas,lanzar ventanas,comportamiento,uso de memoria,URL de inicio X-KDE-Keywords[et]=konqueror,failihaldur,kfm,vihjed,soovitused,eraldi aken,aknad,käitumine,mälukasutus,Kodu,URL X-KDE-Keywords[fi]=konqueror,tiedostonhallinta,kfm,vinkit,tiedostovinkit,omat ikkunat,erilliset ikkunat,käyttäytyminen,muistinkäyttö,kotiosoite, 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[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[ia]=konqueror,gerente de file,kfm,suggestiones,fenestra separate,fenestras generate,comportamento,comportamento,uso de memoria,URL Domo +X-KDE-Keywords[it]=konqueror,gestore dei file,kfm,suggerimenti,suggerimenti dei file,finestra separata,apri finestre,comportamento,uso della memoria,indirizzo home, X-KDE-Keywords[kk]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL, X-KDE-Keywords[km]=konqueror កម្មវិធី​គ្រប់គ្រង​ឯកសារ kfm ព័ត៌មាន​ជំនួយ ព័ត៌មាន​ជំនួយ​ឯកសារ ញែក​បង្អួច បង្កើត​បង្អួច ឥរិយាបថ ឥរិយាបថ ការ​ប្រើប្រាស់​អង្គ​ចងចាំ URL ដើម +X-KDE-Keywords[lv]=konqueror,failu pārlūks,kfm,ieteikumi,failu ieteikumi,atsevišķs logs,izveidot logus,izturēšanās,atmiņas izmantojums,Mājas 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[pl]=konqueror,menadżer plików,kfm,podpowiedzi,podpowiedzi plików, osobne okna,wywołane okna,zachowanie,wykorzystanie pamięci,Domowy adres 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[sr]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,К‑освајач,менаџер фајлова,КФМ,савети,облачићи,засебни прозор,понашање,меморија,домаћи УРЛ +X-KDE-Keywords[sr@ijekavian]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,К‑освајач,менаџер фајлова,КФМ,савети,облачићи,засебни прозор,понашање,меморија,домаћи УРЛ +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,K‑osvajač,menadžer fajlova,KFM,saveti,oblačići,zasebni prozor,ponašanje,memorija,domaći URL +X-KDE-Keywords[sr@latin]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,K‑osvajač,menadžer fajlova,KFM,saveti,oblačići,zasebni prozor,ponašanje,memorija,domaći URL 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[zh_CN]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home 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.97/konqueror/settings/konqhtml/css/kcmcss.desktop kde-baseapps-4.8.0/konqueror/settings/konqhtml/css/kcmcss.desktop --- kde-baseapps-4.7.97/konqueror/settings/konqhtml/css/kcmcss.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konqhtml/css/kcmcss.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -59,7 +59,7 @@ Name[ko]=스타일시트 Name[ku]=Curepelg Name[lt]=Stiliaus aprašymai -Name[lv]=Stilutabulas +Name[lv]=Stilu lapas Name[mai]=स्टाइलशीट Name[mk]=Дизајни на страница Name[ml]=സ്റ്റൈല്‍ഷീറ്റുകള്‍ @@ -196,6 +196,7 @@ X-KDE-Keywords=CSS,HTML,style,stylesheet,accessibility X-KDE-Keywords[ca]=CSS,HTML,estil,fulles d'estil,accessibilitat +X-KDE-Keywords[ca@valencia]=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[es]=CSS,HTML,estilo,hoja de estilo,accesibilidad @@ -204,16 +205,24 @@ X-KDE-Keywords[ga]=CSS,HTML,stíl,stílbhileog,inrochtaineacht X-KDE-Keywords[hu]=CSS,HTML,stílus,stíluslap,akadálymentesítés X-KDE-Keywords[ia]=CSS,HTML,stilo,folio de stilo,accessibilitate +X-KDE-Keywords[it]=CSS,HTML,stile,foglio di stile,accessibilità X-KDE-Keywords[kk]=CSS,HTML,style,stylesheet,accessibility X-KDE-Keywords[km]=CSS HTML រចនាប័ទ្ម សន្លឹក​រចនាប័ទ្ម មធ្យោបាយ​ងាយស្រួល +X-KDE-Keywords[lv]=CSS,HTML,stils,stilu lapa,pieejamība X-KDE-Keywords[nb]=CSS,HTML,stil,stilsett,tilgjengelighet X-KDE-Keywords[nds]=CSS,HTML,Stil,Stilvörlaag,Toganghülp X-KDE-Keywords[nl]=CSS,HTML,stijl,stijlblad,toegankelijkheid +X-KDE-Keywords[pl]=CSS,HTML,styl,arkusz stylów,dostępność 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[sr]=CSS,HTML,style,stylesheet,accessibility,ЦСС,ХТМЛ,стил,опис стила,приступачност +X-KDE-Keywords[sr@ijekavian]=CSS,HTML,style,stylesheet,accessibility,ЦСС,ХТМЛ,стил,опис стила,приступачност +X-KDE-Keywords[sr@ijekavianlatin]=CSS,HTML,style,stylesheet,accessibility,CSS,HTML,stil,opis stila,pristupačnost +X-KDE-Keywords[sr@latin]=CSS,HTML,style,stylesheet,accessibility,CSS,HTML,stil,opis stila,pristupačnost X-KDE-Keywords[sv]=CSS,HTML,stil,stilmall,handikappstöd X-KDE-Keywords[uk]=CSS,HTML,style,stylesheet,accessibility,стиль,таблиця,стилів,доступність,можливості X-KDE-Keywords[x-test]=xxCSS,HTML,style,stylesheet,accessibilityxx +X-KDE-Keywords[zh_CN]=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.97/konqueror/settings/konqhtml/khtml_appearance.desktop kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_appearance.desktop --- kde-baseapps-4.7.97/konqueror/settings/konqhtml/khtml_appearance.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_appearance.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -93,7 +93,7 @@ Name[tg]=Намуди зоҳирӣ Name[th]=รูปลักษณ์ Name[tr]=Görünüm -Name[ug]=قىياپەت +Name[ug]=كۆرۈنۈشى Name[uk]=Вигляд Name[uz]=Tashqi koʻrinish Name[uz@cyrillic]=Ташқи кўриниш @@ -177,23 +177,32 @@ Comment[zh_TW]=設定如何顯示網頁 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding 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[ca@valencia]=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[de]=Konqueror,kfm,Browser,HTML,Web,WWW,Schriften,Zeichensatz,Zeichensätze,Kodierung X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,juegos de caracteres,juegos de caracteres,codificación X-KDE-Keywords[et]=konqueror,kfm,brauser,html,veeb,www,fondid,kooditabel,kodeering X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,merkistöt,merkistö,koodaus X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clónna,clófhoirne,tacair charachtair,ionchódú 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[ia]=konqueror,kfm,navigator,html,web,fonts,insimul de chars,insimules de character,codification +X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,codifica,insiemi di caratteri X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding X-KDE-Keywords[km]=konqueror kfm កម្មវិធី​រុករក html បណ្ដាញ www ពុម្ពអក្សរ សំណុំ​តួអក្សរ សំណុំ​តួអក្សរ ការ​អ៊ិនកូដ +X-KDE-Keywords[lv]=konqueror,kfm,pārlūks,html,web,www,fonti,rakstzīmju kopas,kodējums 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[pl]=konqueror,kfm,przeglądarka,html,sieć,www,czcionki,zestawy znaków,kodowanie 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[sr]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,К‑освајач,КФМ,прегледач,ХТМЛ,веб,фонт,кодирање,знак +X-KDE-Keywords[sr@ijekavian]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,К‑освајач,КФМ,прегледач,ХТМЛ,веб,фонт,кодирање,знак +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,K‑osvajač,KFM,pregledač,HTML,veb,font,kodiranje,znak +X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,K‑osvajač,KFM,pregledač,HTML,veb,font,kodiranje,znak 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[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,encoding Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.97/konqueror/settings/konqhtml/khtml_behavior.desktop kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_behavior.desktop --- kde-baseapps-4.7.97/konqueror/settings/konqhtml/khtml_behavior.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_behavior.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -194,23 +194,32 @@ 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[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[ca@valencia]=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[de]=Konqueror,Kfm,Browser,HTML,Web,WWW,Schriften,Farben,Java,JavaScript,Cursor,Links,Verknüpfungen,Bilder,Zeichensatz,Zeichensätze,Encoding X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,colores,colores,java,javascript,cursor,enlaces,imágenes,juegos de caracteres,juegos de caracteres,codificación X-KDE-Keywords[et]=konqueror,kfm,brauser,html,veeb,www,fondid,värvid,java,javascript,lingid,pildid,kooditabel,kodeering 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[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[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[ia]=konqueror,kfm,navigator,html,web,www,fonts,colores,colores,java,javascript,cursor,ligamines,images,insimules de character,insimules de character,codification +X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,colori,java,javascript,cursore,collegamenti,immagini,codifiche,insiemi di caratteri 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[km]=konqueror kfm កម្មវិធី​រុករក html បណ្ដាញ www ពុម្ពអក្សរ ពណ៌ ពណ៌ java javascript ទស្សន៍ទ្រនិច តំណ រូបភាព សំណុំ​តួអក្សរ សំណុំ​តួអក្សរ ការ​អ៊ិនកូដ +X-KDE-Keywords[lv]=konqueror,kfm,pārlūks,html,web,www,fonti,krāsas,java,javascript,kursors,saites,attēli,rakstzīmju kopas,kodējums 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[pl]=konqueror,kfm,przeglądarka,html,sieć,www,czcionki,kolory,barwy,java,javascript,kursor,odnośniki,obrazy,zestawy znaków,kodowanie 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[sr]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,К‑освајач,КФМ,прегледач,ХТМЛ,веб,фонт,боје,јава,јаваскрипт,показивач,курсор,везе,слике,кодирање +X-KDE-Keywords[sr@ijekavian]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,К‑освајач,КФМ,прегледач,ХТМЛ,веб,фонт,боје,јава,јаваскрипт,показивач,курсор,везе,слике,кодирање +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,K‑osvajač,KFM,pregledač,HTML,veb,font,boje,Java,JavaScript,pokazivač,kursor,veze,slike,kodiranje +X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,K‑osvajač,KFM,pregledač,HTML,veb,font,boje,Java,JavaScript,pokazivač,kursor,veze,slike,kodiranje 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[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 Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.97/konqueror/settings/konqhtml/khtml_general.desktop kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_general.desktop --- kde-baseapps-4.7.97/konqueror/settings/konqhtml/khtml_general.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_general.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -162,6 +162,7 @@ Comment[zh_TW]=設定 Konqueror 一般行為 X-KDE-Keywords=konqueror,tabs X-KDE-Keywords[ca]=konqueror,pestanyes +X-KDE-Keywords[ca@valencia]=konqueror,pestanyes X-KDE-Keywords[cs]=konqueror,karty X-KDE-Keywords[da]=konqueror,faneblade X-KDE-Keywords[de]=Konqueror,Unterfenster @@ -171,16 +172,24 @@ X-KDE-Keywords[ga]=Konqueror,cluaisíní X-KDE-Keywords[hu]=konqueror,lapok X-KDE-Keywords[ia]=konqueror,schedas +X-KDE-Keywords[it]=konqueror,schede X-KDE-Keywords[kk]=konqueror,tabs X-KDE-Keywords[km]=konqueror ផ្ទាំង +X-KDE-Keywords[lv]=konqueror,cilnes X-KDE-Keywords[nb]=konqueror,faner X-KDE-Keywords[nl]=konqueror,tabbladen X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰੋਰ,ਟੈਬ +X-KDE-Keywords[pl]=konqueror,karty X-KDE-Keywords[pt]=konqueror,páginas X-KDE-Keywords[pt_BR]=konqueror,abas +X-KDE-Keywords[sr]=konqueror,tabs,К‑освајач,језичци +X-KDE-Keywords[sr@ijekavian]=konqueror,tabs,К‑освајач,језичци +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,tabs,K‑osvajač,jezičci +X-KDE-Keywords[sr@latin]=konqueror,tabs,K‑osvajač,jezičci 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 Categories=Qt;KDE; diff -Nru kde-baseapps-4.7.97/konqueror/settings/konqhtml/khtml_java_js.desktop kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_java_js.desktop --- kde-baseapps-4.7.97/konqueror/settings/konqhtml/khtml_java_js.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/konqhtml/khtml_java_js.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -152,7 +152,7 @@ Comment[ko]=자바와 자바스크립트 행동 설정 Comment[ku]=Tevgerên Java û JavaScriptê ava bike Comment[lt]=Čia galite konfigūruoti Java bei JavaScript elgseną -Comment[lv]=Šeit jūs varat konfigurēt Java un JavaScript izturēšanos +Comment[lv]=Šeit varat konfigurēt Java un JavaScript izturēšanos Comment[mai]=जावा आओर जावा-स्क्रिप्ट बर्तावकेँ बिन्यस्त करू Comment[mk]=Конфигурирајте го однесувањето на Java и JavaScript Comment[ml]=ജാവയുടെയും ജാവാസ്ക്രിപ്റ്റിന്റെയും പെരുമാറ്റം ക്രമീകരിയ്ക്കുക @@ -196,6 +196,7 @@ Comment[zh_TW]=設定 Java 與 JavaScript 的行為 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,java,javascript X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,java,javascript +X-KDE-Keywords[ca@valencia]=konqueror,kfm,navegador,html,web,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[es]=konqueror,kfm,navegador,html,web,www,java,javascript @@ -204,15 +205,23 @@ X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,java,javascript X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,java,javascript X-KDE-Keywords[ia]=konqueror,kfm,navigator,html,web,java,javascript +X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,java,javascript X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,java,javascript X-KDE-Keywords[km]=konqueror kfm កម្មវិធី​រុករក html បណ្ដាញ www java javascript +X-KDE-Keywords[lv]=konqueror,kfm,pārlūks,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[pl]=konqueror,kfm,przeglądarka,html,sieć,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[sr]=konqueror,kfm,browser,html,web,www,java,javascript,К‑освајач,КФМ,прегледач,ХТМЛ,веб,јава,јаваскрипт +X-KDE-Keywords[sr@ijekavian]=konqueror,kfm,browser,html,web,www,java,javascript,К‑освајач,КФМ,прегледач,ХТМЛ,веб,јава,јаваскрипт +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,kfm,browser,html,web,www,java,javascript,K‑osvajač,KFM,pregledač,HTML,veb,Java,JavaScript +X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,java,javascript,K‑osvajač,KFM,pregledač,HTML,veb,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[zh_CN]=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.97/konqueror/settings/performance/kcmkonqyperformance.desktop kde-baseapps-4.8.0/konqueror/settings/performance/kcmkonqyperformance.desktop --- kde-baseapps-4.7.97/konqueror/settings/performance/kcmkonqyperformance.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/performance/kcmkonqyperformance.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -90,7 +90,7 @@ Name[tg]=Амалкарди система Name[th]=ประสิทธิภาพ Name[tr]=Performans -Name[ug]=ئۈنۈم +Name[ug]=ئىقتىدارى Name[uk]=Швидкодія Name[uz]=Unumdorlik Name[uz@cyrillic]=Унумдорлик @@ -149,7 +149,7 @@ Comment[ko]=Konqueror 성능 향상 설정 Comment[ku]=Mîhengên ji bo zêdekirina performansa Konquerorê ava bike Comment[lt]=Konfigūruokite nustatymus, kurie gali įtakoti Konqueror veikimo spartą -Comment[lv]=Šeit jūs varat konfigurēt Konqueror parametrus, kas ietekmē tā veiktspēju +Comment[lv]=Šeit varat konfigurēt Konqueror parametrus, kas ietekmē tā veiktspēju Comment[mai]=सेटिंग बिन्यस्त करू ताकि कान्करर क' कार्य बेहतर हो सके Comment[mk]=Конфигурирајте ги поставувањата што може да ги\nподобрат перформансите на Konqueror Comment[ml]=കോണ്‍ക്വററിന്റെ പ്രകടനം മെച്ചപ്പെടുത്താവുന്ന സജ്ജീകരണങ്ങള്‍ ക്രമീകരിയ്ക്കുക @@ -193,21 +193,31 @@ X-KDE-Keywords=konqueror,reuse,preloading X-KDE-Keywords[ca]=konqueror,tornar a usar,precàrrega +X-KDE-Keywords[ca@valencia]=konqueror,tornar a usar,precàrrega X-KDE-Keywords[da]=konqueror,genbrug,preloading,forudindlæsning +X-KDE-Keywords[de]=konqueror,wiederverwenden,Vorladen X-KDE-Keywords[es]=konqueror,reutilización,precarga X-KDE-Keywords[et]=konqueror,taaskasutus,eellaadimine X-KDE-Keywords[fi]=konqueror,uudelleenkäyttö,esilataus X-KDE-Keywords[ga]=konqueror,athúsáid,réamhluchtú X-KDE-Keywords[hu]=konqueror,újrafelhasználás,gyorsbetöltés X-KDE-Keywords[ia]=konqueror,reusa,precargante +X-KDE-Keywords[it]=konqueror,riuso,precaricatore X-KDE-Keywords[kk]=konqueror,reuse,preloading X-KDE-Keywords[km]=konqueror ប្រើ​ឡើងវិញ ការ​ផ្ទុក​ជាមុន +X-KDE-Keywords[lv]=konqueror,priekšielāde X-KDE-Keywords[nb]=konqueror,gjenbruk,forhåndslasting X-KDE-Keywords[nl]=konqueror,hergebruik,voorladen X-KDE-Keywords[pa]=ਕੋਨਕਿਉਰੋਰ,ਮੁੜ-ਵਰਤੋਂ,ਮੁੜ-ਲੋਡਕਰਨਾ +X-KDE-Keywords[pl]=konqueror,ponowne wykorzystanie,wstępne wczytywanie X-KDE-Keywords[pt]=konqueror,reutilizar,pré-carregamento X-KDE-Keywords[pt_BR]=konqueror,reutilizar,pré-carregamento +X-KDE-Keywords[sr]=konqueror,reuse,preloading,К‑освајач,предучитавање +X-KDE-Keywords[sr@ijekavian]=konqueror,reuse,preloading,К‑освајач,предучитавање +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,reuse,preloading,K‑osvajač,predučitavanje +X-KDE-Keywords[sr@latin]=konqueror,reuse,preloading,K‑osvajač,predučitavanje X-KDE-Keywords[sv]=konqueror,återanvändning,förladdning 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 diff -Nru kde-baseapps-4.7.97/konqueror/settings/performance/kcmperformance.desktop kde-baseapps-4.8.0/konqueror/settings/performance/kcmperformance.desktop --- kde-baseapps-4.7.97/konqueror/settings/performance/kcmperformance.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/settings/performance/kcmperformance.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -192,21 +192,30 @@ X-KDE-Keywords=performance,speed,memory,improve X-KDE-Keywords[ca]=rendiment,velocitat,memòria,millora +X-KDE-Keywords[ca@valencia]=rendiment,velocitat,memòria,millora X-KDE-Keywords[da]=ydelse,hastighed,hukommelse,forbedr -X-KDE-Keywords[de]=leistung,geschwindigkeit,speichern,optimieren +X-KDE-Keywords[de]=Leistung,Geschwindigkeit,Speicher,optimieren,verbessern X-KDE-Keywords[es]=rendimiento,velocidad,memoria,mejorar X-KDE-Keywords[et]=jõudlus,kiirus,mälu,parandamine X-KDE-Keywords[fi]=suorituskyky,nopeus,muisti,paranna,parannus X-KDE-Keywords[ga]=oibriú,luas,cuimhne,feabhsaigh,feabhsú X-KDE-Keywords[hu]=teljesítmény,sebesség,memória,fejlesztés X-KDE-Keywords[ia]=prestation,velocitate,memoria,meliora +X-KDE-Keywords[it]=prestazioni,velocità,memoria,migliora X-KDE-Keywords[kk]=performance,speed,memory,improve X-KDE-Keywords[km]=ការ​អនុវត្ត ល្បឿន អង្គ​ចងចាំ ធ្វើ​ឲ្យ​ប្រសើរ +X-KDE-Keywords[lv]=veiktspēja,ātrums,atmiņa,uzlabot X-KDE-Keywords[nb]=ytelse,fart,minne,forbedre X-KDE-Keywords[nl]=prestatie,snelheid,geheugen,verbeteren +X-KDE-Keywords[pl]=wydajność,szybkość,prędkość,pamięć,ulepszenie X-KDE-Keywords[pt]=performance,velocidade,memória,melhoria X-KDE-Keywords[pt_BR]=desempenho,velocidade,memória,melhoria +X-KDE-Keywords[sr]=performance,speed,memory,improve,перформансе,брзина,меморија,побољшати +X-KDE-Keywords[sr@ijekavian]=performance,speed,memory,improve,перформансе,брзина,меморија,побољшати +X-KDE-Keywords[sr@ijekavianlatin]=performance,speed,memory,improve,performanse,brzina,memorija,poboljšati +X-KDE-Keywords[sr@latin]=performance,speed,memory,improve,performanse,brzina,memorija,poboljšati X-KDE-Keywords[sv]=prestanda,hastighet,minne,förbättra 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 diff -Nru kde-baseapps-4.7.97/konqueror/sidebar/default_entries/history.desktop kde-baseapps-4.8.0/konqueror/sidebar/default_entries/history.desktop --- kde-baseapps-4.7.97/konqueror/sidebar/default_entries/history.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/sidebar/default_entries/history.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -143,7 +143,7 @@ Comment[ko]=이것은 최근에 방문한 URL 기록입니다. 다양한 방법으로 정렬할 수 있습니다. Comment[ku]=Ev dîroka URl'yên ku te di dawiyê de vekirine ye. Dikarî wan bi gelek awayan rêz bikî Comment[lt]=Tai Jūsų neseniai aplankytų URL istorija, Jūs galite surūšiuoti juos įvairiais būdais. -Comment[lv]=Šī ir nesen apmeklēto URL vēsture. jūs varat tos sakārtot daudzos veidos. +Comment[lv]=Šī ir nesen apmeklēto URL vēsture. Varat tos sakārtot daudzos veidos. Comment[mai]=अहाँ जे हालिया भ्रमण कएने छी, ओ यूआरएल क' ई इतिहास अछि. अहाँ एकरा कतेक तरीका सँ क्रमबद्ध कए सकैत छी. Comment[mk]=Ова е историја на URL кои скоро сте ги посетиле. Може да ги подредувате на разни начини. Comment[ml]=ഇതു് നിങ്ങള്‍ അടുത്തിടെ സന്ദര്‍ശിച്ച യുആര്‍എല്ലുകളുടെ പട്ടികയാണു്. നിങ്ങള്‍ക്കവയെ പല തരത്തില്‍ തരം തിരിയ്ക്കാം. diff -Nru kde-baseapps-4.7.97/konqueror/sidebar/default_entries/places.desktop kde-baseapps-4.8.0/konqueror/sidebar/default_entries/places.desktop --- kde-baseapps-4.7.97/konqueror/sidebar/default_entries/places.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/sidebar/default_entries/places.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -71,7 +71,7 @@ Name[tg]=Маконҳо Name[th]=ที่หลัก ๆ Name[tr]=Konumlar -Name[ug]=ئورۇن +Name[ug]=ئورۇنلار Name[uk]=Місця Name[wa]=Plaeces Name[x-test]=xxPlacesxx @@ -86,7 +86,7 @@ Comment[ca@valencia]=Esta és la llista de llocs. Comment[cs]=Toto je seznam míst. Comment[da]=Dette er listen over steder. -Comment[de]=Dies ist die Liste der Orte. +Comment[de]=Dies ist die Liste von Orten. Comment[el]=Αυτή είναι η λίστα των τοποθεσιών. Comment[en_GB]=This is the list of places. Comment[es]=Esta es la lista de lugares. diff -Nru kde-baseapps-4.7.97/konqueror/sidebar/history_module/kcmhistory.desktop kde-baseapps-4.8.0/konqueror/sidebar/history_module/kcmhistory.desktop --- kde-baseapps-4.7.97/konqueror/sidebar/history_module/kcmhistory.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/sidebar/history_module/kcmhistory.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -194,21 +194,31 @@ Comment[zh_TW]=設定歷史紀錄邊列 X-KDE-Keywords=history,expire X-KDE-Keywords[ca]=historial,venciment +X-KDE-Keywords[ca@valencia]=historial,venciment X-KDE-Keywords[da]=historik,udløb +X-KDE-Keywords[de]=History,Verlauf,veralten,ablaufen X-KDE-Keywords[es]=historial,expiración X-KDE-Keywords[et]=ajalugu,aegumine X-KDE-Keywords[fi]=historia,vanhentuminen X-KDE-Keywords[ga]=stair,caite,as feidhm,téigh as feidhm X-KDE-Keywords[hu]=előzmények,lejárat X-KDE-Keywords[ia]=historia,expira +X-KDE-Keywords[it]=cronologia,scadenza X-KDE-Keywords[kk]=history,expire X-KDE-Keywords[km]=ប្រវត្តិ ផុត​កំណត់ +X-KDE-Keywords[lv]=vēsture,termiņš X-KDE-Keywords[nb]=historie,utdatere X-KDE-Keywords[nl]=geschiedenis,verlopen +X-KDE-Keywords[pl]=historia,wygaśnięcie X-KDE-Keywords[pt]=histórico,expiração X-KDE-Keywords[pt_BR]=histórico,expiração +X-KDE-Keywords[sr]=history,expire,историјат,истицање +X-KDE-Keywords[sr@ijekavian]=history,expire,историјат,истицање +X-KDE-Keywords[sr@ijekavianlatin]=history,expire,istorijat,isticanje +X-KDE-Keywords[sr@latin]=history,expire,istorijat,isticanje X-KDE-Keywords[sv]=historik,utgå X-KDE-Keywords[uk]=history,expire,журнал,старий,застарівання,вилучення X-KDE-Keywords[x-test]=xxhistory,expirexx +X-KDE-Keywords[zh_CN]=history,expire,历史,过期 X-KDE-Keywords[zh_TW]=history,expire Categories=Qt;KDE;X-KDE-settings-webbrowsing; diff -Nru kde-baseapps-4.7.97/konqueror/sidebar/konq_sidebartng.desktop kde-baseapps-4.8.0/konqueror/sidebar/konq_sidebartng.desktop --- kde-baseapps-4.7.97/konqueror/sidebar/konq_sidebartng.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/sidebar/konq_sidebartng.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -63,7 +63,7 @@ Name[tg]=Панел Name[th]=แถบข้าง Name[tr]=Yan Çubuk -Name[ug]=يان بالداق +Name[ug]=يان قورال بالداق Name[uk]=Бічна панель Name[wa]=Bår di costé Name[x-test]=xxSidebarxx diff -Nru kde-baseapps-4.7.97/konqueror/sidebar/places_module/konqsidebar_places.desktop kde-baseapps-4.8.0/konqueror/sidebar/places_module/konqsidebar_places.desktop --- kde-baseapps-4.7.97/konqueror/sidebar/places_module/konqsidebar_places.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/sidebar/places_module/konqsidebar_places.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -11,7 +11,7 @@ Name[ca@valencia]=Mòdul de barra lateral de llocs Name[cs]=Modul postranního panelu míst Name[da]=Modul til sidepanelet Steder -Name[de]=Web-Navigationsbereich +Name[de]=Orte-Navigationsbereich Name[el]=Άρθρωμα πλευρικής μπάρας τοποθεσιών Name[en_GB]=Places SideBar Module Name[es]=Módulo de la barra lateral de lugares diff -Nru kde-baseapps-4.7.97/konqueror/sidebar/test/test.desktop kde-baseapps-4.8.0/konqueror/sidebar/test/test.desktop --- kde-baseapps-4.7.97/konqueror/sidebar/test/test.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/sidebar/test/test.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -85,7 +85,7 @@ Name[tg]=Санҷиш Name[th]=ทดสอบ Name[tr]=Test -Name[ug]=سىنا +Name[ug]=سىناق Name[uk]=Тест Name[uz]=Sinov Name[uz@cyrillic]=Синов diff -Nru kde-baseapps-4.7.97/konqueror/src/konqcombo.cpp kde-baseapps-4.8.0/konqueror/src/konqcombo.cpp --- kde-baseapps-4.7.97/konqueror/src/konqcombo.cpp 2011-08-07 15:40:34.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/src/konqcombo.cpp 2012-01-10 14:14:25.000000000 +0000 @@ -292,13 +292,23 @@ { m_cursorPos = cursorPosition(); m_currentText = currentText(); + m_selectedText = lineEdit()->selectedText(); m_currentIndex = currentIndex(); } void KonqCombo::restoreState() { setTemporary( m_currentText ); - lineEdit()->setCursorPosition( m_cursorPos ); + if (m_selectedText.isEmpty()) { + lineEdit()->setCursorPosition( m_cursorPos ); + } else { + const int index = m_currentText.indexOf(m_selectedText); + if (index == -1) { + lineEdit()->setCursorPosition( m_cursorPos ); + } else { + lineEdit()->setSelection(index, m_selectedText.length()); + } + } } void KonqCombo::updatePixmaps() diff -Nru kde-baseapps-4.7.97/konqueror/src/konqcombo.h kde-baseapps-4.8.0/konqueror/src/konqcombo.h --- kde-baseapps-4.7.97/konqueror/src/konqcombo.h 2011-07-27 18:36:39.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/src/konqcombo.h 2012-01-10 14:14:25.000000000 +0000 @@ -104,6 +104,7 @@ int m_cursorPos; int m_currentIndex; QString m_currentText; + QString m_selectedText; QPoint m_dragStart; int m_pageSecurity; diff -Nru kde-baseapps-4.7.97/konqueror/src/konqmainwindow.cpp kde-baseapps-4.8.0/konqueror/src/konqmainwindow.cpp --- kde-baseapps-4.7.97/konqueror/src/konqmainwindow.cpp 2012-01-02 19:51:26.000000000 +0000 +++ kde-baseapps-4.8.0/konqueror/src/konqmainwindow.cpp 2012-01-10 14:14:25.000000000 +0000 @@ -550,7 +550,8 @@ url.setFileName( QString() ); } - m_combo->lineEdit()->setModified(false); + if (m_combo) + m_combo->lineEdit()->setModified(false); KonqView *view = _view; @@ -587,7 +588,7 @@ } } - const QString oldLocationBarURL = m_combo->currentText(); + const QString oldLocationBarURL = (m_combo ? m_combo->currentText() : QString()); if ( view ) { if ( view == m_currentView ) @@ -945,6 +946,9 @@ // (first fixed in r168902 from 2002!, see also unittest KonqHtmlTest::textThenHtml()) if (!req.typedUrl.isEmpty() || !serviceName.isEmpty()) { + if (childView->isLoading()) { // Stop the view first, #282641. + childView->stop(); + } ok = childView->changePart( mimeType, serviceName, forceAutoEmbed ); } else { ok = childView->ensureViewSupports( mimeType, forceAutoEmbed ); @@ -1454,7 +1458,8 @@ void KonqMainWindow::slotOpenLocation() { focusLocationBar(); - m_combo->lineEdit()->selectAll(); + if (m_combo) + m_combo->lineEdit()->selectAll(); } void KonqMainWindow::slotOpenFile() @@ -1473,7 +1478,8 @@ void KonqMainWindow::slotIconsChanged() { kDebug(); - m_combo->updatePixmaps(); + if (m_combo) + m_combo->updatePixmaps(); m_pViewManager->updatePixmaps(); updateWindowIcon(); } @@ -2058,7 +2064,7 @@ // << m_currentView->locationBarURL() << "m_currentView=" << m_currentView; // Make sure the location bar gets updated when the view(tab) is changed. - if (oldView != newView) { + if (oldView != newView && m_combo) { m_combo->lineEdit()->setModified(false); } m_currentView->setLocationBarURL( m_currentView->locationBarURL() ); @@ -2910,8 +2916,9 @@ break; } } - if (KLineEdit* kle = qobject_cast(m_combo->lineEdit())) - kle->setClearButtonShown( enable ); + KLineEdit* lineEdit = (m_combo ? qobject_cast(m_combo->lineEdit()) : 0); + if (lineEdit) + lineEdit->setClearButtonShown(enable); } void KonqMainWindow::initCombo() @@ -3058,7 +3065,7 @@ // Handle match() from m_pURLCompletion void KonqMainWindow::slotMatch( const QString &match ) { - if ( match.isEmpty() ) // this case is handled directly + if ( match.isEmpty() || !m_combo) return; // Check flag to avoid match() raised by rotation @@ -3208,16 +3215,19 @@ void KonqMainWindow::slotCheckComboSelection() { - bool hasSelection = m_combo->lineEdit()->hasSelectedText(); - //kDebug() << "m_combo->lineEdit()->hasMarkedText():" << hasSelection; - m_paCopy->setEnabled( hasSelection ); - m_paCut->setEnabled( hasSelection ); + if (m_combo) { + const bool hasSelection = m_combo->lineEdit()->hasSelectedText(); + //kDebug() << "m_combo->lineEdit()->hasMarkedText():" << hasSelection; + m_paCopy->setEnabled( hasSelection ); + m_paCut->setEnabled( hasSelection ); + } } void KonqMainWindow::slotClearLocationBar() { slotStop(); - m_combo->clearTemporary(); + if (m_combo) + m_combo->clearTemporary(); focusLocationBar(); } @@ -3315,7 +3325,7 @@ { // Don't set the location bar URL if it hasn't changed // or if the user had time to edit the url since the last call to openUrl (#64868) - if (url != m_combo->lineEdit()->text() && !m_combo->lineEdit()->isModified()) { + if (m_combo && url != m_combo->lineEdit()->text() && !m_combo->lineEdit()->isModified()) { //kDebug() << "url=" << url; m_combo->setURL( url ); updateWindowIcon(); @@ -3324,7 +3334,8 @@ void KonqMainWindow::setPageSecurity( PageSecurity pageSecurity ) { - m_combo->setPageSecurity( pageSecurity ); + if (m_combo) + m_combo->setPageSecurity( pageSecurity ); } void KonqMainWindow::showPageSecurity() @@ -3370,12 +3381,12 @@ QString KonqMainWindow::locationBarURL() const { - return m_combo->currentText(); + return (m_combo ? m_combo->currentText() : QString()); } void KonqMainWindow::focusLocationBar() { - if ( m_combo->isVisible() || !isVisible() ) + if (m_combo && (m_combo->isVisible() || !isVisible())) m_combo->setFocus(); } @@ -5089,7 +5100,7 @@ void KonqMainWindow::goURL() { - QLineEdit *lineEdit = m_combo->lineEdit(); + QLineEdit *lineEdit = m_combo ? m_combo->lineEdit() : 0; if ( !lineEdit ) return; diff -Nru kde-baseapps-4.7.97/lib/konq/favicons/favicons.desktop kde-baseapps-4.8.0/lib/konq/favicons/favicons.desktop --- kde-baseapps-4.7.97/lib/konq/favicons/favicons.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/favicons/favicons.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -9,11 +9,11 @@ Name[bn_IN]=Favicons Name[bs]=favikone Name[ca]=Icones de web -Name[ca@valencia]=Favicones +Name[ca@valencia]=Icones de web Name[cs]=Oblíbené ikony Name[csb]=Faviconë (ikònczi) Name[da]=Favicons -Name[de]=Webseiten-Symbole +Name[de]=Webseitensymbole Name[el]=Αγαπημένα εικονίδια Name[en_GB]=Favicons Name[eo]=Favorikonoj diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/Floppy.desktop kde-baseapps-4.8.0/lib/konq/Templates/Floppy.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/Floppy.desktop 2011-07-27 18:36:39.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/Floppy.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -60,7 +60,7 @@ Name[tg]=Формат Name[th]=รูปแบบ Name[tr]=Biçim -Name[ug]=فورماتى +Name[ug]=پىچىمى Name[uk]=Форматувати Name[wa]=Abwesner Name[x-test]=xxFormatxx diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkCAMERA.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkCAMERA.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkCAMERA.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkCAMERA.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -79,7 +79,7 @@ Name[tg]=Дастгоҳи камера... Name[th]=อุปกรณ์กล้อง... Name[tr]=Kamera Aygıtı... -Name[ug]=كامېرا ئۈسكۈنەسى… +Name[ug]=كامېرا ئۈسكۈنىسى… Name[uk]=Пристрій фотоапарата... Name[uz]=Fotoaparat uskunasi... Name[uz@cyrillic]=Фотоапарат ускунаси... diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkCDROM.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkCDROM.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkCDROM.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkCDROM.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -79,7 +79,7 @@ Name[tg]=Дастгоҳи CD-ROM... Name[th]=อุปกรณ์ซีดีรอม... Name[tr]=CD-ROM Aygıtı... -Name[ug]=CD-ROM ئۈسكۈنەسى… +Name[ug]=CD-ROM ئۈسكۈنىسى… Name[uk]=Пристрій CD-ROM... Name[uz]=Kompakt-disk uskunasi... Name[uz@cyrillic]=Компакт-диск ускунаси... @@ -169,7 +169,7 @@ Comment[tg]=Дастгоҳи CD-ROM-и нав Comment[th]=อุปกรณ์ซีดีรอมตัวใหม่ Comment[tr]=Yeni CD-ROM Aygıtı -Comment[ug]=يېڭى CD-ROM ئۈسكۈنەسى +Comment[ug]=يېڭى CD-ROM ئۈسكۈنىسى Comment[uk]=Новий пристрій CD-ROM Comment[uz]=Yangi kompakt-disk uskunasi Comment[uz@cyrillic]=Янги компакт-диск ускунаси diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkCDWRITER.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkCDWRITER.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkCDWRITER.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkCDWRITER.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -79,7 +79,7 @@ Name[tg]=Дастгоҳи CDWRITER... Name[th]=อุปกรณ์เครื่องเขียนแผ่นซีดี... Name[tr]=CD Yazıcı Aygıtı... -Name[ug]=CD ئويغۇچ ئۈسكۈنەسى… +Name[ug]=CD ئويغۇچ ئۈسكۈنىسى… Name[uk]=Пристрій CDWRITER... Name[uz]=Kompakt-disk yozuvchi uskuna... Name[uz@cyrillic]=Компакт-диск ёзувчи ускуна... @@ -168,7 +168,7 @@ Comment[tg]=Настгоҳи CDWRITER-и нав Comment[th]=อุปกรณ์เครื่องเขียนแผ่นซีดีตัวใหม่ Comment[tr]=Yeni CD Yazıcı Aygıtı -Comment[ug]=يېڭى CD ئويغۇچ ئۈسكۈنەسى +Comment[ug]=يېڭى CD ئويغۇچ ئۈسكۈنىسى Comment[uk]=Новий пристрій CDWRITER Comment[uz]=Yangi kompakt-disk yozuvchi uskuna Comment[uz@cyrillic]=Янги компакт-диск ёзувчи ускуна diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkDVDROM.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkDVDROM.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkDVDROM.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkDVDROM.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -80,7 +80,7 @@ Name[tg]=Дастгоҳи DVD-ROM... Name[th]=อุปกรณ์ดีวีดีรอม... Name[tr]=CD/DVD-ROM Aygıtı... -Name[ug]=DVD-ROM ئۈسكۈنەسى… +Name[ug]=DVD-ROM ئۈسكۈنىسى… Name[uk]=Пристрій DVD-ROM... Name[uz]=DVD-ROM uskunasi... Name[uz@cyrillic]=DVD-ROM ускунаси... @@ -169,7 +169,7 @@ Comment[tg]=Дастгоҳи DVD-ROM-и нав Comment[th]=อุปกรณ์ดีวีดีรอมตัวใหม่ Comment[tr]=Yeni DVD-ROM Aygıtı -Comment[ug]=يېڭى DVD-ROM ئۈسكۈنەسى +Comment[ug]=يېڭى DVD-ROM ئۈسكۈنىسى Comment[uk]=Новий пристрій DVD-ROM Comment[uz]=Yangi DVD uskunasi Comment[uz@cyrillic]=Янги DVD ускунаси diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkFloppy.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkFloppy.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkFloppy.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkFloppy.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -79,7 +79,7 @@ Name[tg]=Дастгоҳи дискета (Floppy)... Name[th]=อุปกรณ์อ่านแผ่นฟลอปปี... Name[tr]=Disket Aygıtı... -Name[ug]=يۇمشاق دىسكا قوزغاتقۇچ ئۈسكۈنەسى… +Name[ug]=يۇمشاق دىسكا قوزغاتقۇچ ئۈسكۈنىسى… Name[uk]=Пристрій гнучкого диска... Name[uz]=Disket uskunasi... Name[uz@cyrillic]=Дискет ускунаси... @@ -168,7 +168,7 @@ Comment[tg]=Дастгоҳи дискетаи (Floppy) нав Comment[th]=อุปกรณ์อ่านแผ่นฟลอปปีตัวใหม่ Comment[tr]=Yeni Disket Aygıtı -Comment[ug]=يېڭى يۇمشاق دىسكا قوزغاتقۇچ ئۈسكۈنەسى +Comment[ug]=يېڭى يۇمشاق دىسكا قوزغاتقۇچ ئۈسكۈنىسى Comment[uk]=Новий пристрій гнучкого диска Comment[uz]=Yangi disket uskunasi Comment[uz@cyrillic]=Янги дискет ускунаси diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkHD.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkHD.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkHD.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkHD.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -79,7 +79,7 @@ Name[tg]=Дастгоҳи диски компютерӣ... Name[th]=อุปกรณ์ฮาร์ดดิสก์... Name[tr]=Sabit Disk Aygıtı... -Name[ug]=قاتتىق دىسكا ئۈسكۈنەسى… +Name[ug]=قاتتىق دىسكا ئۈسكۈنىسى… Name[uk]=Пристрій жорсткого диска... Name[uz]=Qattiq disk uskunasi... Name[uz@cyrillic]=Қаттиқ диск ускунаси... diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkMO.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkMO.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkMO.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkMO.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -79,7 +79,7 @@ Name[tg]=Дастгоҳи MO... Name[th]=อุปกรณ์ MO... Name[tr]=MO Aygıtı... -Name[ug]=MO ئۈسكۈنەسى… +Name[ug]=MO ئۈسكۈنىسى… Name[uk]=Пристрій MO... Name[uz]=MO uskunasi Name[uz@cyrillic]=MO ускунаси @@ -165,7 +165,7 @@ Comment[tg]=Дастгоҳи MO-и нав Comment[th]=อุปกรณ์ MO ตัวใหม่ Comment[tr]=Yeni MO Aygıtı -Comment[ug]=يېڭى MO ئۈسكۈنەسى +Comment[ug]=يېڭى MO ئۈسكۈنىسى Comment[uk]=Новий пристрій MO Comment[wa]=Novea éndjin MO Comment[x-test]=xxNew MO Devicexx diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkPath.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkPath.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkPath.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkPath.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -46,7 +46,7 @@ Name[pa]=ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਲਈ ਬੇਸਿਕ ਲਿੰਕ... Name[pl]=Podstawowy odnośnik do pliku lub katalogu... Name[pt]=Ligação básica para um ficheiro ou pasta... -Name[pt_BR]=Link básico para o arquivo ou pasta... +Name[pt_BR]=Link básico para arquivo ou pasta... Name[ro]=Legătură simplă la fișier sau dosar... Name[ru]=Символическую ссылку... Name[si]=ගොනුව හෝ බහාළුමට මූලික ඈඳුතුව @@ -113,7 +113,7 @@ Comment[pa]=ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰੀ ਲਈ ਪਾਥ ਦਿਓ: Comment[pl]=Proszę podać ścieżkę do pliku lub katalogu: Comment[pt]=Indique a localização do ficheiro ou pasta: -Comment[pt_BR]=Digite o caminho para o arquivo ou diretório: +Comment[pt_BR]=Indique o caminho do arquivo ou pasta: Comment[ro]=Introduceți calea fișierului sau dosarului: Comment[ru]=Введите путь к файлу или папке: Comment[si]=ගොනුව හෝ බහාළුමට මාර්ගය ඇතුළත් කරනෙන diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkProgram.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkProgram.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkProgram.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkProgram.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -76,7 +76,7 @@ Name[tg]=Алоқа барои барнома... Name[th]=เชื่อมโยงไปยังโปรแกรม... Name[tr]=Uygulamaya Bağlantı... -Name[ug]=قوللىنىشچان پروگرامما ئۇلىنىشى… +Name[ug]=پروگرامما ئۇلىنىشى… Name[uk]=Посилання на програму... Name[uz]=Dastur bilan yangi bogʻ... Name[uz@cyrillic]=Дастур билан янги боғ... diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkURL.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkURL.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkURL.desktop 2011-12-02 21:17:41.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkURL.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -151,7 +151,7 @@ Comment[pa]=ਟਿਕਾਣੇ (URL) ਲਈ ਲਿੰਕ ਦਿਓ: Comment[pl]=Nowy skrót do adresu internetowego (URL): Comment[pt]=Indique o atalho para a localização (URL): -Comment[pt_BR]=Informe o link para localização (URL): +Comment[pt_BR]=Indique o link para a localização (URL): Comment[ro]=Introduceți legătura către locație (URL): Comment[ru]=Адрес в Интернете: Comment[se]=Čális liŋkka báikái (URL): diff -Nru kde-baseapps-4.7.97/lib/konq/Templates/linkZIP.desktop kde-baseapps-4.8.0/lib/konq/Templates/linkZIP.desktop --- kde-baseapps-4.7.97/lib/konq/Templates/linkZIP.desktop 2011-10-11 14:42:27.000000000 +0000 +++ kde-baseapps-4.8.0/lib/konq/Templates/linkZIP.desktop 2012-01-10 14:14:25.000000000 +0000 @@ -168,7 +168,7 @@ Comment[tg]=Дастгоҳи ZIP-и нав Comment[th]=อุปกรณ์ดิสก์ ZIP ตัวใหม่ Comment[tr]=Yeni ZIP Aygıtı -Comment[ug]=يېڭى ZIP ئۈسكۈنەسى +Comment[ug]=يېڭى ZIP ئۈسكۈنىسى Comment[uk]=Новий пристрій ZIP Comment[uz]=Yangi ZIP uskunasi Comment[uz@cyrillic]=Янги ZIP ускунаси diff -Nru kde-baseapps-4.7.97/nsplugins/khtml_plugins.desktop kde-baseapps-4.8.0/nsplugins/khtml_plugins.desktop --- kde-baseapps-4.7.97/nsplugins/khtml_plugins.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/nsplugins/khtml_plugins.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -29,7 +29,7 @@ Name[csb]=Wtëkôczë Name[cy]=Ategion Name[da]=Plugins -Name[de]=Erweiterungen +Name[de]=Module Name[el]=Πρόσθετα Name[en_GB]=Plugins Name[eo]=Kromprogrametoj @@ -94,7 +94,7 @@ Name[tg]=Плагинҳо Name[th]=โปรแกรมเสริม Name[tr]=Eklentiler -Name[ug]=قىستۇرمالار +Name[ug]=قىستۇرما Name[uk]=Додатки Name[uz]=Plaginlar Name[uz@cyrillic]=Плагинлар @@ -122,7 +122,7 @@ Comment[csb]=Kònfigùracëjô wtëkôczów przezérnika Comment[cy]=Ffurfweddu ategion y porydd Comment[da]=Indstil browserens plugins -Comment[de]=Erweiterungsmodule für den Webbrowser einrichten +Comment[de]=Module für den Webbrowser einrichten Comment[el]=Ρυθμίστε τα πρόσθετα του περιηγητή Comment[en_GB]=Configure the browser plugins Comment[eo]=Agordi la foliumilajn kromprogrametojn @@ -186,7 +186,7 @@ Comment[tg]=Танзимоти плагинҳои браузер Comment[th]=ปรับแต่งโปรแกรมเสริมของเบราว์เซอร์ Comment[tr]=Tarayıcı eklentilerini yapılandır -Comment[ug]=توركۆرگۈ قىستۇرما سەپلىمەسى +Comment[ug]=توركۆرگۈ قىستۇرما سەپلىمىسى Comment[uk]=Налаштування додатків навігатора Comment[uz]=Brauzerning plaginlarini moslash Comment[uz@cyrillic]=Браузернинг плагинларини мослаш @@ -198,6 +198,7 @@ Comment[zh_TW]=設定瀏覽器外掛程式 X-KDE-Keywords=konqueror,kfm,browser,html,web,www,fonts,plugins X-KDE-Keywords[ca]=konqueror,kfm,navegador,html,web,www,tipus de lletres,connectors +X-KDE-Keywords[ca@valencia]=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[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,complementos @@ -206,15 +207,23 @@ X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,idirlíon,www,gréasán,clófhoirne,clónna,breiseáin X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,bővítmények X-KDE-Keywords[ia]=konqueror,kfm,navigator,html,web,www,fonts,plugins +X-KDE-Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,estensioni X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,fonts,plugins X-KDE-Keywords[km]=konqueror kfm កម្មវិធី​រុករក html បណ្ដាញ www ពុម្ពអក្សរ កម្មវិធី​ជំនួយ +X-KDE-Keywords[lv]=konqueror,kfm,pārlūks,html,web,www,fonti,spraudņi 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[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,plug-ins +X-KDE-Keywords[sr]=konqueror,kfm,browser,html,web,www,fonts,plugins,К‑освајач,КФМ,прегледач,ХТМЛ,веб,фонтови,прикључци +X-KDE-Keywords[sr@ijekavian]=konqueror,kfm,browser,html,web,www,fonts,plugins,К‑освајач,КФМ,прегледач,ХТМЛ,веб,фонтови,прикључци +X-KDE-Keywords[sr@ijekavianlatin]=konqueror,kfm,browser,html,web,www,fonts,plugins,K‑osvajač,KFM,pregledač,HTML,veb,fontovi,priključci +X-KDE-Keywords[sr@latin]=konqueror,kfm,browser,html,web,www,fonts,plugins,K‑osvajač,KFM,pregledač,HTML,veb,fontovi,priključci 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[zh_CN]=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.97/plasma/applets/folderview/plasma-applet-folderview.desktop kde-baseapps-4.8.0/plasma/applets/folderview/plasma-applet-folderview.desktop --- kde-baseapps-4.7.97/plasma/applets/folderview/plasma-applet-folderview.desktop 2012-01-03 19:37:20.000000000 +0000 +++ kde-baseapps-4.8.0/plasma/applets/folderview/plasma-applet-folderview.desktop 2012-01-18 18:07:34.000000000 +0000 @@ -84,6 +84,7 @@ Comment=Display the contents of folders Comment[bg]=Показва съдържанието на папки Comment[ca]=Mostra el contingut de les carpetes +Comment[ca@valencia]=Mostra el contingut de les carpetes Comment[cs]=Zobrazit obsah složek Comment[da]=Vis indholdet af mapper Comment[de]=Ordnerinhalte anzeigen @@ -96,13 +97,16 @@ Comment[hu]=Megjeleníti a mappák tartalmát Comment[ia]=Monstra le contentos de dossieres Comment[is]=Sýna innihald mappa +Comment[it]=Mostra il contenuto delle cartelle Comment[kk]=Қапшықтардағыны көрсету Comment[km]=បង្ហាញ​មាតិកា​របស់​ថត Comment[lt]=Rodyti aplankų turinį +Comment[lv]=Rādīt mapju saturu Comment[nb]=Vis mappers innhold Comment[nds]=Den Inholt vun Ornern wiesen Comment[nl]=Toon de inhoud van mappen Comment[pa]=ਫੋਲਡਰਾਂ ਦੀ ਸਮੱਗਰੀ ਵੇਖਾਓ +Comment[pl]=Wyświetl zawartość katalogów Comment[pt]=Mostrar o conteúdo das pastas Comment[pt_BR]=Mostra o conteúdo das pastas Comment[ro]=Afișează conținutul dosarelor