rev 3155 - trunk/packages/kdeaddons/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sun Feb 19 17:27:21 UTC 2006 

Author: chrsmrtn
Date: 2006-02-19 17:27:20 +0000 (Sun, 19 Feb 2006)
New Revision: 3155

Added:
   trunk/packages/kdeaddons/debian/patches/01_kdeaddons_branch_r511371.diff
Log:
kdeaddons branch pull.


Added: trunk/packages/kdeaddons/debian/patches/01_kdeaddons_branch_r511371.diff
===================================================================
--- trunk/packages/kdeaddons/debian/patches/01_kdeaddons_branch_r511371.diff	2006-02-19 17:22:26 UTC (rev 3154)
+++ trunk/packages/kdeaddons/debian/patches/01_kdeaddons_branch_r511371.diff	2006-02-19 17:27:20 UTC (rev 3155)
@@ -0,0 +1,239 @@
+#DPATCHLEVEL=0
+--- kate/tabbarextension/plugin_katetabbarextension.cpp	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ kate/tabbarextension/plugin_katetabbarextension.cpp	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -364,6 +364,7 @@
+   connect(doc,
+       SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),
+       SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char)));
++  if(doc->isModified()) tab->triggerModified();
+   tab->show();
+   top->addWidget(tab);
+   m_tabs.append(tab);
+--- kate/filelistloader/katefll_plugin.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ kate/filelistloader/katefll_plugin.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -31,7 +31,7 @@
+ Name[nn]=Fillistelastar for Kate
+ Name[nso]=Molaisi wa Palo ya Faele ya Kate
+ Name[pa]=ਕੇਟ ਫਾਇਲ ਸੂਚੀ ਲੋਡਰ
+-Name[pl]=Program wczytyjący listę plików do Kate
++Name[pl]=Program wczytujący listę plików do Kate
+ Name[pt]=Leitor da Lista de Ficheiros do Kate
+ Name[pt_BR]=Carregador de Lista de Arquivos do Kate
+ Name[ro]=Încărcător listă de fişiere Kate
+--- kate/filelistloader/katefll.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ kate/filelistloader/katefll.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -32,7 +32,7 @@
+ GenericName[nn]=Skriveprogram/FLL
+ GenericName[nso]=/FLL ya Mofetosi wa Sengwalwana
+ GenericName[pa]=ਪਾਠ ਸੰਪਾਦਕ /FLL
+-GenericName[pl]=Edytor tekstowy /Wczytywanie listy plików
++GenericName[pl]=Edytor tekstu /Wczytywanie listy plików
+ GenericName[pt]=Lista de Ficheiros do Editor de Texto
+ GenericName[pt_BR]=Editor de Texto /FLL
+ GenericName[ro]=Editor de text / FFL
+--- kate/insertcommand/kateinsertcommand.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ kate/insertcommand/kateinsertcommand.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -31,6 +31,7 @@
+ Name[pt]=Inserção de Comandos do Kate
+ Name[pt_BR]=Inserir Comando do Kate
+ Name[ro]=Inserare comandă Kate
++Name[ru]=Вставка вывода команды в Kate
+ Name[sr]=„Убацивање наредбе“ за Kate
+ Name[sr at Latn]=„Ubacivanje naredbe“ za Kate
+ Name[sv]=Kate - Infoga kommando
+--- kate/snippets/katesnippets.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ kate/snippets/katesnippets.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -70,4 +70,4 @@
+ Comment[tr]=Kate için Yapılandırılabilir Kod Parçacıkları
+ Comment[uk]=Текстові уривки для Kate, які можна налаштовувати
+ Comment[zh_CN]=可配置的 Kate 文本段
+-author=Stephan Möres, Erdling at gmx.net
++author=Stephan Möres, Erdling at gmx.net
+--- konq-plugins/kuick/kmetamenu.cpp	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ konq-plugins/kuick/kmetamenu.cpp	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -106,7 +106,7 @@
+         m_contacts = new KIMContactMenu( parent, imProxy );
+         int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts );
+         connect ( m_contacts, SIGNAL( contactChosen( const QString &) ), SIGNAL( contactChosen( const QString & ) ) );
+-        if ( !imProxy->initialize() && imProxy->imAppsAvailable() )
++        if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() )
+           setItemEnabled( item, false );
+     }
+ 
+--- konq-plugins/kuick/kmetamenu.h	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ konq-plugins/kuick/kmetamenu.h	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -48,14 +48,14 @@
+      void slotBrowse( );
+ signals:
+      void fileChosen( const QString &path );
+-	 void contactChosen( const QString &uid );
++     void contactChosen( const QString &uid );
+ private:
+      KDirMenu *m_root;
+      KDirMenu *m_home;
+      KDirMenu *m_etc;
+      KDirMenu *m_current;
+-	 KIMContactMenu *m_contacts;
+-	 KIMProxy *m_proxy;
++     KIMContactMenu *m_contacts;
++     KIMProxy *m_proxy;
+      KAction *m_browse;
+      QStringList list;
+      KConfig *conf;
+--- konq-plugins/sidebar/metabar/src/metabar.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ konq-plugins/sidebar/metabar/src/metabar.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -26,7 +26,7 @@
+ Comment[pl]=Panel nawigacyjny Metabar dla Konquerora
+ Comment[pt]=Um 'plugin' de navegação do konqueror chamado Metabar
+ Comment[pt_BR]=Um plugin de navegação para o Konqueror chamado de Metabar
+-Comment[ru]=Панель навигации Konqueror
++Comment[ru]=Панель сведений Konqueror
+ Comment[sr]=Прикључак за навигациону таблу konqueror-а назван Метапалета
+ Comment[sr at Latn]=Priključak za navigacionu tablu konqueror-a nazvan Metapaleta
+ Comment[sv]=Ett sidopanelinsticksprogram för Konqueror kallad Metarad
+@@ -47,6 +47,7 @@
+ Name[pa]=ਮੈਟਾ-ਪੱਟੀ
+ Name[pl]=Metabar
+ Name[pt_BR]=MetaBar
++Name[ru]=Сведения
+ Name[sr]=метапалета
+ Name[sr at Latn]=metapaleta
+ Name[sv]=Metarad
+--- konq-plugins/sidebar/metabar/src/metabar_add.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ konq-plugins/sidebar/metabar/src/metabar_add.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -22,7 +22,7 @@
+ Comment[pl]=Wtyczka panelu nawigacyjnego Metabar dla Konquerora
+ Comment[pt]=Um 'plugin' de navegação do konqueror chamado Metabar
+ Comment[pt_BR]=Um plugin de navegação para o Konqueror chamado de MetaBar
+-Comment[ru]=Панель навигации Konqueror
++Comment[ru]=Панель сведений Konqueror
+ Comment[sr]=Прикључак за навигациону таблу konqueror-а назван Метапалета
+ Comment[sr at Latn]=Priključak za navigacionu tablu konqueror-a nazvan Metapaleta
+ Comment[sv]=Ett sidopanelinsticksprogram för Konqueror kallad Metarad
+@@ -39,7 +39,7 @@
+ Name[nl]=Metabalk
+ Name[pa]=ਮੈਟਾ-ਪੱਟੀ
+ Name[pt_BR]=MetaBar
+-Name[ru]=Панель навигации
++Name[ru]=Сведения
+ Name[sr]=Метапалета
+ Name[sr at Latn]=Metapaleta
+ Name[sv]=Metarad
+--- renamedlgplugins/audio/renaudiodlg.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ renamedlgplugins/audio/renaudiodlg.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -12,7 +12,7 @@
+ Name[el]=Προεπισκόπηση ήχου
+ Name[es]=Reproducir audio
+ Name[et]=Audiofailide eelvaatlus
+-Name[eu]=Audio aurreikuspena
++Name[eu]=Audio aurrebista
+ Name[fi]=Musiikkiesikatselu
+ Name[fr]=Aperçu audio
+ Name[ga]=Réamhléargas Fuaime
+--- doc/kate-plugins/insertcommand.docbook	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ doc/kate-plugins/insertcommand.docbook	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -12,8 +12,8 @@
+ </affiliation>
+ </author>
+ </authorgroup>
+-<date>2001-05-15</date>
+-<releaseinfo>1.00.00</releaseinfo>
++<date>2006-02-15</date>
++<releaseinfo>2.5.1</releaseinfo>
+ <abstract>
+ <para>
+ The <quote>Insert Command</quote> plugin allows you to insert shell
+@@ -32,12 +32,18 @@
+ <para>The <quote>Insert Command</quote> plugin allows you to insert
+ shell command output into a document open in &kate;.</para>
+ 
++<para>First enable the <quote>Insert Command</quote> plugin by using the 
++<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure
++&kate;...</guimenuitem></menuchoice> dialog and checking <guilabel>&kate;
++InsertCommand</guilabel> in Application under the Plugins
++tab.</para>
++
+ <sect1 id="insertcommand-fund">
+ <title>Onscreen Fundamentals</title>
+ 
+ <para>
+ <!-- Basics of using this plugin --> To use the plugin, select
+-<guimenu>Insert Command</guimenu> from the <guimenu>Edit</guimenu>
++<guimenu>Insert Command...</guimenu> from the <guimenu>Tools</guimenu>
+ menu, which will present you with a small dialog for entering the
+ command, choosing a working folder and selecting whether to include
+ errors (STDERR output) in the inserted text. You can also have the
+@@ -72,9 +78,19 @@
+ <!-- Configuration of this plugin, if there is any, else remove this
+ --> <!-- section --> To configure the <quote>Insert Command</quote>
+ plugin, open the Kate configuration dialog from the
+-<guimenu>Settings</guimenu> menu and choose the
++<menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
++&kate;...</guimenuitem></menuchoice> menu and choose the
+ <menuchoice><guimenuitem>Plugins</guimenuitem><guilabel>Insert Command
+ page</guilabel></menuchoice>. </para>
++
++<mediaobject>
++<imageobject><imagedata format="PNG"
++fileref="configure_insertcommand.png"/></imageobject>
++<textobject>
++<phrase>The Insert Command Configuration Tab</phrase>
++</textobject>
++</mediaobject>
++
+ <para>
+ The following configuration options are available:
+ </para>
+@@ -85,7 +101,7 @@
+ <listitem>
+ <para>This setting is presented as a spinbox which you can set to the
+ number of commands to be remembered. Any number from 0 to 99 is
+-legal.</para>
++legal. Default is 20.</para>
+ </listitem>
+ </varlistentry>
+ 
+--- doc/kate-plugins/filetemplates.docbook	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ doc/kate-plugins/filetemplates.docbook	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -15,10 +15,6 @@
+     <date>Mon Feb 16 2004</date>
+     <releaseinfo>0.1</releaseinfo>
+ 
+-    <abstract>
+-      <para></para>
+-    </abstract>
+-
+     <keywordset>
+       <keyword>KDE</keyword>
+       <keyword>kate</keyword>
+--- doc/konq-plugins/fsview/index.docbook	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ doc/konq-plugins/fsview/index.docbook	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -159,7 +159,7 @@
+ Arrow</keycap> and <keycap>Down Arrow</keycap> keys to go up and down
+ the nesting hierarchy. <keycap>Space</keycap> selects the item, in
+ conjunction with &Shift; does range selection, and with the &Ctrl; key
+-hold down simultaniously, toggles selection of the current item. Press
++hold down simultaneously, toggles selection of the current item. Press
+ <keycap>Return</keycap> to run the open action onto the current item.</para>
+ 
+ </sect2>
+--- kicker-applets/mediacontrol/mediacontrol.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ kicker-applets/mediacontrol/mediacontrol.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -13,6 +13,7 @@
+ Name[eu]=Multimedia kontrola
+ Name[fi]=Medianhallinta
+ Name[fr]=Télécommande multimédia
++Name[he]=בקרת מדיה
+ Name[hu]=Médiavezérlő
+ Name[is]=Margmiðlunarstjórn
+ Name[it]=Controllo multimediale
+--- kicker-applets/ktimemon/ktimemon.desktop	(.../tags/KDE/3.5.1/kdeaddons)	(revision 511371)
++++ kicker-applets/ktimemon/ktimemon.desktop	(.../branches/KDE/3.5/kdeaddons)	(revision 511371)
+@@ -18,6 +18,7 @@
+ Comment[fi]=Yksinkertainen järjestelmänvalvontaohjelma
+ Comment[fr]=Un moniteur système simple
+ Comment[ga]=Monatóir simplí an chórais
++Comment[he]=צג מערכת פשוט עבור KDE
+ Comment[hu]=Egyszerű rendszermonitor
+ Comment[is]=Einfalt kerfiseftirlit
+ Comment[it]=Un semplice monitor di sistema

More information about the pkg-kde-commits mailing list