rev 4424 - trunk/packages/kdewebdev/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Aug 26 21:25:18 UTC 2006


Author: chrsmrtn
Date: 2006-08-26 21:25:16 +0000 (Sat, 26 Aug 2006)
New Revision: 4424

Added:
   trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r577441.diff
Log:
kdewebdev branch pull.


Added: trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r577441.diff
===================================================================
--- trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r577441.diff	2006-08-26 21:24:18 UTC (rev 4423)
+++ trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r577441.diff	2006-08-26 21:25:16 UTC (rev 4424)
@@ -0,0 +1,790 @@
+#DPATCHLEVEL=0
+--- kfilereplace/kfilereplacepart.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kfilereplace/kfilereplacepart.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -42,6 +42,7 @@
+ Comment[uk]=Засіб пакетного пошуку та заміни
+ Comment[zh_CN]=批量搜索替换工具
+ Comment[zh_HK]=批次搜尋及取代工具
++Comment[zh_TW]=批次搜尋及取代工具
+ Name=KFileReplace
+ Name[hi]=के-फ़ाइल-रिप्लेस
+ Name[sk]=KFile zameniť
+@@ -81,3 +82,4 @@
+ GenericName[uk]=Перегляд заміни в файлах
+ GenericName[zh_CN]=文件替换视图
+ GenericName[zh_HK]=檔案取代檢視模式
++GenericName[zh_TW]=檔案取代檢視
+--- kfilereplace/kfilereplace.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kfilereplace/kfilereplace.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -43,4 +43,5 @@
+ GenericName[uk]=Засіб пошуку та заміни
+ GenericName[zh_CN]=搜索替换工具
+ GenericName[zh_HK]=搜尋及取代工具
++GenericName[zh_TW]=搜尋及取代工具
+ Categories=Qt;KDE;Utility;X-KDE-Utilities-File;
+--- quanta/components/debugger/interfaces/quantadebugger.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/components/debugger/interfaces/quantadebugger.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -36,3 +36,4 @@
+ Comment[uk]=Втулок зневадження Quanta
+ Comment[zh_CN]=Quanta 调试器插件
+ Comment[zh_HK]=一個 Quanta 除錯器的外掛程式
++Comment[zh_TW]=一個 Quanta 除錯器的外掛程式
+--- quanta/components/debugger/gubed/quantadebuggergubed.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/components/debugger/gubed/quantadebuggergubed.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -36,6 +36,7 @@
+ Comment[uk]=Втулок зневадження Quanta для зв'язку зі зневаджувачем PHP -- Gubed, див. http://gubed.sf.net
+ Comment[zh_CN]=与 Gubed PHP 调试器交互 Quanta 调试器插件,见 http://gubed.sf.net
+ Comment[zh_HK]=Quanta 對於 Gubed PHP 除錯器的通訊外掛程式, 請參閱 http://gubed.sf.net
++Comment[zh_TW]=Quanta 對於 Gubed PHP 除錯器的通訊外掛程式, 請參閱 http://gubed.sf.net
+ Icon=kdbg
+ ServiceTypes=Quanta/Debugger
+ X-KDE-Library=quantadebuggergubed
+--- quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -32,6 +32,7 @@
+ Comment[uk]=Втулок зневаджувача DBGp, див. http://xdebug.org
+ Comment[zh_CN]=DBGp 调试器插件,参看 http://xdebug.org
+ Comment[zh_HK]=DBGp 除錯器外掛程式,請參閱 http://xdebug.org
++Comment[zh_TW]=DBGp 除錯器外掛程式,請參閱 http://xdebug.org
+ Icon=kdbg
+ ServiceTypes=Quanta/Debugger
+ X-KDE-Library=quantadebuggerdbgp
+--- quanta/src/quanta.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/src/quanta.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -47,6 +47,7 @@
+ GenericName[uk]=Середовище веб-розробки
+ GenericName[zh_CN]=Web 开发环境
+ GenericName[zh_HK]=網頁開發環境
++GenericName[zh_TW]=網頁開發環境
+ Comment=Web Development Environment
+ Comment[bg]=Среда за разработка на уеб приложения
+ Comment[ca]=Entorn de desenvolupament web
+@@ -84,4 +85,5 @@
+ Comment[uk]=Середовище веб-розробки
+ Comment[zh_CN]=Web 开发环境
+ Comment[zh_HK]=網頁開發環境
++Comment[zh_TW]=網頁開發環境
+ Categories=Qt;KDE;Development;WebDevelopment;
+--- quanta/src/x-webprj.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/src/x-webprj.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -37,6 +37,7 @@
+ Comment[uk]=Проект Quanta
+ Comment[zh_CN]=Quanta 工程
+ Comment[zh_HK]=Quanta 專案
++Comment[zh_TW]=Quanta 專案
+ Icon=quanta
+ Type=MimeType
+ MimeType=application/x-webprj
+--- quanta/src/quanta_be.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/src/quanta_be.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -40,6 +40,7 @@
+ GenericName[uk]=Середовище веб-розробки
+ GenericName[zh_CN]=Web 开发环境
+ GenericName[zh_HK]=網頁開發環境
++GenericName[zh_TW]=網頁開發環境
+ Exec=quanta_be
+ Icon=quanta_be
+ Type=Application
+@@ -82,4 +83,5 @@
+ Comment[uk]=Середовище веб-розробки
+ Comment[zh_CN]=Web 开发环境
+ Comment[zh_HK]=網頁開發環境
++Comment[zh_TW]=網頁開發環境
+ Categories=Qt;KDE;Development;
+--- quanta/data/config/quanta_preview_config.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/data/config/quanta_preview_config.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -37,3 +37,4 @@
+ Name[uk]=Налаштувати компонент перегляду KHTML
+ Name[zh_CN]=配置 KHTML 浏览器部件
+ Name[zh_HK]=設定 KHTML 瀏覽器元件
++Name[zh_TW]=設定 KHTML 瀏覽器 Part
+--- quanta/treeviews/structtreeview.cpp	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ quanta/treeviews/structtreeview.cpp	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -514,7 +514,6 @@
+           slotMouseClickedVPL(button, item, point, dummy);
+       else
+           slotGotoTag(item);
+-      slotGotoTag(item);
+     }
+ 
+     if (button == Qt::MidButton)
+--- COPYING-DOCS	(.../tags/KDE/3.5.4/kdewebdev)	(revision 0)
++++ COPYING-DOCS	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -0,0 +1,397 @@
++		GNU Free Documentation License
++		  Version 1.2, November 2002
++
++
++ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
++     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++
++0. PREAMBLE
++
++The purpose of this License is to make a manual, textbook, or other
++functional and useful document "free" in the sense of freedom: to
++assure everyone the effective freedom to copy and redistribute it,
++with or without modifying it, either commercially or noncommercially.
++Secondarily, this License preserves for the author and publisher a way
++to get credit for their work, while not being considered responsible
++for modifications made by others.
++
++This License is a kind of "copyleft", which means that derivative
++works of the document must themselves be free in the same sense.  It
++complements the GNU General Public License, which is a copyleft
++license designed for free software.
++
++We have designed this License in order to use it for manuals for free
++software, because free software needs free documentation: a free
++program should come with manuals providing the same freedoms that the
++software does.  But this License is not limited to software manuals;
++it can be used for any textual work, regardless of subject matter or
++whether it is published as a printed book.  We recommend this License
++principally for works whose purpose is instruction or reference.
++
++
++1. APPLICABILITY AND DEFINITIONS
++
++This License applies to any manual or other work, in any medium, that
++contains a notice placed by the copyright holder saying it can be
++distributed under the terms of this License.  Such a notice grants a
++world-wide, royalty-free license, unlimited in duration, to use that
++work under the conditions stated herein.  The "Document", below,
++refers to any such manual or work.  Any member of the public is a
++licensee, and is addressed as "you".  You accept the license if you
++copy, modify or distribute the work in a way requiring permission
++under copyright law.
++
++A "Modified Version" of the Document means any work containing the
++Document or a portion of it, either copied verbatim, or with
++modifications and/or translated into another language.
++
++A "Secondary Section" is a named appendix or a front-matter section of
++the Document that deals exclusively with the relationship of the
++publishers or authors of the Document to the Document's overall subject
++(or to related matters) and contains nothing that could fall directly
++within that overall subject.  (Thus, if the Document is in part a
++textbook of mathematics, a Secondary Section may not explain any
++mathematics.)  The relationship could be a matter of historical
++connection with the subject or with related matters, or of legal,
++commercial, philosophical, ethical or political position regarding
++them.
++
++The "Invariant Sections" are certain Secondary Sections whose titles
++are designated, as being those of Invariant Sections, in the notice
++that says that the Document is released under this License.  If a
++section does not fit the above definition of Secondary then it is not
++allowed to be designated as Invariant.  The Document may contain zero
++Invariant Sections.  If the Document does not identify any Invariant
++Sections then there are none.
++
++The "Cover Texts" are certain short passages of text that are listed,
++as Front-Cover Texts or Back-Cover Texts, in the notice that says that
++the Document is released under this License.  A Front-Cover Text may
++be at most 5 words, and a Back-Cover Text may be at most 25 words.
++
++A "Transparent" copy of the Document means a machine-readable copy,
++represented in a format whose specification is available to the
++general public, that is suitable for revising the document
++straightforwardly with generic text editors or (for images composed of
++pixels) generic paint programs or (for drawings) some widely available
++drawing editor, and that is suitable for input to text formatters or
++for automatic translation to a variety of formats suitable for input
++to text formatters.  A copy made in an otherwise Transparent file
++format whose markup, or absence of markup, has been arranged to thwart
++or discourage subsequent modification by readers is not Transparent.
++An image format is not Transparent if used for any substantial amount
++of text.  A copy that is not "Transparent" is called "Opaque".
++
++Examples of suitable formats for Transparent copies include plain
++ASCII without markup, Texinfo input format, LaTeX input format, SGML
++or XML using a publicly available DTD, and standard-conforming simple
++HTML, PostScript or PDF designed for human modification.  Examples of
++transparent image formats include PNG, XCF and JPG.  Opaque formats
++include proprietary formats that can be read and edited only by
++proprietary word processors, SGML or XML for which the DTD and/or
++processing tools are not generally available, and the
++machine-generated HTML, PostScript or PDF produced by some word
++processors for output purposes only.
++
++The "Title Page" means, for a printed book, the title page itself,
++plus such following pages as are needed to hold, legibly, the material
++this License requires to appear in the title page.  For works in
++formats which do not have any title page as such, "Title Page" means
++the text near the most prominent appearance of the work's title,
++preceding the beginning of the body of the text.
++
++A section "Entitled XYZ" means a named subunit of the Document whose
++title either is precisely XYZ or contains XYZ in parentheses following
++text that translates XYZ in another language.  (Here XYZ stands for a
++specific section name mentioned below, such as "Acknowledgements",
++"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
++of such a section when you modify the Document means that it remains a
++section "Entitled XYZ" according to this definition.
++
++The Document may include Warranty Disclaimers next to the notice which
++states that this License applies to the Document.  These Warranty
++Disclaimers are considered to be included by reference in this
++License, but only as regards disclaiming warranties: any other
++implication that these Warranty Disclaimers may have is void and has
++no effect on the meaning of this License.
++
++
++2. VERBATIM COPYING
++
++You may copy and distribute the Document in any medium, either
++commercially or noncommercially, provided that this License, the
++copyright notices, and the license notice saying this License applies
++to the Document are reproduced in all copies, and that you add no other
++conditions whatsoever to those of this License.  You may not use
++technical measures to obstruct or control the reading or further
++copying of the copies you make or distribute.  However, you may accept
++compensation in exchange for copies.  If you distribute a large enough
++number of copies you must also follow the conditions in section 3.
++
++You may also lend copies, under the same conditions stated above, and
++you may publicly display copies.
++
++
++3. COPYING IN QUANTITY
++
++If you publish printed copies (or copies in media that commonly have
++printed covers) of the Document, numbering more than 100, and the
++Document's license notice requires Cover Texts, you must enclose the
++copies in covers that carry, clearly and legibly, all these Cover
++Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
++the back cover.  Both covers must also clearly and legibly identify
++you as the publisher of these copies.  The front cover must present
++the full title with all words of the title equally prominent and
++visible.  You may add other material on the covers in addition.
++Copying with changes limited to the covers, as long as they preserve
++the title of the Document and satisfy these conditions, can be treated
++as verbatim copying in other respects.
++
++If the required texts for either cover are too voluminous to fit
++legibly, you should put the first ones listed (as many as fit
++reasonably) on the actual cover, and continue the rest onto adjacent
++pages.
++
++If you publish or distribute Opaque copies of the Document numbering
++more than 100, you must either include a machine-readable Transparent
++copy along with each Opaque copy, or state in or with each Opaque copy
++a computer-network location from which the general network-using
++public has access to download using public-standard network protocols
++a complete Transparent copy of the Document, free of added material.
++If you use the latter option, you must take reasonably prudent steps,
++when you begin distribution of Opaque copies in quantity, to ensure
++that this Transparent copy will remain thus accessible at the stated
++location until at least one year after the last time you distribute an
++Opaque copy (directly or through your agents or retailers) of that
++edition to the public.
++
++It is requested, but not required, that you contact the authors of the
++Document well before redistributing any large number of copies, to give
++them a chance to provide you with an updated version of the Document.
++
++
++4. MODIFICATIONS
++
++You may copy and distribute a Modified Version of the Document under
++the conditions of sections 2 and 3 above, provided that you release
++the Modified Version under precisely this License, with the Modified
++Version filling the role of the Document, thus licensing distribution
++and modification of the Modified Version to whoever possesses a copy
++of it.  In addition, you must do these things in the Modified Version:
++
++A. Use in the Title Page (and on the covers, if any) a title distinct
++   from that of the Document, and from those of previous versions
++   (which should, if there were any, be listed in the History section
++   of the Document).  You may use the same title as a previous version
++   if the original publisher of that version gives permission.
++B. List on the Title Page, as authors, one or more persons or entities
++   responsible for authorship of the modifications in the Modified
++   Version, together with at least five of the principal authors of the
++   Document (all of its principal authors, if it has fewer than five),
++   unless they release you from this requirement.
++C. State on the Title page the name of the publisher of the
++   Modified Version, as the publisher.
++D. Preserve all the copyright notices of the Document.
++E. Add an appropriate copyright notice for your modifications
++   adjacent to the other copyright notices.
++F. Include, immediately after the copyright notices, a license notice
++   giving the public permission to use the Modified Version under the
++   terms of this License, in the form shown in the Addendum below.
++G. Preserve in that license notice the full lists of Invariant Sections
++   and required Cover Texts given in the Document's license notice.
++H. Include an unaltered copy of this License.
++I. Preserve the section Entitled "History", Preserve its Title, and add
++   to it an item stating at least the title, year, new authors, and
++   publisher of the Modified Version as given on the Title Page.  If
++   there is no section Entitled "History" in the Document, create one
++   stating the title, year, authors, and publisher of the Document as
++   given on its Title Page, then add an item describing the Modified
++   Version as stated in the previous sentence.
++J. Preserve the network location, if any, given in the Document for
++   public access to a Transparent copy of the Document, and likewise
++   the network locations given in the Document for previous versions
++   it was based on.  These may be placed in the "History" section.
++   You may omit a network location for a work that was published at
++   least four years before the Document itself, or if the original
++   publisher of the version it refers to gives permission.
++K. For any section Entitled "Acknowledgements" or "Dedications",
++   Preserve the Title of the section, and preserve in the section all
++   the substance and tone of each of the contributor acknowledgements
++   and/or dedications given therein.
++L. Preserve all the Invariant Sections of the Document,
++   unaltered in their text and in their titles.  Section numbers
++   or the equivalent are not considered part of the section titles.
++M. Delete any section Entitled "Endorsements".  Such a section
++   may not be included in the Modified Version.
++N. Do not retitle any existing section to be Entitled "Endorsements"
++   or to conflict in title with any Invariant Section.
++O. Preserve any Warranty Disclaimers.
++
++If the Modified Version includes new front-matter sections or
++appendices that qualify as Secondary Sections and contain no material
++copied from the Document, you may at your option designate some or all
++of these sections as invariant.  To do this, add their titles to the
++list of Invariant Sections in the Modified Version's license notice.
++These titles must be distinct from any other section titles.
++
++You may add a section Entitled "Endorsements", provided it contains
++nothing but endorsements of your Modified Version by various
++parties--for example, statements of peer review or that the text has
++been approved by an organization as the authoritative definition of a
++standard.
++
++You may add a passage of up to five words as a Front-Cover Text, and a
++passage of up to 25 words as a Back-Cover Text, to the end of the list
++of Cover Texts in the Modified Version.  Only one passage of
++Front-Cover Text and one of Back-Cover Text may be added by (or
++through arrangements made by) any one entity.  If the Document already
++includes a cover text for the same cover, previously added by you or
++by arrangement made by the same entity you are acting on behalf of,
++you may not add another; but you may replace the old one, on explicit
++permission from the previous publisher that added the old one.
++
++The author(s) and publisher(s) of the Document do not by this License
++give permission to use their names for publicity for or to assert or
++imply endorsement of any Modified Version.
++
++
++5. COMBINING DOCUMENTS
++
++You may combine the Document with other documents released under this
++License, under the terms defined in section 4 above for modified
++versions, provided that you include in the combination all of the
++Invariant Sections of all of the original documents, unmodified, and
++list them all as Invariant Sections of your combined work in its
++license notice, and that you preserve all their Warranty Disclaimers.
++
++The combined work need only contain one copy of this License, and
++multiple identical Invariant Sections may be replaced with a single
++copy.  If there are multiple Invariant Sections with the same name but
++different contents, make the title of each such section unique by
++adding at the end of it, in parentheses, the name of the original
++author or publisher of that section if known, or else a unique number.
++Make the same adjustment to the section titles in the list of
++Invariant Sections in the license notice of the combined work.
++
++In the combination, you must combine any sections Entitled "History"
++in the various original documents, forming one section Entitled
++"History"; likewise combine any sections Entitled "Acknowledgements",
++and any sections Entitled "Dedications".  You must delete all sections
++Entitled "Endorsements".
++
++
++6. COLLECTIONS OF DOCUMENTS
++
++You may make a collection consisting of the Document and other documents
++released under this License, and replace the individual copies of this
++License in the various documents with a single copy that is included in
++the collection, provided that you follow the rules of this License for
++verbatim copying of each of the documents in all other respects.
++
++You may extract a single document from such a collection, and distribute
++it individually under this License, provided you insert a copy of this
++License into the extracted document, and follow this License in all
++other respects regarding verbatim copying of that document.
++
++
++7. AGGREGATION WITH INDEPENDENT WORKS
++
++A compilation of the Document or its derivatives with other separate
++and independent documents or works, in or on a volume of a storage or
++distribution medium, is called an "aggregate" if the copyright
++resulting from the compilation is not used to limit the legal rights
++of the compilation's users beyond what the individual works permit.
++When the Document is included in an aggregate, this License does not
++apply to the other works in the aggregate which are not themselves
++derivative works of the Document.
++
++If the Cover Text requirement of section 3 is applicable to these
++copies of the Document, then if the Document is less than one half of
++the entire aggregate, the Document's Cover Texts may be placed on
++covers that bracket the Document within the aggregate, or the
++electronic equivalent of covers if the Document is in electronic form.
++Otherwise they must appear on printed covers that bracket the whole
++aggregate.
++
++
++8. TRANSLATION
++
++Translation is considered a kind of modification, so you may
++distribute translations of the Document under the terms of section 4.
++Replacing Invariant Sections with translations requires special
++permission from their copyright holders, but you may include
++translations of some or all Invariant Sections in addition to the
++original versions of these Invariant Sections.  You may include a
++translation of this License, and all the license notices in the
++Document, and any Warranty Disclaimers, provided that you also include
++the original English version of this License and the original versions
++of those notices and disclaimers.  In case of a disagreement between
++the translation and the original version of this License or a notice
++or disclaimer, the original version will prevail.
++
++If a section in the Document is Entitled "Acknowledgements",
++"Dedications", or "History", the requirement (section 4) to Preserve
++its Title (section 1) will typically require changing the actual
++title.
++
++
++9. TERMINATION
++
++You may not copy, modify, sublicense, or distribute the Document except
++as expressly provided for under this License.  Any other attempt to
++copy, modify, sublicense or distribute the Document is void, and will
++automatically terminate your rights under this License.  However,
++parties who have received copies, or rights, from you under this
++License will not have their licenses terminated so long as such
++parties remain in full compliance.
++
++
++10. FUTURE REVISIONS OF THIS LICENSE
++
++The Free Software Foundation may publish new, revised versions
++of the GNU Free Documentation License from time to time.  Such new
++versions will be similar in spirit to the present version, but may
++differ in detail to address new problems or concerns.  See
++http://www.gnu.org/copyleft/.
++
++Each version of the License is given a distinguishing version number.
++If the Document specifies that a particular numbered version of this
++License "or any later version" applies to it, you have the option of
++following the terms and conditions either of that specified version or
++of any later version that has been published (not as a draft) by the
++Free Software Foundation.  If the Document does not specify a version
++number of this License, you may choose any version ever published (not
++as a draft) by the Free Software Foundation.
++
++
++ADDENDUM: How to use this License for your documents
++
++To use this License in a document you have written, include a copy of
++the License in the document and put the following copyright and
++license notices just after the title page:
++
++    Copyright (c)  YEAR  YOUR NAME.
++    Permission is granted to copy, distribute and/or modify this document
++    under the terms of the GNU Free Documentation License, Version 1.2
++    or any later version published by the Free Software Foundation;
++    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
++    A copy of the license is included in the section entitled "GNU
++    Free Documentation License".
++
++If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
++replace the "with...Texts." line with this:
++
++    with the Invariant Sections being LIST THEIR TITLES, with the
++    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
++
++If you have Invariant Sections without Cover Texts, or some other
++combination of the three, merge those two alternatives to suit the
++situation.
++
++If your document contains nontrivial examples of program code, we
++recommend releasing these examples in parallel under your choice of
++free software license, such as the GNU General Public License,
++to permit their use in free software.
+--- kxsldbg/kxsldbg.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kxsldbg/kxsldbg.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -23,7 +23,7 @@
+ GenericName[it]=Debugger per XSLT
+ GenericName[ja]=XSLT デバッガ
+ GenericName[lt]=XSLT derintuvė
+-GenericName[ms]=Penyah-ralat XSLT
++GenericName[ms]=Penyahralat XSLT
+ GenericName[nl]=XSLT-debugger
+ GenericName[pl]=Debuger XSLT
+ GenericName[pt]=Depuração de XSLT
+@@ -41,6 +41,7 @@
+ GenericName[uk]=Зневаджувач XSLT
+ GenericName[zh_CN]=XSLT 调试器
+ GenericName[zh_HK]=XSLT 除錯器
++GenericName[zh_TW]=XSLT 除錯器
+ Exec=kxsldbg %i %m -caption "%c"
+ Icon=kxsldbg
+ Type=Application
+--- kimagemapeditor/kimagemapeditorpart.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kimagemapeditor/kimagemapeditorpart.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -20,7 +20,7 @@
+ Comment[hu]=HTML-térképszerkesztő
+ Comment[is]=HTML myndakortsritill
+ Comment[it]=Un editor per le mappe di immagini HTML
+-Comment[ja]=HTMLイメージマップエディター
++Comment[ja]=HTMLイメージマップエディタ
+ Comment[lt]=HTML paveikslėlių žemėlapių rengyklė
+ Comment[ms]=Penyunting Peta Imej HTML
+ Comment[nl]=Een hulpmiddel om HTML imagemaps te maken
+@@ -39,6 +39,7 @@
+ Comment[uk]=Редактор imagemap HTML
+ Comment[zh_CN]=HTML 图像映射编辑器
+ Comment[zh_HK]=一個 HTML 影像地圖的編輯器
++Comment[zh_TW]=一個 HTML 影像地圖的編輯器
+ Name=KImageMapEditor
+ Name[pt_BR]=KEditor de Mapeamento de Imagem
+ Name[sk]=KImage editor mapy
+--- kimagemapeditor/kimagemapeditor.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kimagemapeditor/kimagemapeditor.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -26,7 +26,7 @@
+ GenericName[hu]=HTML-térképszerkesztő
+ GenericName[is]=HTML myndakortsritill
+ GenericName[it]=Editor per le mappe di immagini HTML
+-GenericName[ja]=HTMLイメージマップエディター
++GenericName[ja]=HTMLイメージマップエディタ
+ GenericName[lt]=HTML paveikslėlių žemėlapių rengyklė
+ GenericName[ms]=Penyunting Peta Imej HTML
+ GenericName[nl]=HTML imagemap editor
+@@ -44,4 +44,5 @@
+ GenericName[uk]=Редактор карт зображень HTML
+ GenericName[zh_CN]=HTML 图像映射编辑器
+ GenericName[zh_HK]=HTML 影像地圖編輯器
++GenericName[zh_TW]=HTML 影像地圖編輯器
+ Categories=Qt;KDE;Development;WebDevelopment;
+--- klinkstatus/src/klinkstatus.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ klinkstatus/src/klinkstatus.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -44,5 +44,6 @@
+ GenericName[uk]=Перевірка посилань
+ GenericName[zh_CN]=链接检查器
+ GenericName[zh_HK]=連結檢查程式
++GenericName[zh_TW]=連結檢查程式
+ Categories=Qt;KDE;Development;WebDevelopment;
+ 
+--- kommander/editor/kmdr-editor.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kommander/editor/kmdr-editor.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -18,7 +18,7 @@
+ GenericName[hu]=Párbeszédablak-szerkesztő
+ GenericName[is]=Dynamic Dialog ritillinn
+ GenericName[it]=Editor per le maschere dinamiche
+-GenericName[ja]=動的ダイアログエディター
++GenericName[ja]=動的ダイアログエディタ
+ GenericName[lt]=Dinaminė dialogų rengyklė
+ GenericName[ms]=Penyunting Dialog Dinamik
+ GenericName[nl]=Dynamische dialoog-editor
+@@ -37,6 +37,7 @@
+ GenericName[uk]=Динамічний редактор вікон
+ GenericName[zh_CN]=动态对话框编辑器
+ GenericName[zh_HK]=動態對話盒編輯器
++GenericName[zh_TW]=動態對話盒編輯器
+ Name=Kommander Editor
+ Name[br]=Aozer Kommander
+ Name[ca]=Editor Kommander
+@@ -55,7 +56,7 @@
+ Name[hu]=Kommander
+ Name[is]=Kommander ritillinn
+ Name[it]=Editor Kommander
+-Name[ja]=Kommander エディター
++Name[ja]=Kommander エディタ
+ Name[lt]=Kommander rengyklė
+ Name[ms]=Penyunting Kommander
+ Name[pa]=Kommander ਸੰਪਾਦਕ
+@@ -73,6 +74,7 @@
+ Name[uk]=Редактор Kommander
+ Name[zh_CN]=Kommander 编辑器
+ Name[zh_HK]=Kommander 編輯器
++Name[zh_TW]=Kommander 編輯器
+ Exec=kmdr-editor %F
+ Icon=kommander
+ Type=Application
+@@ -95,7 +97,7 @@
+ Comment[hu]=Párbeszédablak-szerkesztő
+ Comment[is]=Dynamic Dialog ritillinn
+ Comment[it]=Editor per le maschere dinamiche
+-Comment[ja]=動的ダイアログエディター
++Comment[ja]=動的ダイアログエディタ
+ Comment[lt]=Dinaminė dialogų rengyklė
+ Comment[ms]=Penyunting Dialog Dinamik
+ Comment[nl]=Dynamische dialoog-editor
+@@ -114,6 +116,7 @@
+ Comment[uk]=Динамічний редактор вікон
+ Comment[zh_CN]=动态对话框编辑器
+ Comment[zh_HK]=動態對話盒編輯器
++Comment[zh_TW]=動態對話盒編輯器
+ MimeType=application/x-kommander
+ DocPath=kommander/index.html
+ Categories=Qt;KDE;Development;
+--- kommander/x-kommander.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kommander/x-kommander.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -39,6 +39,7 @@
+ Comment[uk]=Файл Kommander
+ Comment[zh_CN]=Kommander 文件
+ Comment[zh_HK]=Kommander 檔案
++Comment[zh_TW]=Kommander 檔案
+ Icon=widget_doc
+ Type=MimeType
+ MimeType=application/x-kommander
+--- kommander/executor/kmdr-executor.desktop	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kommander/executor/kmdr-executor.desktop	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -42,6 +42,7 @@
+ Comment[uk]=Запускач для вікон Kommander
+ Comment[zh_CN]=Kommander 对话框执行器
+ Comment[zh_HK]=Kommander 對話盒的運行程式
++Comment[zh_TW]=Kommander 對話盒的運行程式
+ Terminal=false
+ Name=Kommander Executor
+ Name[br]=Aozer Kommander
+@@ -73,4 +74,5 @@
+ Name[uk]=Запускач Kommander
+ Name[zh_CN]=Kommander 执行器
+ Name[zh_HK]=Kommander 執行器
++Name[zh_TW]=Kommander 執行器
+ MimeType=application/x-kommander
+--- kommander/widgets/wizard.h	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kommander/widgets/wizard.h	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -24,12 +24,13 @@
+ /* OTHER INCLUDES */
+ #include <kommanderwidget.h>
+ #include "kommander_export.h"
++#include "myprocess.h"
+ 
+ class QShowEvent;
+ class KOMMANDER_EXPORT Wizard : public QWizard, public KommanderWidget
+ {
+   Q_OBJECT
+-  
++
+   Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false)
+   Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false)
+   Q_PROPERTY(bool KommanderWidget READ isKommanderWidget)
+@@ -47,9 +48,8 @@
+   virtual QString currentState() const;
+   virtual QString populationText() const;
+   virtual void setPopulationText(const QString&);
+-  
++
+   virtual QString handleDCOP(int function, const QStringList& args);
+-    
+   enum HelpAction { None, Command, Dialog };
+   HelpAction helpAction() const;
+   void setHelpAction(HelpAction);
+@@ -59,8 +59,13 @@
+ public slots:
+   virtual void setWidgetText(const QString &);
+   virtual void exec();
++  virtual void show();
+   virtual void runHelp();
+-virtual void populate();
++  virtual void populate();
++protected slots:
++    virtual void initialize();
++    virtual void destroy();
++
+ signals:
+   void widgetOpened();
+   void widgetTextChanged(const QString &);
+--- kommander/widgets/wizard.cpp	(.../tags/KDE/3.5.4/kdewebdev)	(revision 577441)
++++ kommander/widgets/wizard.cpp	(.../branches/KDE/3.5/kdewebdev)	(revision 577441)
+@@ -27,13 +27,17 @@
+ /* OTHER INCLUDES */
+ #include <kommanderfactory.h>
+ #include <kommanderwidget.h>
++#include <specials.h>
+ #include "wizard.h"
++#include "myprocess.h"
+ 
+ Wizard::Wizard(QWidget *a_parent, const char *a_name, bool a_modal, int a_flags)
+   : QWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this)
+ {
+   QStringList states;
+   states << "default";
++  states << "initialization";
++  states << "destroy";
+   setStates(states);
+   setDisplayStates(states);
+ 
+@@ -42,6 +46,7 @@
+ 
+ Wizard::~Wizard()
+ {
++  destroy();
+ }
+ 
+ QString Wizard::currentState() const
+@@ -86,12 +91,40 @@
+   emit widgetTextChanged(a_text);
+ }
+ 
++void Wizard::initialize()
++{
++  setFinishEnabled(page(pageCount() - 1), true);
++  const QStringList assoc = associatedText();
++  if (assoc.count() > 1 && !assoc[1].isEmpty()) 
++  {
++    MyProcess proc(this);
++    proc.run( KommanderWidget::evalAssociatedText(assoc[1]) );
++  }
++}
++
++void Wizard::destroy()
++{
++  const QStringList assoc = associatedText();
++  if (assoc.count() > 2 && !assoc[2].isEmpty()) 
++  {
++    MyProcess proc(this);
++    proc.run(KommanderWidget::evalAssociatedText(assoc[2]));
++  }
++}
++
+ void Wizard::exec()
+ {
+   QWizard::exec();
+   emit finished();
+ }
+ 
++void Wizard::show()
++{
++  QWizard::show();
++  if (!inEditor)
++    initialize();
++}
++
+ void Wizard::runHelp()
+ {
+   if (helpAction() == Command)
+@@ -132,14 +165,22 @@
+ 
+ void Wizard::showEvent(QShowEvent *e)
+ {
+-  QWizard::showEvent( e );
++  QWizard::showEvent(e);
+   emit widgetOpened();
+ }
+ 
+ QString Wizard::handleDCOP(int function, const QStringList& args)
+ {
+-  return KommanderWidget::handleDCOP(function, args);
++  switch (function) {
++    case DCOP::setEnabled:
++      setFinishEnabled(page(pageCount() - 1), args[0] != "false");
++      break;
++    default:
++      return KommanderWidget::handleDCOP(function, args);
++  }
++  return QString::null;
+ }
+ 
+ 
++
+ #include "wizard.moc"




More information about the pkg-kde-commits mailing list