Hello community,
here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2013-05-16 16:47:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old)
and /work/SRC/openSUSE:Factory/.kdebase4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2013-04-18 10:20:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2013-05-16 16:48:49.000000000 +0200
@@ -1,0 +2,8 @@
+Sat May 4 16:51:57 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.3
+ * Bugfix release
+ * See http://www.kde.org/announcements/announce-4.10.3.php
+ * resolves bnc#818500
+
+-------------------------------------------------------------------
Old:
----
kde-baseapps-4.10.2.tar.xz
New:
----
kde-baseapps-4.10.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.OQqn4u/_old 2013-05-16 16:48:50.000000000 +0200
+++ /var/tmp/diff_new_pack.OQqn4u/_new 2013-05-16 16:48:50.000000000 +0200
@@ -17,7 +17,7 @@
Name: kdebase4
-Version: 4.10.2
+Version: 4.10.3
Release: 0
Summary: The Base KDE Apps
License: GPL-2.0+
++++++ folderview_align_to_grid_true.diff ++++++
--- /var/tmp/diff_new_pack.OQqn4u/_old 2013-05-16 16:48:50.000000000 +0200
+++ /var/tmp/diff_new_pack.OQqn4u/_new 2013-05-16 16:48:50.000000000 +0200
@@ -1,6 +1,8 @@
---- kde-baseapps-4.9.98/plasma/applets/folderview/folderview.cpp_old 2013-01-01 16:47:58.000000000 +0100
-+++ kde-baseapps-4.9.98/plasma/applets/folderview/folderview.cpp 2013-01-22 15:59:40.058995404 +0100
-@@ -380,7 +380,7 @@
+diff --git a/plasma/applets/folderview/folderview.cpp b/plasma/applets/folderview/folderview.cpp
+index e53ab49..ad4c37a 100644
+--- a/plasma/applets/folderview/folderview.cpp
++++ b/plasma/applets/folderview/folderview.cpp
+@@ -382,7 +382,7 @@ void FolderView::init()
m_numTextLines = cg.readEntry("numTextLines", 2);
m_textColor = cg.readEntry("textColor", QColor(Qt::transparent));
m_iconsLocked = cg.readEntry("iconsLocked", false);
@@ -8,10 +10,12 @@
+ m_alignToGrid = cg.readEntry("alignToGrid", true);
m_clickToView = cg.readEntry("clickForFolderPreviews", true);
m_previewPlugins = cg.readEntry("previewPlugins", QStringList() << "imagethumbnail" << "jpegthumbnail");
- m_customIconSize = cg.readEntry("customIconSize", 0);
---- kde-baseapps-4.9.98/plasma/applets/folderview/iconview.cpp_old 2013-01-22 16:44:52.773969533 +0100
-+++ kde-baseapps-4.9.98/plasma/applets/folderview/iconview.cpp 2013-01-22 16:45:12.575969345 +0100
-@@ -74,7 +74,7 @@
+ m_sortDirsFirst = cg.readEntry("sortDirsFirst", true);
+diff --git a/plasma/applets/folderview/iconview.cpp b/plasma/applets/folderview/iconview.cpp
+index 4bda174..41bf70c 100644
+--- a/plasma/applets/folderview/iconview.cpp
++++ b/plasma/applets/folderview/iconview.cpp
+@@ -75,7 +75,7 @@ IconView::IconView(QGraphicsWidget *parent)
m_dragInProgress(false),
m_hoverDrag(false),
m_iconsLocked(false),
++++++ kde-baseapps-4.10.2.tar.xz -> kde-baseapps-4.10.3.tar.xz ++++++
Files old/kde-baseapps-4.10.2/doc/dolphin/index.cache.bz2 and new/kde-baseapps-4.10.3/doc/dolphin/index.cache.bz2 differ
Files old/kde-baseapps-4.10.2/doc/kdepasswd/index.cache.bz2 and new/kde-baseapps-4.10.3/doc/kdepasswd/index.cache.bz2 differ
Files old/kde-baseapps-4.10.2/doc/kfind/index.cache.bz2 and new/kde-baseapps-4.10.3/doc/kfind/index.cache.bz2 differ
Files old/kde-baseapps-4.10.2/doc/konqueror/index.cache.bz2 and new/kde-baseapps-4.10.3/doc/konqueror/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kfileitemlistview.cpp new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kfileitemlistview.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kfileitemlistview.cpp 2013-03-01 07:36:05.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kfileitemlistview.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -323,6 +323,7 @@
const int index = firstVisibleIndex();
const int count = lastVisibleIndex() - index + 1;
+ m_modelRolesUpdater->setMaximumVisibleItems(maximumVisibleItems());
m_modelRolesUpdater->setVisibleIndexRange(index, count);
if (m_updateIconSizeTimer->isActive()) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -79,6 +79,7 @@
m_iconSize(),
m_firstVisibleIndex(0),
m_lastVisibleIndex(-1),
+ m_maximumVisibleItems(100),
m_roles(),
m_enabledPlugins(),
m_pendingVisibleItems(),
@@ -178,6 +179,11 @@
}
}
+void KFileItemModelRolesUpdater::setMaximumVisibleItems(int count)
+{
+ m_maximumVisibleItems = count;
+}
+
void KFileItemModelRolesUpdater::setPreviewsShown(bool show)
{
if (show == m_previewShown) {
@@ -670,7 +676,16 @@
const int lastIndex = range.index + range.count - 1;
for (int i = range.index; i <= lastIndex; ++i) {
const KFileItem item = m_model->fileItem(i);
- if (!hasValidIndexRange || (i >= m_firstVisibleIndex && i <= m_lastVisibleIndex)) {
+ bool visible;
+ if (hasValidIndexRange) {
+ visible = (i >= m_firstVisibleIndex && i <= m_lastVisibleIndex);
+ } else {
+ // If the view has not informed us about the visible range yet,
+ // just assume that the first items are visible.
+ visible = (i < m_maximumVisibleItems);
+ }
+
+ if (visible) {
m_pendingVisibleItems.insert(item);
} else {
m_pendingInvisibleItems.insert(item);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h 2013-03-01 07:36:05.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kfileitemmodelrolesupdater.h 2013-05-03 06:36:32.000000000 +0200
@@ -77,6 +77,8 @@
*/
void setVisibleIndexRange(int index, int count);
+ void setMaximumVisibleItems(int count);
+
/**
* If \a show is set to true, the "iconPixmap" role will be filled with a preview
* of the file. If \a show is false the MIME type icon will be used for the "iconPixmap"
@@ -254,6 +256,7 @@
QSize m_iconSize;
int m_firstVisibleIndex;
int m_lastVisibleIndex;
+ int m_maximumVisibleItems;
QSet<QByteArray> m_roles;
QSet<QByteArray> m_resolvableRoles;
QStringList m_enabledPlugins;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kitemlistview.cpp new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kitemlistview.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kitemlistview.cpp 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kitemlistview.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -208,6 +208,11 @@
return m_layouter->maximumItemOffset();
}
+int KItemListView::maximumVisibleItems() const
+{
+ return m_layouter->maximumVisibleItems();
+}
+
void KItemListView::setVisibleRoles(const QList<QByteArray>& roles)
{
const QList<QByteArray> previousRoles = m_visibleRoles;
@@ -1142,7 +1147,10 @@
// Important: Don't read any m_layouter-property inside the for-loop in case if
// multiple ranges are given! m_layouter accesses m_sizeHintResolver which is
// updated in each loop-cycle and has only a consistent state after the loop.
- Q_ASSERT(m_layouter->isDirty());
+ // TODO: This assert can be hit when filtering in Icons and Compact view,
+ // see https://bugs.kde.org/show_bug.cgi?id=317827 comments 2 and 3.
+ // We should try to figure out if the assert is wrong or if there is a bug in the code.
+ //Q_ASSERT(m_layouter->isDirty());
#endif
m_endTransactionAnimationHint = NoAnimation;
endTransaction();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kitemlistview.h new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kitemlistview.h
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kitemlistview.h 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kitemlistview.h 2013-05-03 06:36:32.000000000 +0200
@@ -92,6 +92,8 @@
qreal maximumItemOffset() const;
+ int maximumVisibleItems() const;
+
void setVisibleRoles(const QList<QByteArray>& roles);
QList<QByteArray> visibleRoles() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kitemlistviewaccessible.cpp new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kitemlistviewaccessible.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kitemlistviewaccessible.cpp 2013-03-01 07:36:05.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kitemlistviewaccessible.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -242,9 +242,15 @@
if (!view()->isVisible()) {
return QRect();
}
- const QPoint origin = view()->scene()->views()[0]->mapToGlobal(QPoint(0, 0));
- const QRect viewRect = view()->geometry().toRect();
- return viewRect.translated(origin);
+
+ const QGraphicsScene* scene = view()->scene();
+ if (scene) {
+ const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0));
+ const QRect viewRect = view()->geometry().toRect();
+ return viewRect.translated(origin);
+ } else {
+ return QRect();
+ }
}
int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kstandarditemlistwidget.cpp new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/kstandarditemlistwidget.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -258,21 +258,21 @@
* https://git.reviewboard.kde.org/r/109614/
*/
// Paint pixmap1 so that pixmap1 = m_pixmap * (1.0 - hoverOpacity())
- QPixmap pixmap1(option->rect.size());
+ QPixmap pixmap1(m_pixmap.size());
pixmap1.fill(Qt::transparent);
{
QPainter p(&pixmap1);
p.setOpacity(1.0 - hoverOpacity());
- drawPixmap(&p, m_pixmap);
+ p.drawPixmap(0, 0, m_pixmap);
}
// Paint pixmap2 so that pixmap2 = m_hoverPixmap * hoverOpacity()
- QPixmap pixmap2(option->rect.size());
+ QPixmap pixmap2(pixmap1.size());
pixmap2.fill(Qt::transparent);
{
QPainter p(&pixmap2);
p.setOpacity(hoverOpacity());
- drawPixmap(&p, m_hoverPixmap);
+ p.drawPixmap(0, 0, m_hoverPixmap);
}
// Paint pixmap2 on pixmap1 using CompositionMode_Plus
@@ -285,7 +285,7 @@
}
// Finally paint pixmap1 on the widget
- painter->drawPixmap(0, 0, pixmap1);
+ drawPixmap(painter, pixmap1);
} else {
drawPixmap(painter, m_hoverPixmap);
}
@@ -294,7 +294,7 @@
}
painter->setFont(m_customizedFont);
- painter->setPen(m_isHidden ? m_additionalInfoTextColor : textColor());
+ painter->setPen(textColor());
const TextInfo* textInfo = m_textInfo.value("text");
if (!textInfo) {
@@ -523,8 +523,12 @@
QColor KStandardItemListWidget::textColor() const
{
- if (m_customTextColor.isValid() && !isSelected()) {
- return m_customTextColor;
+ if (!isSelected()) {
+ if (m_isHidden) {
+ return m_additionalInfoTextColor;
+ } else if (m_customTextColor.isValid()) {
+ return m_customTextColor;
+ }
}
const QPalette::ColorGroup group = isActiveWindow() ? QPalette::Active : QPalette::Inactive;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp new/kde-baseapps-4.10.3/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp 2013-03-01 07:36:05.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -32,6 +32,7 @@
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setAcceptRichText(false);
+ enableFindReplace(false);
document()->setDocumentMargin(0);
if (parent) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/panels/terminal/terminalpanel.cpp new/kde-baseapps-4.10.3/dolphin/src/panels/terminal/terminalpanel.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/panels/terminal/terminalpanel.cpp 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/panels/terminal/terminalpanel.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -31,6 +31,7 @@
#include
#include <QBoxLayout>
+#include <QDir>
#include <QShowEvent>
TerminalPanel::TerminalPanel(QWidget* parent) :
@@ -183,8 +184,12 @@
{
m_konsolePartCurrentDirectory = dir;
+ // Only change the view URL if 'dir' is different from the current view URL.
+ // Note that the current view URL could also be a symbolic link to 'dir'
+ // -> use QDir::canonicalPath() to check that.
+ const KUrl oldUrl(url());
const KUrl newUrl(dir);
- if (newUrl != url()) {
+ if (newUrl != oldUrl && dir != QDir(oldUrl.path()).canonicalPath()) {
emit changeUrl(newUrl);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/settings/kcm/kcmdolphingeneral.desktop new/kde-baseapps-4.10.3/dolphin/src/settings/kcm/kcmdolphingeneral.desktop
--- old/kde-baseapps-4.10.2/dolphin/src/settings/kcm/kcmdolphingeneral.desktop 2013-03-01 07:36:05.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/settings/kcm/kcmdolphingeneral.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -88,7 +88,7 @@
Comment[et]=See teenus võimaldab seadistada Dolphini üldisi seadistusi.
Comment[eu]=Zerbitzu honen bitartez Dolphin-en ezarpen orokorrak konfiguratu daitezke.
Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia.
-Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin
+Comment[fr]=Ce service permet de configurer les paramètres généraux de Dolphin.
Comment[fy]=Mei dizze tsjinst kinne jo de algemiene dolfyn opsjes ynstelle.
Comment[ga]=Leis an tseirbhís seo is féidir na socruithe ginearálta Dolphin a chumrú.
Comment[gl]=Este servizo permite modificar a configuración xeral de Dolphin.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop new/kde-baseapps-4.10.3/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop
--- old/kde-baseapps-4.10.2/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop 2013-03-01 07:36:05.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/settings/kcm/kcmdolphinnavigation.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -18,7 +18,7 @@
Name[eu]=Dolphin nabigazioa
Name[fa]=ناوبری دلفین
Name[fi]=Dolphin – selaus
-Name[fr]=Navigation dans Dolphin
+Name[fr]=Navigation avec Dolphin
Name[fy]=Dolfyn navigaasje
Name[ga]=Nascleanúint Dolphin
Name[gl]=Configuración da navegación de Dolphin
@@ -89,7 +89,7 @@
Comment[et]=See teenus võimaldab seadistada Dolphini liikumist.
Comment[eu]=Zerbitzu honen bitartez Dolphin-en nabigazioa konfiguratu daiteke.
Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia.
-Comment[fr]=Ce service permet de configurer la navigation dans Dolphin.
+Comment[fr]=Ce service permet de configurer la navigation avec Dolphin.
Comment[fy]=Mei dizze tsjinst kinne jo de dolfyn navigaasje ynstelle.
Comment[ga]=Leis an tseirbhís seo is féidir nascleanúint Dolphin a chumrú.
Comment[gl]=Este servizo permite modificar a configuración da navegación de Dolphin.
@@ -243,7 +243,7 @@
Comment[et]=Failihalduri liikumise seadistamine
Comment[eu]=Konfiguratu fitxategi-kudeatzailearen nabigazioa
Comment[fi]=Tiedostonhallinnan selausasetukset
-Comment[fr]=Configuration de la navigation dans le gestionnaire de fichiers
+Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers
Comment[fy]=Triembehearnavigaasje ynstelle
Comment[ga]=Cumraigh nascleanúint bhainisteoir na gcomhad
Comment[gl]=Configura as navegación co xestor de ficheiros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop new/kde-baseapps-4.10.3/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop
--- old/kde-baseapps-4.10.2/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop 2013-03-01 07:36:05.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/settings/kcm/kcmdolphinviewmodes.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -240,7 +240,7 @@
Comment[et]=Failihalduri vaaterežiimide seadistamine
Comment[eu]=Konfiguratu fitxategi-kudeatzailearen ikuspegi moduak
Comment[fi]=Tiedostonhallinnan katselutilojen asetukset
-Comment[fr]=Configuration des modes d'affichage du gestionnaire de fichiers
+Comment[fr]=Configuration les modes d'affichage du gestionnaire de fichiers
Comment[fy]=Triembehear werjeftemodus ynstelle
Comment[ga]=Cumraigh amhairc bhainisteoir na gcomhad
Comment[gl]=Configura os modos de visualización do xestor de ficheiros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/dolphin/src/views/renamedialog.cpp new/kde-baseapps-4.10.3/dolphin/src/views/renamedialog.cpp
--- old/kde-baseapps-4.10.2/dolphin/src/views/renamedialog.cpp 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/dolphin/src/views/renamedialog.cpp 2013-05-03 06:36:32.000000000 +0200
@@ -147,16 +147,10 @@
bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String("."));
if (enable && !m_renameOneItem) {
// Assure that the new name contains exactly one # (or a connected sequence of #'s)
- const int minSplitCount = 1;
- int maxSplitCount = 2;
- if (newName.startsWith(QLatin1Char('#'))) {
- --maxSplitCount;
- }
- if (newName.endsWith(QLatin1Char('#'))) {
- --maxSplitCount;
- }
- const int splitCount = newName.split(QLatin1Char('#'), QString::SkipEmptyParts).count();
- enable = enable && (splitCount >= minSplitCount) && (splitCount <= maxSplitCount);
+ const int count = newName.count(QLatin1Char('#'));
+ const int first = newName.indexOf(QLatin1Char('#'));
+ const int last = newName.lastIndexOf(QLatin1Char('#'));
+ enable = (last - first + 1 == count);
}
enableButtonOk(enable);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/kdepasswd/kcm/kcm_useraccount.desktop new/kde-baseapps-4.10.3/kdepasswd/kcm/kcm_useraccount.desktop
--- old/kde-baseapps-4.10.2/kdepasswd/kcm/kcm_useraccount.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/kdepasswd/kcm/kcm_useraccount.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -112,7 +112,7 @@
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[fr]=mot de passe ; courriel ; nom ; organisation ; nom réel ; image de connexion ; visage ; mode rappel ;
+X-KDE-Keywords[fr]=mot de passe ; courrier électronique ; nom ; organisation ; nom réel ; image de connexion ; visage ; mode rappel ;
X-KDE-Keywords[ga]=focal faire;ríomhphost;ainm;eagras;fíorainm;íomhá logála isteach;aghaidh;mód macalla;
X-KDE-Keywords[gl]=contrasinal;correo electrónico;email;organización;nome real;cara;
X-KDE-Keywords[hu]=jelszó;e-mail;név;szervezet;valódi név;bejelentkezési kép;arckép;visszajelzési mód;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/akregator/akregator_konqplugin.desktop new/kde-baseapps-4.10.3/konq-plugins/akregator/akregator_konqplugin.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/akregator/akregator_konqplugin.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/akregator/akregator_konqplugin.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -17,7 +17,7 @@
Name[et]=Lisa uudistevoog Akregatorile
Name[eu]=Gehitu jarioa Akregatorri
Name[fi]=Lisää syöte Akregatoriin
-Name[fr]=Ajouter le flux à Akregator
+Name[fr]=Ajouter un flux à Akregator
Name[ga]=Cuir Fotha le hAkregator
Name[gl]=Engadir a fonte a Akregator
Name[he]=הוסף הזנה ל־Akregator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/dirfilter/dirfilterplugin.desktop new/kde-baseapps-4.10.3/konq-plugins/dirfilter/dirfilterplugin.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/dirfilter/dirfilterplugin.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/dirfilter/dirfilterplugin.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -84,7 +84,7 @@
Comment[et]=Kataloogivaate filtreerimine omaduste filtri abil
Comment[eu]=Iragazi direktorioen ikuspegia atributuaren iragazki bat erabiliz
Comment[fi]=Suodata kansionäkymää käyttäen attribuuttisuodatinta
-Comment[fr]=Filtre l'affichage des dossiers en utilisant un filtre d'attribut
+Comment[fr]=Filtre d'affichage des dossiers en utilisant un filtre d'attribut
Comment[ga]=Scag an t-amharc comhadlainne le scagaire tréithe
Comment[gl]=Filtra a vista dos cartafoles usando un filtro de atributos
Comment[he]=סנן תצוגת תיקייה באמצעות מסנן תכונה
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop new/kde-baseapps-4.10.3/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -25,7 +25,7 @@
Name[et]=DOM-puu näitaja
Name[eu]=DOM zuhaitz-ikustailea
Name[fi]=DOM-puunäkymä
-Name[fr]=Afficheur d'arbre DOM
+Name[fr]=Afficheur d'arborescence « DOM »
Name[ga]=Amharcán Crainn DOM
Name[gl]=Visor da árbore DOM
Name[he]=מציג עץ DOM
@@ -85,7 +85,7 @@
Comment[et]=Näitab aktiivse lehekülje DOM-puud
Comment[eu]=Ikusi uneko orriaren DOM zuhaitza
Comment[fi]=Katso sivun DOM-puuta
-Comment[fr]=Affiche l'arbre DOM de la page actuelle
+Comment[fr]=Affiche l'arborescence « DOM » de la page actuelle
Comment[ga]=Féach ar chrann DOM an leathanaigh reatha
Comment[gl]=Mostra a árbore DOM da páxina actual
Comment[he]=הצג את עץ ה־DOM של הדף הנוכחי
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/fsview/fsview.desktop new/kde-baseapps-4.10.3/konq-plugins/fsview/fsview.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/fsview/fsview.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/fsview/fsview.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -22,7 +22,7 @@
Name[et]=Failisuuruse näitaja
Name[eu]=Fitxategi-tamainaren ikustailea
Name[fi]=Tiedostokokonäkymä
-Name[fr]=Afficheur de taille de fichiers
+Name[fr]=Afficheur de la taille de fichiers
Name[ga]=Amharcán Méid Chomhaid
Name[gl]=Visor do tamaño dos ficheiros
Name[he]=מציג גדלי קבצים
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop new/kde-baseapps-4.10.3/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -85,7 +85,7 @@
Comment[et]=Võimalus kiiresti muuta KHTML-i seadistusi
Comment[eu]=KHTML ezarpenak era azkarrean aldatzeko modua
Comment[fi]=Nopea tapa vaihtaa KHTML-asetuksia
-Comment[fr]=Un moyen rapide de modifier les paramètres de KHTML
+Comment[fr]=Un moyen rapide pour modifier les paramètres de KHTML
Comment[ga]=Modh tapa chun socruithe KHTML a athrú
Comment[gl]=Unha forma rápida de alterar a configuración de KHTML
Comment[he]=דרך מהירה לשנות את הגדרות ה־KHTML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop new/kde-baseapps-4.10.3/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -83,7 +83,7 @@
Comment[et]=Võimalus kiiresti luua HTML-pildigalerii
Comment[eu]=Modu erraz bat HTMLko irudien galeria sortzeko
Comment[fi]=Helppo tapa tuottaa HTML-kuvagalleria
-Comment[fr]=Un moyen simple de générer une galerie d'images HTML
+Comment[fr]=Un moyen simple pour générer une galerie d'images HTML
Comment[ga]=Modh éasca chun gailearaí íomhá HTML a chruthú
Comment[gl]=Unha forma fácil de xerar unha galería HTML de imaxes
Comment[he]=דרך קלה לחולל גלריית תמונות HTML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/microformat/mf_konqmficon.desktop new/kde-baseapps-4.10.3/konq-plugins/microformat/mf_konqmficon.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/microformat/mf_konqmficon.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/microformat/mf_konqmficon.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -29,7 +29,7 @@
Name[km]=រូបតំណាង Microformat
Name[ko]=마이크로포맷 아이콘
Name[ku]=Ikona Mîkroformat
-Name[lt]=Mikroformato ženkliukas
+Name[lt]=Mikroformato piktograma
Name[lv]=Mikroformāta ikona
Name[mr]=Microformat चिन्ह
Name[nb]=Mikroformat-ikon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/minitools/minitoolsplugin.desktop new/kde-baseapps-4.10.3/konq-plugins/minitools/minitoolsplugin.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/minitools/minitoolsplugin.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/minitools/minitoolsplugin.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -26,7 +26,7 @@
Name[et]=Järjehoidja-apletid
Name[eu]=JS-Laster-markak
Name[fi]=Kirjanmerkitsijät
-Name[fr]=Signets scriptés
+Name[fr]=Signets avec scripts
Name[ga]=Leabharmhaircíní
Name[gl]=Marcadores
Name[he]=סימניות
@@ -40,6 +40,7 @@
Name[km]=Bookmarklet
Name[ko]=북마클릿
Name[ku]=Cih-Nîşanker
+Name[lt]=Išmanios žymelės
Name[lv]=Grāmatzīmju sīkrīki
Name[mr]=ओळखचिन्ह
Name[nb]=Småbokmerker
@@ -83,7 +84,7 @@
Comment[et]=Lülitab sisse järjehoidja-aplettide kasutamise
Comment[eu]=JS-laster-marken erabiltzea gaitzen du
Comment[fi]=Ottaa käyttöön kirjanmerkitsijät
-Comment[fr]=Active l'utilisation de signets avec des scripts
+Comment[fr]=Active l'utilisation de signets avec scripts
Comment[ga]=Cumasaigh leabharmhaircíní
Comment[gl]=Activa o uso de marcadores
Comment[he]=אפשר שימוש בסימניות
@@ -97,6 +98,7 @@
Comment[km]=អនុញ្ញាតការប្រើ bookmarklet
Comment[ko]=북마클릿 활성화시키기
Comment[ku]=Bikaranîna cih-nîşankeran çalak dike
+Comment[lt]=Įjungia išmanių žymelių naudojimą
Comment[lv]=Lauj jums izmantot grāmatzīmju sīkrīkus
Comment[mr]=ओळखचिन्हाचा वापर कार्यान्वित करतो
Comment[nb]=Slår på bruk av småbokmerker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/shellcmdplugin/kshellcmdplugin.desktop new/kde-baseapps-4.10.3/konq-plugins/shellcmdplugin/kshellcmdplugin.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/shellcmdplugin/kshellcmdplugin.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/shellcmdplugin/kshellcmdplugin.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -36,7 +36,7 @@
Name[eu]=Shell-eko komandoentzako plugina
Name[fa]=وصله فرمان پوسته
Name[fi]=Komentoriviliitännäinen
-Name[fr]=Module de ligne de commandes
+Name[fr]=Module externe de ligne de commandes
Name[fy]=Flueslkommando-plugin
Name[ga]=Breiseán Ordaithe Blaoisce
Name[gl]=Complemento de Shell de ordes
@@ -123,7 +123,7 @@
Comment[eu]=Shell-eko komandoentzako plugina Konqueror-entzako
Comment[fa]=وصله فرمان پوسته برای Konqueror
Comment[fi]=Konquerorin komentoriviliitännäinen
-Comment[fr]=Module de lignes de commande pour Konqueror
+Comment[fr]=Module externe de lignes de commande pour Konqueror
Comment[fy]=In flueskommando-plugin foar Konqueror
Comment[ga]=Breiseán Ordaithe Blaoisce le haghaidh Konqueror
Comment[gl]=Complemento de Shell de ordes para Konqueror
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/uachanger/uachangerplugin.desktop new/kde-baseapps-4.10.3/konq-plugins/uachanger/uachangerplugin.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/uachanger/uachangerplugin.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/uachanger/uachangerplugin.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -25,7 +25,6 @@
Name[et]=Identifikaatori muutja
Name[eu]=Erabiltzaile-agente aldatzailea
Name[fi]=Käyttäjäagentin vaihtaja
-Name[fr]=Modificateur d'agent utilisateur
Name[ga]=Clár Athraithe UserAgent
Name[gl]=Cambio da identificación do navegador
Name[he]=משנה מחרוזות זיהוי דפדפן
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/validators/plugin_validators.desktop new/kde-baseapps-4.10.3/konq-plugins/validators/plugin_validators.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/validators/plugin_validators.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/validators/plugin_validators.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -25,7 +25,7 @@
Name[et]=Veebilehekülje kontrollijad
Name[eu]=Webgune balidatzaileak
Name[fi]=Verkkosivuvalidaattorit
-Name[fr]=Valideurs de sites web
+Name[fr]=Validateurs de sites web
Name[ga]=Bailíochtóirí Suímh Ghréasáin
Name[gl]=Validación de páxinas web
Name[he]=מוודאי תקינות אתר אינטרנט
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/webarchiver/plugin_webarchiver.desktop new/kde-baseapps-4.10.3/konq-plugins/webarchiver/plugin_webarchiver.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/webarchiver/plugin_webarchiver.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/webarchiver/plugin_webarchiver.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -25,7 +25,7 @@
Name[et]=Veebiarhiveerija
Name[eu]=Web artxibatzailea
Name[fi]=Web-arkistoija
-Name[fr]=Archiveur web
+Name[fr]=Archiveur Web
Name[ga]=Cartlannaí Gréasáin
Name[gl]=Arquivador web
Name[hne]=वेब आर्काइवर
@@ -85,7 +85,7 @@
Comment[et]=Võimaldab luua veebilehekülgede arhiive
Comment[eu]=Webguneen artxiboak sortzen ditu
Comment[fi]=Luo arkistoja verkkosivuista
-Comment[fr]=Crée des archives de sites web
+Comment[fr]=Crée des archives de sites Web
Comment[ga]=Cruthaigh cartlann de shuímh Ghréasáin
Comment[gl]=Crea arquivos de páxinas web
Comment[he]=יוצר ארכיבים של אתרי אינטרנט
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konq-plugins/webarchiver/webarchivethumbnail.desktop new/kde-baseapps-4.10.3/konq-plugins/webarchiver/webarchivethumbnail.desktop
--- old/kde-baseapps-4.10.2/konq-plugins/webarchiver/webarchivethumbnail.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konq-plugins/webarchiver/webarchivethumbnail.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -16,7 +16,7 @@
Name[et]=Veebiarhiivid
Name[eu]=Web-artxiboak
Name[fi]=Verkkosivuarkistot
-Name[fr]=Archives web
+Name[fr]=Archives Web
Name[ga]=Cartlanna Gréasáin
Name[gl]=Arquivos web
Name[he]=ארכיון אתרי אינטרנט
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/about/konq_aboutpage.desktop new/kde-baseapps-4.10.3/konqueror/about/konq_aboutpage.desktop
--- old/kde-baseapps-4.10.2/konqueror/about/konq_aboutpage.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/about/konq_aboutpage.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -27,7 +27,7 @@
Name[eu]=Konqueror-en 'Honi buruz' orrialdea
Name[fa]=صفحه درباره برای Konqueror
Name[fi]=Konquerorin tietoja-sivu
-Name[fr]=Page À propos de Konqueror
+Name[fr]=Page « À propos » de Konqueror
Name[fy]=Ynformaasjeside foar Konqueror
Name[ga]=Leathanach Eolais le haghaidh Konqueror
Name[gl]=Páxina acerca de Konqueror
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/ebrowsing/ebrowsing.desktop new/kde-baseapps-4.10.3/konqueror/settings/ebrowsing/ebrowsing.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/ebrowsing/ebrowsing.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/ebrowsing/ebrowsing.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -205,7 +205,7 @@
X-KDE-Keywords[es]=Navegación mejorada,Navegación,WWW,Internet,Filtros de Internet,Red,Motores de búsqueda,Accesos rápidos
X-KDE-Keywords[et]=Täiustatud sirvimine,Sirvimine,WWW,Internet,Internetifiltrid,Võrk,Otsimootorid,Kiirkorraldused
X-KDE-Keywords[fi]=selaimen lisäasetukset,edistynyt selailu,selailu,selaus,WWW,Internet,Internet-suodattimet,verkko,hakukoneet,pikavalinnat
-X-KDE-Keywords[fr]=Navigation avancée,Navigation,WWW,Internet,Filtres Internet,Réseau,Moteur de recherche,Raccourcis
+X-KDE-Keywords[fr]=Navigation avancée, navigation, WWW, Internet, filtres Internet, réseau, moteur de recherche, raccourcis
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[gl]=Navegación mellorada,navegar,www.internet,filtros de internet,rede, motores de busca,atallos
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
@@ -214,6 +214,7 @@
X-KDE-Keywords[kk]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts
X-KDE-Keywords[km]=ការរកមើលដែលបានធ្វើឲ្យប្រសើរ ការរកមើល WWW អ៊ីនធឺណិត តម្រងអ៊ីនធឺណិត បណ្ដាញ ម៉ាស៊ីនស្វែងរក ផ្លូវកាត់
X-KDE-Keywords[ko]=Enhanced Browsing,Browsing,WWW,Internet,Internet Filters,Network,Search Engines,Shortcuts,웹 브라우징,브라우징,네트워크,검색,검색 엔진,바로 가기
+X-KDE-Keywords[lt]=Išplėstinis naršymas,Naršymas,WWW,Internetas,Interneto filtrai,Tinklas,Paieškos varikliai,trumpiniai
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[nds]=Verwiedert Nettkieken,Nettkieken,WWW,Internet,Internet-Filtern,Nettwark,Söökmaschinen,Afkörten,Tastkombinatschonen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/cache.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/cache.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/cache.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/cache.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -23,7 +23,7 @@
Name[bs]=Keš
Name[ca]=Cau
Name[ca@valencia]=Cau
-Name[cs]=Cache
+Name[cs]=Mezipaměť
Name[csb]=Cache
Name[cy]=Cache
Name[da]=Cache
@@ -117,7 +117,7 @@
Comment[bs]=Podešavanje veb keša
Comment[ca]=Configura les opcions per al cau web
Comment[ca@valencia]=Configura les opcions per al cau web
-Comment[cs]=Nastavení cache pro webové stránky
+Comment[cs]=Nastavení mezipaměti pro webové stránky
Comment[csb]=Kònfigùracëjô nastôwù cache
Comment[cy]=Ffurfweddu gosodiadau'r storfa w?
Comment[da]=Indstil web-cache
@@ -206,7 +206,7 @@
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[fr]=Cache,Historique,Historique de navigation,Ports,Taille
+X-KDE-Keywords[fr]=Cache, historique, historique de navigation, ports, taille
X-KDE-Keywords[ga]=Taisce,Stair,Stair Brabhsála,Poirt,Méid
X-KDE-Keywords[gl]=Caché,historial,historial de navegación,portos,tamaño
X-KDE-Keywords[hu]=Gyorsítótár,Előzmények,Böngészési előzmények,Portok,Méret
@@ -215,6 +215,7 @@
X-KDE-Keywords[kk]=Cache,History,Browsing History,Ports,Size
X-KDE-Keywords[km]=ឃ្លាំងសម្ងាត់ ប្រវត្តិ ប្រវត្តិការរកមើល ច្រក ទំហំ
X-KDE-Keywords[ko]=Cache,History,Browsing History,Ports,Size,캐시,과거 기록,히스토리,포트,크기
+X-KDE-Keywords[lt]=Podėlis,Naršymo praeitis,Prievadai,Dydis
X-KDE-Keywords[lv]=Kešatmiņa,vēsture,pārlūkošanas vēsture,porti,izmērs
X-KDE-Keywords[mr]=कॅशे,इतिहास,इतिहास संचारण,पोर्टस्,आकार
X-KDE-Keywords[nb]=Mellomlager,Historie,Nettleserhistorie,Porter,Størrelse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/cookies.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/cookies.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/cookies.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/cookies.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -127,7 +127,7 @@
Comment[eu]=Konfiguratu cookien portaera
Comment[fa]=پیکربندی روش کار کردن کوکیها
Comment[fi]=Evästeiden asetukset
-Comment[fr]=Configuration de la manière dont les cookies fonctionnent
+Comment[fr]=Configuration du fonctionnement des cookies
Comment[fy]=Hjir kinne jo de wurkwize fan koekjes ynstelle
Comment[ga]=Cumraigh conas a oibríonn fianáin
Comment[gl]=Configurar o funcionamento das cookies
@@ -202,7 +202,7 @@
X-KDE-Keywords[es]=Cookies,Navegación,Internet,WWW,Red,Política,Dominios
X-KDE-Keywords[et]=Küpsised,Sirvimine,Internet,WWW,Võrk,Reeglid,Domeenid
X-KDE-Keywords[fi]=Evästeet,Selaus,Selailu,Internet,WWW,Verkko,Käytäntö,Käytänne,Verkkoalueet
-X-KDE-Keywords[fr]=Cookies,Navigation,Internet,WWW,Réseau,Politique,Domaines
+X-KDE-Keywords[fr]=Cookies, navigation, Internet, WWW, réseau, politique, domaines
X-KDE-Keywords[ga]=Fianáin,Brabhsáil,Idirlíon,WWW,Gréasán,Líonra,Polasaí,Fearainn
X-KDE-Keywords[gl]=cookies,navegar,internet,www,rede,política,dominios
X-KDE-Keywords[hu]=Sütik,Böngészés,Internet,WWW,Hálózat,Házirend,Tartományok
@@ -211,6 +211,7 @@
X-KDE-Keywords[kk]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains
X-KDE-Keywords[km]=ខូគី ការរកមើល អ៊ីនធឺណិត WWW បណ្ដាញ គោលនយោបាយ ដែន
X-KDE-Keywords[ko]=Cookies,Browsing,Internet,WWW,Network,Policy,Domains,쿠키,브라우징,인터넷,네트워크,정책,도메인
+X-KDE-Keywords[lt]=Slapukai,Naršymas,Internetas,WWW,Tinklas,Taisyklės,Sritys
X-KDE-Keywords[lv]=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[nds]=Kookjes,Nettkieken,Internet,WWW,Nettwark,Regel,Domänen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/kproxydlg.cpp new/kde-baseapps-4.10.3/konqueror/settings/kio/kproxydlg.cpp
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/kproxydlg.cpp 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/kproxydlg.cpp 2013-05-03 06:36:28.000000000 +0200
@@ -272,6 +272,11 @@
connect(mUi.manualProxySocksEdit, SIGNAL(textChanged(QString)), SLOT(slotChanged()));
connect(mUi.manualNoProxyEdit, SIGNAL(textChanged(QString)), SLOT(slotChanged()));
+ connect(mUi.manualProxyHttpSpinBox, SIGNAL(valueChanged(int)), SLOT(slotChanged()));
+ connect(mUi.manualProxyHttpsSpinBox, SIGNAL(valueChanged(int)), SLOT(slotChanged()));
+ connect(mUi.manualProxyFtpSpinBox, SIGNAL(valueChanged(int)), SLOT(slotChanged()));
+ connect(mUi.manualProxySocksSpinBox, SIGNAL(valueChanged(int)), SLOT(slotChanged()));
+
connect(mUi.systemProxyHttpEdit, SIGNAL(textChanged(QString)), SLOT(slotChanged()));
connect(mUi.systemProxyHttpsEdit, SIGNAL(textChanged(QString)), SLOT(slotChanged()));
connect(mUi.systemProxyFtpEdit, SIGNAL(textChanged(QString)), SLOT(slotChanged()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/netpref.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/netpref.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/netpref.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/netpref.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -128,7 +128,7 @@
Comment[eu]=Konfiguratu sarearen hobespen orokorrak (denbora-mugen balioak, besteak beste)
Comment[fa]=پیکربندی تنظیمات شبکه محلی، مانند مقادیر اتمام وقت
Comment[fi]=Yleiset verkkoasetukset
-Comment[fr]=Configuration générique du réseau comme par exemple les valeurs des délais d'attente
+Comment[fr]=Configuration générique du réseau comme, par exemple, les valeurs des délais d'attente
Comment[fy]=ynstelle fan algemiene netwurkfoarkar, sa as tiidslimytwearden
Comment[ga]=Cumraigh sainroghanna ginearálta líonra, mar shampla teorainneacha ama
Comment[gl]=Configurar as preferencias xenéricas de rede, como os tempos límite
@@ -213,6 +213,7 @@
X-KDE-Keywords[kk]=timeout,iopref,netpref,network preferences,ftp
X-KDE-Keywords[km]=អស់ពេល iopref netpref ចំណូលចិត្តបណ្ដាញ ftp
X-KDE-Keywords[ko]=timeout,iopref,netpref,network preferences,ftp,시간,시간 초과,네트워크 설정
+X-KDE-Keywords[lt]=skirtasis laikas,ionust,tinklonust,tinklo nustatymai,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[nds]=Tietgrenz,In- un Utgaav-Instellen,Nettwarkinstellen,Nettwark,Instellen,FTP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/proxy.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/proxy.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/proxy.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/proxy.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -218,6 +218,7 @@
X-KDE-Keywords[kk]=Proxy,Proxy server,Firewall,Squid,Прокси
X-KDE-Keywords[km]=ប្រូកស៊ី ម៉ាស៊ីនបម្រើប្រូកស៊ី ជញ្ជាំងភ្លើង Squid
X-KDE-Keywords[ko]=Proxy,Proxy server,Firewall,Squid,proxy,프록시,프록시 서버,방화벽
+X-KDE-Keywords[lt]=Įgaliotasis serveris,Įgaliotasis,Užkarda,Squid
X-KDE-Keywords[nb]=Mellomtjener,Brannmur,Squid
X-KDE-Keywords[nds]=Proxy,Proxy-Server,Nettdiek,Squid
X-KDE-Keywords[nl]=Proxy,proxy-server,firewall,squid
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/smb.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/smb.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/smb.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/smb.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -201,7 +201,7 @@
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[fr]=SMB,SAMBA,client SMB,réseau Windows,LAN,Réseau,voisinage,Serveur,Diffusion,WINS,Partages,Connexion,Mots de passe
+X-KDE-Keywords[fr]=SMB, SAMBA,client SMB, réseau Windows, LAN, réseau, voisinage,Serveur, diffusion, WINS, partages, connexion, mots de passe
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[gl]=SMB,SAMBA,cliente SMB,rede de windows,LAN,rede,veciñanza,servidor, retransmisión,WINS,compartición,compartir,acceso,contrasinais
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
@@ -210,6 +210,7 @@
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[ko]=SMB,SAMBA,SMB client,Windows network,LAN,Network,neighborhood,Server,Broadcast,WINS,Share,Login,Passwords,삼바,윈도우,윈도우 네트워크,네트워크 환경,내 네트워크 환경,로그인,공유,암호,비밀번호
+X-KDE-Keywords[lt]=SMB,SAMBA,SMB klientas,Windows tinklas,LAN,tinklas,tinklo aplinka,Serveris,Transliavimas,WINS,Bendrinti,Registracija,Slaptažodžiai
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[nds]=SMB,SAMBA,SMB-Programm,Windows-Nettwark,LAN,Nettwark,Nettwarkümgeven,Naverschap,Server,Rundroop,WINS,Freegaav,Anmellen,Passwöör
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/googlebot.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/googlebot.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/googlebot.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/googlebot.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -24,7 +24,7 @@
Name[et]=UADescription (Googlebot/2.1)
Name[eu]=UA azalpena (Wget 1.5.3)
Name[fi]=Käyttäjäagenttikuvaus (Googlebot/2.1)
-Name[fr]=UADescription (Googlebot/2.1)
+Name[fr]=UADescription (Googlebot / 2.1)
Name[fy]=GA-omskriuwing (Googlebot/2.1)
Name[ga]=UADescription (Googlebot/2.1)
Name[gl]=UADescription (Googlebot/2.1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/nn301oncurrent.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/nn301oncurrent.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/nn301oncurrent.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/nn301oncurrent.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -25,7 +25,7 @@
Name[eu]=UA azalpena (NN 3.01 unekoan)
Name[fa]=UADescription (NN 3.01 در حال حاضر)
Name[fi]=Käyttäjäagenttikuvaus (NN 3.01 nykyisellä)
-Name[fr]=UADescription (Navigator 3.01 sous le système actuel)
+Name[fr]=UADescription (Netscape 3.01 sous le système actuel)
Name[fy]=GA-omskriuwing (NN 3.01 op aktive)
Name[ga]=UADescription (NN 3.01 ar an gcóras reatha)
Name[gl]=UADescription (NN 3.01 no actual)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/nn475oncurrent.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/nn475oncurrent.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/nn475oncurrent.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/nn475oncurrent.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -25,7 +25,7 @@
Name[eu]=UA azalpena (NN 4.76 unekoan)
Name[fa]=UADescription (NN 4.76 در حال حاضر)
Name[fi]=Käyttäjäagenttikuvaus (NN 4.76 nykyisellä)
-Name[fr]=UADescription (Navigator 4.76 sous le système actuel)
+Name[fr]=UADescription (Netscape 4.76 sous le système actuel)
Name[fy]=GA-omskriuwing (NN 4.76 op aktive)
Name[ga]=UADescription (NN 4.76 ar an gcóras reatha)
Name[gl]=UADescription (NN 4.76 no actual)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/nn475onwin95.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/nn475onwin95.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/uasproviders/nn475onwin95.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/uasproviders/nn475onwin95.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -26,7 +26,7 @@
Name[eu]=UA azalpena (NN 4.7 Windows 95-ean)
Name[fa]=UADescription (NN 4.7 در Windows 95)
Name[fi]=Käyttäjäagenttikuvaus (NN 4.7 Windows 95:lla)
-Name[fr]=UADescription (Navigator 4.7 sous Windows 95)
+Name[fr]=UADescription (Netscape 4.7 sous Windows 95)
Name[fy]=GA-omskriuwing (NN 4.76 op Windows 95)
Name[ga]=UADescription (NN 4.7 ar Windows 95)
Name[gl]=UADescription (NN 4.7 en Windows 95)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/kio/useragent.desktop new/kde-baseapps-4.10.3/konqueror/settings/kio/useragent.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/kio/useragent.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/kio/useragent.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -200,7 +200,7 @@
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[fr]=Agent utilisateur, Navigateur, Internet, www, réseau, agent, liens, serveur,connexion
+X-KDE-Keywords[fr]=Agent utilisateur, navigateur, Internet, www, réseau, agent, liens, serveur, connexion
X-KDE-Keywords[ga]=UserAgent,gníomhaire úsáideora,Brabhsálaí,Idirlíon,WWW,Líonra,Gréasán,gníomhaire,ceangail,freastalaí,logáil isteach
X-KDE-Keywords[gl]=Programa cliente,navegador,internet,www,rede,axente,cliente,asociacións,servidor,acceso
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
@@ -209,6 +209,7 @@
X-KDE-Keywords[kk]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login
X-KDE-Keywords[km]=ភ្នាក់ងារអ្នកប្រើ កម្មវិធីរុករក អ៊ីនធឺណិត WWW បណ្ដាញ ភ្នាក់ងារ ការចង ម៉ាស៊ីនបម្រើ ចូល
X-KDE-Keywords[ko]=User Agent,Browser,Internet,WWW,Network,agent,bindings,server,login,사용자 에이전트,브라우저,인터넷,네트워크,바인딩,서버,로그인
+X-KDE-Keywords[lt]=Naudotojo agentas,Naršyklė,Internetas,WWW,Tinklas,Agentas,sąsajos,serveris,prisijungimas
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[nds]=Nettkieker-Kennen,Nettkieker,Internet,WWW,Nettwark,Kennen,Toornen,Server,Anmellen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konq/fileappearance.desktop new/kde-baseapps-4.10.3/konqueror/settings/konq/fileappearance.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konq/fileappearance.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konq/fileappearance.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -214,6 +214,7 @@
X-KDE-Keywords[kk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour
X-KDE-Keywords[km]=konqueror កម្មវិធីគ្រប់គ្រងឯកសារ ការរុំពាក្យ រុំ គូសបន្ទាត់ក្រោម ទិដ្ឋភាព ទំហំឯកសារ បៃ ពុម្ពអក្សរ ពណ៌ ពណ៌
X-KDE-Keywords[ko]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,파일,파일 관리자,워드랩,밑줄,표시,크기,바이트,글꼴,색,색상
+X-KDE-Keywords[lt]=konqueror,failųtvarkyklė,teksto skaidymas į eilutes,pabraukimas,skaidyti,(pa)rodyti, (pa)vaizduoti,failo dydis,baitai,šriftas,spalva
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[nds]=Konqueror,Dateipleger,Reegümbrook,Ümbrook,ümbreken,Ünnerstreek,Dorstellen,Ansicht,Dateigrött,Bytes,Schrift,Klöör
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konq/filebehavior.desktop new/kde-baseapps-4.10.3/konqueror/settings/konq/filebehavior.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konq/filebehavior.desktop 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konq/filebehavior.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -205,7 +205,7 @@
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,toiminta,muistinkäyttö,kotiosoite,verkkotoiminnot,edistymisikkuna,roskakori,poista,varmistus,varmista
-X-KDE-Keywords[fr]=konqueror, gestionnaire de fichiers, kfm, astuces, conseils de fichier, fenêtre séparée, séparer les fenêtre, comportement, comportement, utilisation de la mémoire, Adresse d'accueil, opérations réseaux, boîte de dialogue de progression, corbeille, effacer, confirmation
+X-KDE-Keywords[fr]=konqueror, gestionnaire de fichiers, kfm, astuces, conseils de fichier, fenêtre séparée, séparer les fenêtres, comportement, comportement, utilisation de la mémoire, adresse d'accueil, opérations réseau, boîte de dialogue de progression, corbeille, effacer, confirmation
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[gl]=konqueror,xestor de ficheiros,kfm,consello,axudiña,xanela separada,comportamento, uso da memoria,URL de inicio,operacións de rede,diálogo de progreso,lixo,borrar, confirmación
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
@@ -214,6 +214,7 @@
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[ko]=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[lt]=konqueror,failų tvarkyklė,kfm,patarimai,failo patarimai,atskirtas langas,daugelis langų,elgsena,veikimas,atminties naudojimas,Pradžios URL,tinklo operacijos,eigos dialogas,šiukšliadėžė,ištrinti,patvirtinimas
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[nds]=Konqueror,Dateipleger,kfm,Kortinfos,Datei-Kortinfo,nieg Finster,Ünnerfinstern,Bedregen,Spiekerbruuk,Tohuus-Adress,Nettwark-Akschonen,Vörankamendialoog,Affalltünn,Wegmaken,Wegdoon,Beglöven
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konq/webappearance.desktop new/kde-baseapps-4.10.3/konqueror/settings/konq/webappearance.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konq/webappearance.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konq/webappearance.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -215,6 +215,7 @@
X-KDE-Keywords[kk]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour
X-KDE-Keywords[km]=konqueror កម្មវិធីគ្រប់គ្រងឯកសារ ការរុំពាក្យ រុំ គូសបន្ទាត់ក្រោម ទិដ្ឋភាព ទំហំឯកសារ បៃ ពុម្ពអក្សរ ពណ៌ ពណ៌
X-KDE-Keywords[ko]=konqueror,filemanager,word wrap,wrap,underline,display,filesize,bytes,font,color,colour,파일,파일 관리자,워드랩,밑줄,표시,크기,바이트,글꼴,색,색상
+X-KDE-Keywords[lt]=konqueror,failųtvarkyklė,teksto skaidymas į eilutes,pabraukimas,skaidyti,(pa)rodyti, (pa)vaizduoti,failo dydis,baitai,šriftas,spalva
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[nds]=Konqueror,Dateipleger,Reegümbrook,Ümbrook,ümbreken,Ünnerstreek,Dorstellen,Ansicht,Dateigrött,Bytes,Schrift,Klöör
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konq/webbehavior.desktop new/kde-baseapps-4.10.3/konqueror/settings/konq/webbehavior.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konq/webbehavior.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konq/webbehavior.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -206,7 +206,7 @@
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,toiminta,muistinkäyttö,kotiosoite,
-X-KDE-Keywords[fr]=Konqueror, gestionnaire de fichiers, kfm, astuces, conseils de fichier, fenêtre séparée, séparer les fenêtres, comportement, comportement, utilisation de la mémoire, Adresse d'accueil,
+X-KDE-Keywords[fr]=Konqueror, gestionnaire de fichiers, kfm, astuces, conseils de fichier, fenêtre séparée, séparer les fenêtres, comportement, comportement, utilisation de la mémoire, adresse d'accueil,
X-KDE-Keywords[ga]=konqueror,bainisteoir comhad,kfm,leideanna,leideanna comhaid,fuinneog ar leith,sceith fuinneoga,oibriú,úsáid chuimhne,URL Baile,
X-KDE-Keywords[gl]=konqueror,xestor de ficheiros,kfm,consello,axudiña,xanela separada,comportamento, uso da memoria,URL de inicio,
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,
@@ -215,6 +215,7 @@
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[ko]=konqueror,filemanager,kfm,tips,file tips,separate window,spawn windows,behavior,behaviour,memory usage,Home URL,파일 관리자,팁,파일 팁,창 분할,창,행동,메모리,메모리 사용,홈 페이지
+X-KDE-Keywords[lt]=konqueror,failų tvarkyklė,kfm,patarimai,failo patarimai,atskirtas langas,daugelis langų,elgsena,veikimas,atminties naudojimas,Pradžios 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[nds]=Konqueror,Dateipleger,kfm,Kortinfos,Datei-Kortinfo,nieg Finster,Ünnerfinstern,Bedregen,Spiekerbruuk,Tohuus-Adress,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/css/kcmcss.desktop new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/css/kcmcss.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/css/kcmcss.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/css/kcmcss.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -204,7 +204,7 @@
X-KDE-Keywords[es]=CSS,HTML,estilo,hoja de estilo,accesibilidad
X-KDE-Keywords[et]=CSS,HTML,stiil,laaditabel,hõlbustus
X-KDE-Keywords[fi]=CSS,HTML,style,tyyli,stylesheet,tyylisivu,esteettömyys
-X-KDE-Keywords[fr]=CSS,HTML,style,feuille de style,accessibilité
+X-KDE-Keywords[fr]=CSS, HTML, style, feuille de style, accessibilité
X-KDE-Keywords[ga]=CSS,HTML,stíl,stílbhileog,inrochtaineacht
X-KDE-Keywords[gl]=CSS,HTML,estilo,folla de estilos,accesibilidade
X-KDE-Keywords[hu]=CSS,HTML,stílus,stíluslap,akadálymentesítés
@@ -213,6 +213,7 @@
X-KDE-Keywords[kk]=CSS,HTML,style,stylesheet,accessibility
X-KDE-Keywords[km]=CSS HTML រចនាប័ទ្ម សន្លឹករចនាប័ទ្ម មធ្យោបាយងាយស្រួល
X-KDE-Keywords[ko]=CSS,HTML,style,stylesheet,accessibility,스타일시트,접근성,스타일
+X-KDE-Keywords[lt]=CSS,HTML,stilius,stiliaus aprašas,pritaikymas neįgaliesiems
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_appearance.desktop new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_appearance.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_appearance.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_appearance.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -186,7 +186,7 @@
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[fr]=konqueror,kfm,navigateur,html,web,www,polices,table de caractères,tables de caractères,encodage
+X-KDE-Keywords[fr]=konqueror, kfm, navigateur, html, web, www, polices, table de caractères, tables de caractères, encodage
X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clónna,clófhoirne,tacair charachtair,ionchódú
X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,tipos de letra,conxunto de caracteres,codificación,caracter
X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,karakterkészletek,karakterkészletek,kódolás
@@ -195,6 +195,7 @@
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[ko]=konqueror,kfm,browser,html,web,www,fonts,charsets,character sets,encoding,문자셋,인코딩,글꼴,문자,브라우저
+X-KDE-Keywords[lt]=konqueror,kfm,naršyklė,html,žiniatinklis,www,šriftai,ženklų rinkinys,koduotė
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[nds]=Konqueror,kfm,Nettkieker,html,Nett,www,Schriften,Schriftoorden,Tekensetten,Koderen,Tekenkoderen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_behavior.desktop new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_behavior.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_behavior.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_behavior.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -202,7 +202,7 @@
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[fr]=konqueror,kfm,navigateur,html,web,www,polices,couleurs,couleurs,java,javascript,curseur,liens,images,table de caractères,tables de caractères,encodage
+X-KDE-Keywords[fr]=konqueror, kfm, navigateur, html, web, www, polices, couleurs, couleurs, java, javascript, curseur, liens, images, table de caractères, tables de caractères, encodage
X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,clófhoirne,clónna,dathanna,java,javascript,cúrsóir,naisc,nascanna,íomhánna,tacair charachtair,ionchódú
X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,tipos de letra,cores,java,javascript,cursor,ligazóns,imaxes,conxunto de caracteres,codificación,caracter
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
@@ -211,6 +211,7 @@
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[ko]=konqueror,kfm,browser,html,web,www,fonts,colours,colors,java,javascript,cursor,links,images,charsets,character sets,encoding,색,색상,자바,자바스크립트,커서,링크,그림,문자셋,인코딩
+X-KDE-Keywords[lt]=konqueror,kfm,naršyklė,html,žiniatinklis,www,šriftai,spalvos,java,javascript,žymeklis,nuorodos,paveikslėliai,ženklų rinkinys,koduotė
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[nds]=Konqueror,kfm,Nettkieker,html,Nett,www,Schriften,Schriftoorden,Klören,Java,Javaskript,Blinker,Links,Biller,Tekensetten,Koderen,Tekenkoderen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_general.desktop new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_general.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_general.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_general.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -172,7 +172,7 @@
X-KDE-Keywords[es]=konqueror,pestañas
X-KDE-Keywords[et]=konqueror,kaardid
X-KDE-Keywords[fi]=konqueror,välilehdet
-X-KDE-Keywords[fr]=konqueror,onglets
+X-KDE-Keywords[fr]=konqueror, onglets
X-KDE-Keywords[ga]=Konqueror,cluaisíní
X-KDE-Keywords[gl]=konqueror,lapelas
X-KDE-Keywords[hu]=konqueror,lapok
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_java_js.desktop new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_java_js.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/konqhtml/khtml_java_js.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/konqhtml/khtml_java_js.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -204,7 +204,7 @@
X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,www,java,javascript
X-KDE-Keywords[et]=konqueror,kfm,brauser,html,veeb,www,java,javascript
X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,java,javascript
-X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,java,javascript
+X-KDE-Keywords[fr]=konqueror, kfm, navigateur, html, web, www, java, javascript
X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,gréasán,www,java,javascript
X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,java,javascript
X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,java,javascript
@@ -213,6 +213,7 @@
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[ko]=konqueror,kfm,browser,html,web,www,java,javascript,브라우저,웹,자바,자바스크립트
+X-KDE-Keywords[lt]=konqueror,kfm,naršyklė,html,žiniatinklis,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[nds]=Konqueror,kfm,Nettkieker,html,Nett,www,Java,Javaskript
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/performance/kcmkonqyperformance.desktop new/kde-baseapps-4.10.3/konqueror/settings/performance/kcmkonqyperformance.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/performance/kcmkonqyperformance.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/performance/kcmkonqyperformance.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -35,7 +35,7 @@
Name[eu]=Eraginkortasuna
Name[fa]=کارایی
Name[fi]=Suorituskyky
-Name[fr]=Performance
+Name[fr]=Performances
Name[fy]=Prestaasje
Name[ga]=Feidhmiúchán
Name[gl]=Rendemento
@@ -201,7 +201,7 @@
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[fr]=konqueror,réutiliser,préchargement
+X-KDE-Keywords[fr]=konqueror, ré-utiliser, préchargement
X-KDE-Keywords[ga]=konqueror,athúsáid,réamhluchtú
X-KDE-Keywords[gl]=konqueror,reutilización,precarga
X-KDE-Keywords[hu]=konqueror,újrafelhasználás,gyorsbetöltés
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/settings/performance/kcmperformance.desktop new/kde-baseapps-4.10.3/konqueror/settings/performance/kcmperformance.desktop
--- old/kde-baseapps-4.10.2/konqueror/settings/performance/kcmperformance.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/settings/performance/kcmperformance.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -34,7 +34,7 @@
Name[eu]=KDEren eraginkortasuna
Name[fa]=کارایی KDE
Name[fi]=KDE:n suorituskyky
-Name[fr]=Performance de KDE
+Name[fr]=Performances de KDE
Name[fy]=KDE-prestaasjes
Name[ga]=Feidhmiúchán KDE
Name[gl]=Rendemento de KDE
@@ -125,7 +125,7 @@
Comment[eu]=Konfiguratu Konquerorren eraginkortasuna hobe dezaketen ezarpenak
Comment[fa]=پیکربندی تنظیماتی که کارایی KDE را بهبود میبخشد
Comment[fi]=KDE:n suorituskykyyn vaikuttavat asetukset
-Comment[fr]=Configuration de paramètres qui peuvent améliorer les performances de KDE
+Comment[fr]=Configuration de paramètres pouvant améliorer les performances de KDE
Comment[fy]=Hjir kinne jo ynstellings kiezen die de prestaasje fan KDE kinne ferbetterje
Comment[ga]=Cumraigh socruithe a chuirfidh feabhas ar fheidhmiúchán KDE
Comment[gl]=Configura das opcións que poden mellorar o rendemento de KDE
@@ -200,7 +200,7 @@
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[fr]=performance,vitesse,mémoire,améliorer
+X-KDE-Keywords[fr]=performance, vitesse, mémoire, améliorer
X-KDE-Keywords[ga]=oibriú,luas,cuimhne,feabhsaigh,feabhsú
X-KDE-Keywords[gl]=rendemento,velocidade,memoria,mellorar
X-KDE-Keywords[hu]=teljesítmény,sebesség,memória,fejlesztés
@@ -209,6 +209,7 @@
X-KDE-Keywords[kk]=performance,speed,memory,improve
X-KDE-Keywords[km]=ការអនុវត្ត ល្បឿន អង្គចងចាំ ធ្វើឲ្យប្រសើរ
X-KDE-Keywords[ko]=performance,speed,memory,improve,성능,속도,메모리,향상
+X-KDE-Keywords[lt]=našumas,greitis,atmintis,pagerinti
X-KDE-Keywords[lv]=veiktspēja,ātrums,atmiņa,uzlabot
X-KDE-Keywords[nb]=ytelse,fart,minne,forbedre
X-KDE-Keywords[nds]=Leisten,Gauheit,Spieker,Verbetern
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/sidebar/history_module/kcmhistory.desktop new/kde-baseapps-4.10.3/konqueror/sidebar/history_module/kcmhistory.desktop
--- old/kde-baseapps-4.10.2/konqueror/sidebar/history_module/kcmhistory.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/sidebar/history_module/kcmhistory.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -202,7 +202,7 @@
X-KDE-Keywords[es]=historial,expiración
X-KDE-Keywords[et]=ajalugu,aegumine
X-KDE-Keywords[fi]=historia,vanhentuminen
-X-KDE-Keywords[fr]=historique,expiration
+X-KDE-Keywords[fr]=historique, expiration
X-KDE-Keywords[ga]=stair,caite,as feidhm,téigh as feidhm
X-KDE-Keywords[gl]=historial,caducar,expirar
X-KDE-Keywords[hu]=előzmények,lejárat
@@ -211,6 +211,7 @@
X-KDE-Keywords[kk]=history,expire
X-KDE-Keywords[km]=ប្រវត្តិ ផុតកំណត់
X-KDE-Keywords[ko]=history,expire,과거 기록,히스토리,만료
+X-KDE-Keywords[lt]=istorija,nebegalioti
X-KDE-Keywords[lv]=vēsture,termiņš
X-KDE-Keywords[nb]=historie,utdatere
X-KDE-Keywords[nds]=Vörgeschicht,aflopen,Afloop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/sidebar/history_module/konqsidebar_history.desktop new/kde-baseapps-4.10.3/konqueror/sidebar/history_module/konqsidebar_history.desktop
--- old/kde-baseapps-4.10.2/konqueror/sidebar/history_module/konqsidebar_history.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/sidebar/history_module/konqsidebar_history.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -20,7 +20,7 @@
Name[et]=Ajaloo külgriba moodul
Name[eu]=Historiaren albo-barraren modulua
Name[fi]=Historiasivupalkkimoduuli
-Name[fr]=Barre latérale d'historique
+Name[fr]=Module de panneau latéral pour l'historique
Name[fy]=Skiednis sydbalke module
Name[ga]=Barra Taoibh Staire
Name[gl]=Módulo da barra lateral co historial
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/sidebar/konq_sidebartng.desktop new/kde-baseapps-4.10.3/konqueror/sidebar/konq_sidebartng.desktop
--- old/kde-baseapps-4.10.2/konqueror/sidebar/konq_sidebartng.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/sidebar/konq_sidebartng.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -20,7 +20,7 @@
Name[et]=Külgriba
Name[eu]=Albo-barra
Name[fi]=Sivupalkki
-Name[fr]=Barre latérale
+Name[fr]=Panneau latéral
Name[fy]=Sydbalke
Name[ga]=Barra Taoibh
Name[gl]=Barra lateral
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/sidebar/places_module/konqsidebar_places.desktop new/kde-baseapps-4.10.3/konqueror/sidebar/places_module/konqsidebar_places.desktop
--- old/kde-baseapps-4.10.2/konqueror/sidebar/places_module/konqsidebar_places.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/sidebar/places_module/konqsidebar_places.desktop 2013-05-03 06:36:28.000000000 +0200
@@ -18,7 +18,7 @@
Name[et]=Asukohtade külgriba moodul
Name[eu]=Lekuen albo-barraren modulua
Name[fi]=Sijainnit sivupalkki-moduuli
-Name[fr]=Barre latérale des emplacements
+Name[fr]=Module de panneau latéral pour les emplacements
Name[ga]=Modúl Barra Taoibh Áiteanna
Name[gl]=Módulo da barra lateral de lugares
Name[gu]=જગ્યાઓ બાજુપટ્ટી મોડ્યુલ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/konqueror/sidebar/web_module/konqsidebar_web.desktop new/kde-baseapps-4.10.3/konqueror/sidebar/web_module/konqsidebar_web.desktop
--- old/kde-baseapps-4.10.2/konqueror/sidebar/web_module/konqsidebar_web.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/konqueror/sidebar/web_module/konqsidebar_web.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -27,7 +27,7 @@
Name[eu]=Webeko albo-barraren modulua
Name[fa]=پیمانه میله جانبی وب
Name[fi]=Verkkosivupalkkimoduuli
-Name[fr]=Barre latérale de navigation sur le Web
+Name[fr]=Module de panneau latéral pour la navigation Web
Name[fy]=Web sydbalke module
Name[ga]=Modúl Barra Taoibh Gréasáin
Name[gl]=Módulo da barra lateral web
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/lib/konq/Templates/linkCDWRITER.desktop new/kde-baseapps-4.10.3/lib/konq/Templates/linkCDWRITER.desktop
--- old/kde-baseapps-4.10.2/lib/konq/Templates/linkCDWRITER.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/lib/konq/Templates/linkCDWRITER.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -25,7 +25,7 @@
Name[et]=CD-kirjutaja...
Name[eu]=CDWRITER gailua...
Name[fi]=CDWRITER-laite...
-Name[fr]=Graveur de CD-ROM...
+Name[fr]=Graveur de CD...
Name[fy]=kompaktskiifstasjon...
Name[ga]=Gléas CDWRITER...
Name[gl]=Gravadora de CD...
@@ -114,7 +114,7 @@
Comment[et]=Uus CD-kirjutaja
Comment[eu]=CDWRITER gailu berria
Comment[fi]=Uusi CDWRITER-laite
-Comment[fr]=Nouveau graveur de CD-ROM
+Comment[fr]=Nouveau graveur de CD
Comment[fy]=Nije kompaktskiifstasjon
Comment[ga]=Gléas Nua CDWRITER
Comment[gl]=Novo dispositivo gravador de CD
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/lib/konq/Templates/linkPath.desktop new/kde-baseapps-4.10.3/lib/konq/Templates/linkPath.desktop
--- old/kde-baseapps-4.10.2/lib/konq/Templates/linkPath.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/lib/konq/Templates/linkPath.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -17,7 +17,7 @@
Name[et]=Lihtlink failile või kataloogile...
Name[eu]=Oinarrizko esteka fitxategi edo karpetara...
Name[fi]=Peruslinkki tiedostoon tai kansioon...
-Name[fr]=Lien de base vers un fichier ou un dossier...
+Name[fr]=Lien standard vers un fichier ou un dossier...
Name[fy]=Basis keppeling nei triem of triemtafel
Name[ga]=Nasc bunúsach le comhad nó comhadlann...
Name[gl]=Ligazón básica a un ficheiro ou cartafol...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/lib/konq/Templates/linkURL.desktop new/kde-baseapps-4.10.3/lib/konq/Templates/linkURL.desktop
--- old/kde-baseapps-4.10.2/lib/konq/Templates/linkURL.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/lib/konq/Templates/linkURL.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -25,7 +25,7 @@
Name[et]=Viit asukohale (URL)...
Name[eu]=Estekatu kokapena (URLa)...
Name[fi]=Linkki sijaintiin (URL)...
-Name[fr]=Lien vers un URL...
+Name[fr]=Lien vers un emplacement (URL)...
Name[fy]=Keppeling nei lokaasje (URL-adres)...
Name[ga]=Nasc le Suíomh (URL)...
Name[gl]=Ligazón a un lugar (URL)...
@@ -114,7 +114,7 @@
Comment[et]=Sisesta viit asukohale (URL):
Comment[eu]=Sartu kokapenarekiko (URL) esteka:
Comment[fi]=Anna linkki sijaintiin (URL):
-Comment[fr]=Nouveau lien vers une URL :
+Comment[fr]=Nouveau lien vers un emplacement (URL) :
Comment[fy]=Keppeling nei lokaasje ynfiere (URL-adres):
Comment[ga]=Iontráil nasc le suíomh (URL):
Comment[gl]=Indique o lugar (URL):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/lib/konq/directory_bookmarkbar.desktop new/kde-baseapps-4.10.3/lib/konq/directory_bookmarkbar.desktop
--- old/kde-baseapps-4.10.2/lib/konq/directory_bookmarkbar.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/lib/konq/directory_bookmarkbar.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -27,7 +27,7 @@
Name[eu]=Laster-marken barra
Name[fa]=میله ابزار چوب الف
Name[fi]=Kirjanmerkkien työkalurivi
-Name[fr]=Barre de signets
+Name[fr]=Barre d'outils pour les signets
Name[fy]=Blêdwizerbalke
Name[ga]=Barra Uirlisí Leabharmharcanna
Name[gl]=Barra de Marcadores
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/lib/konq/favicons/favicons.desktop new/kde-baseapps-4.10.3/lib/konq/favicons/favicons.desktop
--- old/kde-baseapps-4.10.2/lib/konq/favicons/favicons.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/lib/konq/favicons/favicons.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -21,7 +21,7 @@
Name[et]=Lemmikikoonid
Name[eu]=Favicon-ak
Name[fi]=Verkkosivukuvakkeet
-Name[fr]=Favicons
+Name[fr]=Émoticônes
Name[fy]=Favicon-ôfbyldings
Name[ga]=Deilbhíní Ceanán
Name[gl]=Iconas de páxina web
@@ -92,7 +92,7 @@
Comment[et]=Veebilehekülgede ikoonide salvestamine
Comment[eu]=Webguneen ikonoak gordetzen ditu
Comment[fi]=Säilyttää verkkosivujen kuvakkeita
-Comment[fr]=Stocke les icônes des sites Internet
+Comment[fr]=Enregistre les icônes des sites Internet
Comment[ga]=Stórálann sé deilbhín suíomh Gréasáin
Comment[gl]=Garda as iconas logotipo dos sitios web
Comment[gu]=વેબસાઈટના ચિહ્નો સંગ્રહ કરે છે
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/lib/konq/konqdndpopupmenuplugin.desktop new/kde-baseapps-4.10.3/lib/konq/konqdndpopupmenuplugin.desktop
--- old/kde-baseapps-4.10.2/lib/konq/konqdndpopupmenuplugin.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/lib/konq/konqdndpopupmenuplugin.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -20,7 +20,7 @@
Comment[et]=Konquerori hüpikmenüü lohistamisplugin.
Comment[eu]=Konquerorren laster-menuetarako arrastratu-eta-jaregin plugina
Comment[fi]=Vedä-ja-pudota-liitännäinen Konquerorin ponnahdusvalikolle.
-Comment[fr]=Module externe de glisser-déposer pour le menu contextuel de Konqueror
+Comment[fr]=Module externe de glisser-déposer pour le menu contextuel de Konqueror.
Comment[fy]=Sleep plugin foar de Konqueror popup menu.
Comment[ga]=Breiseán tarraing-agus-scaoileadh le haghaidh Roghchláir Aníos Konqueror
Comment[gl]=Complemento de arrastrar e soltar para o menú contextual de Konqueror.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/nsplugins/khtml_plugins.desktop new/kde-baseapps-4.10.3/nsplugins/khtml_plugins.desktop
--- old/kde-baseapps-4.10.2/nsplugins/khtml_plugins.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/nsplugins/khtml_plugins.desktop 2013-05-03 06:36:32.000000000 +0200
@@ -206,7 +206,7 @@
X-KDE-Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,complementos
X-KDE-Keywords[et]=konqueror,kfm,brauser,html,veeb,www,fondid,pluginad
X-KDE-Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,fontit,liitännäiset
-X-KDE-Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,modules externes
+X-KDE-Keywords[fr]=konqueror, kfm, navigateur, html, web, www, polices, modules externes
X-KDE-Keywords[ga]=konqueror,kfm,brabhsálaí,html,idirlíon,www,gréasán,clófhoirne,clónna,breiseáin
X-KDE-Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,complementos
X-KDE-Keywords[hu]=konqueror,kfm,böngésző,html,web,www,betűtípusok,bővítmények
@@ -215,6 +215,7 @@
X-KDE-Keywords[kk]=konqueror,kfm,browser,html,web,www,fonts,plugins
X-KDE-Keywords[km]=konqueror kfm កម្មវិធីរុករក html បណ្ដាញ www ពុម្ពអក្សរ កម្មវិធីជំនួយ
X-KDE-Keywords[ko]=konqueror,kfm,browser,html,web,www,fonts,plugins,브라우저,탐색기,웹,글꼴,플러그인
+X-KDE-Keywords[lt]=konqueror,kfm,naršyklė,html,žiniatinklis,www,šriftai,priedai
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[nds]=Konqueror,kfm,Nettkieker,html,Nett,www
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/plasma/applets/folderview/folderview.cpp new/kde-baseapps-4.10.3/plasma/applets/folderview/folderview.cpp
--- old/kde-baseapps-4.10.2/plasma/applets/folderview/folderview.cpp 2013-03-29 08:01:18.000000000 +0100
+++ new/kde-baseapps-4.10.3/plasma/applets/folderview/folderview.cpp 2013-05-03 06:36:29.000000000 +0200
@@ -385,7 +385,6 @@
m_alignToGrid = cg.readEntry("alignToGrid", false);
m_clickToView = cg.readEntry("clickForFolderPreviews", true);
m_previewPlugins = cg.readEntry("previewPlugins", QStringList() << "imagethumbnail" << "jpegthumbnail");
- m_customIconSize = cg.readEntry("customIconSize", 0);
m_sortDirsFirst = cg.readEntry("sortDirsFirst", true);
m_sortColumn = cg.readEntry("sortColumn", int(KDirModel::Name));
m_sortOrder = sortOrderStringToEnum(cg.readEntry("sortOrder", "ascending"));
@@ -491,9 +490,8 @@
needReload = true;
}
//Reload m_customIconSize values
- const int size = m_customIconSize;
m_customIconSize = cg.readEntry("customIconSize", m_customIconSize);
- if (size != iconSize().width()) {
+ if (m_customIconSize != iconSize().width()) {
needReload = true;
}
@@ -625,8 +623,7 @@
FolderView::~FolderView()
{
- if (m_dialog)
- delete m_dialog;
+ delete m_dialog;
delete m_newMenu;
}
@@ -769,21 +766,21 @@
uiDisplay.numLinesEdit->setValue(m_numTextLines);
uiDisplay.colorButton->setColor(textColor());
- for (int i = 0; i < uiDisplay.sortCombo->maxCount(); i++) {
+ for (int i = 0; i < uiDisplay.sortCombo->count(); i++) {
if (m_sortColumn == uiDisplay.sortCombo->itemData(i).toInt()) {
uiDisplay.sortCombo->setCurrentIndex(i);
break;
}
}
- for (int i = 0; i < uiDisplay.flowCombo->maxCount(); i++) {
+ for (int i = 0; i < uiDisplay.flowCombo->count(); i++) {
if (m_flow == uiDisplay.flowCombo->itemData(i).valueIconView::Flow()) {
uiDisplay.flowCombo->setCurrentIndex(i);
break;
}
}
- for (int i = 0; i < uiFilter.filterCombo->maxCount(); i++) {
+ for (int i = 0; i < uiFilter.filterCombo->count(); i++) {
if (m_filterType == uiFilter.filterCombo->itemData(i).valueProxyModel::FilterMode()) {
uiFilter.filterCombo->setCurrentIndex(i);
break;
@@ -1970,6 +1967,15 @@
updateSortActionsState();
config().writeEntry("sortColumn", m_sortColumn);
emit configNeedsSaving();
+
+ if (isUserConfiguring()) {
+ for (int i = 0; i < uiDisplay.sortCombo->count(); i++) {
+ if (m_sortColumn == uiDisplay.sortCombo->itemData(i).toInt()) {
+ uiDisplay.sortCombo->setCurrentIndex(i);
+ break;
+ }
+ }
+ }
}
m_delayedSaveTimer.start(5000, this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/plasma/applets/folderview/iconview.cpp new/kde-baseapps-4.10.3/plasma/applets/folderview/iconview.cpp
--- old/kde-baseapps-4.10.2/plasma/applets/folderview/iconview.cpp 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/plasma/applets/folderview/iconview.cpp 2013-05-03 06:36:29.000000000 +0200
@@ -37,6 +37,7 @@
#include <KDirModel>
#include <KGlobalSettings>
#include <KIcon>
+#include <KIconEffect>
#include <KStringHandler>
#include <KFileItemDelegate>
@@ -1053,7 +1054,16 @@
const QIcon icon = qvariant_cast<QIcon>(index.data(Qt::DecorationRole));
const QRect ir = QStyle::alignedRect(option.direction, Qt::AlignTop | Qt::AlignHCenter,
option.decorationSize, r);
- icon.paint(painter, ir);
+
+
+ if (selected) {
+ const QColor color = option.palette.brush(QPalette::Normal, QPalette::Highlight).color();
+ QImage image = icon.pixmap(ir.size()).toImage();
+ KIconEffect::colorize(image, color, 0.8f);
+ painter->drawPixmap(ir, QPixmap::fromImage(image));
+ } else {
+ icon.paint(painter, ir);
+ }
const QRect tr = r.adjusted(0, ir.bottom() - r.top() + 2, 0, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/plasma/applets/folderview/plasma-applet-folderview.desktop new/kde-baseapps-4.10.3/plasma/applets/folderview/plasma-applet-folderview.desktop
--- old/kde-baseapps-4.10.2/plasma/applets/folderview/plasma-applet-folderview.desktop 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/plasma/applets/folderview/plasma-applet-folderview.desktop 2013-05-03 06:36:29.000000000 +0200
@@ -95,7 +95,7 @@
Comment[et]=Kataloogide sisu näitamine
Comment[eu]=Bistaratu karpeten edukia
Comment[fi]=Näyttää kansion sisällön
-Comment[fr]=Afficher les contenus des dossiers
+Comment[fr]=Afficher les contenus de dossiers
Comment[ga]=Taispeáin inneachar d'fhillteáin
Comment[gl]=Mostra o contido dos cartafoles
Comment[hu]=Megjeleníti a mappák tartalmát
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.10.2/plasma/applets/folderview/popupview.cpp new/kde-baseapps-4.10.3/plasma/applets/folderview/popupview.cpp
--- old/kde-baseapps-4.10.2/plasma/applets/folderview/popupview.cpp 2013-03-01 07:36:06.000000000 +0100
+++ new/kde-baseapps-4.10.3/plasma/applets/folderview/popupview.cpp 2013-05-03 06:36:29.000000000 +0200
@@ -196,9 +196,15 @@
m_model->setSortLocaleAware(m_parentViewModel->isSortLocaleAware());
m_model->setParseDesktopFiles(m_parentViewModel->parseDesktopFiles());
m_model->setFilterMode(m_parentViewModel->ProxyModel::NoFilter);
- m_model->setSortDirectoriesFirst(m_parentViewModel->sortDirectoriesFirst());
- m_model->setDynamicSortFilter(m_parentViewModel->dynamicSortFilter());
- m_model->sort(m_parentViewModel->sortColumn(), m_parentViewModel->sortOrder());
+ m_model->setDynamicSortFilter(true);
+
+ if (!m_parentViewModel->dynamicSortFilter()) {
+ m_model->setSortDirectoriesFirst(true);
+ m_model->sort(int(KDirModel::Name), Qt::AscendingOrder);
+ } else {
+ m_model->setSortDirectoriesFirst(m_parentViewModel->sortDirectoriesFirst());
+ m_model->sort(m_parentViewModel->sortColumn(), m_parentViewModel->sortOrder());
+ }
m_delegate = new KFileItemDelegate(this);
m_selectionModel = new QItemSelectionModel(m_model, this);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org