|
|
| (244 intermediate revisions by 68 users not shown) |
| Line 1: |
Line 1: |
| This is a list of planned features for the 4.3 release.
| | {{Moved To Community}} |
| | |
| See also:
| |
| * [[Schedules/KDE4/4.3 Release Schedule]]
| |
| * [[Schedules/KDE4/4.2 Feature Plan]]
| |
| * [[Schedules/KDE4/4.3 Release Goals]]
| |
| | |
| Legend:
| |
| * todo => not started yet
| |
| * in-progress => started, but not completed yet
| |
| * done => completed
| |
| __TOC__
| |
| | |
| = Other =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;" | |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| { {FeatureTodo|Akonadi|Various Akonadi related items can be found here http://techbase.kde.org/Projects/PIM/Akonadi#Scheduled_for_4.3|[email protected]|Akonadi Developers}} | |
| |}
| |
| | |
| = kdelibs =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|KLocale|Investigate adding Currency Code and currency minor units support based on ISO 4217 (http://en.wikipedia.org/wiki/ISO_4217).|[email protected]|John Layt}} | |
| {{FeatureInProgress|Sonnet|Implement language detection|[email protected]|Jakub Stachowski}} | |
| {{FeatureTodo|Sonnet|Integrate language detection with spellchecking|[email protected]|Jakub Stachowski}} | |
| {{FeatureTodo|Sonnet|Integrate language detection with strigi|[email protected]|Jakub Stachowski}} | |
| {{FeatureTodo|KCalendarSystem|Add new astronomical calculation support classes to be used in kdelibs to build new astronomically based calendar systems, and in kdepim to build new version of libkholiday.|[email protected]|John Layt}} | |
| {{FeatureTodo|KCalendarSystem|Add new calendar systems: Indian Civil (Saka), Ethiopean, Chinese, Pure Julian, Pure Gregorian, etc.|[email protected]|John Layt}} | |
| {{FeatureTodo|KDEPrint|If no file printing support in Qt4.5, migrate FilePrinter class from Okular to enable file printing for all apps via QPrinter. To be discussed on k-c-d first.|[email protected]|John Layt}} | |
| {{FeatureTodo|KDEPrint|Add framework for standard actions for 'Send to...' for e-mail, fax, etc by printing to PDF/PS.|[email protected]|John Layt}} | |
| {{FeatureTodo|new bookmark system|Port KBookmarks to akonadi/nepomuk. Will need help on this. [[Projects/PIM/Akonadi/Bookmarks|Details]]|[email protected]|Xavier Vello}} | |
| {{FeatureTodo|kdeui|entries to help menu and aboutdata pointing to UserBase entry and forum.kde.org|[email protected]|Friedrich W. H. Kossebau}} | |
| |}
| |
| | |
| = kdebase-workspace =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| | |
| |- border="1" cellpadding="5" cellspacing="0" style="border
| |
| ! colspan="4" style="text-align: center" |Non-Plasma, Non-KWin
| |
| {{FeatureTodo|Kxkb|Support for languages in keyboard layout descriptions|rysin:AT:kde.org|Andriy Rysin}}
| |
| {{FeatureTodo|PolicyKit integration|Import PolicyKit-KDE from extragear|[email protected]|Dario Freddi}} | |
| | |
| |- border="1" cellpadding="5" cellspacing="0" style="border
| |
| ! colspan="4" style="text-align: center" |KRunner
| |
| | |
| |- border="1" cellpadding="5" cellspacing="0" style="border
| |
| ! colspan="4" style="text-align: center" |Plasma - Priority Features
| |
| | |
| |- border="1" cellpadding="5" cellspacing="0" style="border
| |
| ! colspan="4" style="text-align: center" |Plasma
| |
| {{FeatureTodo|Now Playing data engine|Support for MPD|kde:AT:randomguy3.me.uk|Alex Merry}}
| |
| |- border="1" cellpadding="5" cellspacing="0" style="border
| |
| ! colspan="4" style="text-align: center" |KWin - Core
| |
| {{FeatureTodo|KWin|Redesign KWin system settings GUI|[email protected]|Lucas Murray}} | |
| | |
| | |
| {{FeatureInProgress|KWin|Window docking/quick tiling|[email protected]|Lucas Murray}} | |
| |- border="1" cellpadding="5" cellspacing="0" style="border
| |
| ! colspan="4" style="text-align: center" |KWin - Desktop Effects
| |
| {{FeatureInProgress|KWin|Improved mouse mark/scribble effect|[email protected]|Lucas Murray}} | |
| {{FeatureTodo|KWin|Expand present windows into other effects (E.g. Desktop Grid)|[email protected]|Martin Gräßlin}} | |
| {{FeatureDone|KWin|Fade desktop effect (Desktop switcher)|[email protected]|Lucas Murray}} | |
| |}
| |
| {{FeatureDone|KSysguard|Added GetHotNewStuff support}}
| |
| | |
| = kdepimlibs =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|Buildsystem|Require OpenLDAP (coordinate with the Windows team)|[email protected]|Allen Winter}} | |
| {{FeatureTodo|Buildsystem|Require Cyrus-SASL (coordinate with the Windows team)|[email protected]|Allen Winter}} | |
| {{FeatureTodo|libkleopatraclient|New interface library for kleopatra uiserver clients|[email protected]|Marc Mutz}} | |
| |}
| |
| | |
| = kdenetwork =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| | |
| {{FeatureInProgress|Kopete|Updated contact list interface (uses Qt 4 rather than Qt 3)|[email protected]|Matt Rogers}} | |
| {{FeatureTodo|Kopete|Update Kopete to better support Decibel|[email protected]|Kopete Developers}} | |
| | |
| | |
| | |
| | |
| {{FeatureTodo|KGet|Support mms://-protocol, see https://launchpad.net/libmms|[email protected]|Lukas Appelhans}} | |
| {{FeatureTodo|KGet|MLDonkey-Plugin based on libkmldonkey|[email protected]|Lukas Appelhans}} | |
| | |
| | |
| {{FeatureTodo|KRDC|Minimal-clutter mode to optimize screen real estate usage|[email protected]|Guillaume Pothier}} | |
| {{FeatureInProgress|Telepathy|Telepathy-specification compliant Account Manager using KWallet to store account data|[email protected]|George Goldberg}} | |
| |}
| |
| | |
| = kdepim =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureInProgress|Akonadi|Migration of contacts and calendar data from KResource to Akonadi ([http://techbase.kde.org/Projects/PIM/Akonadi#Scheduled_for_4.3 Details])|[email protected]|Volker Krause, Kevin Krammer, Tobias Koenig}} | |
| {{FeatureInProgress|Akregator|Support for syncing the feed list with Google Reader |[email protected]|Frank Osterfeld}} | |
| {{FeatureTodo|[http://kblogger.pwsp.net KBlogger]|KBlogger, a blogging application|[email protected]|Christian Weilbach}} | |
| {{FeatureTodo|KBlogger|Port to use KRichTextEdit (Or KMEditor)|[email protected]|Stephen Kelly}} | |
| {{FeatureInProgress|Kjots| Create and port to akonadi model. |[email protected]|Stephen Kelly}} | |
| {{FeatureTodo|Kjots| Add support for nepomuk including tagging, possibly storage, and linking. Also a nepomuk tag proxy model for representing the structure as tagged.|[email protected]|Stephen Kelly}} | |
| {{FeatureInProgress|Kjots| Create plasmoid capable of showing the entire tree, or a single book.|[email protected]|Stephen Kelly}} | |
| {{FeatureTodo|Kjots| Email KJots pages using default mail client ({{bug|124509}}. |[email protected]|Stephen Kelly}} | |
| {{FeatureInProgress|Kleopatra|OpenPGP support|[email protected]|Marc Mutz (Gpg4win)}} | |
| | |
| | |
| {{FeatureTodo|KMail|Save metadata about attachments to Nepomuk when saving them|[email protected]|Ismail Onur Filiz}} | |
| {{FeatureTodo|KNode|Port to use KRichTextEdit (Or KMEditor)|[email protected]|Stephen Kelly}} | |
| {{FeatureTodo|Kontact|Support for Kontact wide profiles|[email protected]|Kolab Konsortium}} | |
| | |
| {{FeatureTodo|KOrganizer|Support for extended free-busy lists|[email protected]|Kolab Konsortium}} | |
| {{FeatureInProgress|KPilot|Port old conduits to new base conduit architecture and KDE4/Qt4|[email protected]|Jason 'vanRijn' Kasper}} | |
| {{FeatureInProgress|KPilot|Finish Keyring conduit, base conduit code and test cases, category syncing|[email protected]|Jason 'vanRijn' Kasper}} | |
| {{FeatureInProgress|KContactManager|A new Akonadi-based address book to replace KAddressbook|[email protected]|Tobias Koenig}} | |
| |}
| |
| | |
| = kdeutils =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|printer-applet|Restore feature parity with KDEPrint3 where possible.|[email protected]|John Layt}} | |
| {{FeatureTodo|Okteta|make editing capability to Decoding table |[email protected]|Friedrich W. H. Kossebau}} | |
| {{FeatureTodo|Okteta|add Kate-like search tool|[email protected]|Friedrich W. H. Kossebau}} | |
| {{FeatureTodo|Okteta|add support for import by drop, both url and data|[email protected]|Friedrich W. H. Kossebau}} | |
| {{FeatureTodo|Okteta|copy again puts also a value or char variant of the data to clipboard|[email protected]|Friedrich W. H. Kossebau}} | |
| {{FeatureTodo|Okteta|add support for memory mapping of files|[email protected]|Friedrich W. H. Kossebau}} | |
| {{FeatureTodo|Okteta|add further export formats like s-record and intel 16|[email protected]|Friedrich W. H. Kossebau}} | |
| {{FeatureTodo|Okteta|add support for jobs like io, printing, string search or filter|[email protected]|Friedrich W. H. Kossebau}} | |
| {{FeatureTodo|kwalletmanager|Move kwalletmanager to the Model/View architecture and redesign the UI.|[email protected]|Michael Leupold}} | |
| |}
| |
| | |
| = kdebindings =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|krossjava|Integrate into e.g. SuperKaramba and fix issues that show up.|[email protected]|Sebastian Sauer}} | |
| | |
| | |
| |}
| |
| | |
| = kdegames =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureInProgress|Killbots|Add "sonic screwdriver" functionality.|[email protected]|Parker Coates}} | |
| {{FeatureTodo|Killbots|Add a tutorial for beginners.|[email protected]|Parker Coates}} | |
| {{FeatureTodo|Kolf|Replace with Kolf 2 (please help!)|[email protected]|Stefan Majewsky}} | |
| {{FeatureTodo|KsirK|rewrite AI code or at least correct most problems related in bug #170777. Volunteers wanted!|[email protected]|Gaël de Chalendar}} | |
| {{FeatureTodo|KsirK|Previous/Next in start new game as described in bug #170774|[email protected]|Gaël de Chalendar}} | |
| {{FeatureTodo|KsirK|Polish the skin editor (doc, contextual help, ...)|[email protected]|Gaël de Chalendar}} | |
| | |
| | |
| {{FeatureInProgress|ktron|Port and remake the KTron game for KDE 4.3|[email protected]|Stas Verberkt}} | |
| |}
| |
| | |
| = kdeadmin =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|KGrubEditor|Integrate KGrubEditor into KDE Admin http://sourceforge.net/projects/kgrubeditor. Approved by Nicolas Ternisien <[email protected]> |artemis_dot_fowl_dot_2007@gmail_dot_com|Konstantinos Smanis}} | |
| {{FeatureTodo|Guidance|Port Guidance to KDE 4, and move it to KDE Admin http://www.simonzone.com/software/guidance/.|[email protected]|Nicolas Ternisien}} | |
| {{FeatureTodo|system-config-printer-kde|Restore feature parity with KDEPrint3 where possible.|[email protected]|john Layt}} | |
| |}
| |
| | |
| = kdesdk =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureInProgress|Lokalize|XLIFF support|shafff-at-ukr.net|Nick Shaforostoff}}
| |
| {{FeatureInProgress|Lokalize|various Translation Memory enhancements|shafff-at-ukr.net|Nick Shaforostoff}}
| |
| {{FeatureTodo|Lokalize|Kross-based scripting|shafff-at-ukr.net|Nick Shaforostoff}}
| |
| {{FeatureInProgress|Lokalize|QA: glossary checklists|shafff-at-ukr.net|Nick Shaforostoff}}
| |
| {{FeatureTodo|KAppTemplate|Add DBUS support in templates|[email protected]|Anne-Marie Mahfouf}} | |
| {{FeatureInProgress|Umbrello|Replace all q3 widgets in the refactoring assistant|[email protected]|Andi Fischer}} | |
| {{FeatureInProgress|Umbrello|Merge in SoC qgraphicsview port branch|[email protected]|Gopala Krishna A}} | |
| |}
| |
| | |
| = kdeedu =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|KAlgebra|Export to MathML Presentation Markup|[email protected]|Aleix Pol}} | |
| {{FeatureTodo|KAlgebra|Some integration with the new KFormula widget|[email protected]|Aleix Pol}} | |
| {{FeatureInProgress|KAlgebra|Add ability to draw 3D plots in cylindrical and spherical coordinates.|[email protected]|Percy Camilo Triveño Aucahuasi}} | |
| {{FeatureTodo|Kalzium|Port Kalzium's periodic table to use new QGraphicsView.|[email protected]|Marcus D. Hanwell}} | |
| {{FeatureTodo|Kalzium|Remove the libavogadro snapshot, depend on libavogadro directly.|[email protected]|Benoit Jacob}} | |
| {{FeatureTodo|Kalzium|Plasmoid to access Kalzium database|[email protected]|Carsten Niehaus}} | |
| {{FeatureInProgress|KEduca|Rewrite of the classic test writing/taking application|[email protected]|Matt Williams}} | |
| | |
| | |
| | |
| | |
| {{FeatureTodo|Kig|Improve construction of bisect lines.|[email protected]|Pino Toscano}} | |
| {{FeatureTodo|Kig|Improve feedback when constructing objects.|[email protected]|Pino Toscano}} | |
| | |
| {{FeatureTodo|Kig|Script objects as macros (to be reused more than once).|[email protected]|Pino Toscano}} | |
| | |
| {{FeatureTodo|Kig|Improve the new/edit script wizard.|[email protected]|Pino Toscano}} | |
| {{FeatureTodo|KLettres|Visual Indicator when letter is wrong|[email protected]|Anne-Marie Mahfouf}} | |
| | |
| | |
| {{FeatureTodo|KStars|Marble widget for Geolocation tool|[email protected]|Médéric Boquien}} | |
| | |
| | |
| {{FeatureTodo|KStars|Better rendering of comets/asteroids|[email protected]|Jason Harris}} | |
| {{FeatureTodo|KStars|Texture mapping of the skymap???|[email protected]|Jason Harris}} | |
| | |
| {{FeatureTodo|KStars|Display Comet Magnitudes whenever possible|[email protected]|Akarsh Simha}} | |
| {{FeatureTodo|KStars|Information links in-place for each technical term|[email protected]|Akarsh Simha}} | |
| {{FeatureTodo|KStars|Tool to suggest star-hopping techniques???|[email protected]|Akarsh Simha}} | |
| {{FeatureTodo|KStars|Extend conjunction tool to have one object unspecified, but have a genre of objects specified instead|[email protected]|Akarsh Simha}} | |
| | |
| {{FeatureTodo|KStars|Simulate Satellites and Iridium Flares|[email protected]|Akarsh Simha}} | |
| {{FeatureTodo|KStars|Social and Geographical Integration for KStars|[email protected]|Akarsh Simha}} | |
| {{FeatureTodo|KTurtle|Optional rulers/grid for canvas units|[email protected]|Mauricio Piacentini}} | |
| | |
| | |
| {{FeatureTodo|Marble|Support for MarbleWidget::setEnabled( bool )|[email protected]|Inge Wallin}} | |
| | |
| | |
| | |
| {{FeatureInProgress|Marble|Plugin architecture for map layers|[email protected]|Torsten Rahn}} | |
| | |
| | |
| {{FeatureInProgress|Marble|GeoClue Integration |[email protected]|Jens-Michael Hoffmann}} | |
| | |
| {{FeatureInProgress|Marble|More map providers (WMS?) |[email protected]|Jens-Michael Hoffmann}} | |
| {{FeatureInProgress|Marble|Winkel Triple projection / equivalent |[email protected]|Henry de Valence}} | |
| {{FeatureInProgress|Marble|Marble WorldClock Plasmoid|[email protected]|Henry de Valence}} | |
| {{FeatureInProgress|Marble|Qt-Version settings dialog|[email protected]|Henry de Valence}} | |
| {{FeatureInProgress|Marble|Panoramio Support||Shashank Singh}}
| |
| {{FeatureInProgress|Marble|Twitter Plugin||Shashank Singh}}
| |
| | |
| {{FeatureInProgress|Marble|Support for other planets and the moon|[email protected]|Torsten Rahn}} | |
| | |
| {{FeatureInProgress|Marble|Support for imperial units|[email protected]|Torsten Rahn}} | |
| | |
| | |
| {{FeatureInProgress|Marble|Port authors list from the Qt-About dialog to the KDE-About dialog|[email protected]|Torsten Rahn}} | |
| | |
| {{FeatureInProgress|Marble|GeoData Model/View Visualization|[email protected]|Patrick Spendrin}} | |
| {{FeatureInProgress|Marble|More generic projection support|[email protected]|Inge Wallin}} | |
| | |
| | |
| {{FeatureTodo|Step|Improve GUI for creating softbody|[email protected]|Vladimir Kuznetsov}} | |
| {{FeatureTodo|Step|Use common constraints handling code for collisions|[email protected]|Vladimir Kuznetsov}} | |
| |}
| |
| | |
| = kdemultimedia =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|JuK|Remove Qt/KDE3 support lib requirements|[email protected]|Michael Pyne}} | |
| {{FeatureTodo|JuK|Allow setting covers directly from URLs supported by KIO - drag/drop already allows this however|[email protected]|Michael Pyne}} | |
| {{FeatureDone|JuK|Use XCOMPOSITE real transparency when available for the track announcement popup|[email protected]|Michael Pyne}} | |
| | |
| |}
| |
| | |
| = kdeaccessibility =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| |}
| |
| | |
| = kdegraphics =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureInProgress|Okular|Generator for Mobipocket format|[email protected]|Jakub Stachowski}} | |
| {{FeatureInProgress|strigi|Thumbnailer and analyzer for Mobipocket format|[email protected]|Jakub Stachowski}} | |
| | |
| | |
| | |
| | |
| {{FeatureTodo|Okular|Support .snp and .emf file formats|[email protected]|Brad Hards}} | |
| | |
| {{FeatureTodo|Okular|Rich-text for annotations text.|[email protected]|Pino Toscano}} | |
| |}
| |
| | |
| = kdebase-runtime =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureTodo|kio_bookmarks|Refactoring using the new bookmarks system and qt/plasma for displaying|[email protected]|Xavier Vello}} | |
| |}
| |
| | |
| = kdebase-apps =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| {{FeatureInProgress|konq_thumbnails|Basic thumbnail support for KHTMLPart views(almost finished, now cleanup code)|[email protected]|Siyuan Cao}} | |
| {{FeatureTodo|konq_thumbnails|thumbnail support for all KonqFrame|[email protected]|Siyuan Cao}} | |
| {{FeatureTodo|konq_thumbnails|more thumbnail page styles and customization|[email protected]|Siyuan Cao}} | |
| |}
| |
| | |
| = kdeplasma-addons =
| |
| {| class="sortable" border="1" cellpadding="5" cellspacing="0" style="border: gray solid 1px; border-collapse: collapse; text-align: left; width: 100%;"
| |
| |- style="background: #ececec; white-space:nowrap;"
| |
| ! Status !! Project !! Description !! Contact
| |
| |}
| |
