packages: kde4-kdepim/kde4-kdepim-branch.diff - updated for 4.3.1 - fixes h...
shadzik
shadzik at pld-linux.org
Sat Sep 5 15:27:22 CEST 2009
Author: shadzik Date: Sat Sep 5 13:27:21 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 4.3.1
- fixes https://bugs.kde.org/show_bug.cgi?id=206024
---- Files affected:
packages/kde4-kdepim:
kde4-kdepim-branch.diff (1.12 -> 1.13)
---- Diffs:
================================================================
Index: packages/kde4-kdepim/kde4-kdepim-branch.diff
diff -u packages/kde4-kdepim/kde4-kdepim-branch.diff:1.12 packages/kde4-kdepim/kde4-kdepim-branch.diff:1.13
--- packages/kde4-kdepim/kde4-kdepim-branch.diff:1.12 Wed Aug 19 22:02:54 2009
+++ packages/kde4-kdepim/kde4-kdepim-branch.diff Sat Sep 5 15:27:15 2009
@@ -1,6753 +1,833 @@
-Index: akregator/src/browserframe.h
+Index: kresources/slox/kcal_slox.desktop
===================================================================
---- akregator/src/browserframe.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/browserframe.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -68,6 +68,10 @@
-
- void loadConfig( const KConfigGroup& config, const QString& prefix);
- void saveConfig( KConfigGroup& config, const QString& prefix);
-+
-+ bool hasZoom() const;
-+ int getZoomFactor() const;
-+ void setZoomFactor(int);
- public slots:
-
- void slotHistoryForward();
-@@ -80,6 +84,8 @@
- void slotPaletteOrFontChanged();
- void slotOpenLinkInBrowser();
- void slotOpenLinkInNewTab();
-+ void slotZoomIn(int);
-+ void slotZoomOut(int);
-
- private slots:
-
-Index: akregator/src/articleviewer.cpp
-===================================================================
---- akregator/src/articleviewer.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/articleviewer.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -76,7 +76,7 @@
- namespace Akregator {
-
- ArticleViewer::ArticleViewer(QWidget *parent)
-- : QWidget(parent),
-+ : QFrame(parent),
- m_url(0),
- m_htmlFooter(),
- m_currentText(),
-@@ -87,6 +87,7 @@
- m_normalViewFormatter( new DefaultNormalViewFormatter( m_imageDir, m_part->view() ) ),
- m_combinedViewFormatter( new DefaultCombinedViewFormatter( m_imageDir, m_part->view() ) )
- {
-+ setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
- QGridLayout* layout = new QGridLayout(this);
- layout->setMargin(0);
- layout->addWidget(m_part->widget(), 0, 0);
-@@ -137,16 +138,6 @@
- action->setText(i18n("&Save Link As..."));
- connect(action, SIGNAL(triggered(bool) ), SLOT(slotSaveLinkAs()));
-
-- action = m_part->actionCollection()->addAction("articleviewer_scroll_up");
-- action->setText(i18n("&Scroll Up"));
-- connect(action, SIGNAL(triggered(bool)), SLOT(slotScrollUp()));
-- action->setShortcuts(KShortcut( "Up" ));
--
-- action = m_part->actionCollection()->addAction("articleviewer_scroll_down");
-- action->setText(i18n("&Scroll Down"));
-- connect(action, SIGNAL(triggered(bool)), SLOT(slotScrollDown()));
-- action->setShortcuts(KShortcut( "Down" ));
--
- updateCss();
-
- connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged()));
-@@ -337,18 +328,11 @@
- emit completed();
- }
-
--void ArticleViewer::slotScrollUp()
-+void ArticleViewer::slotZoomIn(int id)
- {
-- m_part->view()->scrollBy(0,-10);
--}
-+ if (id != 0)
-+ return;
-
--void ArticleViewer::slotScrollDown()
--{
-- m_part->view()->scrollBy(0,10);
--}
--
--void ArticleViewer::slotZoomIn()
--{
- int zf = m_part->fontScaleFactor();
- if (zf < 100)
- {
-@@ -362,8 +346,11 @@
- }
- }
-
--void ArticleViewer::slotZoomOut()
-+void ArticleViewer::slotZoomOut(int id)
- {
-+ if (id != 0)
-+ return;
-+
- int zf = m_part->fontScaleFactor();
- if (zf <= 100)
- {
-Index: akregator/src/org.kde.akregator.part.xml
-===================================================================
---- akregator/src/org.kde.akregator.part.xml (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/org.kde.akregator.part.xml (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -16,5 +16,8 @@
- <arg name="url" type="s" direction="in"/>
- </method>
- <method name="addFeed" />
-+ <method name="handleCommandLine">
-+ <arg name="result" type="b" direction="out"/>
-+ </method>
- </interface>
- </node>
-Index: akregator/src/aboutdata.h
-===================================================================
---- akregator/src/aboutdata.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/aboutdata.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -28,7 +28,7 @@
- #include "akregator_export.h"
- #include <kaboutdata.h>
-
--#define AKREGATOR_VERSION "1.5.0"
-+#define AKREGATOR_VERSION "1.5.1"
-
- namespace Akregator {
- /**
-Index: akregator/src/akregator_part.h
-===================================================================
---- akregator/src/akregator_part.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/akregator_part.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -124,6 +124,8 @@
-
- void exportFile(const KUrl& url);
-
-+ bool handleCommandLine();
-+
- public slots:
- /** Used to save settings after changing them from configuration dialog. Calls AkregatorPart's saveSettings. */
- void saveSettings();
-Index: akregator/src/actionmanagerimpl.cpp
-===================================================================
---- akregator/src/actionmanagerimpl.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/actionmanagerimpl.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -366,7 +366,9 @@
- KToggleAction* importantAction = coll->add<KToggleAction>("article_set_status_important");
- importantAction->setText(i18n("&Mark as Important"));
- importantAction->setIcon(KIcon("mail-mark-important"));
-- importantAction->setShortcuts(KShortcut("Ctrl+I"));
-+ KShortcut importantSC( "Ctrl+I" );
-+ importantSC.setAlternate( Qt::Key_I );
-+ importantAction->setShortcuts( importantSC );
- importantAction->setCheckedState(KGuiItem(i18n("Remove &Important Mark")));
- connect(importantAction, SIGNAL(triggered(bool)), d->mainWidget, SLOT(slotArticleToggleKeepFlag(bool)));
-
-@@ -419,17 +421,8 @@
- action = KStandardAction::copy(articleViewer, SLOT(slotCopy()), coll);
- coll->addAction("viewer_copy", action);
-
-- action = coll->addAction("inc_font_sizes");
-- action->setIcon(KIcon("zoom-in"));
-- action->setText(i18n("&Increase Font Sizes"));
-- connect(action, SIGNAL(triggered(bool)), articleViewer, SLOT(slotZoomIn()));
-- action->setShortcut( QKeySequence::ZoomIn );
--
-- action = coll->addAction("dec_font_sizes");
-- action->setIcon(KIcon("zoom-out"));
-- action->setText(i18n("&Decrease Font Sizes"));
-- connect(action, SIGNAL(triggered(bool)), articleViewer, SLOT(slotZoomOut()));
-- action->setShortcut( QKeySequence::ZoomOut );
-+ connect(d->tabWidget, SIGNAL(signalZoomInFrame(int)), d->articleViewer, SLOT(slotZoomIn(int)));
-+ connect(d->tabWidget, SIGNAL(signalZoomOutFrame(int)), d->articleViewer, SLOT(slotZoomOut(int)));
- }
-
- void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
-@@ -545,6 +538,18 @@
- action->setText(i18n("&Close Tab"));
- connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotCloseTab()));
- action->setShortcuts(KStandardShortcut::close());
-+
-+ action = coll->addAction("inc_font_sizes");
-+ action->setIcon(KIcon("zoom-in"));
-+ action->setText(i18n("&Increase Font Sizes"));
-+ connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotFrameZoomIn()));
-+ action->setShortcut( QKeySequence::ZoomIn );
-+
-+ action = coll->addAction("dec_font_sizes");
-+ action->setIcon(KIcon("zoom-out"));
-+ action->setText(i18n("&Decrease Font Sizes"));
-+ connect(action, SIGNAL(triggered(bool)), d->tabWidget, SLOT(slotFrameZoomOut()));
-+ action->setShortcut( QKeySequence::ZoomOut );
- }
-
- void ActionManagerImpl::initFrameManager(FrameManager* frameManager)
-Index: akregator/src/akregator_part.cpp
-===================================================================
---- akregator/src/akregator_part.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/akregator_part.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -46,6 +46,7 @@
- #include <knotifyconfigwidget.h>
- #include <kaboutdata.h>
- #include <kapplication.h>
-+#include <KCmdLineArgs>
- #include <kconfig.h>
- #include <kconfigdialog.h>
- #include <kfiledialog.h>
-@@ -658,7 +659,25 @@
- underline = konq.readEntry("UnderlineLinks", false);
- Settings::setUnderlineLinks(underline);
- }
-+}
-
-+bool Part::handleCommandLine() {
-+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-+ QString addFeedGroup = !args->getOption("group").isEmpty() ?
-+ args->getOption("group")
-+ : i18n("Imported Folder");
-+
-+ QStringList feedsToAdd = args->getOptionList("addfeed");
-+
-+ if (feedsToAdd.isEmpty() && args->count() > 0) {
-+ QString url = args->url(0).url();
-+ if(!url.isEmpty())
-+ feedsToAdd.append(url);
-+ }
-+
-+ if (!feedsToAdd.isEmpty())
-+ addFeedsToGroup( feedsToAdd, addFeedGroup );
-+ return true;
- }
-
- } // namespace Akregator
-Index: akregator/src/tabwidget.cpp
-===================================================================
---- akregator/src/tabwidget.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/tabwidget.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -179,6 +179,21 @@
- return w ? frames.value(w) : 0;
- }
-
-+void TabWidget::slotFrameZoomIn()
-+{
-+ if ( !d->currentFrame() )
-+ return;
-+ emit signalZoomInFrame( d->currentFrame()->id() );
-+}
-+
-+void TabWidget::slotFrameZoomOut()
-+{
-+ if ( !d->currentFrame() )
-+ return;
-+ emit signalZoomOutFrame( d->currentFrame()->id() );
-+}
-+
-+
- void TabWidget::slotTabChanged(int index)
- {
-
-Index: akregator/src/main.cpp
-===================================================================
---- akregator/src/main.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/main.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -27,6 +27,7 @@
- #include "akregator_options.h"
-
- #include <kcmdlineargs.h>
-+#include <KDebug>
- #include <klocale.h>
- #include <libkdepim/pimapplication.h>
- #include <QtDBus/QtDBus>
-@@ -62,25 +63,7 @@
- akr.call( "openStandardFeedList");
- }
-
-- QString addFeedGroup = !args->getOption("group").isEmpty() ?
-- args->getOption("group")
-- : i18n("Imported Folder");
--
-- QStringList feeds = args->getOptionList("addfeed");
-- QStringList feedsToAdd;
-- QStringList::ConstIterator end( feeds.constEnd() );
-- for (QStringList::ConstIterator it = feeds.constBegin(); it != end; ++it)
-- feedsToAdd.append(*it);
--
-- if (feedsToAdd.isEmpty() && args->count() > 0) {
-- QString url = args->url(0).url();
-- if(!url.isEmpty())
-- feedsToAdd.append(url);
-- }
--
-- if (!feedsToAdd.isEmpty())
-- akr.call("addFeedsToGroup", feedsToAdd, addFeedGroup );
--
-+ akr.call( "handleCommandLine" );
- args->clear();
- }
- return KUniqueApplication::newInstance();
-@@ -95,6 +78,11 @@
- KCmdLineArgs::addCmdLineOptions( Akregator::akregator_options() );
- KUniqueApplication::addCmdLineOptions();
-
-+ if ( !Akregator::Application::start() ) {
-+ kWarning() << "akregator is already running, exiting.";
-+ exit( 0 );
-+ }
-+
- Akregator::Application app;
-
- // start knotifyclient if not already started. makes it work for people who doesn't use full kde, according to kmail devels
-Index: akregator/src/mainwidget.cpp
-===================================================================
---- akregator/src/mainwidget.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/mainwidget.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -343,6 +343,8 @@
- BrowserFrame* frame = new BrowserFrame(m_tabWidget);
-
- connect( m_part, SIGNAL(signalSettingsChanged()), frame, SLOT(slotPaletteOrFontChanged()));
-+ connect( m_tabWidget, SIGNAL(signalZoomInFrame(int)), frame, SLOT(slotZoomIn(int)));
-+ connect( m_tabWidget, SIGNAL(signalZoomOutFrame(int)), frame, SLOT(slotZoomOut(int)));
-
- Kernel::self()->frameManager()->slotAddFrame(frame);
-
-@@ -1114,6 +1116,8 @@
- frame->loadConfig( config, framePrefix + QLatin1Char( '_' ) );
-
- connect( m_part, SIGNAL(signalSettingsChanged()), frame, SLOT(slotPaletteOrFontChanged()));
-+ connect( m_tabWidget, SIGNAL(signalZoomInFrame(int)), frame, SLOT(slotZoomIn(int)));
-+ connect( m_tabWidget, SIGNAL(signalZoomOutFrame(int)), frame, SLOT(slotZoomOut(int)));
-
- Kernel::self()->frameManager()->slotAddFrame(frame);
-
-Index: akregator/src/browserframe.cpp
-===================================================================
---- akregator/src/browserframe.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/browserframe.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -47,6 +47,7 @@
- #include <kxmlguiclient.h>
- #include <kparts/browserextension.h>
- #include <kparts/part.h>
-+#include <khtml_part.h>
-
- #include <cassert>
-
-@@ -131,6 +132,65 @@
- emit signalOpenUrlRequest( req );
- }
-
-+bool BrowserFrame::hasZoom() const
-+{
-+ return qobject_cast<KHTMLPart *>( d->part ) != 0;
-+}
-+
-+void BrowserFrame::slotZoomIn(int zoomid)
-+{
-+ if ( zoomid != id() )
-+ return;
-+
-+ if ( !d->part )
-+ return;
-+
-+ if ( KHTMLPart * const khtml_part = qobject_cast<KHTMLPart *>( d->part ) ) {
-+ int zf = khtml_part->fontScaleFactor();
-+ if (zf < 100) {
-+ zf = zf - (zf % 20) + 20;
-+ khtml_part->setFontScaleFactor(zf);
-+ } else {
-+ zf = zf - (zf % 50) + 50;
-+ khtml_part->setFontScaleFactor(zf < 300 ? zf : 300);
-+ }
-+ }
-+}
-+
-+void BrowserFrame::slotZoomOut(int zoomid)
-+{
-+ if ( zoomid != id() )
-+ return;
-+
-+ if ( !d->part )
-+ return;
-+
-+ if ( KHTMLPart * const khtml_part = qobject_cast<KHTMLPart *>( d->part ) ) {
-+ int zf = khtml_part->fontScaleFactor();
-+ if (zf <= 100) {
-+ zf = zf - (zf % 20) - 20;
-+ khtml_part->setFontScaleFactor(zf > 20 ? zf : 20);
-+ } else {
-+ zf = zf - (zf % 50) - 50;
-+ khtml_part->setFontScaleFactor(zf);
-+ }
-+ }
-+}
-+
-+int BrowserFrame::getZoomFactor() const
-+{
-+ if ( KHTMLPart * const khtml_part = qobject_cast<KHTMLPart *>( d->part ) )
-+ return khtml_part->fontScaleFactor();
-+
-+ return -1;
-+}
-+
-+void BrowserFrame::setZoomFactor( int zf )
-+{
-+ if (KHTMLPart* const khtml_part = qobject_cast<KHTMLPart *>( d->part ) )
-+ khtml_part->setFontScaleFactor( zf );
-+}
-+
- namespace {
-
- enum SeparatorOption {
-@@ -198,6 +258,13 @@
- addActionsToMenu( popup, actionGroups.value( "editactions" ), NoSeparator );
- }
-
-+ if (hasZoom())
-+ {
-+ addSeparatorIfNotFirst();
-+ popup->addAction( ActionManager::getInstance()->action("inc_font_sizes") );
-+ popup->addAction( ActionManager::getInstance()->action("dec_font_sizes") );
-+ }
-+
- addSeparatorIfNotFirst();
- addActionsToMenu( popup, actionGroups.value( "part" ), NoSeparator );
-
-@@ -367,19 +434,22 @@
-
- void BrowserFrame::loadConfig( const KConfigGroup& config, const QString& prefix)
- {
-- QString url = config.readEntry( QString::fromLatin1( "url" ).prepend( prefix ), QString() );
-- QString mimetype = config.readEntry( QString::fromLatin1( "mimetype" ).prepend( prefix ), QString() );
-+ const QString url = config.readEntry( QString::fromLatin1( "url" ).prepend( prefix ), QString() );
-+ const QString mimetype = config.readEntry( QString::fromLatin1( "mimetype" ).prepend( prefix ), QString() );
-+ const int zf = config.readEntry( QString::fromLatin1( "zoom" ).prepend( prefix ), 100 );
- OpenUrlRequest req(url);
- KParts::OpenUrlArguments args;
- args.setMimeType(mimetype);
- req.setArgs(args);
- openUrl(req);
-+ setZoomFactor( zf );
- }
-
- void BrowserFrame::saveConfig( KConfigGroup& config, const QString& prefix)
- {
- config.writeEntry( QString::fromLatin1( "url" ).prepend( prefix ), url().url() );
- config.writeEntry( QString::fromLatin1( "mimetype" ).prepend( prefix ), d->mimetype );
-+ config.writeEntry( QString::fromLatin1( "zoom" ).prepend( prefix ), getZoomFactor() );
- }
-
- #include "browserframe.moc"
-Index: akregator/src/articleviewer.h
-===================================================================
---- akregator/src/articleviewer.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/articleviewer.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -29,8 +29,8 @@
-
- #include <khtml_part.h>
-
-+#include <QFrame>
- #include <QPointer>
--#include <QWidget>
-
- #include <boost/shared_ptr.hpp>
- #include <vector>
-@@ -51,7 +51,7 @@
-
- class ArticleViewerPart;
-
--class ArticleViewer : public QWidget
-+class ArticleViewer : public QFrame
- {
- Q_OBJECT
- public:
-@@ -80,10 +80,8 @@
-
- public slots:
-
-- void slotScrollUp();
-- void slotScrollDown();
-- void slotZoomIn();
-- void slotZoomOut();
-+ void slotZoomIn(int);
-+ void slotZoomOut(int);
- void slotSetZoomFactor(int percent);
- void slotPrint();
-
-Index: akregator/src/tabwidget.h
-===================================================================
---- akregator/src/tabwidget.h (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/tabwidget.h (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -54,11 +54,15 @@
- void slotAddFrame(Akregator::Frame* f);
- void slotRemoveFrame(int frameId);
- void slotSelectFrame(int frameId);
-+ void slotFrameZoomIn();
-+ void slotFrameZoomOut();
-
- Q_SIGNALS:
- void signalCurrentFrameChanged(int);
- void signalRemoveFrameRequest(int);
- void signalOpenUrlRequest(Akregator::OpenUrlRequest&);
-+ void signalZoomInFrame(int);
-+ void signalZoomOutFrame(int);
-
- private:
- /*reimpl*/ void tabInserted( int );
-Index: akregator/src/utils/filtercolumnsproxymodel.cpp
-===================================================================
---- akregator/src/utils/filtercolumnsproxymodel.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/utils/filtercolumnsproxymodel.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -29,7 +29,7 @@
- using namespace Akregator;
-
- FilterColumnsProxyModel::FilterColumnsProxyModel( QObject* parent )
-- : QSortFilterProxyModel( parent ), m_mode( Whitelist ), m_vecSize( 0 )
-+ : QSortFilterProxyModel( parent ), m_vecSize( 0 ), m_mode( Whitelist )
- {
-
- }
-Index: akregator/src/addfeeddialog.cpp
-===================================================================
---- akregator/src/addfeeddialog.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/src/addfeeddialog.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -87,11 +87,17 @@
- m_feed = new Feed( Kernel::self()->storage() );
-
- // HACK: make weird wordpress links ("feed:http://foobar/rss") work
-- if (feedUrl.startsWith(QLatin1String("feed:")))
-+ if (feedUrl.startsWith(QLatin1String("feed:http")))
- feedUrl = feedUrl.right( feedUrl.length() - 5 );
-
- if (feedUrl.indexOf(":/") == -1)
- feedUrl.prepend("http://");
-+
-+ KUrl asUrl( feedUrl );
-+ if ( asUrl.scheme() == QLatin1String("feed") ) {
-+ asUrl.setScheme( "http" );
-+ feedUrl = asUrl.url();
-+ }
- m_feed->setXmlUrl(feedUrl);
-
- widget->statusLabel->setText( i18n("Downloading %1", feedUrl) );
-Index: akregator/configuration/akregator_config_advanced.desktop
-===================================================================
---- akregator/configuration/akregator_config_advanced.desktop (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ akregator/configuration/akregator_config_advanced.desktop (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -23,6 +23,7 @@
- Name[ga]=Ardsocruithe
- Name[gl]=Avanzado
- Name[hu]=Speciális
-+Name[is]=Nánar
- Name[it]=Avanzate
- Name[ja]=詳細
- Name[km]=កម្រិតខ្ពស់
-Index: libkleo/libkleopatrarc.desktop
-===================================================================
---- libkleo/libkleopatrarc.desktop (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ libkleo/libkleopatrarc.desktop (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -333,6 +333,7 @@
- Name[ga]=Eochracha Eile
- Name[gl]=Outras chaves
- Name[hu]=Egyéb kulcsok
-+Name[is]=Aðrir lyklar
- Name[it]=Altre chiavi
- Name[ja]=その他の鍵
- Name[km]=សោផ្សេងទៀត
-Index: kmail/kmreadermainwin.rc
-===================================================================
---- kmail/kmreadermainwin.rc (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ kmail/kmreadermainwin.rc (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -1,5 +1,5 @@
- <!DOCTYPE kpartgui>
--<kpartgui version="411" name="kmreadermainwin" >
-+<kpartgui version="412" name="kmreadermainwin" >
- <MenuBar>
- <Menu noMerge="1" name="file" >
- <text>&File</text>
-@@ -11,6 +11,10 @@
- <Separator/>
- <Action name="file_close" />
- </Menu>
-+ <Menu noMerge="1" name="edit">
-+ <text>&Edit</text>
-+ <Action name="kmail_copy"/>
-+ </Menu>
- <Menu noMerge="1" name="view">
- <text>&View</text>
- <Action name="view_headers"/>
-Index: kmail/kmfilterdlg.cpp
-===================================================================
---- kmail/kmfilterdlg.cpp (.../tags/KDE/4.3.0/kdepim) (wersja 1013413)
-+++ kmail/kmfilterdlg.cpp (.../branches/KDE/4.3/kdepim) (wersja 1013413)
-@@ -168,14 +168,14 @@
- hbl = new QHBoxLayout( page1 );
- hbl->setObjectName( "kmfd_hbl" );
- hbl->setSpacing( spacingHint() );
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim-branch.diff?r1=1.12&r2=1.13&f=u
More information about the pld-cvs-commit
mailing list