[pkg-kde-commits] rev 2620 - trunk/packages/koffice/debian/patches
Isaac Clerencia
isaac at costa.debian.org
Mon Dec 12 10:55:42 UTC 2005
Author: isaac
Date: 2005-12-12 10:55:39 +0000 (Mon, 12 Dec 2005)
New Revision: 2620
Added:
trunk/packages/koffice/debian/patches/01_koffice_branch_r487865.diff
Log:
koffice branch pull (fixes security bug #342294
Added: trunk/packages/koffice/debian/patches/01_koffice_branch_r487865.diff
===================================================================
--- trunk/packages/koffice/debian/patches/01_koffice_branch_r487865.diff 2005-12-12 10:10:20 UTC (rev 2619)
+++ trunk/packages/koffice/debian/patches/01_koffice_branch_r487865.diff 2005-12-12 10:55:39 UTC (rev 2620)
@@ -0,0 +1,1090 @@
+#DPATCHLEVEL=0
+--- kword/templates/Wordprocessing/TwoColumns.desktop (revision 479651)
++++ kword/templates/Wordprocessing/TwoColumns.desktop (revision 487865)
+@@ -65,6 +65,7 @@
+ Name[zu]=Amakholamu Amabili
+ Comment=Creates an A4 document with two columns per page
+ Comment[ca]=Crea un document A4 amb dues columnes per pàgina
++Comment[cy]=Creu dogfen A4 efo dwy golofn ar y dudalen
+ Comment[da]=Opretter et A4-dokument med to søjler pr side.
+ Comment[de]=Erstellt ein zweispaltiges A4-Dokument
+ Comment[el]=Δημιουργεί ένα έγγραφο A4 με δύο στήλες ανά σελίδα
+--- kexi/plugins/forms/kexiformscrollview.cpp (revision 479651)
++++ kexi/plugins/forms/kexiformscrollview.cpp (revision 487865)
+@@ -56,6 +56,9 @@
+
+ KexiFormScrollView::~KexiFormScrollView()
+ {
++ if (m_owner)
++ delete m_data;
++ m_data = 0;
+ }
+
+ void
+--- kexi/plugins/forms/kexidbfactory.desktop (revision 479651)
++++ kexi/plugins/forms/kexidbfactory.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+
+ Name=Kexi DB Widgets
+ Name[bg]=Графични обекти на Kexi за бази данни
++Name[cy]=Celfigion Cronfa Ddata Kexi
+ Name[da]=Kexi DB-kontroller
+ Name[de]=Kexi Datenbank-Elemente
+ Name[el]=Γραφικά συστατικά Kexi DB
+--- kexi/plugins/migration/keximigrationhandler.desktop (revision 479651)
++++ kexi/plugins/migration/keximigrationhandler.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+
+ GenericName=Migration Plugin
+ GenericName[bg]=Приставка за мигриране
++GenericName[cy]=Ategyn Mudo
+ GenericName[da]=Migrationsplugin
+ GenericName[de]=Migrations-Plugin
+ GenericName[el]=Πρόσθετο μετάβασης δεδομένων
+@@ -31,6 +32,7 @@
+ GenericName[zh_CN]=升迁插件
+ Name=Migration Plugin
+ Name[bg]=Приставка за мигриране
++Name[cy]=Ategyn Mudo
+ Name[da]=Migrationsplugin
+ Name[de]=Migrations-Plugin
+ Name[el]=Πρόσθετο μετάβασης δεδομένων
+--- kexi/plugins/reports/kexireportfactory.desktop (revision 479651)
++++ kexi/plugins/reports/kexireportfactory.desktop (revision 487865)
+@@ -4,6 +4,7 @@
+ ServiceTypes=KFormDesigner/WidgetFactory
+
+ Name=Kexi Report Widgets
++Name[cy]=Celfigion Adroddiad i Kexi
+ Name[da]=Kexi Rapportkontroller
+ Name[de]=Kexi Bericht-Elemente
+ Name[el]=Γραφικά συστατικά αναφοράς Kexi
+--- kexi/interfaces/kwmailmerge/kwserialletter_kexi.desktop (revision 479651)
++++ kexi/interfaces/kwmailmerge/kwserialletter_kexi.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Name=Kexi Source
+ Name[ar]=مصدر Kexi
+ Name[bg]=Източник на данни за Kexi
++Name[br]=Tarzh Kexi
+ Name[ca]=Font de Kexi
+ Name[cs]=Zdroj Kexi
+ Name[cy]=Ffynhonell Kexi
+--- kexi/widget/tableview/kexidataawareobjectiface.h (revision 479651)
++++ kexi/widget/tableview/kexidataawareobjectiface.h (revision 487865)
+@@ -49,6 +49,15 @@
+ /** This interface is implemented by KexiTableView and KexiFormView
+ and used by KexiDataAwareView. If yu're implementing this interface,
+ add KEXI_DATAAWAREOBJECTINTERFACE convenience macro just after Q_OBJECT.
++
++ You should add following code to your destructor so data is deleted:
++ \code
++ if (m_owner)
++ delete m_data;
++ m_data = 0;
++ \endcode
++ This is not performed in KexiDataAwareObjectInterface because you may need
++ to access m_data in your desctructor.
+ */
+ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
+ {
+--- kexi/widget/tableview/kexidataawareobjectiface.cpp (revision 479651)
++++ kexi/widget/tableview/kexidataawareobjectiface.cpp (revision 487865)
+@@ -70,6 +70,7 @@
+ delete m_insertItem;
+ delete m_rowEditBuffer;
+ delete m_itemIterator;
++ //we cannot delete m_data here... subclasses should do this
+ }
+
+ void KexiDataAwareObjectInterface::clearVariables()
+--- kexi/migration/pqxx/keximigrate_pqxx.desktop (revision 479651)
++++ kexi/migration/pqxx/keximigrate_pqxx.desktop (revision 487865)
+@@ -3,6 +3,7 @@
+ Name=PostgreSQL
+ Name[hi]=पोस्टग्रे-एसक्यूएल
+ Comment=PostgreSQL Migration Driver for Kexi
++Comment[cy]=Gyrrydd Mudo PostgreSQL ar gyfer Kexi
+ Comment[da]=PostgreSQL Migrationsdriver for Kexi
+ Comment[de]=PostgreSQL-Migrationstreiber für Kexi
+ Comment[el]=Οδηγός μετάβασης PostgreSQL του Kexi
+--- kexi/migration/pqxx/pqxxmigrate.cpp (revision 479651)
++++ kexi/migration/pqxx/pqxxmigrate.cpp (revision 487865)
+@@ -40,7 +40,7 @@
+ what the system might be and is a work in progress
+ */
+
+-KEXIMIGRATE_DRIVER_INFO( pqxxMigrate, pqxx );
++KEXIMIGRATE_DRIVER_INFO( pqxxMigrate, pqxx )
+
+ //==================================================================================
+ //Constructor
+--- kexi/migration/mysql/mysqlmigrate.cpp (revision 479651)
++++ kexi/migration/mysql/mysqlmigrate.cpp (revision 487865)
+@@ -35,7 +35,7 @@
+
+ /* This is the implementation for the MySQL specific import routines. */
+
+-KEXIMIGRATE_DRIVER_INFO( MySQLMigrate, mysql );
++KEXIMIGRATE_DRIVER_INFO( MySQLMigrate, mysql )
+
+ /* ************************************************************************** */
+ //! Constructor
+--- kexi/migration/mysql/keximigrate_mysql.desktop (revision 479651)
++++ kexi/migration/mysql/keximigrate_mysql.desktop (revision 487865)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=MySQL
+ Comment=MySQL Migration Driver for Kexi
++Comment[cy]=Gyrrydd Mudo MySQL ar gyfer Kexi
+ Comment[da]=MySQL Migrationsdriver for Kexi
+ Comment[de]=MySQL-Migrationstreiber für Kexi
+ Comment[el]=Οδηγός μετάβασης MySQL του Kexi
+--- kexi/migration/keximigration_driver.desktop (revision 479651)
++++ kexi/migration/keximigration_driver.desktop (revision 487865)
+@@ -3,6 +3,7 @@
+ Type=ServiceType
+ X-KDE-ServiceType=Kexi/MigrationDriver
+ Comment=Kexi Data Migration Driver
++Comment[cy]=Gyrrydd Mudo Data Kexi
+ Comment[da]=Kexi datamigrationsdriver
+ Comment[de]=Kexi-Treiber zur Datenmigration
+ Comment[el]=Οδηγός μετάβασης δεδομένων του Kexi
+--- kexi/kexipart.desktop (revision 479651)
++++ kexi/kexipart.desktop (revision 487865)
+@@ -41,6 +41,8 @@
+ GenericName[bg]=Създаване на бази от данни
+ GenericName[br]=Aozer ar stlennvon
+ GenericName[ca]=Creador de bases de dades
++GenericName[cs]=Tvůrce databází
++GenericName[cy]=Creuydd Cronfa Ddata
+ GenericName[da]=Opretter af databaser
+ GenericName[de]=Datenbank-Erstellung
+ GenericName[el]=Δημιουργός βάσης δεδομένων
+--- kexi/kexidb/drivers/pqxx/pqxxdriver.cpp (revision 479651)
++++ kexi/kexidb/drivers/pqxx/pqxxdriver.cpp (revision 487865)
+@@ -28,7 +28,7 @@
+
+ using namespace KexiDB;
+
+-KEXIDB_DRIVER_INFO( pqxxSqlDriver, pqxxsql );
++KEXIDB_DRIVER_INFO( pqxxSqlDriver, pqxxsql )
+
+ //==================================================================================
+ //
+--- kexi/kexidb/drivers/mySQL/mysqldriver.cpp (revision 479651)
++++ kexi/kexidb/drivers/mySQL/mysqldriver.cpp (revision 487865)
+@@ -40,7 +40,7 @@
+
+ using namespace KexiDB;
+
+-KEXIDB_DRIVER_INFO( MySqlDriver, mysql );
++KEXIDB_DRIVER_INFO( MySqlDriver, mysql )
+
+ /* TODO: Implement buffered/unbuffered, rather than buffer everything.
+ Each MYSQL connection can only handle at most one unbuffered cursor,
+--- kexi/kexidb/drivers/odbc/odbcdriver.cpp (revision 479651)
++++ kexi/kexidb/drivers/odbc/odbcdriver.cpp (revision 487865)
+@@ -37,7 +37,7 @@
+
+ using namespace KexiDB;
+
+-KEXIDB_DRIVER_INFO( ODBCDriver, odbc );
++KEXIDB_DRIVER_INFO( ODBCDriver, odbc )
+
+ ODBCDriver::ODBCDriver( QObject *parent, const char *name, const QStringList &args )
+ : Driver( parent, name, args )
+--- kexi/kexi.desktop (revision 479651)
++++ kexi/kexi.desktop (revision 487865)
+@@ -12,6 +12,8 @@
+ GenericName[bg]=Създаване на бази от данни
+ GenericName[br]=Aozer ar stlennvon
+ GenericName[ca]=Creador de bases de dades
++GenericName[cs]=Tvůrce databází
++GenericName[cy]=Creuydd Cronfa Ddata
+ GenericName[da]=Opretter af databaser
+ GenericName[de]=Datenbank-Erstellung
+ GenericName[el]=Δημιουργός βάσης δεδομένων
+--- kexi/data/x-kexiproject-sqlite2.desktop (revision 479651)
++++ kexi/data/x-kexiproject-sqlite2.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Icon=kexiproject_sqlite2
+ Patterns=*.kexi
+ Comment=Kexi Database File-Based Project
++Comment[cy]=Cywaith Ffeil ar gyfer Cronfa Ddata Kexi
+ Comment[da]=Kexi database filbaseret projekt
+ Comment[de]=Kexi-Datenbankprojekt
+ Comment[el]=Έργο Kexi βάσης δεδομένων βασισμένη σε αρχείο
+--- kexi/data/x-kexiproject-sqlite3.desktop (revision 479651)
++++ kexi/data/x-kexiproject-sqlite3.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Icon=kexiproject_sqlite
+ Patterns=*.kexi
+ Comment=Kexi Database File-Based Project
++Comment[cy]=Cywaith Ffeil ar gyfer Cronfa Ddata Kexi
+ Comment[da]=Kexi database filbaseret projekt
+ Comment[de]=Kexi-Datenbankprojekt
+ Comment[el]=Έργο Kexi βάσης δεδομένων βασισμένη σε αρχείο
+--- kexi/data/x-kexiproject-sqlite.desktop (revision 479651)
++++ kexi/data/x-kexiproject-sqlite.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Icon=kexiproject_sqlite
+ Patterns=
+ Comment=Kexi Database File-Based Project
++Comment[cy]=Cywaith Ffeil ar gyfer Cronfa Ddata Kexi
+ Comment[da]=Kexi database filbaseret projekt
+ Comment[de]=Kexi-Datenbankprojekt
+ Comment[el]=Έργο Kexi βάσης δεδομένων βασισμένη σε αρχείο
+--- kexi/data/kde32compat/x-sqlite2.desktop (revision 479651)
++++ kexi/data/kde32compat/x-sqlite2.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Patterns=
+ Comment=SQLite2 Database File
+ Comment[br]=Restr stlennvon SQLite2
++Comment[cy]=Ffeil Gronfa DdataSQLite2
+ Comment[da]=SQLite2 databasefil
+ Comment[de]=SQLite2-Datenbankdatei
+ Comment[el]=Αρχείο βάσης δεδομένων SQLite2
+--- kexi/data/kde32compat/x-sqlite3.desktop (revision 479651)
++++ kexi/data/kde32compat/x-sqlite3.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Patterns=
+ Comment=SQLite3 Database File
+ Comment[br]=Restr stlennvon SQLite3
++Comment[cy]=Ffeil Gronfa DdataSQLite3
+ Comment[da]=SQLite3 databasefil
+ Comment[de]=SQLite3-Datenbankdatei
+ Comment[el]=Αρχείο βάσης δεδομένων SQLite3
+--- kexi/data/kexiscripthandler.desktop (revision 479651)
++++ kexi/data/kexiscripthandler.desktop (revision 487865)
+@@ -30,6 +30,7 @@
+ GenericName[zh_CN]=脚本
+ Name=Scripts
+ Name[br]=Urzhiaouegoù
++Name[cs]=Skripty
+ Name[cy]=Sgriptiau
+ Name[da]=Scripter
+ Name[de]=Skripte
+--- kexi/formeditor/factories/containerfactory.desktop (revision 479651)
++++ kexi/formeditor/factories/containerfactory.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+
+ Name=Container Widgets
+ Name[bg]=Контейнери
++Name[cy]=Celfigion Cynhwysydd
+ Name[da]=Container-kontroller
+ Name[de]=Container-Elemente
+ Name[el]=Γραφικά συστατικά υποδοχείς
+--- kexi/formeditor/factories/stdwidgets.desktop (revision 479651)
++++ kexi/formeditor/factories/stdwidgets.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+
+ Name=Basic Widgets
+ Name[bg]=Основни графични обекти
++Name[cy]=Celfigion Sylfaenol
+ Name[da]=Basale kontroller
+ Name[de]=Basis-Elemente
+ Name[el]=Βασικά γραφικά συστατικά
+--- kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp (revision 479651)
++++ kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp (revision 487865)
+@@ -649,7 +649,7 @@
+ }
+ }
+
+-K_EXPORT_COMPONENT_FACTORY(libkformdesigner_kdev_part, KFDFactory);
++K_EXPORT_COMPONENT_FACTORY(libkformdesigner_kdev_part, KFDFactory)
+
+ #include "kfd_kdev_part.moc"
+
+--- kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop (revision 479651)
++++ kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop (revision 487865)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=Form Designer KDevelop Plugin
+ Name[bg]=Приставка на KDevelop за проектиране на форми
++Name[cy]=Ategyn KDevelop: Dylunydd Ffurflenni
+ Name[da]=Form Designer KDEvelop-plugin
+ Name[de]=KDevelop-Plugin zum Formularentwurf
+ Name[el]=Πρόσθετο σχεδίασης φόρμας του KDevelop
+--- kexi/formeditor/test/kformdesigner.desktop (revision 479651)
++++ kexi/formeditor/test/kformdesigner.desktop (revision 487865)
+@@ -13,6 +13,7 @@
+ Type=Application
+ DocPath=kformdesigner/kformdesigner.html
+ GenericName=Form Designer
++GenericName[cy]=Dylunydd Ffurflenni
+ GenericName[de]=Formular-Designer
+ GenericName[el]=Σχεδιαστής φόρμας
+ GenericName[es]=Diseñador de formularios
+--- kexi/formeditor/test/kfd_part.cpp (revision 479651)
++++ kexi/formeditor/test/kfd_part.cpp (revision 487865)
+@@ -691,7 +691,7 @@
+ }
+ }
+
+-K_EXPORT_COMPONENT_FACTORY(libkformdesigner_part, KFDFactory);
++K_EXPORT_COMPONENT_FACTORY(libkformdesigner_part, KFDFactory)
+
+ #include "kfd_part.moc"
+
+--- lib/koscript/main.cc (revision 479651)
++++ lib/koscript/main.cc (revision 487865)
+@@ -52,7 +52,7 @@
+
+ if (args->count() < 1)
+ {
+- fprintf(stderr, i18n("You must specify a script.\n").local8Bit());
++ fprintf(stderr, "%s", i18n("You must specify a script.\n").local8Bit().data());
+ ::exit(1);
+ }
+
+--- Makefile.cvs (revision 479651)
++++ Makefile.cvs (revision 487865)
+@@ -1,5 +1,3 @@
+-# $Id: Makefile.cvs 16192 1999-01-30 23:14:41Z garbanzo $
+-
+ all:
+ @echo "This Makefile is only for the CVS repository"
+ @echo "This will be deleted before making the distribution"
+--- filters/kpresenter/kword/kprkword.desktop (revision 479651)
++++ filters/kpresenter/kword/kprkword.desktop (revision 487865)
+@@ -4,6 +4,7 @@
+ Name=KPresenter KWord Filter
+ Name[br]=Sil KWord KPresenter
+ Name[cs]=Filtr pro převod KPresenter->KWord
++Name[cy]=Hidlen KWord KPresenter
+ Name[da]=KPresenter KWord-filter
+ Name[de]=KPresenter KWord-Filter
+ Name[el]=KPresenter KWord φίλτρο
+--- filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 479651)
++++ filters/kword/pdf/xpdf/xpdf/Stream.cc (revision 487865)
+@@ -15,6 +15,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
++#include <limits.h>
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
+@@ -409,13 +410,28 @@
+ width = widthA;
+ nComps = nCompsA;
+ nBits = nBitsA;
++ predLine = NULL;
++ ok = gFalse;
+
++ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
++ nComps >= INT_MAX / nBits ||
++ width >= INT_MAX / nComps / nBits)
++ return;
++
+ nVals = width * nComps;
++ if (nVals + 7 <= 0)
++ return;
++
+ pixBytes = (nComps * nBits + 7) >> 3;
+ rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
++ if (rowBytes < 0)
++ return;
++
+ predLine = (Guchar *)gmalloc(rowBytes);
+ memset(predLine, 0, rowBytes);
+ predIdx = rowBytes;
++
++ ok = gTrue;
+ }
+
+ StreamPredictor::~StreamPredictor() {
+@@ -982,6 +998,10 @@
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if ( !pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
+@@ -2861,6 +2881,10 @@
+ height = read16();
+ width = read16();
+ numComps = str->getChar();
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ return gFalse;
++ }
+ if (prec != 8) {
+ error(getPos(), "Bad DCT precision %d", prec);
+ return gFalse;
+@@ -2887,6 +2911,10 @@
+ height = read16();
+ width = read16();
+ numComps = str->getChar();
++ if (numComps <= 0 || numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ return gFalse;
++ }
+ if (prec != 8) {
+ error(getPos(), "Bad DCT precision %d", prec);
+ return gFalse;
+@@ -2909,6 +2937,10 @@
+
+ length = read16() - 2;
+ scanInfo.numComps = str->getChar();
++ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
++ error(getPos(), "Bad number of components in DCT stream");
++ return gFalse;
++ }
+ --length;
+ if (length != 2 * scanInfo.numComps + 3) {
+ error(getPos(), "Bad DCT scan info block");
+@@ -3179,6 +3211,10 @@
+ FilterStream(strA) {
+ if (predictor != 1) {
+ pred = new StreamPredictor(this, predictor, columns, colors, bits);
++ if ( !pred->isOk()) {
++ delete pred;
++ pred = NULL;
++ }
+ } else {
+ pred = NULL;
+ }
+--- filters/kword/pdf/xpdf/xpdf/Stream.h (revision 479651)
++++ filters/kword/pdf/xpdf/xpdf/Stream.h (revision 487865)
+@@ -227,6 +227,7 @@
+
+ int lookChar();
+ int getChar();
++ GBool isOk() { return ok; }
+
+ private:
+
+@@ -242,6 +243,7 @@
+ int rowBytes; // bytes per line
+ Guchar *predLine; // line buffer
+ int predIdx; // current index in predLine
++ GBool ok;
+ };
+
+ //------------------------------------------------------------------------
+--- filters/kword/oowriter/kword_oowriter_import.desktop (revision 479651)
++++ filters/kword/oowriter/kword_oowriter_import.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Name[br]=Sil enporzh OpenOffice.org Writer evit KWord
+ Name[ca]=Filtre d'importació OpenOffice.org Writer per a KWord
+ Name[cs]=Importní filtr formátu OpenOffice.org Writer pro KWord
++Name[cy]=Hidl Mewnforio OpenOffice.org Writer ar gyfer KWord
+ Name[da]=OpenOffice.org Writer importfilter for KWord
+ Name[de]=OpenOffice.org Writer-Importfilter für KWord
+ Name[el]=Φίλτρο εισαγωγής OpenOffice.org Writer για το KWord
+--- filters/kword/oowriter/kword_oowriter_export.desktop (revision 479651)
++++ filters/kword/oowriter/kword_oowriter_export.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Name[br]=Sil ezporzh OpenOffice.org Writer evit KWord
+ Name[ca]=Filtre d'exportació OpenOffice.org Writer per a KWord
+ Name[cs]=Exportní filtr formátu OpenOffice.org Writer pro KWord
++Name[cy]=Hidl Allforio OpenOffice.org Writer ar gyfer KWord
+ Name[da]=OpenOffice.org Writer eksportfilter for KWord
+ Name[de]=OpenOffice.org Writer-Exportfilter für KWord
+ Name[el]=Φίλτρο εξαγωγής OpenOffice.org Writer για το KWord
+--- filters/kspread/opencalc/kspread_opencalc_import.desktop (revision 479651)
++++ filters/kspread/opencalc/kspread_opencalc_import.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Name[br]=Sil enporzh OpenOffice.org Calc evit KSpread
+ Name[ca]=Filtre d'importació OpenOffige.org Calc per a KSpread
+ Name[cs]=OpenOffice.org Calc importní filtr pro KSpread
++Name[cy]=Hidl Mewnforio OpenOffice.org Calc ar gyfer KSpread
+ Name[da]=OpenOffice.org-Calc importfilter for KSpread
+ Name[de]=OpenOffice.org Calc Importfilter für KSpread
+ Name[el]=Φίλτρο εισαγωγής OpenOffice.org Calc για το KSpread
+--- filters/kspread/opencalc/kspread_opencalc_export.desktop (revision 479651)
++++ filters/kspread/opencalc/kspread_opencalc_export.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Name[br]=Sil ezporzh OpenOffice.org Calc evit KSpread
+ Name[ca]=Filtre d'exportació OpenOffige.org Calc per a KSpread
+ Name[cs]=OpenOffice.org Calc exportní filtr pro KSpread
++Name[cy]=Hidlen Allforio OpenOffice.org Calc ar gyfer KSpread
+ Name[da]=OpenOffice.rog-Calc eksportfilter for KSpread
+ Name[de]=OpenOffice.org Calc-Exportfilter für KSpread
+ Name[el]=Φίλτρο εξαγωγής OpenOffice.org Calc για το KSpread
+--- filters/krita/magick/krita_magick.desktop (revision 479651)
++++ filters/krita/magick/krita_magick.desktop (revision 487865)
+@@ -7,6 +7,8 @@
+ Exec=krita %u
+ DocPath=krita/index.html
+ GenericName=Painting and Image Editing Application
++GenericName[cs]=Malování a úpravy obrázků
++GenericName[cy]=Cymhwysiad Peintio Golygu Delweddau
+ GenericName[da]=Male og billedredigeringsprogram
+ GenericName[de]=Mal- und Bildbearbeitungsprogramm
+ GenericName[es]=Aplicación de pintura y de edición de imágenes
+@@ -19,6 +21,7 @@
+ GenericName[pt]=Aplicação de Pintura e Edição de Imagens
+ GenericName[pt_BR]=Aplicação de Pintura e Edição de Imagens
+ GenericName[sv]=Målnings- och bildredigeringsprogram
++GenericName[uk]=Програма для малювання і редагування зображень
+ MimeType=image/x-xcf-gimp;image/png;image/gif;image/cgm;image/jpeg;image/tiff;image/x-bmp;image/x-ico;image/x-pcx;image/x-portable-pixmap;image/x-targa;image/x-xbm;image/x-xcf;image/x-xpm;image/x-vnd.adobe.photoshop
+ Type=Application
+ Icon=krita
+--- filters/krita/magick/krita_magick_export.desktop (revision 479651)
++++ filters/krita/magick/krita_magick_export.desktop (revision 487865)
+@@ -3,6 +3,7 @@
+ Name=Krita Magick Export Filter
+ Name[br]=Sil ezporzh Magick evit Krita
+ Name[ca]=Filtre d'exportació Magick per a Krita
++Name[cy]=Hidl Allforio Magick Krita
+ Name[da]=Krita Magick-eksportfilter
+ Name[de]=Magick-Exportfilter für Krita
+ Name[el]=Φίλτρο εξαγωγής Magick του Krita
+--- filters/kchart/svg/kchart_svg_export.desktop (revision 479651)
++++ filters/kchart/svg/kchart_svg_export.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Name[br]=Sil ezporzh SVG evit KChart
+ Name[ca]=Filtre d'exportació SVG per a KChart
+ Name[cs]=Exportní filtr do formátu SVG pro KChart
++Name[cy]=Hidlen Allforio SVG KChart
+ Name[da]=KChart SVG-eksportfilter
+ Name[de]=SVG-Export für KChart
+ Name[el]=Φίλτρο εξαγωγής SVG του KChart
+--- filters/kchart/png/kchart_png_export.desktop (revision 479651)
++++ filters/kchart/png/kchart_png_export.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Name[br]=Sil ezporzh PNG evit KChart
+ Name[ca]=Filtre d'exportació PNG per a KChart
+ Name[cs]=Exportní filtr do formátu PNG pro KChart
++Name[cy]=Hidlen Allforio PNG KChart
+ Name[da]=KChart PNG-eksportfilter
+ Name[de]=PNG-Export für KChart
+ Name[el]=Φίλτρο εξαγωγής PNG του KChart
+--- kugar/kudesigner/kudesigner.desktop (revision 479651)
++++ kugar/kudesigner/kudesigner.desktop (revision 487865)
+@@ -42,6 +42,7 @@
+ Name[zh_CN]=Kugar 设计器
+ Name[zh_TW]=Kugar 設計家
+ GenericName=Report Template
++GenericName[cy]=Patrymlun Adroddiad
+ GenericName[da]=Rapport-skabelon
+ GenericName[de]=Reportvorlage
+ GenericName[el]=Πρότυπο αναφοράς
+--- krita/plugins/cimg/kritacimg.desktop (revision 479651)
++++ krita/plugins/cimg/kritacimg.desktop (revision 487865)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=CImg Image Restoration Filter
++Name[cy]=Hidlen adfer Delwedd CImg
+ Name[da]=Cimg-billedrestaureringsfilter
+ Name[de]=CImg Filter zur Bildrestauration
+ Name[el]=Φίλτρο αποκατάστασης εικόνων CImg
+@@ -22,6 +23,7 @@
+ Name[sv]=Cimg-bildrestaureringsfilter
+ Name[zh_CN]=CImg 图像修复滤镜
+ Comment=CImg Image restoration filter
++Comment[cy]=Hidlen adfer Delwedd CImg
+ Comment[da]=Cimg-billedforbedringsfilter
+ Comment[de]=CImg basierter Filter zur Bildrestauration
+ Comment[el]=Φίλτρο αποκατάστασης εικόνων CImg
+--- krita/plugins/tool_filter/kritatoolfilter.desktop (revision 479651)
++++ krita/plugins/tool_filter/kritatoolfilter.desktop (revision 487865)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=Filter Tool
+ Name[br]=Ostil ar sil
++Name[cy]=Erfyn Hidlen
+ Name[da]=Filterværktøj
+ Name[de]=Filterwerkzeug
+ Name[el]=Εργαλείο φιλτραρίσματος
+@@ -28,6 +29,7 @@
+ Name[uk]=Інструмент фільтрування
+ Name[zh_CN]=过滤工具
+ Comment=Filter tool and paint operation
++Comment[cy]=Erfyn hidlen a gweithrediadau paent
+ Comment[da]=Filterværktøj og maleoperation
+ Comment[de]=Filterwerkzeug und Maloperation
+ Comment[el]=Εργαλείο φιλτραρίσματος και λειτουργία σχεδίασης
+--- krita/plugins/tool_crop/kritatoolcrop.desktop (revision 479651)
++++ krita/plugins/tool_crop/kritatoolcrop.desktop (revision 487865)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=Crop Tool
+ Name[br]=Ostilh krennañ
++Name[cy]=Hidlen Docio
+ Name[da]=Beskæringsværktøj
+ Name[de]=Zuschneidewerkzeug
+ Name[el]=Εργαλείο κοψίματος
+--- krita/plugins/tool_transform/kritatooltransform.desktop (revision 479651)
++++ krita/plugins/tool_transform/kritatooltransform.desktop (revision 487865)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=Crop Tool
+ Name[br]=Ostilh krennañ
++Name[cy]=Hidlen Docio
+ Name[da]=Beskæringsværktøj
+ Name[de]=Zuschneidewerkzeug
+ Name[el]=Εργαλείο κοψίματος
+--- krita/paintops/kritadefaultpaintops.desktop (revision 479651)
++++ krita/paintops/kritadefaultpaintops.desktop (revision 487865)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Default Paint Operations
++Name[cy]=Gweithrediadau Paent Rhagosodol
+ Name[da]=Standard maleoperationer
+ Name[de]=Standard Zeichen- und Maloperationen
+ Name[el]=Προκαθορισμένες λειτουργίες σχεδίασης
+@@ -9,6 +10,7 @@
+ Name[eu]=Margotze-eragiketa lehenetsiak
+ Name[fi]=Oletusväritystoimenpiteet
+ Name[fr]=Opérations de dessin par défaut
++Name[ga]=Oibríochtaí Réamhshocraithe Péinteála
+ Name[he]=פעולות הצביעה המוגדרות כברירת מחדל
+ Name[hu]=Alapértelmezett festési műveletek
+ Name[it]=Operazioni predefinite di disegno
+@@ -25,6 +27,7 @@
+ Name[uk]=Типові дії малювання
+ Name[zh_CN]=默认绘图操作
+ Comment=Default paint operations
++Comment[cy]=Gweithrediadau paent rhagosodol
+ Comment[da]=Standard maleoperationer
+ Comment[de]=Standard Zeichen- und Maloperationen
+ Comment[el]=Προκαθορισμένες λειτουργίες σχεδίασης
+@@ -33,6 +36,7 @@
+ Comment[eu]=Margotze-eragiketa lehenetsiak
+ Comment[fi]=Oletusväritystoimenpiteet
+ Comment[fr]=Opérations de dessin par défaut
++Comment[ga]=Oibríochtaí réamhshocraithe péinteála
+ Comment[he]=פעולות הצביעה המוגדרות כברירת מחדל
+ Comment[hu]=Alapértelmezett festési műveletek
+ Comment[it]=Operazioni predefinite di disegno
+--- krita/tools/kritadefaulttools.desktop (revision 479651)
++++ krita/tools/kritadefaulttools.desktop (revision 487865)
+@@ -3,6 +3,7 @@
+ Name=Default Tools
+ Name[bg]=Инструменти по подразбиране
+ Name[br]=Ostilhoù dre ziouer
++Name[cy]=Offer Rhagosodol
+ Name[da]=Standardværktøjer
+ Name[de]=Standardwerkzeuge
+ Name[el]=Προκαθορισμένα εργαλεία
+--- krita/modules/colorspace_ws/kritawsplugin.desktop (revision 479651)
++++ krita/modules/colorspace_ws/kritawsplugin.desktop (revision 487865)
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Name=Wet & Sticky Canvas Color Model
++Name[cy]=Model Lliw Cynfas Gwlyb a Gludiog
+ Name[da]=Våd & klæbrig kanvasfarve-model
+ Name[de]=Farbmodell Feuchte & klebrige Leinwand
+ Name[en_GB]=Wet & Sticky Canvas Colour Model
+--- krita/modules/colorspace_rgb/templates/transparent_1280x1024.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/transparent_1280x1024.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Icon=template_rgb_empty
+ Name=Transparent 1280 x 1024
+ Name[br]=Treuzwelus 1280 x 1024
++Name[cy]=Tryloyw 1280 x 1024
+ Name[da]=Gennemsigtig 1280 x 1024
+ Name[el]=Διαφανής 1280 x 1024
+ Name[es]=1280 x 1024 transparente
+@@ -29,6 +30,7 @@
+ Name[zh_CN]=透明 1280 x 1024
+ Comment=Creates a transparent image of 1280 x 1024 pixels.
+ Comment[ca]=Crea una imatge transparent de 1280 x 1024 pixels.
++Comment[cy]=Creu delwedd dryloyw o 1280 x 1024 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 1280 x 1024 pixels.
+ Comment[de]=Erstellt ein transparentes Bild mit 1280 x 1024 Pixeln.
+ Comment[el]=Δημιουργεί μία διαφανή εικόνα μεγέθους 1280 x 1024 εικονοστοιχείων.
+--- krita/modules/colorspace_rgb/templates/transparent_640x480.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/transparent_640x480.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Icon=template_rgb_empty
+ Name=Transparent 640 x 480
+ Name[br]=Treuzwelus 640 x 480
++Name[cy]=Tryloyw 640 x 480
+ Name[da]=Gennemsigtig 640 x 480
+ Name[el]=Διαφανής 640 x 480
+ Name[es]=640 x 480 transparente
+@@ -29,6 +30,7 @@
+ Name[zh_CN]=透明 640 x 480
+ Comment=Creates a transparent image of 640 x 480 pixels.
+ Comment[ca]=Crea una imatge transparent de 640 x 480 pixels.
++Comment[cy]=Creu delwedd dryloyw o 640 x 480 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 640 x 480 pixels.
+ Comment[de]=Erstellt ein transparentes Bild mit 640 x 480 Pixeln.
+ Comment[el]=Δημιουργεί μία διαφανή εικόνα μεγέθους 640 x 480 εικονοστοιχείων.
+--- krita/modules/colorspace_rgb/templates/white_1600x1200.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/white_1600x1200.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Icon=template_rgb_empty
+ Name=White 1600 x 1200
+ Name[ca]=Blanc 1600 x 1200
++Name[cy]=Gwyn 1600 x 1200
+ Name[de]=Weiß 1600 x 1200
+ Name[el]=Λευκή 1600 x 1200
+ Name[es]=1600 x 1200 blanco
+@@ -29,6 +30,7 @@
+ Name[uk]=Біле 1600 x 1200
+ Name[zh_CN]=白色 1600 x 1200
+ Comment=Creates a white RGB image of 1600 x 1200 pixels.
++Comment[cy]=Creu delwedd RGB wen o 1600 x 1200 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 1600 x 1200 pixels.
+ Comment[de]=Erstellt ein weißes RGB-Bild mit 1600 x 1200 Pixeln.
+ Comment[el]=Δημιουργεί μία λευκή RGB εικόνα μεγέθους 1600 x 1200 εικονοστοιχείων.
+--- krita/modules/colorspace_rgb/templates/white_1024x768.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/white_1024x768.desktop (revision 487865)
+@@ -7,6 +7,7 @@
+ Name[bg]=Бяло 1024 x 768
+ Name[br]=Gwenn 1024 x 768
+ Name[ca]=Blanc 1024 x 768
++Name[cy]=Gwyn 1024 x 768
+ Name[da]=Hvidt 1024 x 768
+ Name[de]=Weiß 1024 x 768
+ Name[el]=Λευκή 1024 x 768
+@@ -37,6 +38,7 @@
+ Name[zh_CN]=白色 1024 x 768
+ Comment=Creates a white RGB image of 1024 x 768 pixels.
+ Comment[bg]=Създаване на бяло RGB изображение с размери 1024 x 768 точки.
++Comment[cy]=Creu delwedd RGB wen o 1024 x 768 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 1024 x 768 pixels.
+ Comment[de]=Erstellt ein weißes RGB-Bild mit 1024 x 768 Pixeln.
+ Comment[el]=Δημιουργεί μία λευκή RGB εικόνα μεγέθους 1024 x 768 εικονοστοιχείων.
+--- krita/modules/colorspace_rgb/templates/white_1280x1024.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/white_1280x1024.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Icon=template_rgb_empty
+ Name=White 1280 x 1024
+ Name[ca]=Blanc 1280 x 1024
++Name[cy]=Gwyn 1280 x 1024
+ Name[de]=Weiß 1280 x 1024
+ Name[el]=Λευκή 1280 x 1024
+ Name[es]=1280 x 1024 blanco
+@@ -29,6 +30,7 @@
+ Name[uk]=Біле 1280 x 1024
+ Name[zh_CN]=白色 1280 x 1024
+ Comment=Creates a white RGB image of 1280 x 1024 pixels.
++Comment[cy]=Creu delwedd RGB wen o 1280 x 1024 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 1280 x 1024 pixels.
+ Comment[de]=Erstellt ein weißes RGB-Bild mit 1280 x 1024 Pixeln.
+ Comment[el]=Δημιουργεί μία λευκή RGB εικόνα μεγέθους 1280 x 1024 εικονοστοιχείων.
+--- krita/modules/colorspace_rgb/templates/white_640x480.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/white_640x480.desktop (revision 487865)
+@@ -7,6 +7,7 @@
+ Name[bg]=Бяло 640x480
+ Name[br]=Gwenn 640x480
+ Name[ca]=Blanc 640x480
++Name[cy]=Gwyn 640 x 480
+ Name[da]=Hvidt 640x480
+ Name[de]=Weiß 640x480
+ Name[el]=Λευκή 640x480
+@@ -37,6 +38,7 @@
+ Name[zh_CN]=白色 640 x 480
+ Comment=Creates a white RGB image of 640 x 480 pixels.
+ Comment[bg]=Създаване на бяло RGB изображение с размери 640 x 480 точки.
++Comment[cy]=Creu delwedd RGB wen o 640 x 480 picsel.
+ Comment[da]=Laver et hvidt RGB-billede på 640 x 480 pixels.
+ Comment[de]=Erstellt ein weißes RGB-Bild mit 640 x 480 Pixeln.
+ Comment[el]=Δημιουργεί μία λευκή RGB εικόνα μεγέθους 640 x 480 εικονοστοιχείων.
+--- krita/modules/colorspace_rgb/templates/transparent_1600x1200.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/transparent_1600x1200.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Name=Transparent 1600 x 1200
+ Name[bg]=Прозрачно 1600 x 1200
+ Name[br]=Treuzwelus 1600 x 1200
++Name[cy]=Tryloyw 1600 x 1200
+ Name[da]=Gennemsigtig 1600 x 1200
+ Name[el]=Διαφανής 1600 x 1200
+ Name[es]=1600 x 1200 transparente
+@@ -35,6 +36,7 @@
+ Comment=Creates a transparent image of 1600 x 1200 pixels.
+ Comment[bg]=Създаване на прозрачно изображение с размери 1600 x 1200 точки.
+ Comment[ca]=Crea una imatge transparent de 1600 x 1200 pixels.
++Comment[cy]=Creu delwedd dryloyw o 1600 x 1200 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 1600 x 1200 pixels.
+ Comment[de]=Erstellt ein transparentes Bild mit 1600 x 1200 Pixeln.
+ Comment[el]=Δημιουργεί μία διαφανή εικόνα μεγέθους 1600 x 1200 εικονοστοιχείων.
+--- krita/modules/colorspace_rgb/templates/transparent_1024x768.desktop (revision 479651)
++++ krita/modules/colorspace_rgb/templates/transparent_1024x768.desktop (revision 487865)
+@@ -5,6 +5,7 @@
+ Icon=template_rgb_empty
+ Name=Transparent 1024 x 768
+ Name[br]=Treuzwelus 1024 x 768
++Name[cy]=Tryloyw 1024 x 768
+ Name[da]=Gennemsigtig 1024 x 768
+ Name[el]=Διαφανής 1024 x 768
+ Name[es]=1024 x 768 transparente
+@@ -29,6 +30,7 @@
+ Name[zh_CN]=透明 1024 x 768
+ Comment=Creates a transparent image of 1024 x 768 pixels.
+ Comment[ca]=Crea una imatge transparent de 1024 x 768 pixels.
++Comment[cy]=Creu delwedd dryloyw o 1024 x 768 picsel.
+ Comment[da]=Laver et gennemsigtigt billede på 1024 x 768 pixels.
+ Comment[de]=Erstellt ein transparentes Bild mit 1024 x 768 Pixeln.
+ Comment[el]=Δημιουργεί μία διαφανή εικόνα μεγέθους 1024 x 768 εικονοστοιχείων.
+--- krita/modules/colorspace_wet/kritawetplugin.desktop (revision 479651)
++++ krita/modules/colorspace_wet/kritawetplugin.desktop (revision 487865)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=Watercolor Paint Plugin
++Name[cy]=Ategyn Paent Dyfrlliw
+ Name[da]=Plugin for vandfarvemaling
+ Name[de]=Plugin für Wasserfarben-Effekte
+ Name[es]=Extensión de pintura de acuarela
+@@ -24,6 +25,7 @@
+ Name[uk]=Втулка малювання акварельними фарбами
+ Name[zh_CN]=水彩绘画插件
+ Comment=Color model and tools for painting with simulated watercolors
++Comment[cy]=Model lliw ac offer ar gyfer paentio efo dyfrliwiau wedi'u hefelychu
+ Comment[da]=Farvemodel og værktøjer til at male med simulerede vandfarver
+ Comment[de]=Farbmodell und Werkzeuge zum Malen mit simulierten Wasserfarben
+ Comment[en_GB]=Colour model and tools for painting with simulated watercolours
+--- krita/modules/colorspace_gray/kritagrayplugin.desktop (revision 479651)
++++ krita/modules/colorspace_gray/kritagrayplugin.desktop (revision 487865)
+@@ -29,6 +29,7 @@
+ Name[sv]=Gråskalefärgmodell
+ Name[ta]=பழுப்புநிற வண்ண மாதிரி
+ Name[tr]=Griton Renk Modeli
++Name[uk]=Кольорова модель "відтінки сірого"
+ Name[zh_CN]=灰度色彩模型
+ Comment=Color model for 8-bit grayscale images
+ Comment[bg]=Цветови модел за 8 битови сиви изображения
+--- krita/modules/colorspace_gray/templates/white_640x480.desktop (revision 479651)
++++ krita/modules/colorspace_gray/templates/white_640x480.desktop (revision 487865)
+@@ -6,6 +6,7 @@
+ Name=White Background, 640 x 480
+ Name[bg]=Бял фон, 640 x 480
+ Name[ca]=Fons blanc, 640 x 480
++Name[cy]=Cefndir Gwyn, 640 x 480
+ Name[da]=Hvid baggrund, 640 x 480
+ Name[de]=Weißer Hintergrund, 640 x 480
+ Name[el]=Λευκό φόντο, 640 x 480
+@@ -37,6 +38,7 @@
+ Comment=Creates an image of 640 x 480 pixels with a white background.
+ Comment[bg]=Създаване на изображение с размери 640 x 480 точки и бял фон.
+ Comment[ca]=Crea una imatge de 640 x 480 pixels amb el fons blanc.
++Comment[cy]=Creu delwedd o 640 x 480 o bicseli efo cefndir gwyn.
+ Comment[da]=Laver et billede på 640 x 480 pixels med en hvis baggrund.
+ Comment[de]=Erstellt ein Bild mit 640 x 480 Pixeln mit einem weißen Hintergrund.
+ Comment[el]=Δημιουργεί μία εικόνα μεγέθους 640 x 480 εικονοστοιχείων με λευκό φόντο.
+--- krita/modules/colorspace_cmyk/templates/white_2000x800.desktop (revision 479651)
++++ krita/modules/colorspace_cmyk/templates/white_2000x800.desktop (revision 487865)
+@@ -7,6 +7,7 @@
+ Name[bg]=Бяло 2000 x 800
+ Name[br]=Gwenn 2000 x 800
+ Name[ca]=Blanc 2000 x 800
++Name[cy]=Gwyn 2000 x 800
+ Name[de]=Weiß 2000 x 800
+ Name[el]=Λευκό 2000 x 800
+ Name[es]=2000 x 800 blanco
+@@ -36,6 +37,7 @@
+ Name[zh_CN]=白色 2000 x 800
+ Comment=Creates a white CMYK image of 2000 x 800 pixels.
+ Comment[bg]=Създаване на бяло CMYK изображение с размери 2000 x 800 точки.
++Comment[cy]=Creu delwedd CMYK wen o 2000 x 800 picsel.
+ Comment[da]=Laver et hvidt CMYK-billede på 2000 x 800 pixels.
+ Comment[de]=Erstellt ein weißes CMYK-Bild 2000 x 800 Pixeln.
+ Comment[el]=Δημιουργεί μία λευκή CMYK εικόνα μεγέθους 2000 x 800 εικονοστοιχείων.
+--- krita/data/templates/empty.desktop (revision 479651)
++++ krita/data/templates/empty.desktop (revision 487865)
+@@ -45,6 +45,7 @@
+ Name[zh_CN]=空文档
+ Comment=Create an empty document
+ Comment[bg]=Създаване на празен документ
++Comment[cy]=Creu dogfen wag
+ Comment[da]=Opretter et tomt dokument
+ Comment[de]=Erstellt ein leeres Dokument
+ Comment[el]=Δημιουργία ενός κενού εγγράφου
+@@ -53,6 +54,7 @@
+ Comment[eu]=Sortu dokumentu huts bat
+ Comment[fi]=Luo tyhjä asiakirja
+ Comment[fr]=Créer un document vide
++Comment[ga]=Cruthaigh cáipéis fholamh
+ Comment[he]=יצירת מסמך ריק
+ Comment[hi]=एक खाली दस्तावेज़ बनाएँ
+ Comment[hu]=Üres dokumentum létrehozása
+--- kchart/templates/BarChart.desktop (revision 479651)
++++ kchart/templates/BarChart.desktop (revision 487865)
+@@ -4,6 +4,7 @@
+ URL=.source/BarChart.chrt
+ Name=Bar Chart
+ Name[cs]=Sloupcový graf
++Name[cy]=Siart Bar
+ Name[da]=Bjælkediagram
+ Name[de]=Balkendiagramm
+ Name[el]=Ραβδόγραμμα
+@@ -31,6 +32,7 @@
+ Name[zh_CN]=条形图
+ Comment=An example of a bar chart.
+ Comment[cs]=Příklad sloupcového grafu.
++Comment[cy]=Enghraifft o siart bar.
+ Comment[da]=Et eksempel på et bjælkediagram.
+ Comment[de]=Beispiel für ein Balkendiagramm.
+ Comment[el]=Ένα παράδειγμα ραβδογράμματος.
+--- mimetypes/kde33/vnd.oasis.opendocument.formula.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.formula.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Формула на OASIS OpenDocument
+ Comment[br]=Formulenn OpenDocument OASIS
+ Comment[ca]=Fòrmula OASIS OpenDocument
++Comment[cy]=Fformiwla OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument formel
+ Comment[de]=OASIS OpenDocument-Formel
+ Comment[el]=Μαθηματικός τύπος του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Електронна таблица на OASIS OpenDocument
+ Comment[br]=Loger OpenOffice.org OASIS
+ Comment[ca]=Full de càlcul OASIS OpenDocument
++Comment[cy]=Taenlen OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument regneark
+ Comment[de]=OASIS OpenDocument-Kalkulationstabelle
+ Comment[el]=Λογιστικό φύλλο του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Шаблон за графика на OASIS OpenDocument
+ Comment[br]=Patrom skeudenn OpenOffice.org OASIS
+ Comment[ca]=Plantilla de gràfics OASIS OpenDocument
++Comment[cy]=Patrymlun Graffeg OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument grafikskabelon
+ Comment[de]=OASIS OpenDocument-Graphiken (Vorlage)
+ Comment[el]=Πρότυπο γραφικών του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Презентация на OASIS OpenDocument
+ Comment[br]=Emginnig OASIS OpenDocument
+ Comment[ca]=Presentació OASIS OpenDocument
++Comment[cy]=Cyflwyniad OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument præsentation
+ Comment[de]=OASIS OpenDocument-Präsentation
+ Comment[el]=Παρουσίαση του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Текстов шаблон на OASIS OpenDocument
+ Comment[br]=Patrom skrid OpenOffice.org OASIS
+ Comment[ca]=Plantilla de text OASIS OpenDocument
++Comment[cy]=Patrymlun Testun OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument tekstskabelon
+ Comment[de]=OASIS OpenDocument-Textdokument (Vorlage)
+ Comment[el]=Πρότυπο κειμένου του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Графика на OASIS OpenDocument
+ Comment[br]=Skeudenn OpenOffice.org OASIS
+ Comment[ca]=Gràfics OASIS OpenDocument
++Comment[cy]=Graffeg OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument grafik
+ Comment[de]=OASIS OpenDocument-Graphiken
+ Comment[el]=Γραφικά του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Шаблон за електронна таблица на OASIS OpenDocument
+ Comment[br]=Patrom loger OpenOffice.org OASIS
+ Comment[ca]=Plantilla de full de càlcul OASIS OpenDocument
++Comment[cy]=Patrymlun Taenlen OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument regnearkskabelon
+ Comment[de]=OASIS OpenDocument-Kalkulationstabelle (Vorlage)
+ Comment[el]=Πρότυπο λογιστικού φύλλου του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.chart.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.chart.desktop (revision 487865)
+@@ -7,6 +7,7 @@
+ Comment=OASIS OpenDocument Chart
+ Comment[bg]=Диаграма на OASIS OpenDocument
+ Comment[br]=Treser grafoù OpenDocument OASIS
++Comment[cy]=Siart OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument diagram
+ Comment[de]=OASIS OpenDocument-Diagramm
+ Comment[el]=Διάγραμμα του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.image.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.image.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Изображение на OASIS OpenDocument
+ Comment[br]=Skeudenn OpenDocument OASIS
+ Comment[ca]=Imatge OASIS OpenDocument
++Comment[cy]=Delwedd OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument billede
+ Comment[de]=OASIS OpenDocument-Bild
+ Comment[el]=Εικόνα του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Шаблон за презентация на OASIS OpenDocument
+ Comment[br]=Patrom un emginnig OASIS OpenDocument
+ Comment[ca]=Plantilla de presentació OASIS OpenDocument
++Comment[cy]=Patrymlun Cyflwyniad OASIS OpenDocument
+ Comment[da]=OASIS OpenDocument præsentationsskabelon
+ Comment[de]=OASIS OpenDocument-Präsentation (Vorlage)
+ Comment[el]=Πρότυπο παρουσίασης του OASIS OpenDocument
+--- mimetypes/kde33/vnd.oasis.opendocument.text.desktop (revision 479651)
++++ mimetypes/kde33/vnd.oasis.opendocument.text.desktop (revision 487865)
+@@ -8,6 +8,7 @@
+ Comment[bg]=Текстов документ на OASIS OpenDocument
+ Comment[br]=Skrid OpenDocument OASIS
+ Comment[ca]=Text OASIS OpenDocument
++Comment[cy]=Testun OASIS OpenDocument
+ Comment[da]=OASIS Open Office tekst
+ Comment[de]=OASIS OpenDocument-Textdokument
+ Comment[el]=Κείμενο του OASIS OpenDocument
+--- kivio/kiviopart/kiviopart.desktop (revision 479651)
++++ kivio/kiviopart/kiviopart.desktop (revision 487865)
+@@ -36,6 +36,7 @@
+ X-KDE-NativeMimeType=application/x-kivio
+ Categories=Qt;KDE;Office;
+ GenericName=Flowchart & Diagram
++GenericName[cy]=Siart Llif & Diagram
+ GenericName[da]=Flowdiagrammer & diagrammer
+ GenericName[de]=Flussdiagramme und Statistiken
+ GenericName[el]=Διάγραμμα ροής & απλό διάγραμμα
+--- karbon/core/vtext.cc (revision 479651)
++++ karbon/core/vtext.cc (revision 487865)
+@@ -51,6 +51,7 @@
+
+ // Trace routines for ttf / ps font -> VSubpath
+
++static
+ int traceMoveto( FT_Vector *to, VPath *composite )
+ {
+ double tox = ( to->x / 64.0 );
+@@ -63,6 +64,7 @@
+ return 0;
+ }
+
++static
+ int traceLineto( FT_Vector *to, VPath *composite )
+ {
+ double tox = ( to->x / 64.0 );
+@@ -74,8 +76,9 @@
+ composite->lineTo( KoPoint( tox, toy ) );
+
+ return 0;
+-};
++}
+
++static
+ int traceQuadraticBezier( FT_Vector *control, FT_Vector *to, VPath *composite )
+ {
+ double x1 = ( control->x / 64.0 );
+@@ -89,8 +92,9 @@
+ //composite->curve2To( KoPoint( x1, y1 ), KoPoint( x2, y2 ) );
+
+ return 0;
+-};
++}
+
++static
+ int traceCubicBezier( FT_Vector *p, FT_Vector *q, FT_Vector *to, VPath *composite )
+ {
+ double x1 = ( p->x / 64.0 );
+@@ -106,7 +110,7 @@
+ composite->curveTo( KoPoint( x1, y1 ), KoPoint( x2, y2 ), KoPoint( x3, y3 ) );
+
+ return 0;
+-};
++}
+
+ FT_Outline_Funcs OutlineMethods =
+ {
More information about the pkg-kde-commits
mailing list