(fs);
- if (tfs == 0) continue;
-
- QTextDocument *doc = tfs->document();
- QTextBlock block = doc->begin();
- while (block.isValid()) {
- int blockLevel = block.blockFormat().intProperty(KoParagraphStyle::OutlineLevel);
-
- // no blockLevel?
- if (blockLevel == 0) {
- block = block.next();
- continue;
- }
+ QTextBlock block = textDocument->begin();
+ for (; block.isValid(); block = block.next()) {
+ int blockLevel = 0;
+ if (block.blockFormat().hasProperty(KoParagraphStyle::OutlineLevel)) {
+ blockLevel = block.blockFormat().intProperty(KoParagraphStyle::OutlineLevel);
+ }
+
+ // no blockLevel yet?
+ if (blockLevel == 0) {
+ continue;
+ }
- Okular::DocumentViewport viewport = calculateViewport( block, textDocumentayout );
+ Okular::DocumentViewport viewport = calculateViewport( block, textDocumentLayout );
- QDomElement item = m_documentSynopsis.createElement( block.text() );
- item.setAttribute( "Viewport", viewport.toString() );
+ QDomElement item = m_documentSynopsis.createElement( block.text() );
+ item.setAttribute( "Viewport", viewport.toString() );
- // we need a parent, which has to be at a higher heading level than this heading level
- // so we just work through the stack
- while ( ! parentNodeStack.isEmpty() ) {
- int parentLevel = parentNodeStack.top().first;
- if ( parentLevel < blockLevel ) {
- // this is OK as a parent
- parentNode = parentNodeStack.top().second;
- break;
- } else {
- // we'll need to be further into the stack
- parentNodeStack.pop();
- }
+ // we need a parent, which has to be at a higher heading level than this heading level
+ // so we just work through the stack
+ while ( ! parentNodeStack.isEmpty() ) {
+ int parentLevel = parentNodeStack.top().first;
+ if ( parentLevel < blockLevel ) {
+ // this is OK as a parent
+ parentNode = parentNodeStack.top().second;
+ break;
+ } else {
+ // we'll need to be further into the stack
+ parentNodeStack.pop();
}
- parentNode.appendChild( item );
- parentNodeStack.push( qMakePair( blockLevel, QDomNode(item) ) );
-
- block = block.next();
}
+ parentNode.appendChild( item );
+ parentNodeStack.push( qMakePair( blockLevel, QDomNode(item) ) );
}
return true;
diff -Nru calligra-2.9.7/extras/properties/CMakeLists.txt calligra-2.9.11/extras/properties/CMakeLists.txt
--- calligra-2.9.7/extras/properties/CMakeLists.txt 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/extras/properties/CMakeLists.txt 2016-02-02 19:53:13.000000000 +0000
@@ -6,7 +6,7 @@
kde4_add_plugin(calligradocinfopropspage ${calligradocinfopropspage_PART_SRCS})
-target_link_libraries(calligradocinfopropspage ${KDE4_KFILE_LIBS} kowidgets)
+target_link_libraries(calligradocinfopropspage ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} kowidgets)
install(TARGETS calligradocinfopropspage DESTINATION ${PLUGIN_INSTALL_DIR})
diff -Nru calligra-2.9.7/extras/quickprint/krita_print.desktop calligra-2.9.11/extras/quickprint/krita_print.desktop
--- calligra-2.9.7/extras/quickprint/krita_print.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/extras/quickprint/krita_print.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -12,7 +12,6 @@
Name[bs]=Štampaj...
Name[ca]=Imprimeix...
Name[ca@valencia]=Imprimeix...
-Name[cs]=Tisk...
Name[cy]=Argraffu...
Name[da]=Udskriv...
Name[de]=Drucken ...
@@ -23,8 +22,6 @@
Name[et]=Trükkimine...
Name[eu]=Inprimatu...
Name[fa]=چاپ...
-Name[fi]=Tulosta…
-Name[fr]=Impression...
Name[fy]=Printsje...
Name[ga]=Priontáil...
Name[gl]=Imprimir…
diff -Nru calligra-2.9.7/filters/flow/wpg/import/calligra_filter_wpg2odg.desktop calligra-2.9.11/filters/flow/wpg/import/calligra_filter_wpg2odg.desktop
--- calligra-2.9.7/filters/flow/wpg/import/calligra_filter_wpg2odg.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/flow/wpg/import/calligra_filter_wpg2odg.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -14,6 +14,7 @@
Name[eu]=Flow-ren WPG inportazio-iragazkia
Name[fi]=Flow’n WPG-tuontisuodatin
Name[fr]=Filtre d'importation WPG
+Name[gl]=Filtro para Flow de importación de WPG
Name[hu]=Flow WPG importszűrő
Name[it]=Filtro di importazione WPG per Flow
Name[ja]=Flow WPG インポートフィルタ
diff -Nru calligra-2.9.7/filters/karbon/image/calligra_filter_karbon2image.desktop calligra-2.9.11/filters/karbon/image/calligra_filter_karbon2image.desktop
--- calligra-2.9.7/filters/karbon/image/calligra_filter_karbon2image.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/karbon/image/calligra_filter_karbon2image.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -2,12 +2,14 @@
Type=Service
Name=Karbon JPEG/PNG Export Filter
Name[ca]=Filtre d'exportació JPEG/PNG per al Karbon
+Name[ca@valencia]=Filtre d'exportació JPEG/PNG per al Karbon
Name[cs]=Exportní filtr do formátu JPEG/PNG pro Karbon
Name[de]=Karbon JPEG-/PNG-Exportfilter
Name[en_GB]=Karbon JPEG/PNG Export Filter
Name[es]=Filtro de Karbon de exportación a JPEG/PNG
Name[et]=Karboni JPEG/PNG ekspordifilter
Name[fi]=Karbonin JPEG/PNG-vientisuodatin
+Name[gl]=Filtro para Karbon de exportación de JPEG e PNG
Name[it]=Filtro di esportazione JPEG/PNG per Karbon
Name[ja]=Karbon JPEG/PNG エクスポートフィルタ
Name[nb]=JPEG/PNG-eksportfilter for Karbon
diff -Nru calligra-2.9.7/filters/karbon/karbon1.x/karbon_karbon1x_thumbnail.desktop calligra-2.9.11/filters/karbon/karbon1.x/karbon_karbon1x_thumbnail.desktop
--- calligra-2.9.7/filters/karbon/karbon1.x/karbon_karbon1x_thumbnail.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/karbon/karbon1.x/karbon_karbon1x_thumbnail.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,7 +3,7 @@
Name=Karbon 14 Drawings
Name[bs]=Karbon 14 crteži
Name[ca]=Dibuixos del Karbon 14
-Name[ca@valencia]=Dibuixos del Karbon 14
+Name[ca@valencia]=Dibuixos del Karbon 14
Name[cs]=Kresby Karbon 14
Name[da]=Karbon 14-tegninger
Name[de]=Karbon 14 Zeichnungen
diff -Nru calligra-2.9.7/filters/karbon/xfig/karbon_xfig_thumbnail.desktop calligra-2.9.11/filters/karbon/xfig/karbon_xfig_thumbnail.desktop
--- calligra-2.9.7/filters/karbon/xfig/karbon_xfig_thumbnail.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/karbon/xfig/karbon_xfig_thumbnail.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,7 +3,7 @@
Name=XFig Images
Name[bs]=XFig slike
Name[ca]=Imatges del XFig
-Name[ca@valencia]=Imatges de l'XFig
+Name[ca@valencia]=Imatges del XFig
Name[cs]=Obrázky XFig
Name[da]=XFig-billeder
Name[de]=XFig-Bilder
diff -Nru calligra-2.9.7/filters/libmsooxml/KoOdfExporter.cpp calligra-2.9.11/filters/libmsooxml/KoOdfExporter.cpp
--- calligra-2.9.7/filters/libmsooxml/KoOdfExporter.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libmsooxml/KoOdfExporter.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -41,7 +41,7 @@
//------------------------------------------
-class Q_DECL_HIDDEN KoOdfExporter::Private
+class KoOdfExporter::Private
{
public:
Private() {}
diff -Nru calligra-2.9.7/filters/libmsooxml/MsooXmlRelationships.cpp calligra-2.9.11/filters/libmsooxml/MsooXmlRelationships.cpp
--- calligra-2.9.7/filters/libmsooxml/MsooXmlRelationships.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libmsooxml/MsooXmlRelationships.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -30,7 +30,7 @@
using namespace MSOOXML;
-class Q_DECL_HIDDEN MsooXmlRelationships::Private
+class MsooXmlRelationships::Private
{
public:
Private()
diff -Nru calligra-2.9.7/filters/libmsooxml/VmlDrawingReader.cpp calligra-2.9.11/filters/libmsooxml/VmlDrawingReader.cpp
--- calligra-2.9.7/filters/libmsooxml/VmlDrawingReader.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libmsooxml/VmlDrawingReader.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -43,7 +43,7 @@
{
}
-class Q_DECL_HIDDEN VmlDrawingReader::Private
+class VmlDrawingReader::Private
{
public:
Private() {
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfGraphicProperties.cpp calligra-2.9.11/filters/libodf2/KoOdfGraphicProperties.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfGraphicProperties.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfGraphicProperties.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -37,7 +37,7 @@
// private class
-class Q_DECL_HIDDEN KoOdfGraphicProperties::Private
+class KoOdfGraphicProperties::Private
{
public:
Private() {};
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfHeaderFooterProperties.cpp calligra-2.9.11/filters/libodf2/KoOdfHeaderFooterProperties.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfHeaderFooterProperties.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfHeaderFooterProperties.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -37,7 +37,7 @@
// private class
-class Q_DECL_HIDDEN KoOdfHeaderFooterProperties::Private
+class KoOdfHeaderFooterProperties::Private
{
public:
Private() {};
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfListLevelProperties.cpp calligra-2.9.11/filters/libodf2/KoOdfListLevelProperties.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfListLevelProperties.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfListLevelProperties.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -37,7 +37,7 @@
// private class
-class Q_DECL_HIDDEN KoOdfListLevelProperties::Private
+class KoOdfListLevelProperties::Private
{
public:
Private()
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfListStyle.cpp calligra-2.9.11/filters/libodf2/KoOdfListStyle.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfListStyle.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfListStyle.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -38,7 +38,7 @@
// ================================================================
// class KoOdfListStyle
-class Q_DECL_HIDDEN KoOdfListStyle::Private
+class KoOdfListStyle::Private
{
public:
Private();
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfPageLayout.cpp calligra-2.9.11/filters/libodf2/KoOdfPageLayout.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfPageLayout.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfPageLayout.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -40,7 +40,7 @@
// class KoOdfPageLayout
-class Q_DECL_HIDDEN KoOdfPageLayout::Private
+class KoOdfPageLayout::Private
{
public:
Private();
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfPageLayoutProperties.cpp calligra-2.9.11/filters/libodf2/KoOdfPageLayoutProperties.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfPageLayoutProperties.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfPageLayoutProperties.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -37,7 +37,7 @@
// private class
-class Q_DECL_HIDDEN KoOdfPageLayoutProperties::Private
+class KoOdfPageLayoutProperties::Private
{
public:
Private() {};
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfParagraphProperties.cpp calligra-2.9.11/filters/libodf2/KoOdfParagraphProperties.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfParagraphProperties.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfParagraphProperties.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -37,7 +37,7 @@
// private class
-class Q_DECL_HIDDEN KoOdfParagraphProperties::Private
+class KoOdfParagraphProperties::Private
{
public:
Private();
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfStyleBase.cpp calligra-2.9.11/filters/libodf2/KoOdfStyleBase.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfStyleBase.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfStyleBase.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -40,7 +40,7 @@
// class KoOdfStyleBase
-class Q_DECL_HIDDEN KoOdfStyleBase::Private
+class KoOdfStyleBase::Private
{
public:
Private(KoOdfStyleBase::StyleType type);
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfStyle.cpp calligra-2.9.11/filters/libodf2/KoOdfStyle.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfStyle.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfStyle.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -40,7 +40,7 @@
// class KoOdfStyle
-class Q_DECL_HIDDEN KoOdfStyle::Private
+class KoOdfStyle::Private
{
public:
Private();
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfStyleManager.cpp calligra-2.9.11/filters/libodf2/KoOdfStyleManager.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfStyleManager.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfStyleManager.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -43,7 +43,7 @@
// class KoOdfStyleManager
-class Q_DECL_HIDDEN KoOdfStyleManager::Private
+class KoOdfStyleManager::Private
{
public:
Private() {};
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfStyleProperties.cpp calligra-2.9.11/filters/libodf2/KoOdfStyleProperties.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfStyleProperties.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfStyleProperties.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -34,7 +34,7 @@
// private class
-class Q_DECL_HIDDEN KoOdfStyleProperties::Private
+class KoOdfStyleProperties::Private
{
public:
Private() {};
diff -Nru calligra-2.9.7/filters/libodf2/KoOdfTextProperties.cpp calligra-2.9.11/filters/libodf2/KoOdfTextProperties.cpp
--- calligra-2.9.7/filters/libodf2/KoOdfTextProperties.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoOdfTextProperties.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -37,7 +37,7 @@
// private class
-class Q_DECL_HIDDEN KoOdfTextProperties::Private
+class KoOdfTextProperties::Private
{
public:
Private() {};
diff -Nru calligra-2.9.7/filters/libodf2/KoXmlStreamReader.cpp calligra-2.9.11/filters/libodf2/KoXmlStreamReader.cpp
--- calligra-2.9.7/filters/libodf2/KoXmlStreamReader.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodf2/KoXmlStreamReader.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -35,7 +35,7 @@
// class KoXmlStreamReader and Private class
-class Q_DECL_HIDDEN KoXmlStreamReader::Private
+class KoXmlStreamReader::Private
{
public:
Private(KoXmlStreamReader *qq);
@@ -406,7 +406,7 @@
// class KoXmlStreamAttribute and Private class
-class Q_DECL_HIDDEN KoXmlStreamAttribute::Private
+class KoXmlStreamAttribute::Private
{
public:
Private(const QXmlStreamAttribute *attr, const KoXmlStreamReader *r);
@@ -564,7 +564,7 @@
// class KoXmlStreamAttributes and Private class
-class Q_DECL_HIDDEN KoXmlStreamAttributes::Private : public QSharedData
+class KoXmlStreamAttributes::Private : public QSharedData
{
public:
Private(const KoXmlStreamReader *r, const QXmlStreamAttributes &qa);
diff -Nru calligra-2.9.7/filters/libodfreader/OdfReaderContext.cpp calligra-2.9.11/filters/libodfreader/OdfReaderContext.cpp
--- calligra-2.9.7/filters/libodfreader/OdfReaderContext.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodfreader/OdfReaderContext.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -34,7 +34,7 @@
// class OdfReaderContext::Private
-class Q_DECL_HIDDEN OdfReaderContext::Private
+class OdfReaderContext::Private
{
public:
Private(KoStore *store);
diff -Nru calligra-2.9.7/filters/libodfreader/OdfTextReaderBackend.cpp calligra-2.9.11/filters/libodfreader/OdfTextReaderBackend.cpp
--- calligra-2.9.7/filters/libodfreader/OdfTextReaderBackend.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodfreader/OdfTextReaderBackend.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -33,7 +33,7 @@
// class OdfTextReaderBackend::Private
-class Q_DECL_HIDDEN OdfTextReaderBackend::Private
+class OdfTextReaderBackend::Private
{
public:
Private();
diff -Nru calligra-2.9.7/filters/libodfreader/OdtReaderBackend.cpp calligra-2.9.11/filters/libodfreader/OdtReaderBackend.cpp
--- calligra-2.9.7/filters/libodfreader/OdtReaderBackend.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/libodfreader/OdtReaderBackend.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -33,7 +33,7 @@
// class OdtReaderBackend::Private
-class Q_DECL_HIDDEN OdtReaderBackend::Private
+class OdtReaderBackend::Private
{
public:
Private();
diff -Nru calligra-2.9.7/filters/plan/mpxj/import/calligra_filter_mpp2plan.desktop calligra-2.9.11/filters/plan/mpxj/import/calligra_filter_mpp2plan.desktop
--- calligra-2.9.7/filters/plan/mpxj/import/calligra_filter_mpp2plan.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/plan/mpxj/import/calligra_filter_mpp2plan.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -4,7 +4,6 @@
Name[bs]=MS Project uvozni filter
Name[ca]=Filtre d'importació de MS Project
Name[ca@valencia]=Filtre d'importació de MS Project
-Name[cs]=Importní filtr MS Project
Name[da]=MS Project-importfilter
Name[de]=MS-Projekt-Importfilter
Name[el]=Φίλτρο εισαγωγής MS Project
@@ -13,7 +12,6 @@
Name[et]=MS Projecti impordifilter
Name[eu]=MS Project inportazio-iragazkia
Name[fi]=MS Project -tuontisuodatin
-Name[fr]=Filtre d'importation MS Project
Name[gl]=Filtro de importación de MS Project
Name[hu]=MS Projekt importszűrő
Name[it]=Filtro di importazione MS Project
diff -Nru calligra-2.9.7/filters/plan/mpxj/import/calligra_filter_mpx2plan.desktop calligra-2.9.11/filters/plan/mpxj/import/calligra_filter_mpx2plan.desktop
--- calligra-2.9.7/filters/plan/mpxj/import/calligra_filter_mpx2plan.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/plan/mpxj/import/calligra_filter_mpx2plan.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -4,7 +4,6 @@
Name[bs]=MS Project uvozni Filter razmjene
Name[ca]=Filtre d'importació de MS Project Exchange
Name[ca@valencia]=Filtre d'importació de MS Project Exchange
-Name[cs]=Importní filtr Microsoft Project Exchange
Name[da]=MS Project Exchange-importfilter
Name[de]=MS-Projekt-Exchange-Importfilter
Name[el]=Φίλτρο εισαγωγής του MS Project Exchange
@@ -13,7 +12,6 @@
Name[et]=MS Project Exchange'i impordifilter
Name[eu]=MS Project Exchange inportazio-iragazkia
Name[fi]=MS Project Exchange -tuontisuodatin
-Name[fr]=Filtre d'importation MS Project Exchange
Name[gl]=Filtro de importación de MS Project
Name[hu]=MS Projekt Exchange importszűrő
Name[it]=Filtro di importazione MS Project Exchange
diff -Nru calligra-2.9.7/filters/plan/mpxj/import/calligra_filter_planner2plan.desktop calligra-2.9.11/filters/plan/mpxj/import/calligra_filter_planner2plan.desktop
--- calligra-2.9.7/filters/plan/mpxj/import/calligra_filter_planner2plan.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/plan/mpxj/import/calligra_filter_planner2plan.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -4,7 +4,6 @@
Name[bs]=Planner uvozni filter
Name[ca]=Filtre d'importació del Planner
Name[ca@valencia]=Filtre d'importació del Planner
-Name[cs]=Importní filtr Planner
Name[da]=Planner-importfilter
Name[de]=Planner-Importfilter
Name[el]=Φίλτρο εισαγωγής Planner
@@ -13,7 +12,6 @@
Name[et]=Planneri impordifilter
Name[eu]=Planner inportazio-iragazkia
Name[fi]=Planner-tuontisuodatin
-Name[fr]=Filtre d'importation Planner
Name[gl]=Filtro de importación de Planner
Name[hu]=Planner importszűrő
Name[it]=Filtro di importazione di Planner
diff -Nru calligra-2.9.7/filters/sheets/csv/calligra_filter_csv2sheets.desktop calligra-2.9.11/filters/sheets/csv/calligra_filter_csv2sheets.desktop
--- calligra-2.9.7/filters/sheets/csv/calligra_filter_csv2sheets.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/sheets/csv/calligra_filter_csv2sheets.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -7,7 +7,7 @@
Name[bs]=CSV uvozni filter za KSpread
Name[ca]=Filtre d'importació CSV per al KSpread
Name[ca@valencia]=Filtre d'importació CSV per al KSpread
-Name[cs]=CSV importní filtr pro KSpread
+Name[cs]=Exportní filtr CSV pro KSpread
Name[cy]=Hidlen Fewnforio CSV i Kontour
Name[da]=CSV-importfilter for KSpread
Name[de]=KSpread CSV-Importfilter
diff -Nru calligra-2.9.7/filters/sheets/csv/calligra_filter_sheets2csv.desktop calligra-2.9.11/filters/sheets/csv/calligra_filter_sheets2csv.desktop
--- calligra-2.9.7/filters/sheets/csv/calligra_filter_sheets2csv.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/sheets/csv/calligra_filter_sheets2csv.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -7,7 +7,6 @@
Name[bs]=CSV izvozni filter za KSpread
Name[ca]=Filtre d'exportació CSV per al KSpread
Name[ca@valencia]=Filtre d'exportació CSV per al KSpread
-Name[cs]=CSV exportní filtr pro KSpread
Name[cy]=Hidlen Allforio CSV i Kontour
Name[da]=CSV-eksportfilter for KSpread
Name[de]=KSpread CSV-Exportfilter
@@ -19,7 +18,6 @@
Name[eu]=CSV esportazio-iragazkia KSpread-erako
Name[fa]=پالایه صادرات CSV برای KSpread
Name[fi]=KSpreadin CSV-vientisuodatin
-Name[fr]=Filtre d'exportation CSV de KSpread
Name[fy]=CSV-Eksportfilter foar KSpread
Name[ga]=Scagaire Easpórtála CSV le haghaidh KSpread
Name[gl]=Filtro para KSpread de exportación de CSV
diff -Nru calligra-2.9.7/filters/sheets/gnumeric/calligra_filter_gnumeric2sheets.desktop calligra-2.9.11/filters/sheets/gnumeric/calligra_filter_gnumeric2sheets.desktop
--- calligra-2.9.7/filters/sheets/gnumeric/calligra_filter_gnumeric2sheets.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/sheets/gnumeric/calligra_filter_gnumeric2sheets.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -12,7 +12,7 @@
Name[da]=GNUmeric-importfilter for KSpread
Name[de]=KSpread GNUmeric-Importfilter
Name[el]=Φίλτρο εισαγωγής GNUMERIC για το KSpread
-Name[en_GB]=GNUmeric Import Filter for KSpread
+Name[en_GB]=GNUMERIC Import Filter for KSpread
Name[eo]=GNUmeric-importfiltrilo por KSpread
Name[es]=Filtro de KSpread de importación de GNUmeric
Name[et]=KSpreadi GNUmerici impordifilter
diff -Nru calligra-2.9.7/filters/stage/keynote/import/calligra_filter_key2odp.desktop calligra-2.9.11/filters/stage/keynote/import/calligra_filter_key2odp.desktop
--- calligra-2.9.7/filters/stage/keynote/import/calligra_filter_key2odp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/stage/keynote/import/calligra_filter_key2odp.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,6 +3,7 @@
Name=Stage Apple Keynote Import Filter
Name[bs]=Uvodna faza Apple uvoznog filtera
Name[ca]=Filtre d'importació de l'Apple Keynote per l'Stage
+Name[ca@valencia]=Filtre d'importació de l'Apple Keynote per l'Stage
Name[cs]=Importní filtr Apple Keynote do Stage
Name[da]=Apple Keynote-importfilter til Stage
Name[de]=Stage-Importfilter für Apple Keynote
@@ -11,6 +12,7 @@
Name[et]=Stage'i Apple Keynote'i impordifilter
Name[fi]=Stagen Apple Keynote -tuontisuodatin
Name[fr]=Filtre d'importation Apple Keynote de Stage
+Name[gl]=Filtro para Krita de importación de ora
Name[it]=Filtro di importazione Apple Keynote per Stage
Name[ja]=Stage Apple Keynote インポートフィルタ
Name[nb]=Apple Keynote importfilter for Stage
diff -Nru calligra-2.9.7/filters/stage/keynote/import/stage_key_thumbnail.desktop calligra-2.9.11/filters/stage/keynote/import/stage_key_thumbnail.desktop
--- calligra-2.9.7/filters/stage/keynote/import/stage_key_thumbnail.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/stage/keynote/import/stage_key_thumbnail.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,6 +3,7 @@
Name=Apple Keynote Documents
Name[bs]=Apple uvodni dokumenti
Name[ca]=Documents de l'Apple Keynote
+Name[ca@valencia]=Documents de l'Apple Keynote
Name[cs]=Dokumenty Apple Keynote
Name[da]=Apple Keynote-dokumenter
Name[de]=Apple Keynote Dokumente
@@ -11,6 +12,7 @@
Name[et]=Apple Keynote'i dokumendid
Name[fi]=Apple Keynote -tiedostot
Name[fr]=Documents Apple Keynote
+Name[gl]=Documentos de Apple Keynote
Name[it]=Documenti Apple Keynote
Name[ja]=Apple Keynote 文書
Name[nb]=Apple Keynote-dokumenter
diff -Nru calligra-2.9.7/filters/stage/powerpoint/calligra_filter_ppt2odp.desktop calligra-2.9.11/filters/stage/powerpoint/calligra_filter_ppt2odp.desktop
--- calligra-2.9.7/filters/stage/powerpoint/calligra_filter_ppt2odp.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/stage/powerpoint/calligra_filter_ppt2odp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -6,7 +6,6 @@
Name[bs]=Microsoft PowerPoint unosni Filter za KPresenter
Name[ca]=Filtre d'importació Microsoft PowerPoint per al KPresenter
Name[ca@valencia]=Filtre d'importació Microsoft PowerPoint per al KPresenter
-Name[cs]=Importní filtr Microsoft PowerPoint pro KPresenter
Name[cy]=Hidlen Fewnforio Microsoft PowerPoint i KPresenter
Name[da]=Microsoft Powerpoint importfilter til KPresenter
Name[de]=KPresenter MS-PowerPoint-Importfilter
@@ -17,7 +16,6 @@
Name[eu]=Microsoft PowerPoint inportazio-iragazkia KPresenter-erako
Name[fa]=پالایه واردات Microsoft PowerPoint برای KPresenter
Name[fi]=KPresenterin Microsoft PowerPoint -tuontisuodatin
-Name[fr]=Filtre d'importation Microsoft PowerPoint pour KPresenter
Name[fy]=Microsoft PowerPoint-Ymportfilter foar KPresenter
Name[ga]=Scagaire Iompórtála Microsoft PowerPoint le haghaidh KSpread
Name[gl]=Filtro de para KPresenter importación de Microsoft PowerPoint
diff -Nru calligra-2.9.7/filters/stage/powerpoint/CMakeLists.txt calligra-2.9.11/filters/stage/powerpoint/CMakeLists.txt
--- calligra-2.9.7/filters/stage/powerpoint/CMakeLists.txt 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/stage/powerpoint/CMakeLists.txt 2016-02-02 19:53:13.000000000 +0000
@@ -29,7 +29,7 @@
install( FILES stage_powerpoint_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
endif()
-if(SHOULD_BUILD_OKULARGENERATOR_PPT)
+if(SHOULD_BUILD_OKULAR_GENERATOR_PPT)
install( FILES libokularGenerator_powerpoint_calligra.desktop okularPowerpoint_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( PROGRAMS okularApplication_powerpoint_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
endif()
diff -Nru calligra-2.9.7/filters/stage/powerpoint/libokularGenerator_powerpoint_calligra.desktop calligra-2.9.11/filters/stage/powerpoint/libokularGenerator_powerpoint_calligra.desktop
--- calligra-2.9.7/filters/stage/powerpoint/libokularGenerator_powerpoint_calligra.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/stage/powerpoint/libokularGenerator_powerpoint_calligra.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,15 +3,15 @@
Name=Microsoft PowerPoint Presentation
Name[bs]=Microsoft PowerPoint prezentacija
Name[ca]=Presentacions del Microsoft PowerPoint
-Name[cs]=Prezentace Microsoft PowerPoint
+Name[ca@valencia]=Presentacions del Microsoft PowerPoint
Name[da]=Microsoft Powerpoint-præsentation
Name[de]=Microsoft-Powerpoint-Präsentation
Name[en_GB]=Microsoft PowerPoint Presentation
Name[es]=Presentación Microsoft Powerpoint
Name[et]=Microsoft PowerPointi esitlus
-Name[fi]=Microsoft Powerpoint -esitys
-Name[fr]=Présentation Microsoft PowerPoint
-Name[it]=Presentazione Microsoft PowerPoint
+Name[fi]=Microsoft PowerPoint -esitys
+Name[gl]=Presentación de Microsoft PowerPoint
+Name[it]=Presentazione di Microsoft PowerPoint
Name[ja]=Microsoft Powerpoint プレゼンテーション
Name[nb]=Microsoft Powerpoint presentasjon
Name[nl]=Microsoft Powerpoint-presentaties
@@ -26,14 +26,13 @@
Comment=PPT for Okular
Comment[bs]=PPT za Okular
Comment[ca]=PPT per a l'Okular
-Comment[cs]=PPT pro Okular
+Comment[ca@valencia]=PPT per a l'Okular
Comment[da]=PPT til Okular
Comment[de]=PPT für Okular
Comment[en_GB]=PPT for Okular
Comment[es]=PPT para Okular
Comment[et]=PPT Okularile
-Comment[fi]=PPT Okulariin
-Comment[fr]=PPT pour Okular
+Comment[gl]=PPT para Okular.
Comment[ia]=PPT pro Okular
Comment[it]=PPT per Okular
Comment[ja]=Okular 用 PPT
diff -Nru calligra-2.9.7/filters/stage/powerpoint/PptToOdp.cpp calligra-2.9.11/filters/stage/powerpoint/PptToOdp.cpp
--- calligra-2.9.7/filters/stage/powerpoint/PptToOdp.cpp 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/stage/powerpoint/PptToOdp.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1702,7 +1702,7 @@
// style:vertical-pos
list_level_properties.set_style_vertical_pos("middle");
// style:vertical-rel
- list_level_properties.set_style_vertical_pos("line");
+ list_level_properties.set_style_vertical_rel("line");
// svg:x
// svg:y
}
diff -Nru calligra-2.9.7/filters/stage/pptx/calligra_filter_pptx2odp.desktop calligra-2.9.11/filters/stage/pptx/calligra_filter_pptx2odp.desktop
--- calligra-2.9.7/filters/stage/pptx/calligra_filter_pptx2odp.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/stage/pptx/calligra_filter_pptx2odp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -5,7 +5,6 @@
Name[bs]=MS PowerPoint 2007 unosni Filter za KPresenter
Name[ca]=Filtre d'importació Microsoft PowerPoint 2007 per al KPresenter
Name[ca@valencia]=Filtre d'importació Microsoft PowerPoint 2007 per al KPresenter
-Name[cs]=Importní filtr MS PowerPoint 2007 pro KPresenter
Name[da]=MS Powerpoint 2007 importfilter til KPresenter
Name[de]=KPresenter MS-PowerPoint-2007-Importfilter
Name[el]=Φίλτρο εισαγωγής MS PowerPoint 2007 PowerPoint για το KPresenter
@@ -14,7 +13,6 @@
Name[et]=KPresenteri MS PowerPoint 2007 impordifilter
Name[eu]=MS PowerPoint 2007 inportazio-iragazkia KPresenter-erako
Name[fi]=KPresenterin Microsoft PowerPoint 2007 -tuontisuodatin
-Name[fr]=Filtre d'importation Microsoft PowerPoint 2007 pour KPresenter
Name[ga]=Scagaire Iompórtála Microsoft PowerPoint 2007 le haghaidh KPresenter
Name[gl]=Filtro para KPresenter de importación de Microsoft PowerPoint 2007
Name[hu]=Microsoft PowerPoint 2007 importszűrő a KPresenterhez
diff -Nru calligra-2.9.7/filters/stage/pptx/CMakeLists.txt calligra-2.9.11/filters/stage/pptx/CMakeLists.txt
--- calligra-2.9.7/filters/stage/pptx/CMakeLists.txt 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/stage/pptx/CMakeLists.txt 2016-02-02 19:53:13.000000000 +0000
@@ -43,7 +43,7 @@
install( FILES stage_pptx_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
endif()
-if(SHOULD_BUILD_OKULARGENERATOR_PPTX)
+if(SHOULD_BUILD_OKULAR_GENERATOR_PPTX)
install( FILES libokularGenerator_pptx_calligra.desktop okularPptx_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( PROGRAMS okularApplication_pptx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
endif()
diff -Nru calligra-2.9.7/filters/stage/pptx/libokularGenerator_pptx_calligra.desktop calligra-2.9.11/filters/stage/pptx/libokularGenerator_pptx_calligra.desktop
--- calligra-2.9.7/filters/stage/pptx/libokularGenerator_pptx_calligra.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/stage/pptx/libokularGenerator_pptx_calligra.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,15 +3,15 @@
Name=Microsoft PowerPoint Presentation
Name[bs]=Microsoft PowerPoint prezentacija
Name[ca]=Presentacions del Microsoft PowerPoint
-Name[cs]=Prezentace Microsoft PowerPoint
+Name[ca@valencia]=Presentacions del Microsoft PowerPoint
Name[da]=Microsoft Powerpoint-præsentation
Name[de]=Microsoft-Powerpoint-Präsentation
Name[en_GB]=Microsoft PowerPoint Presentation
Name[es]=Presentación Microsoft Powerpoint
Name[et]=Microsoft PowerPointi esitlus
-Name[fi]=Microsoft Powerpoint -esitys
-Name[fr]=Présentation Microsoft PowerPoint
-Name[it]=Presentazione Microsoft PowerPoint
+Name[fi]=Microsoft PowerPoint -esitys
+Name[gl]=Presentación de Microsoft PowerPoint
+Name[it]=Presentazione di Microsoft PowerPoint
Name[ja]=Microsoft Powerpoint プレゼンテーション
Name[nb]=Microsoft Powerpoint presentasjon
Name[nl]=Microsoft Powerpoint-presentaties
@@ -26,14 +26,13 @@
Comment=PPTX for Okular
Comment[bs]=PPTX za Okular
Comment[ca]=PPTX per a l'Okular
-Comment[cs]=PPTX pro Okular
+Comment[ca@valencia]=PPTX per a l'Okular
Comment[da]=PPTX til Okular
Comment[de]=PPTX für Okular
Comment[en_GB]=PPTX for Okular
Comment[es]=PPTX para Okular
Comment[et]=PPTX Okularile
-Comment[fi]=PPTX Okulariin
-Comment[fr]=PPTX pour Okular
+Comment[gl]=PPTX para Okular.
Comment[ia]=PPTX pro Okular
Comment[it]=PPTX per Okular
Comment[ja]=Okular 用 PPTX
diff -Nru calligra-2.9.7/filters/words/docx/export/calligra_filter_odt2docx.desktop calligra-2.9.11/filters/words/docx/export/calligra_filter_odt2docx.desktop
--- calligra-2.9.7/filters/words/docx/export/calligra_filter_odt2docx.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/filters/words/docx/export/calligra_filter_odt2docx.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,6 +3,7 @@
Name=MS Word DOCX Export Filter
Name[bs]=MS Word DOCX izvozni filter
Name[ca]=Filtre d'exportació DOCX per al Word de MS
+Name[ca@valencia]=Filtre d'exportació DOCX per al Word de MS
Name[cs]=Exportní filtr MS Word DOCX
Name[da]=MS Word DOCX-eksportfilter
Name[de]=MS Word DOCX-Exportfilter
@@ -11,6 +12,7 @@
Name[et]=MS Wordi DOCX-i ekspordifilter
Name[fi]=MS Word DOCX -vientisuodatin
Name[fr]=Filtre d'exportation de MS Word DOCX
+Name[gl]=Filtro de rxportación de MS Word DOCX
Name[it]=Filtro di esportazione DOCX per MS Word
Name[ja]=Microsoft Word DOCX エクスポートフィルタ
Name[nb]=MS Word DOCX eksportfilter
diff -Nru calligra-2.9.7/filters/words/docx/import/libokularGenerator_docx_calligra.desktop calligra-2.9.11/filters/words/docx/import/libokularGenerator_docx_calligra.desktop
--- calligra-2.9.7/filters/words/docx/import/libokularGenerator_docx_calligra.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/words/docx/import/libokularGenerator_docx_calligra.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -37,14 +37,13 @@
Comment=DOCX for Okular
Comment[bs]=DOCX za Okular
Comment[ca]=DOCX per a l'Okular
-Comment[cs]=DOCX pro Okular
+Comment[ca@valencia]=DOCX per a l'Okular
Comment[da]=DOCX til Okular
Comment[de]=DOCX für Okular
Comment[en_GB]=DOCX for Okular
Comment[es]=DOCX para Okular
Comment[et]=DOCX Okularile
-Comment[fi]=DOCX Okulariin
-Comment[fr]=DOCX pour Okular
+Comment[gl]=DOCX para Okular.
Comment[ia]=DOCX pro Okular
Comment[it]=DOCX per Okular
Comment[ja]=Okular 用 DOCX
diff -Nru calligra-2.9.7/filters/words/msword-odf/libokularGenerator_doc_calligra.desktop calligra-2.9.11/filters/words/msword-odf/libokularGenerator_doc_calligra.desktop
--- calligra-2.9.7/filters/words/msword-odf/libokularGenerator_doc_calligra.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/words/msword-odf/libokularGenerator_doc_calligra.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name=Microsoft Word Documents
Name[bs]=Microsoft Word dokumenti
Name[ca]=Documents del Microsoft Word
-Name[ca@valencia]=Documents del Microsoft Word
+Name[ca@valencia]=Documents del Microsoft Word
Name[cs]=Dokumenty Microsoft Word
Name[da]=Microsoft Word-dokumenter
Name[de]=Microsoft Word Dokumente
@@ -36,14 +36,13 @@
Comment=DOC for Okular
Comment[bs]=DOC za Okular
Comment[ca]=DOC per a l'Okular
-Comment[cs]=DOC pro Okular
+Comment[ca@valencia]=DOC per a l'Okular
Comment[da]=DOC til Okular
Comment[de]=DOC für Okular
Comment[en_GB]=DOC for Okular
Comment[es]=DOC para Okular
Comment[et]=DOC Okularile
-Comment[fi]=DOC Okulariin
-Comment[fr]=DOCpour Okular
+Comment[gl]=DOC para Okular.
Comment[ia]=DOC pro Okular
Comment[it]=DOC per Okular
Comment[ja]=Okular 用 DOC
diff -Nru calligra-2.9.7/filters/words/msword-odf/words_msword_thumbnail.desktop calligra-2.9.11/filters/words/msword-odf/words_msword_thumbnail.desktop
--- calligra-2.9.7/filters/words/msword-odf/words_msword_thumbnail.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/words/msword-odf/words_msword_thumbnail.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,7 +3,7 @@
Name=Microsoft Word Documents
Name[bs]=Microsoft Word dokumenti
Name[ca]=Documents del Microsoft Word
-Name[ca@valencia]=Documents del Microsoft Word
+Name[ca@valencia]=Documents del Microsoft Word
Name[cs]=Dokumenty Microsoft Word
Name[da]=Microsoft Word-dokumenter
Name[de]=Microsoft Word Dokumente
diff -Nru calligra-2.9.7/filters/words/wiki/export/calligra_filter_odt2wiki.desktop calligra-2.9.11/filters/words/wiki/export/calligra_filter_odt2wiki.desktop
--- calligra-2.9.7/filters/words/wiki/export/calligra_filter_odt2wiki.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/words/wiki/export/calligra_filter_odt2wiki.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,6 +3,7 @@
Name=Words Wiki Export Filter
Name[bs]=Word-ov Wiki izvozni filter
Name[ca]=Filtre d'exportació Wiki per al Words
+Name[ca@valencia]=Filtre d'exportació Wiki per al Words
Name[cs]=Exportní filtr Words Wiki
Name[da]=Words Wiki-eksportfilter
Name[de]=Words Wiki-Exportfilter
@@ -10,6 +11,7 @@
Name[es]=Filtro de Words de exportación a Wiki
Name[et]=Wordsi Wiki ekspordifilter
Name[fi]=Wordsin Wiki-vientisuodatin
+Name[gl]=Filtro para Words de exportación de wiki
Name[it]=Filtro di esportazione Wiki per Words
Name[ja]=Words Wiki エクスポートフィルタ
Name[nb]=Wiki eksportfilter for Words
diff -Nru calligra-2.9.7/filters/words/wordperfect/import/libokularGenerator_wpd_calligra.desktop calligra-2.9.11/filters/words/wordperfect/import/libokularGenerator_wpd_calligra.desktop
--- calligra-2.9.7/filters/words/wordperfect/import/libokularGenerator_wpd_calligra.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/filters/words/wordperfect/import/libokularGenerator_wpd_calligra.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -34,13 +34,13 @@
Comment=WPD for Okular
Comment[bs]=WPD za Okular
Comment[ca]=WPD per a l'Okular
-Comment[cs]=WPD pro Okular
+Comment[ca@valencia]=WPD per a l'Okular
Comment[da]=WPD til Okular
Comment[de]=WPD für Okular
Comment[en_GB]=WPD for Okular
Comment[es]=WPD para Okular
Comment[et]=WPD Okularile
-Comment[fi]=WPD Okulariin
+Comment[gl]=WPD para Okular.
Comment[ia]=WPD pro Okular
Comment[it]=WPD per Okular
Comment[ja]=Okular 用 WPD
diff -Nru calligra-2.9.7/flow/part/CMakeLists.txt calligra-2.9.11/flow/part/CMakeLists.txt
--- calligra-2.9.7/flow/part/CMakeLists.txt 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/part/CMakeLists.txt 2016-02-02 19:53:13.000000000 +0000
@@ -54,3 +54,6 @@
### GUI files ###
install( FILES flow.rc DESTINATION ${DATA_INSTALL_DIR}/flow)
install( FILES flowrc DESTINATION ${CONFIG_INSTALL_DIR} )
+if(APPLE)
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/flow_KDEINIT_SRCS.icns DESTINATION ${BUNDLE_INSTALL_DIR}/calligraflow.app/Contents/Resources)
+endif()
diff -Nru calligra-2.9.7/flow/part/flow.appdata.xml calligra-2.9.11/flow/part/flow.appdata.xml
--- calligra-2.9.7/flow/part/flow.appdata.xml 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/part/flow.appdata.xml 2016-02-02 19:53:13.000000000 +0000
@@ -6,6 +6,7 @@
Flow
Flow
Flow
+ Flow
Flow
Flow
Flow
@@ -14,6 +15,7 @@
Flow
Flow
Flow
+ Flow
Flow (Fluxo)
Flow
Flow
@@ -29,12 +31,14 @@
Flowchart & Diagram Editing
Uređivanje dijagrama i organigrama
Edició de diagrames de fluxos i diagrames
+ Edició de diagrames de fluxos i diagrames
Programm zum Erstellen von Diagrammen
Flowchart & Diagram Editing
Edición de gráficos y diagramas de flujo
Voo- ja muud skeemid
Vuokaavio- ja diagrammimuokkaus
Édition de diagrammes
+ Editor de diagramas
Modifica de diagramma de fluxo & diagramma
Diagrammi di flusso e modifica di diagrammi
フローチャートおよびダイアグラム図の作成
@@ -54,12 +58,14 @@
Calligra Flow je jednostavan alat za crtanje dijagrama i organigrama sa bliskom integracijom s drugim Calligra aplikacijama. Omogućava vam da crtate mrežne dijagrame, organizacione dijagrame, dijagrame toka i drugo.
El Calligra Flow és una aplicació fàcil d'utilitzar per fer diagrames i diagrames de flux amb una estreta integració amb altres aplicacions del Calligra. Permet crear diagrames de xarxa, diagrames d'organització, diagrames de flux i més.
+ El Calligra Flow és una aplicació fàcil d'utilitzar per fer diagrames i diagrames de flux amb una estreta integració amb altres aplicacions del Calligra. Permet crear diagrames de xarxa, diagrames d'organització, diagrames de flux i més.
Calligra Flow ist ein einfach zu verwendendes Programm für Diagramme und Flussdiagramme mit enger Integration in andere Calligra-Programme. Mit diesem Programm können Sie Netzwerkdiagramme, Organisationsdiagramme, Flussdiagramme und andere Diagramme erstellen und bearbeiten
Calligra Flow is an easy to use diagramming and flowcharting application with tight integration to the other Calligra applications. It enables you to create network diagrams, organisation charts, flowcharts and more.
Calligra Flow es una aplicación de fácil uso que sirve para crear diagramas de flujo y gráficos, y que goza de una alta integración con el resto de aplicaciones de Calligra. Le permite crear diagramas de red, gráficos de organización, gráficos de flujo y más.
Calligra Flow on hõlpsasti kasutatav voo- ja muude skeemide rakendus, mis on tihedalt seotud muude Calligra rakendustega. See võimaldab luua võrguskeeme, organisatsiooniskeeme, vooskeeme jms.
Calligra Flow on helppokäyttöinen diagrammi- ja vuokaaviosovellus, joka integroituu tiukasti muihin Calligra-sovelluksiin. Sillä voit luoda verkko-, organisaatio- ja vuokaavioita sekä muita.
- Calligra Flow est une application de diagrammes et d'organigrammes facile à utiliser fortement intégrée avec les autres application Calligra. Elle vous permet de créer des plans de réseaux, des organigrammes, des graphiques, et autres.
+ Calligra Flow est une application de diagrammes et d'organigrammes facile à utiliser fortement intégrée avec les autres application Calligra. Elle vous permet de créer des plans de réseaux, des organigrammes, des graphiques, et autres.
+ Calligra Flow é un programa de diagramas fácil de usar e completamente integrado co resto de programas de Calligra. Permítelle crear diagramas de rede, gráficas de organización, diagramas de fluxo, e moito máis.
Calligra Flow es un application facile de usar pro facer diagrammas e diagrammas de fluxo con un forte integration con altere applicationes de Calligra. Illo permitte te crear diagrammas de rete, graphicos de organisation, diagrammas de fluxo e alteres.
Calligra Flow è un'applicazione di facile utilizzo per creare diagrammi di flusso e altro con una stretta integrazione con le altre applicazioni di Calligra. Ti consente di creare diagrammi di rete, organigrammi, diagrammi di flusso e altro.
Calligra Flow は簡単にダイアグラムやフローチャートを作成する事ができるアプリケーションです。作成した図は他の Calligra アプリケーションでも使用する事ができます。
@@ -75,6 +81,7 @@
Features:
Svojstva:
Característiques:
+ Característiques:
Vlastnosti:
Funktionen:
Features:
@@ -82,6 +89,7 @@
Omadused:
Ominaisuuksia:
Fonctionnalités :
+ Funcionalidades:
Characteristicas
Funzionalità:
機能:
@@ -98,12 +106,14 @@
Create network diagrams, organisation charts, flowcharts and more
Kreirajte mrežne dijagrame, organizacione dijagrame, dijagrame toka i drugo
Crea diagrames de xarxa, diagrames d'organització, diagrames de flux i més
+ Crea diagrames de xarxa, diagrames d'organització, diagrames de flux i més
Erstellung von Netzwerkdiagrammen, Organisationsdiagrammen, Flussdiagrammen und mehr
Create network diagrams, organisation charts, flowcharts and more
Crea diagramas de red, gráficos de organización, gráficos de flujo y más
Võrguskeemide, organisatsiooniskeemide, vooskeemide ja muude skeemide loomine
Verkko-, organisaatio- ja vuokaavioiden sekä muiden luonti
Créez des plans de réseaux, des organigrammes, des graphiques et autres
+ Cree diagramas de rede, gráficas de organización, diagramas de fluxo, e moito máis.
Crea diagrammas de rete, graphicos de organisation, diagrammas de fluxo e alteres.
Crea diagrammi di rete, organigrammi, diagrammi di flusso e altro
ネットワークダイアグラム、組織図、フローチャートなどの作成
@@ -119,12 +129,14 @@
Scriptable stencil creation using Python
Skriptno kreiranje likova za crtanje koristeći Python
Creació de patrons amb scripts usant el Python
+ Creació de patrons amb scripts usant el Python
Skriptfähige Erstellung von Schablonen mittels Python
Scriptable stencil creation using Python
Creación de plantillas mediante scripts utilizando Python
Skriptitav trafarettide loomine Pythoni abil
Skriptattava sapluunojen luonti Pythonilla
Création de pochoirs programmable en utilisant le langage Python
+ Cree pinceis con Python.
Creation de stencil de script usante Python
Creazione forme con script utilizzando Python
Python スクリプトでのステンシルの作成
@@ -140,12 +152,14 @@
Support for Dia stencils.
Podrška za Dia šablone.
Implementació de patrons del Dia.
+ Implementació de patrons del Dia.
Unterstützung für Dia-Schablonen.
Support for Dia stencils.
Admite las plantillas de Dia.
Dia trafarettide toetamine
Dian sapluunojen tuki
Prise en charge des pochoirs issus de Dia.
+ Compatíbel con pinceis de Dia.
Supporto pro stencils de Dia.
Supporta le forme di Dia.
Dia ステンシルのサポート
diff -Nru calligra-2.9.7/flow/part/FlowView.cpp calligra-2.9.11/flow/part/FlowView.cpp
--- calligra-2.9.7/flow/part/FlowView.cpp 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/flow/part/FlowView.cpp 2016-02-02 16:57:46.000000000 +0000
@@ -66,4 +66,11 @@
selectionChanged();
}
+void FlowView::replaceActivePage(KoPAPageBase *page, KoPAPageBase *newActivePage)
+{
+ if (page == activePage() ) {
+ viewMode()->updateActivePage(newActivePage);
+ }
+}
+
#include "FlowView.moc"
diff -Nru calligra-2.9.7/flow/part/FlowView.h calligra-2.9.11/flow/part/FlowView.h
--- calligra-2.9.7/flow/part/FlowView.h 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/flow/part/FlowView.h 2016-02-02 16:57:46.000000000 +0000
@@ -40,6 +40,8 @@
/// Called when the doc emits updateGui
void updateGui();
+ void replaceActivePage(KoPAPageBase *page, KoPAPageBase *newActivePage);
+
protected:
/// Creates and initializes the GUI.
void initializeGUI();
diff -Nru calligra-2.9.7/flow/plugins/dockers/flowdockersplugin.desktop calligra-2.9.11/flow/plugins/dockers/flowdockersplugin.desktop
--- calligra-2.9.7/flow/plugins/dockers/flowdockersplugin.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/plugins/dockers/flowdockersplugin.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Flow Dockers plugin
Name[bs]=Dodatak za plutajuće dokere
Name[ca]=Connector d'acobladors per al Flow
-Name[ca@valencia]=Connector de Dockers per al Flow
+Name[ca@valencia]=Connector d'acobladors per al Flow
Name[da]=Dokker-plugin til Flow
Name[de]=Flow-Docker-Modul
Name[el]=Πρόσθετο προσάρτησης του Flow
@@ -11,7 +11,6 @@
Name[et]=Flow dokkide plugin
Name[eu]=Flow-ren panelen plugina
Name[fi]=Flow’n telakkaliitännäinen
-Name[fr]=Module externe pour Flow en panneaux
Name[gl]=Complemento para Flow de docas
Name[hu]=Flow dokkoló bővítmény
Name[it]=Estensione per le aree di aggancio di Flow
diff -Nru calligra-2.9.7/flow/stencils/Assorted/arrow-turn-up.desktop calligra-2.9.11/flow/stencils/Assorted/arrow-turn-up.desktop
--- calligra-2.9.7/flow/stencils/Assorted/arrow-turn-up.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Assorted/arrow-turn-up.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Стрелка, поворачивающая вверх
Name[sk]=Šípka otočiť hore
Name[sv]=Uppåtsvängd pil
+Name[tr]=Yukarı-Dönen Ok
Name[uk]=Стрілка «поворот вгору»
Name[x-test]=xxTurn-Up Arrowxx
Name[zh_CN]=翻折箭头
diff -Nru calligra-2.9.7/flow/stencils/Assorted/cross-maltese.desktop calligra-2.9.11/flow/stencils/Assorted/cross-maltese.desktop
--- calligra-2.9.7/flow/stencils/Assorted/cross-maltese.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Assorted/cross-maltese.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[sk]=Maltézsky kríž
Name[sl]=Malteški križ
Name[sv]=Malteserkors
+Name[tr]=Malta Haçı
Name[ug]=مالتا كىروسى
Name[uk]=Мальтійський хрест
Name[x-test]=xxMaltese Crossxx
diff -Nru calligra-2.9.7/flow/stencils/Assorted/cross-swiss.desktop calligra-2.9.11/flow/stencils/Assorted/cross-swiss.desktop
--- calligra-2.9.7/flow/stencils/Assorted/cross-swiss.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Assorted/cross-swiss.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[sk]=Švajčiarsky kríž
Name[sl]=Švicarski križ
Name[sv]=Schweizerkors
+Name[tr]=Haç
Name[ug]=شىۋېتسىيە كىروسى
Name[uk]=Швейцарський хрест
Name[x-test]=xxSwiss Crossxx
diff -Nru calligra-2.9.7/flow/stencils/Assorted/octagon.desktop calligra-2.9.11/flow/stencils/Assorted/octagon.desktop
--- calligra-2.9.7/flow/stencils/Assorted/octagon.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Assorted/octagon.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -8,7 +8,7 @@
Name[da]=Oktogon
Name[de]=Achteck
Name[el]=Οκτάγωνο
-Name[en_GB]=Octogon
+Name[en_GB]=Octagon
Name[es]=Octógono
Name[et]=Kaheksanurk
Name[eu]=Oktogonoa
diff -Nru calligra-2.9.7/flow/stencils/Assorted/star8curved.desktop calligra-2.9.11/flow/stencils/Assorted/star8curved.desktop
--- calligra-2.9.7/flow/stencils/Assorted/star8curved.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Assorted/star8curved.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Krivková osemcípa hviezda
Name[sl]=Ukrivljena osemkraka zvezda
Name[sv]=Rundad åttauddig stjärna
+Name[tr]=Eğimli Sekiz Noktalı Yıldız
Name[uk]=Викривлена восьмикутна зірка
Name[x-test]=xxCurved Eight Point Starxx
Name[zh_CN]=曲边八角星
diff -Nru calligra-2.9.7/flow/stencils/Assorted/star8sharp.desktop calligra-2.9.11/flow/stencils/Assorted/star8sharp.desktop
--- calligra-2.9.7/flow/stencils/Assorted/star8sharp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Assorted/star8sharp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Ostrá osemcípa hviezda
Name[sl]=Ostra osemkraka zvezda
Name[sv]=Spetsig åttauddig stjärna
+Name[tr]=Keskin Sekiz Noktalı Yıldız
Name[uk]=Зірка з вісьмома гострими променями
Name[x-test]=xxSharp Eight Point Starxx
Name[zh_CN]=八角星
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Activity-Looping.desktop calligra-2.9.11/flow/stencils/BPMN/Activity-Looping.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Activity-Looping.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Activity-Looping.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Activity-Looping
Name[bs]=Aktivnost petlje
Name[ca]=Activitat-bucle
-Name[ca@valencia]=Activitat-enllaçada
+Name[ca@valencia]=Activitat-bucle
Name[da]=Aktivitetsløkke
Name[de]=Aktivitäten-Schleife
Name[el]=Βρόχος-δραστηριότητας
@@ -23,6 +23,7 @@
Name[ru]=Циклическое действие
Name[sk]=Slučkovanie aktivít
Name[sv]=Upprepad-aktivitet
+Name[tr]=Aktivite-Döngü
Name[uk]=Циклічна дія
Name[x-test]=xxActivity-Loopingxx
Name[zh_CN]=活动-循环
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop calligra-2.9.11/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Ad-Hoc-Collapsed-Sub-Process
Name[bs]=Ad hoc prošireni subproces
Name[ca]=Subprocés col·lapsat ad-hoc
-Name[ca@valencia]=Sub-procés col·lapsat ad-hoc
+Name[ca@valencia]=Subprocés col·lapsat ad-hoc
Name[da]=Ad-Hoc-Collapsed-Sub-Process
Name[de]=Ad-Hoc - Zugeklappter Teilprozess
Name[el]=Ειδική-περίπτωση-κατάρρευσης-υπο-διεργασίας
@@ -23,6 +23,7 @@
Name[ru]=Свёрнутый Ad-hoc подпроцесс
Name[sk]=Ad-Hoc-Collapsed-Sub-Process
Name[sv]=Ad-hoc-sammanslagen-delprocess
+Name[tr]=Ad-Hoc-Çöken-Alt-Süreç
Name[uk]=Спеціально згорнутий підпроцес
Name[x-test]=xxAd-Hoc-Collapsed-Sub-Processxx
Name[zh_CN]=特设-折叠子进程
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Collapsed-Sub-Process.desktop calligra-2.9.11/flow/stencils/BPMN/Collapsed-Sub-Process.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Collapsed-Sub-Process.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Collapsed-Sub-Process.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Collapsed-Sub-Process
Name[bs]=Prošireni subproces
Name[ca]=Subprocés col·lapsat
-Name[ca@valencia]=Sub-procés col·lapsat
+Name[ca@valencia]=Subprocés col·lapsat
Name[da]=Collapsed-Sub-Process
Name[de]=Zugeklappter Teilprozess
Name[el]=Κατάρρευση-υπο-διεργασίας
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop calligra-2.9.11/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Compensation-Collapsed-Sub-Process
Name[bs]=Kompenzirano-prošireni subproces
Name[ca]=Subprocés col·lapsat de compensació
-Name[ca@valencia]=Sub-procés col·lapsat de compensació
+Name[ca@valencia]=Subprocés col·lapsat de compensació
Name[da]=Compensation-Collapsed-Sub-Process
Name[de]=Kompensation - Zugeklappter Teilprozess
Name[el]=Αντιστάθμιση-σε-κατάρρευση-υπο-διεργασίας
@@ -22,6 +22,7 @@
Name[ru]=Компенсационно свёрнутый подпроцесс
Name[sk]=Compensation-Collapsed-Sub-Process
Name[sv]=Kompensation-sammanslagen-delprocess
+Name[tr]=Düzeltme-Çöken-Alt-Süreç
Name[uk]=Компенсаційно згорнутий підпроцес
Name[x-test]=xxCompensation-Collapsed-Sub-Processxx
Name[zh_CN]=补偿-折叠子进程
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Compensation.desktop calligra-2.9.11/flow/stencils/BPMN/Compensation.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Compensation.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Compensation.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Компенсация
Name[sk]=Kompenzácia
Name[sv]=Kompensation
+Name[tr]=Geri Alma
Name[uk]=Компенсація
Name[x-test]=xxCompensationxx
Name[zh_CN]=补偿
diff -Nru calligra-2.9.7/flow/stencils/BPMN/End-Event-Compensation.desktop calligra-2.9.11/flow/stencils/BPMN/End-Event-Compensation.desktop
--- calligra-2.9.7/flow/stencils/BPMN/End-Event-Compensation.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/End-Event-Compensation.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Компенсация завершения события
Name[sk]=End-Event-Compensation
Name[sv]=Sluthändelse-kompensation
+Name[tr]=Son-Etkinlik-Düzeltme
Name[uk]=Компенсація кінцевої події
Name[x-test]=xxEnd-Event-Compensationxx
Name[zh_CN]=结束事件-补偿
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop calligra-2.9.11/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Оператор исключающего ИЛИ, управляемый данными
Name[sk]=Gateway-Exclusive-XOR-Data-Based
Name[sv]=Port-exklusiv-eller-databaserad
+Name[tr]=Ağ Geçidi-Harici-XOR-Veri-Tabanlı
Name[uk]=Шлюз виключного АБО на основі даних
Name[x-test]=xxGateway-Exclusive-XOR-Data-Basedxx
Name[zh_CN]=网关-独占 XOR 数据为基础
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop calligra-2.9.11/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Оператор исключающего ИЛИ, управляемый событиями
Name[sk]=Gateway-Exclusive-XOR-Event-Based
Name[sv]=Port-exklusiv-eller-händelsebaserad
+Name[tr]=Ağ Geçidi-Harici-XOR-Olay-Tabanlı
Name[uk]=Шлюз виключного АБО на основі подій
Name[x-test]=xxGateway-Exclusive-XOR-Event-Basedxx
Name[zh_CN]=网关-独占 XOR 事件为基础
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop calligra-2.9.11/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Оператор включающего ИЛИ
Name[sk]=Gateway-Inclusive-OR
Name[sv]=Port-inklusiv-eller
+Name[tr]=Ağ Geçidi-Dahili-OR
Name[uk]=Шлюз включного АБО
Name[x-test]=xxGateway-Inclusive-ORxx
Name[zh_CN]=网关-包含 OR
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Gateway-Parallel-AND.desktop calligra-2.9.11/flow/stencils/BPMN/Gateway-Parallel-AND.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Gateway-Parallel-AND.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Gateway-Parallel-AND.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Оператор И
Name[sk]=Gateway-Parallel-AND
Name[sv]=Port-parallell-och
+Name[tr]=Ağ Geçidi-Paralel-AND
Name[uk]=Шлюз паралельного ТА
Name[x-test]=xxGateway-Parallel-ANDxx
Name[zh_CN]=网关-并行 AND
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop calligra-2.9.11/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Промежуточное событие - компенсация
Name[sk]=Intermediate-Event-Compensation
Name[sv]=Mellanliggande-händelse-kompensation
+Name[tr]=Orta Düzey-Olay-Düzeltme
Name[uk]=Компенсація проміжної події
Name[x-test]=xxIntermediate-Event-Compensationxx
Name[zh_CN]=中间事件-补偿
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop calligra-2.9.11/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Looping-Collapsed-Sub-Process
Name[bs]=Ponavljajući prošireni subproces
Name[ca]=Bucle-Subprocés-Col·lapsat
-Name[ca@valencia]=Llaçant-Sub-Procés-Col·lapsat
+Name[ca@valencia]=Bucle-Subprocés-Col·lapsat
Name[da]=Looping-Collapsed-Sub-Process
Name[de]=Schleife - Zugeklappter Teilprozess
Name[el]=Βρόχος-υπο-διεργασίας-σε-κατάρρευση
@@ -22,6 +22,7 @@
Name[ru]=Циклический свёрнутый подпроцесс
Name[sk]=Looping-Collapsed-Sub-Process
Name[sv]=Upprepad-sammanslagen-delprocess
+Name[tr]=Döngü-Çöken-Alt-Süreç
Name[uk]=Циклічно згорнутий підпроцес
Name[x-test]=xxLooping-Collapsed-Sub-Processxx
Name[zh_CN]=循环-折叠子进程
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop calligra-2.9.11/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Multiple-Instance-Collapsed-Sub-Process
Name[bs]=Višestruko instancirani prošireni subproces
Name[ca]=Subprocés-Col·lapsat-Múltiples-Instàncies
-Name[ca@valencia]=Sub-procés-Col·lapsat-Múltiples-Instàncies
+Name[ca@valencia]=Subprocés-Col·lapsat-Múltiples-Instàncies
Name[da]=Multiple-Instance-Collapsed-Sub-Process
Name[de]=Zugeklappter Teilprozess - Parallele Mehrfachausführung
Name[el]=Πολλαπλές-περιπτώσεις-υπο-διεργασιών-σε-κατάρρευση
@@ -22,6 +22,7 @@
Name[ru]=Многоэкземплярный свёрнутый подпроцесс
Name[sk]=Multiple-Instance-Collapsed-Sub-Process
Name[sv]=Flerinstans-sammanslagen-delprocess
+Name[tr]=Çoklu-Örnek-Çöken-Alt-Süreç
Name[uk]=Декілька екземплярів згорнутих підпроцесів
Name[x-test]=xxMultiple-Instance-Collapsed-Sub-Processxx
Name[zh_CN]=多重实例-折叠子进程
diff -Nru calligra-2.9.7/flow/stencils/BPMN/Multiple-Instance-Task.desktop calligra-2.9.11/flow/stencils/BPMN/Multiple-Instance-Task.desktop
--- calligra-2.9.7/flow/stencils/BPMN/Multiple-Instance-Task.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/BPMN/Multiple-Instance-Task.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Задача со множественными вхождениями
Name[sk]=Multiple-Instance-Task
Name[sv]=Flerinstans-uppgift
+Name[tr]=Çoklu-Örnek-Görev
Name[uk]=Декілька екземплярів задачі
Name[x-test]=xxMultiple-Instance-Taskxx
Name[zh_CN]=多重实例-任务
diff -Nru calligra-2.9.7/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop calligra-2.9.11/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop
--- calligra-2.9.7/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Окружность с заполненными по диагонали четвертями
Name[sk]=Kružnica diagonálne štvrtiny vyplnené
Name[sv]=Cirkel diagonala fjärdedelar fyllda
+Name[tr]=Köşegen Çeyrekleri Dolu Daire
Name[uk]=Коло з заповненими діагональними чвертями
Name[x-test]=xxCircle Diagonal Quarters Filledxx
Name[zh_CN]=对角四分填充圆
diff -Nru calligra-2.9.7/flow/stencils/Building_Site/collection.desktop calligra-2.9.11/flow/stencils/Building_Site/collection.desktop
--- calligra-2.9.7/flow/stencils/Building_Site/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Building_Site/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=Vytváranie siete
Name[sl]=Gradbišče
Name[sv]=Byggplats
+Name[tr]=İnşaat Alanı
Name[uk]=Планування будівництва
Name[x-test]=xxBuilding Sitexx
Name[zh_CN]=建筑场地
diff -Nru calligra-2.9.7/flow/stencils/Building_Site/pre_silo.desktop calligra-2.9.11/flow/stencils/Building_Site/pre_silo.desktop
--- calligra-2.9.7/flow/stencils/Building_Site/pre_silo.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Building_Site/pre_silo.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Pre-Silo
Name[bs]=Pre-silos
Name[ca]=Sitja prèvia
-Name[ca@valencia]=Pre-Silo
+Name[ca@valencia]=Sitja prèvia
Name[da]=Pre-Silo
Name[de]=Zementsilo
Name[el]=Pre-Silo
@@ -23,6 +23,7 @@
Name[ru]=Предварительная ёмкость
Name[sk]=Pre-Silo
Name[sv]=Försilo
+Name[tr]=Çimento-ambarı
Name[uk]=Бункер для цементу
Name[x-test]=xxPre-Siloxx
Name[zh_CN]=预设存储
diff -Nru calligra-2.9.7/flow/stencils/Building_Site/proportioning_batcher.desktop calligra-2.9.11/flow/stencils/Building_Site/proportioning_batcher.desktop
--- calligra-2.9.7/flow/stencils/Building_Site/proportioning_batcher.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Building_Site/proportioning_batcher.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Proportioning Batcher
Name[bs]=Proporcionalni serijalizer
Name[ca]=Dosificador proporcionat
-Name[ca@valencia]=Proporcionat Batcher
+Name[ca@valencia]=Dosificador proporcionat
Name[da]=Proportioning Batcher
Name[de]=Dosieranlage
Name[el]=Συσκευή δοσολογίας
diff -Nru calligra-2.9.7/flow/stencils/Building_Site/road_rotated_tee.desktop calligra-2.9.11/flow/stencils/Building_Site/road_rotated_tee.desktop
--- calligra-2.9.7/flow/stencils/Building_Site/road_rotated_tee.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Building_Site/road_rotated_tee.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Перевёрнутая Т-образная дорога
Name[sk]=Cestný otočený prierez
Name[sv]=Roterad t-vägkorsning
+Name[tr]=Döndürülmüş T şeklinde Yol
Name[uk]=Перехрестя у формі повернутої «Т»
Name[x-test]=xxRoad Rotated Teexx
Name[zh_CN]=旋转后的丁字路口
diff -Nru calligra-2.9.7/flow/stencils/Building_Site/road_tee.desktop calligra-2.9.11/flow/stencils/Building_Site/road_tee.desktop
--- calligra-2.9.7/flow/stencils/Building_Site/road_tee.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Building_Site/road_tee.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Т-образная дорога
Name[sk]=Cestný prierez
Name[sv]=T-vägkorsning
+Name[tr]=T şeklinde Yol
Name[uk]=Перехрестя у формі «Т»
Name[x-test]=xxRoad Teexx
Name[zh_CN]=丁字路口
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Кабельный организатор 1U
Name[sk]=OrganizadorRack1U
Name[sv]=Organizador-rack 1U
+Name[tr]=OrganizadorRack1U
Name[uk]=Стійка Organizador 1U
Name[x-test]=xxOrganizadorRack1Uxx
Name[zh_TW]=OrganizadorRack1U
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Кабельный организатор 2U
Name[sk]=OrganizadorRack2U
Name[sv]=Organizador-rack 2U
+Name[tr]=OrganizadorRack2U
Name[uk]=Стійка Organizador 2U
Name[x-test]=xxOrganizadorRack2Uxx
Name[zh_TW]=OrganizadorRack2U
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Кабельный органайзер 1U
Name[sk]=OrganizerRack1U
Name[sv]=Organiseringsrack 1U
+Name[tr]=OrganizerRack1U
Name[uk]=Стійка Organizer 1U
Name[x-test]=xxOrganizerRack1Uxx
Name[zh_TW]=OrganizerRack1U
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Кабельный органайзер 2U
Name[sk]=OrganizerRack2U
Name[sv]=Organiseringsrack 1U
+Name[tr]=OrganizerRack2U
Name[uk]=Стійка Organizer 2U
Name[x-test]=xxOrganizerRack2Uxx
Name[zh_TW]=OrganizerRack2U
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Сървърен шкаф 1U
Name[bs]=ServerRack1U
Name[ca]=ServidorRack1U
-Name[ca@valencia]=ServerRack1U
+Name[ca@valencia]=ServidorRack1U
Name[cs]=ServerRack1U
Name[da]=ServerRack1U
Name[de]=ServerRack 1 HE
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Сървърен шкаф 2U
Name[bs]=ServerRack2U
Name[ca]=ServidorRack2U
-Name[ca@valencia]=ServerRack2U
+Name[ca@valencia]=ServidorRack2U
Name[cs]=ServerRack2U
Name[da]=ServerRack2U
Name[de]=ServerRack 2 HE
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=ServerRack2USlow
Name[bs]=ServerRack2USlow
Name[ca]=ServidorRack2USlow
-Name[ca@valencia]=ServerRack2USlow
+Name[ca@valencia]=ServidorRack2USlow
Name[da]=ServerRack2USlow
Name[de]=ServerRack2USlow
Name[el]=ServerRack2USlow
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=ServerRack2UVerySlow
Name[bs]=ServerRack2UVerySlow
Name[ca]=ServidorRack2UVerySlow
-Name[ca@valencia]=ServerRack2UVerySlow
+Name[ca@valencia]=ServidorRack2UVerySlow
Name[da]=ServerRack2UVerySlow
Name[de]=ServerRack2UVerySlow
Name[el]=ServerRack2UVerySlow
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Сървърен шкаф 3U
Name[bs]=ServerRack3U
Name[ca]=ServidorRack3U
-Name[ca@valencia]=ServerRack3U
+Name[ca@valencia]=ServidorRack3U
Name[cs]=ServerRack3U
Name[da]=ServerRack3U
Name[de]=ServerRack 3 HE
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=ServerRack3USlowDensity
Name[bs]=ServerRack3USlowDensity
Name[ca]=ServidorRack3USlowDensity
-Name[ca@valencia]=ServerRack3USlowDensity
+Name[ca@valencia]=ServidorRack3USlowDensity
Name[da]=ServerRack3USlowDensity
Name[de]=ServerRack3USlowDensity
Name[el]=ServerRack3USlowDensity
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Сървърен шкаф 4U
Name[bs]=ServerRack4U
Name[ca]=ServidorRack4U
-Name[ca@valencia]=ServerRack4U
+Name[ca@valencia]=ServidorRack4U
Name[cs]=ServerRack4U
Name[da]=ServerRack4U
Name[de]=ServerRack 4 HE
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=ServerRack4URightCapacity
Name[bs]=ServerRack4URightCapacity
Name[ca]=ServidorRack4URightCapacity
-Name[ca@valencia]=ServerRack4URightCapacity
+Name[ca@valencia]=ServidorRack4URightCapacity
Name[da]=ServerRack4URightCapacity
Name[de]=ServerRack4URightCapacity
Name[el]=ServerRack4URightCapacity
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=ServerRack4USlowCapacity
Name[bs]=ServerRack4USlowCapacity
Name[ca]=ServidorRack4USlowCapacity
-Name[ca@valencia]=ServerRack4USlowCapacity
+Name[ca@valencia]=ServidorRack4USlowCapacity
Name[da]=ServerRack4USlowCapacity
Name[de]=ServerRack4USlowCapacity
Name[el]=ServerRack4USlowCapacity
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=ServerRack4UVeryRightCapacity
Name[bs]=ServerRack4UVeryRightCapacity
Name[ca]=ServidorRack4UVeryRightCapacity
-Name[ca@valencia]=ServerRack4UVeryRightCapacity
+Name[ca@valencia]=ServidorRack4UVeryRightCapacity
Name[da]=ServerRack4UVeryRightCapacity
Name[de]=ServerRack4UVeryRightCapacity
Name[el]=ServerRack4UVeryRightCapacity
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Сървърен шкаф 5U
Name[bs]=ServerRack5U
Name[ca]=ServidorRack5U
-Name[ca@valencia]=ServerRack5U
+Name[ca@valencia]=ServidorRack5U
Name[cs]=ServerRack5U
Name[da]=ServerRack5U
Name[de]=ServerRack 5 HE
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=ServerRack5URightDensity
Name[bs]=ServerRack5URightDensity
Name[ca]=ServidorRack5URightDensity
-Name[ca@valencia]=ServerRack5URightDensity
+Name[ca@valencia]=ServidorRack5URightDensity
Name[da]=ServerRack5URightDensity
Name[de]=ServerRack5URightDensity
Name[el]=ServerRack5URightDensity
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Стойка коммутаторов на 16 портов
Name[sk]=SwitchRack50P
Name[sv]=Kopplingsskåp 50P
+Name[tr]=SwitchRack50P
Name[uk]=Стійка комутаторів 50P
Name[x-test]=xxSwitchRack50Pxx
Name[zh_TW]=交換器機架 50P
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Телефонная станция
Name[sk]=TelephoneExchange
Name[sv]=Telefonväxel
+Name[tr]=Santral
Name[uk]=Телефонна станція
Name[x-test]=xxTelephoneExchangexx
Name[zh_TW]=電話交換器
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Телефонная панель на 20 портов
Name[sk]=VoicePanel20P
Name[sv]=Röstpanel 20P
+Name[tr]=VoicePanel20P
Name[uk]=Голосова панель 20P
Name[x-test]=xxVoicePanel20Pxx
Name[zh_TW]=語音面板 20P
diff -Nru calligra-2.9.7/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop calligra-2.9.11/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop
--- calligra-2.9.7/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Телефонная панель на 50 портов
Name[sk]=VoicePanel50P
Name[sv]=Röstpanel 50P
+Name[tr]=VoicePanel50P
Name[uk]=Голосова панель 50P
Name[x-test]=xxVoicePanel50Pxx
Name[zh_TW]=語音面板 50P
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/ACgen.desktop calligra-2.9.11/flow/stencils/ChemEng/ACgen.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/ACgen.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/ACgen.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Генератор переменного тока
Name[sk]=ACgen
Name[sv]=växelströmsgenerator
+Name[tr]=Alternatif Akım Üreticisi
Name[uk]=Генератор змінного струму
Name[x-test]=xxACgenxx
Name[zh_TW]=ACgen
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/airforced.desktop calligra-2.9.11/flow/stencils/ChemEng/airforced.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/airforced.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/airforced.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Воздушный вентилятор с принудительным затягиванием
Name[sk]=airforced
Name[sv]=fläktluft
+Name[tr]=havadestekli
Name[uk]=Охолоджувач з примусовим виводом повітря
Name[x-test]=xxairforcedxx
Name[zh_TW]=airforced
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/airinduced.desktop calligra-2.9.11/flow/stencils/ChemEng/airinduced.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/airinduced.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/airinduced.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Воздушный вентилятор с принудительным отводом
Name[sk]=airinduced
Name[sv]=självdrag
+Name[tr]=havaemici
Name[uk]=Охолоджувач з примусовим затягуванням повітря
Name[x-test]=xxairinducedxx
Name[zh_TW]=airinduced
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/autoclave.desktop calligra-2.9.11/flow/stencils/ChemEng/autoclave.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/autoclave.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/autoclave.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Автоклав
Name[sk]=autoclave
Name[sv]=autoklav
+Name[tr]=otoklav
Name[uk]=Автоклав
Name[x-test]=xxautoclavexx
Name[zh_TW]=autoclave
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/bigtraycol.desktop calligra-2.9.11/flow/stencils/ChemEng/bigtraycol.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/bigtraycol.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/bigtraycol.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Большой резервуар
Name[sk]=bigtraycol
Name[sv]=kolonn stora bottnar
+Name[tr]=büyük çekmece kolonu
Name[uk]=Тарільчата колона, детально
Name[x-test]=xxbigtraycolxx
Name[zh_TW]=bigtraycol
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/coilv.desktop calligra-2.9.11/flow/stencils/ChemEng/coilv.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/coilv.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/coilv.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Спираль вертикальная
Name[sk]=coilv
Name[sv]=spole vertikal
+Name[tr]=yataybobin
Name[uk]=Вертикальний нагрівальний або охолоджувальний змійовик
Name[x-test]=xxcoilvxx
Name[zh_TW]=coilv
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/collection.desktop calligra-2.9.11/flow/stencils/ChemEng/collection.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Химическая инженерия
Name[sk]=ChemEng
Name[sv]=Kemiteknik
+Name[tr]=KimMüh
Name[uk]=Хімічна промисловість
Name[x-test]=xxChemEngxx
Name[zh_CN]=化学工程
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/compr.desktop calligra-2.9.11/flow/stencils/ChemEng/compr.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/compr.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/compr.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Компрессор
Name[sk]=compr
Name[sv]=kompressor
+Name[tr]=kompresör
Name[uk]=Компресор або турбіна
Name[x-test]=xxcomprxx
Name[zh_TW]=compr
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/coveredtank.desktop calligra-2.9.11/flow/stencils/ChemEng/coveredtank.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/coveredtank.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/coveredtank.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Резервуар с крышкой
Name[sk]=coveredtank
Name[sv]=täckt tank
+Name[tr]=kapalıdepo
Name[uk]=Резервуар з кришкою
Name[x-test]=xxcoveredtankxx
Name[zh_TW]=coveredtank
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/cyclone.desktop calligra-2.9.11/flow/stencils/ChemEng/cyclone.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/cyclone.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/cyclone.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Центробежный сепаратор
Name[sk]=cyklón
Name[sv]=cyklon
+Name[tr]=siklon
Name[uk]=Центробіжний вентилятор
Name[x-test]=xxcyclonexx
Name[zh_TW]=cyclone
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/displa.desktop calligra-2.9.11/flow/stencils/ChemEng/displa.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/displa.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/displa.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Крутящий насос или компрессор с положительным смещением
Name[sk]=displa
Name[sv]=fördelare
+Name[tr]=dönerpompa
Name[uk]=Обертальний насос або компресор з додатним зміщенням
Name[x-test]=xxdisplaxx
Name[zh_TW]=displa
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/fan.desktop calligra-2.9.11/flow/stencils/ChemEng/fan.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/fan.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/fan.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,6 +32,7 @@
Name[sk]=ventilátor
Name[sl]=ventilator
Name[sv]=fläkt
+Name[tr]=fan
Name[uk]=Вентилятор або розмішувач
Name[x-test]=xxfanxx
Name[zh_CN]=风扇
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/fluidcont.desktop calligra-2.9.11/flow/stencils/ChemEng/fluidcont.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/fluidcont.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/fluidcont.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=contentor de fluido
Name[sk]=fluidcont
Name[sv]=vätskebehållare
+Name[tr]=sıvı teması tankı
Name[uk]=Проста посудина для рідини
Name[x-test]=xxfluidcontxx
Name[zh_TW]=fluidcont
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/pneum.desktop calligra-2.9.11/flow/stencils/ChemEng/pneum.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/pneum.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/pneum.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Пневматический
Name[sk]=pneum
Name[sv]=pneum
+Name[tr]=basınçlı hava hattı
Name[uk]=Пневматична лінія
Name[x-test]=xxpneumxx
Name[zh_TW]=pneum
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/pneumv.desktop calligra-2.9.11/flow/stencils/ChemEng/pneumv.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/pneumv.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/pneumv.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=pneum-v
Name[sk]=pneumv
Name[sv]=pneum vertikal
+Name[tr]=Basınçlı hava hattı dikey
Name[uk]=Пневматична вертикальна лінія
Name[x-test]=xxpneumvxx
Name[zh_TW]=pneumv
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/pnuemv.desktop calligra-2.9.11/flow/stencils/ChemEng/pnuemv.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/pnuemv.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/pnuemv.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=pnuem-v
Name[sk]=pnuemv
Name[sv]=pnuem vertikal
+Name[tr]=Basınçlı hava hattı dikey
Name[uk]=Пневматична вертикальна лінія
Name[x-test]=xxpnuemvxx
Name[zh_TW]=pnuemv
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/recipr.desktop calligra-2.9.11/flow/stencils/ChemEng/recipr.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/recipr.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/recipr.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Взаимный
Name[sk]=recipr
Name[sv]=kolv
+Name[tr]=pistonlu komprasör
Name[uk]=Поршневий компресор або насос
Name[x-test]=xxreciprxx
Name[zh_TW]=recipr
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/regval.desktop calligra-2.9.11/flow/stencils/ChemEng/regval.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/regval.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/regval.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=valor-reg
Name[sk]=regval
Name[sv]=reglerventil
+Name[tr]=düzenleyici valf
Name[uk]=Регульований клапан
Name[x-test]=xxregvalxx
Name[zh_TW]=regval
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/regvalv.desktop calligra-2.9.11/flow/stencils/ChemEng/regvalv.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/regvalv.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/regvalv.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=valor-reg-v
Name[sk]=regvalv
Name[sv]=reglerventil vertikal
+Name[tr]=düzenleyici valf dikey
Name[uk]=Регульований клапан, вертикальний
Name[x-test]=xxregvalvxx
Name[zh_TW]=regvalv
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/SaT-fixedtube.desktop calligra-2.9.11/flow/stencils/ChemEng/SaT-fixedtube.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/SaT-fixedtube.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/SaT-fixedtube.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=tubo fixo de SaT
Name[sk]=SaT-fixedtube
Name[sv]=tubpanna fasttub
+Name[tr]=IsıDeğiştirici-sabitboru
Name[uk]=Обмінник з фіксованим зведенням
Name[x-test]=xxSaT-fixedtubexx
Name[zh_TW]=SaT-fixedtube
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/SaT-floatinghead.desktop calligra-2.9.11/flow/stencils/ChemEng/SaT-floatinghead.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/SaT-floatinghead.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/SaT-floatinghead.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=cabeça flutuante de SaT
Name[sk]=SaT-floatinghead
Name[sv]=tubpanna rörlig topp
+Name[tr]=IsıDeğiştirici-derecelibaşlık
Name[uk]=Обмінник з рухомою голівкою
Name[x-test]=xxSaT-floatingheadxx
Name[zh_TW]=SaT-floatinghead
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/sealedtank.desktop calligra-2.9.11/flow/stencils/ChemEng/sealedtank.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/sealedtank.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/sealedtank.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Запаянный сосуд
Name[sk]=sealedtank
Name[sv]=täckt tank
+Name[tr]=mühürlüdepo
Name[uk]=Запечатана посудина
Name[x-test]=xxsealedtankxx
Name[zh_TW]=sealedtank
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/tank.desktop calligra-2.9.11/flow/stencils/ChemEng/tank.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/tank.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/tank.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=tank
Name[sl]=rezervoar
Name[sv]=tank
+Name[tr]=depo
Name[uk]=Відкрита посудина
Name[x-test]=xxtankxx
Name[zh_TW]=tank
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/traycol.desktop calligra-2.9.11/flow/stencils/ChemEng/traycol.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/traycol.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/traycol.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Лоток
Name[sk]=traycol
Name[sv]=kolonn bottnar
+Name[tr]=çekmece kolonu
Name[uk]=Спрощена тарільчата колона
Name[x-test]=xxtraycolxx
Name[zh_TW]=traycol
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/val.desktop calligra-2.9.11/flow/stencils/ChemEng/val.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/val.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/val.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=val
Name[sk]=val
Name[sv]=ventil
+Name[tr]=valf
Name[uk]=Клапан
Name[x-test]=xxvalxx
Name[zh_TW]=val
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/valv.desktop calligra-2.9.11/flow/stencils/ChemEng/valv.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/valv.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/valv.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=valv
Name[sk]=valv
Name[sv]=ventil vertikal
+Name[tr]=valf dikey
Name[uk]=Вертикальний клапан
Name[x-test]=xxvalvxx
Name[zh_TW]=valv
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/wcool.desktop calligra-2.9.11/flow/stencils/ChemEng/wcool.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/wcool.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/wcool.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=arrefecimento à água
Name[sk]=wcool
Name[sv]=vattenkylare
+Name[tr]=susoğut
Name[uk]=Водяний охолоджувач
Name[x-test]=xxwcoolxx
Name[zh_TW]=wcool
diff -Nru calligra-2.9.7/flow/stencils/ChemEng/wcoolv.desktop calligra-2.9.11/flow/stencils/ChemEng/wcoolv.desktop
--- calligra-2.9.7/flow/stencils/ChemEng/wcoolv.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/ChemEng/wcoolv.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=arrefecimento à água em v
Name[sk]=wcoolv
Name[sv]=vattenkylare vertikal
+Name[tr]=susoğuty
Name[uk]=Вертикальний водяний охолоджувач
Name[x-test]=xxwcoolvxx
Name[zh_TW]=wcoolv
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/30-degree-bend.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/30-degree-bend.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/30-degree-bend.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/30-degree-bend.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=30-градусное натяжение
Name[sk]=30 stupňový ohyb
Name[sv]=30-graders böj
+Name[tr]=30-derece-büküm
Name[uk]=30-градусний вигин
Name[x-test]=xx30-degree-bendxx
Name[zh_TW]=30 度彎曲
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/buechner-funnel.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/buechner-funnel.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/buechner-funnel.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/buechner-funnel.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Воронка Бюхнера
Name[sk]=buechner-funnel
Name[sv]=büchnertratt
+Name[tr]=buechner-huni
Name[uk]=Лійка Бюхнера
Name[x-test]=xxbuechner-funnelxx
Name[zh_TW]=Buechner 漏斗
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-black.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-black.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-black.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-black.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор (чёрный)
Name[sk]=kondenzátor-čierny
Name[sv]=kylare-svart
+Name[tr]=kondansatör-siyah
Name[uk]=Холодильник (чорний)
Name[x-test]=xxcondenser-blackxx
Name[zh_TW]=冷凝器-黑
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-blue.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-blue.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-blue.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-blue.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор (синий)
Name[sk]=kondenzátor-modrý
Name[sv]=kylare-blå
+Name[tr]=kondansatör-mavi
Name[uk]=Холодильник (синій)
Name[x-test]=xxcondenser-bluexx
Name[zh_TW]=冷凝器-藍
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор
Name[sk]=kondenzátor
Name[sv]=kylare
+Name[tr]=kondansatör
Name[uk]=Холодильник
Name[x-test]=xxcondenserxx
Name[zh_TW]=冷凝器
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-green.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-green.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-green.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-green.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор (зелёный)
Name[sk]=kondenzátor-zelený
Name[sv]=kylare-grön
+Name[tr]=kondanstör-yeşil
Name[uk]=Холодильник (зелений)
Name[x-test]=xxcondenser-greenxx
Name[zh_TW]=冷凝器-綠
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор (произвольный вертикальный)
Name[sk]=kondenzátor-liebig-zvislý
Name[sv]=kylare-liebig-vertikal
+Name[tr]=kondansatör-liebig-dikey
Name[uk]=Холодильник Лібіґа (вертикальний)
Name[x-test]=xxcondenser-liebig-verticalxx
Name[zh_TW]=冷凝器-liebig-垂直
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-orange.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-orange.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-orange.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-orange.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор (оранжевый)
Name[sk]=kondenzátor-oranžový
Name[sv]=kylare-orange
+Name[tr]=kondansatör-turuncu
Name[uk]=Холодильник (помаранчевий)
Name[x-test]=xxcondenser-orangexx
Name[zh_TW]=冷凝器-橘
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор (бледно-голубой)
Name[sk]=kondenzátor-pale-modrý
Name[sv]=kylare-blekblå
+Name[tr]=kondansatör-soluk-mavi
Name[uk]=Холодильник (блідо-синій)
Name[x-test]=xxcondenser-pale-bluexx
Name[zh_TW]=冷凝器-淡藍
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-red.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-red.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/condenser-red.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/condenser-red.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Конденсор (красный)
Name[sk]=kondenzátor-červený
Name[sv]=kylare-röd
+Name[tr]=kondansatör-kırmızı
Name[uk]=Холодильник (червоний)
Name[x-test]=xxcondenser-redxx
Name[zh_TW]=冷凝器-紅
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/erlenmeyer.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/erlenmeyer.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/erlenmeyer.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/erlenmeyer.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Колба Райана-Эрленмейера
Name[sk]=ryan -Erlenmeyer Flask
Name[sv]=Erlenmeyerkolv
+Name[tr]=Erlenmeyer Kabı
Name[uk]=Колба Ерленмеєра
Name[x-test]=xxryan -Erlenmeyer Flaskxx
Name[zh_TW]=ryan -Erlenmeyer Flask
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/sep-funnel.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/sep-funnel.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/sep-funnel.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/sep-funnel.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Разделительная воронка
Name[sk]=sep-funnel
Name[sv]=separertratt
+Name[tr]=ayırma-hunisi
Name[uk]=Фільтраційна лійка
Name[x-test]=xxsep-funnelxx
Name[zh_TW]=sep-funnel
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Разделительная воронка (трёхфазная)
Name[sk]=sep-funnel-three-phases
Name[sv]=separertratt-trefas
+Name[tr]=üç-fazlı-ayırma-hunisi
Name[uk]=Фільтраційна лійка з трьома фазами
Name[x-test]=xxsep-funnel-three-phasesxx
Name[zh_TW]=sep-funnel-three-phases
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Разделительная воронка (двухфазная)
Name[sk]=sep-funnel-two-phases
Name[sv]=separertratt-tvåfas
+Name[tr]=iki fazlı ayırma hunisi
Name[uk]=Фільтраційна лійка з двома фазами
Name[x-test]=xxsep-funnel-two-phasesxx
Name[zh_TW]=sep-funnel-two-phases
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/stirbar.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/stirbar.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/stirbar.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/stirbar.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[pt_BR]=barra batedora
Name[sk]=stirbar
Name[sv]=magnetstav
+Name[tr]=manyetik çubuk
Name[uk]=Магнітний перемішувач
Name[x-test]=xxstirbarxx
Name[zh_TW]=攪拌棒
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/stirplate.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/stirplate.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/stirplate.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/stirplate.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Размешиватель
Name[sk]=stirplate
Name[sv]=omrörare
+Name[tr]=manyetik tabaka
Name[uk]=Плита для перемішування
Name[x-test]=xxstirplatexx
Name[zh_TW]=攪拌盤
diff -Nru calligra-2.9.7/flow/stencils/Chemistry_Lab/stirplate-front.desktop calligra-2.9.11/flow/stencils/Chemistry_Lab/stirplate-front.desktop
--- calligra-2.9.7/flow/stencils/Chemistry_Lab/stirplate-front.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Chemistry_Lab/stirplate-front.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Размешиватель (спереди)
Name[sk]=stirplate-front
Name[sv]=omrörare-framsida
+Name[tr]=manyetik tabaka-ön
Name[uk]=Плита для перемішування (спереду)
Name[x-test]=xxstirplate-frontxx
Name[zh_TW]=攪拌盤-前
diff -Nru calligra-2.9.7/flow/stencils/Circuit/hdiode.desktop calligra-2.9.11/flow/stencils/Circuit/hdiode.desktop
--- calligra-2.9.7/flow/stencils/Circuit/hdiode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit/hdiode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Хоризонтален диод
Name[bs]=Horizontalna dioda
Name[ca]=Díode horitzontal
-Name[ca@valencia]=Diode horitzontal
+Name[ca@valencia]=Díode horitzontal
Name[da]=Vandret diode
Name[de]=Waagerechte Diode
Name[el]=Οριζόντια δίοδος
diff -Nru calligra-2.9.7/flow/stencils/Circuit/hzener.desktop calligra-2.9.11/flow/stencils/Circuit/hzener.desktop
--- calligra-2.9.7/flow/stencils/Circuit/hzener.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit/hzener.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Хоризонтален ценеров диод
Name[bs]=Horizontalna Zener dioda
Name[ca]=Díode Zener horitzontal
-Name[ca@valencia]=Diode Zener horitzontal
+Name[ca@valencia]=Díode Zener horitzontal
Name[da]=Vandret zenerdiode
Name[de]=Waagerechte Zener-Diode
Name[el]=Οριζόντια δίοδος Zener
diff -Nru calligra-2.9.7/flow/stencils/Circuit/speaker_de.desktop calligra-2.9.11/flow/stencils/Circuit/speaker_de.desktop
--- calligra-2.9.7/flow/stencils/Circuit/speaker_de.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit/speaker_de.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=Reproduktor (európsky)
Name[sl]=Zvočnik (evropski)
Name[sv]=Högtalare (europeisk)
+Name[tr]=Hoparlör (Avrupa)
Name[uk]=Гучномовець (Європа)
Name[x-test]=xxSpeaker (European)xx
Name[zh_TW]=揚聲器(歐洲)
diff -Nru calligra-2.9.7/flow/stencils/Circuit/vdiode.desktop calligra-2.9.11/flow/stencils/Circuit/vdiode.desktop
--- calligra-2.9.7/flow/stencils/Circuit/vdiode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit/vdiode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Вертикален диод
Name[bs]=Vertikalna dioda
Name[ca]=Díode vertical
-Name[ca@valencia]=Diode vertical
+Name[ca@valencia]=Díode vertical
Name[da]=Lodret diode
Name[de]=Senkrechte Diode
Name[el]=Κάθετη δίοδος
diff -Nru calligra-2.9.7/flow/stencils/Circuit/vzener.desktop calligra-2.9.11/flow/stencils/Circuit/vzener.desktop
--- calligra-2.9.7/flow/stencils/Circuit/vzener.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit/vzener.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Вертикален ценеров диод
Name[bs]=Vertikalna Zener dioda
Name[ca]=Díode Zener vertical
-Name[ca@valencia]=Diode Zener vertical
+Name[ca@valencia]=Díode Zener vertical
Name[da]=Lodret zenerdiode
Name[de]=Senkrechte Zener-Diode
Name[el]=Κάθετη δίοδος Zener
diff -Nru calligra-2.9.7/flow/stencils/Circuit2/ddiode.desktop calligra-2.9.11/flow/stencils/Circuit2/ddiode.desktop
--- calligra-2.9.7/flow/stencils/Circuit2/ddiode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit2/ddiode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Diagonal Diode
Name[bs]=Dijagonalna dioda
Name[ca]=Díode diagonal
-Name[ca@valencia]=Diode diagonal
+Name[ca@valencia]=Díode diagonal
Name[da]=Diagonal diode
Name[de]=Diagonale Diode
Name[el]=Διαγώνια δίοδος
diff -Nru calligra-2.9.7/flow/stencils/Circuit2/dzener.desktop calligra-2.9.11/flow/stencils/Circuit2/dzener.desktop
--- calligra-2.9.7/flow/stencils/Circuit2/dzener.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit2/dzener.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Diagonal Zener Diode
Name[bs]=Dijagonalna Zener dioda
Name[ca]=Díode Zener diagonal
-Name[ca@valencia]=Diode Zener diagonal
+Name[ca@valencia]=Díode Zener diagonal
Name[da]=Diagonal zenerdiode
Name[de]=Diagonale Zener-Diode
Name[el]=Διαγώνια δίοδος Zener
diff -Nru calligra-2.9.7/flow/stencils/Circuit2/opto.desktop calligra-2.9.11/flow/stencils/Circuit2/opto.desktop
--- calligra-2.9.7/flow/stencils/Circuit2/opto.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit2/opto.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Оптрон
Name[sk]=Optoizolant
Name[sv]=Optoisolator
+Name[tr]=Optoizolatör
Name[uk]=Оптрон
Name[x-test]=xxOptoisolatorxx
Name[zh_TW]=光隔離器
diff -Nru calligra-2.9.7/flow/stencils/Circuit2/ramp.desktop calligra-2.9.11/flow/stencils/Circuit2/ramp.desktop
--- calligra-2.9.7/flow/stencils/Circuit2/ramp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit2/ramp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Рампообразная волна
Name[sk]=Spádová vlna
Name[sv]=Sågtandsvåg
+Name[tr]=Köpüren Dalga
Name[uk]=Пилкоподібний сигнал
Name[x-test]=xxRamp Wavexx
Name[zh_TW]=鋸齒波
diff -Nru calligra-2.9.7/flow/stencils/Circuit2/relay.desktop calligra-2.9.11/flow/stencils/Circuit2/relay.desktop
--- calligra-2.9.7/flow/stencils/Circuit2/relay.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Circuit2/relay.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Relé
Name[sl]=Relé
Name[sv]=Relä
+Name[tr]=Röle
Name[uk]=Реле
Name[x-test]=xxRelayxx
Name[zh_TW]=繼電器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/10700.desktop calligra-2.9.11/flow/stencils/Cisco/10700.desktop
--- calligra-2.9.7/flow/stencils/Cisco/10700.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/10700.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -9,6 +9,7 @@
Name[de]=10700
Name[el]=10700
Name[en_GB]=10700
+Name[eo]=10700
Name[es]=10700
Name[et]=10700
Name[eu]=10700
diff -Nru calligra-2.9.7/flow/stencils/Cisco/15200.desktop calligra-2.9.11/flow/stencils/Cisco/15200.desktop
--- calligra-2.9.7/flow/stencils/Cisco/15200.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/15200.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -9,6 +9,7 @@
Name[de]=15200
Name[el]=15200
Name[en_GB]=15200
+Name[eo]=15200
Name[es]=15200
Name[et]=15200
Name[eu]=15200
diff -Nru calligra-2.9.7/flow/stencils/Cisco/15800.desktop calligra-2.9.11/flow/stencils/Cisco/15800.desktop
--- calligra-2.9.7/flow/stencils/Cisco/15800.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/15800.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -9,6 +9,7 @@
Name[de]=15800
Name[el]=15800
Name[en_GB]=15800
+Name[eo]=15800
Name[es]=15800
Name[et]=15800
Name[eu]=15800
diff -Nru calligra-2.9.7/flow/stencils/Cisco/3174.desktop calligra-2.9.11/flow/stencils/Cisco/3174.desktop
--- calligra-2.9.7/flow/stencils/Cisco/3174.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/3174.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=3174 (настолен) контролер на клъстър
Name[bs]=3174 (desktop) kontroler klastera
Name[ca]=3174 (escriptori) controlador de clúster
-Name[ca@valencia]=3174 (desktop) cluster controller
+Name[ca@valencia]=3174 (escriptori) controlador de clúster
Name[da]=3174 (desktop) cluster controller
Name[de]=3174 (Desktop-)Cluster-Controller
Name[el]=3174 (επιφάνειας εργασίας) ελεγκτής συστοιχίας
diff -Nru calligra-2.9.7/flow/stencils/Cisco/3x74.desktop calligra-2.9.11/flow/stencils/Cisco/3x74.desktop
--- calligra-2.9.7/flow/stencils/Cisco/3x74.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/3x74.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=3X74 (floor) контролер за клъстър
Name[bs]=3174 (spratni) kontroler klastera
Name[ca]=3X74 (terra) controlador de clúster
-Name[ca@valencia]=3X74 (floor) cluster controller
+Name[ca@valencia]=3X74 (terra) controlador de clúster
Name[da]=3X74 (floor) cluster controller
Name[de]=3X74 (Boden-)Cluster-Controller
Name[el]=3X74 (δαπέδου) ελεγκτής συστοιχίας
diff -Nru calligra-2.9.7/flow/stencils/Cisco/6701.desktop calligra-2.9.11/flow/stencils/Cisco/6701.desktop
--- calligra-2.9.7/flow/stencils/Cisco/6701.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/6701.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -9,6 +9,7 @@
Name[de]=6701
Name[el]=6701
Name[en_GB]=6701
+Name[eo]=6701
Name[es]=6701
Name[et]=6701
Name[eu]=6701
diff -Nru calligra-2.9.7/flow/stencils/Cisco/6705.desktop calligra-2.9.11/flow/stencils/Cisco/6705.desktop
--- calligra-2.9.7/flow/stencils/Cisco/6705.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/6705.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -9,6 +9,7 @@
Name[de]=6705
Name[el]=6705
Name[en_GB]=6705
+Name[eo]=6705
Name[es]=6705
Name[et]=6705
Name[eu]=6705
diff -Nru calligra-2.9.7/flow/stencils/Cisco/6732.desktop calligra-2.9.11/flow/stencils/Cisco/6732.desktop
--- calligra-2.9.7/flow/stencils/Cisco/6732.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/6732.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -9,6 +9,7 @@
Name[de]=6732
Name[el]=6732
Name[en_GB]=6732
+Name[eo]=6732
Name[es]=6732
Name[et]=6732
Name[eu]=6732
diff -Nru calligra-2.9.7/flow/stencils/Cisco/antenna.desktop calligra-2.9.11/flow/stencils/Cisco/antenna.desktop
--- calligra-2.9.7/flow/stencils/Cisco/antenna.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/antenna.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Антена
Name[bs]=Antena
Name[ca]=Antena
-Name[ca@valencia]=Antenna
+Name[ca@valencia]=Antena
Name[cs]=Anténa
Name[da]=Antenne
Name[de]=Antenne
diff -Nru calligra-2.9.7/flow/stencils/Cisco/branch_office_subdued.desktop calligra-2.9.11/flow/stencils/Cisco/branch_office_subdued.desktop
--- calligra-2.9.7/flow/stencils/Cisco/branch_office_subdued.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/branch_office_subdued.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Офис отделения приглушённый
Name[sk]=Branch office tlmený
Name[sv]=Filialkontor diskret
+Name[tr]=Alt grup ofisi pasif
Name[uk]=Філія (притлумлено)
Name[x-test]=xxBranch office subduedxx
Name[zh_CN]=分支办公室(柔和)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/breakout_box.desktop calligra-2.9.11/flow/stencils/Cisco/breakout_box.desktop
--- calligra-2.9.7/flow/stencils/Cisco/breakout_box.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/breakout_box.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Разбивающий модуль
Name[sk]=Pretrhnutá škatuľa
Name[sv]=Kopplingslåda
+Name[tr]=Kaçış kutusu
Name[uk]=Комутаційний пристрій
Name[x-test]=xxBreakout boxxx
Name[zh_CN]=中断箱
diff -Nru calligra-2.9.7/flow/stencils/Cisco/centri_firewall.desktop calligra-2.9.11/flow/stencils/Cisco/centri_firewall.desktop
--- calligra-2.9.7/flow/stencils/Cisco/centri_firewall.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/centri_firewall.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Защитна стена Centri
Name[bs]=Centri Firewall
Name[ca]=Tallafoc Centri
-Name[ca@valencia]=Tallafocs Centri
+Name[ca@valencia]=Tallafoc Centri
Name[cs]=Centri Firewall
Name[da]=Centri Firewall
Name[de]=Centri-Firewall
diff -Nru calligra-2.9.7/flow/stencils/Cisco/data_center_switch.desktop calligra-2.9.11/flow/stencils/Cisco/data_center_switch.desktop
--- calligra-2.9.7/flow/stencils/Cisco/data_center_switch.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/data_center_switch.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -6,7 +6,7 @@
Name[da]=Datacenterswitch
Name[de]=Daten-Center Switch
Name[el]=Data Center Switch
-Name[en_GB]=Data Center Switch
+Name[en_GB]=Data Centre Switch
Name[es]=Conmutador de centro de datos
Name[et]=Andmekeskuse kommutaator
Name[eu]=Datu-zentroko kommutadorea
diff -Nru calligra-2.9.7/flow/stencils/Cisco/data_center_switch_reversed.desktop calligra-2.9.11/flow/stencils/Cisco/data_center_switch_reversed.desktop
--- calligra-2.9.7/flow/stencils/Cisco/data_center_switch_reversed.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/data_center_switch_reversed.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -6,7 +6,7 @@
Name[da]=Datacenterswitch omvendt
Name[de]=Daten-Center Switch invertiert
Name[el]=Έγινε αναστροφή μεταγωγέα κέντρου δεδομένων
-Name[en_GB]=Data Center Switch Reversed
+Name[en_GB]=Data Centre Switch Reversed
Name[es]=Conmutador invertido de centro de datos
Name[et]=Andmekeskuse kommutaator tagurpidi
Name[eu]=Datu-zentroko alderantzizko kommutadorea
diff -Nru calligra-2.9.7/flow/stencils/Cisco/data_switch_processor.desktop calligra-2.9.11/flow/stencils/Cisco/data_switch_processor.desktop
--- calligra-2.9.7/flow/stencils/Cisco/data_switch_processor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/data_switch_processor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Обработчик коммутации данных
Name[sk]=Procesor dátového prepínača
Name[sv]=Dataväxelprocessor
+Name[tr]=Veri Anahtarı İşlemcisi
Name[uk]=Процесор комутації даних
Name[x-test]=xxData Switch Processorxx
Name[zh_CN]=资料交换器处理器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/detector.desktop calligra-2.9.11/flow/stencils/Cisco/detector.desktop
--- calligra-2.9.7/flow/stencils/Cisco/detector.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/detector.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[sk]=Detektor
Name[sl]=Detektor
Name[sv]=Detektor
+Name[tr]=Algılayıcı
Name[uk]=Індикатор
Name[x-test]=xxDetectorxx
Name[zh_CN]=检测器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/digital_cross-connect.desktop calligra-2.9.11/flow/stencils/Cisco/digital_cross-connect.desktop
--- calligra-2.9.7/flow/stencils/Cisco/digital_cross-connect.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/digital_cross-connect.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Цифровой разветвитель
Name[sk]=Digitálne prepojenie
Name[sv]=Digital korskoppling
+Name[tr]=Sayısal Çapraz-Bağlayıcı
Name[uk]=Цифровий розгалуджувач
Name[x-test]=xxDigital Cross-Connectxx
Name[zh_CN]=交叉连接器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/director_fcis.desktop calligra-2.9.11/flow/stencils/Cisco/director_fcis.desktop
--- calligra-2.9.7/flow/stencils/Cisco/director_fcis.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/director_fcis.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Интеллектуальный коммутатор носителя каналов управляющего класса
Name[sk]=Inteligentný prepínač Director-class Fibre Channel
Name[sv]=Avancerad intelligent fiberkanalväxel
+Name[tr]=Yönetmen-sınıfı Fiber Kanal akıllı anahtarı
Name[uk]=Інтелектуальний комутатор оптоволоконного каналу класу спрямовуючого пристрою
Name[x-test]=xxDirector-class Fibre Channel intelligent switchxx
Name[zh_CN]=导向器级光纤通道智能开关
diff -Nru calligra-2.9.7/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop calligra-2.9.11/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop
--- calligra-2.9.7/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Угловая метка коммутатор-маршрутизатора с поддержкой NetFlow
Name[sk]=Edge Label Switch Router s NetFlow
Name[sv]=Edge etikettbytesrouter med nätflöde
+Name[tr]=NetFlow içeren "Edge Label Switch Router"
Name[uk]=Комутатор-маршрутизатор Edge з NetFlow
Name[x-test]=xxEdge Label Switch Router with NetFlowxx
Name[zh_CN]=使用 NetFlow 的边缘标签交换路由器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/etherclient.desktop calligra-2.9.11/flow/stencils/Cisco/etherclient.desktop
--- calligra-2.9.7/flow/stencils/Cisco/etherclient.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/etherclient.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Клиент локальной сети
Name[sk]=EtherClient
Name[sv]=Etherklient
+Name[tr]=EtherClient
Name[uk]=EtherClient
Name[x-test]=xxEtherClientxx
Name[zh_CN]=以太客户端
diff -Nru calligra-2.9.7/flow/stencils/Cisco/fc_storage.desktop calligra-2.9.11/flow/stencils/Cisco/fc_storage.desktop
--- calligra-2.9.7/flow/stencils/Cisco/fc_storage.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/fc_storage.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=Хранилище FC
Name[sk]=FC úložisko
Name[sv]=Fiberkanallagring
+Name[tr]=FC Depolama
Name[uk]=Сховище FC
Name[x-test]=xxFC Storagexx
Name[zh_CN]=FC 存储器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/fddi_ring.desktop calligra-2.9.11/flow/stencils/Cisco/fddi_ring.desktop
--- calligra-2.9.7/flow/stencils/Cisco/fddi_ring.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/fddi_ring.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=Кольцо FDDI
Name[sk]=FDDI prstenec
Name[sv]=FDDI-ring
+Name[tr]=FDDI Halka
Name[uk]=Кільце FDDI
Name[x-test]=xxFDDI Ringxx
Name[zh_CN]=FDDI Ring
diff -Nru calligra-2.9.7/flow/stencils/Cisco/firewall.desktop calligra-2.9.11/flow/stencils/Cisco/firewall.desktop
--- calligra-2.9.7/flow/stencils/Cisco/firewall.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/firewall.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Защитна стена
Name[bs]=Firewall
Name[ca]=Tallafoc
-Name[ca@valencia]=Tallafocs
+Name[ca@valencia]=Tallafoc
Name[cs]=Firewall
Name[da]=Firewall
Name[de]=Firewall
diff -Nru calligra-2.9.7/flow/stencils/Cisco/firewall_horizontal.desktop calligra-2.9.11/flow/stencils/Cisco/firewall_horizontal.desktop
--- calligra-2.9.7/flow/stencils/Cisco/firewall_horizontal.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/firewall_horizontal.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Firewall horizontal
Name[bs]=Horizontalni Firewall
Name[ca]=Tallafoc horitzontal
-Name[ca@valencia]=Tallafocs horitzontal
+Name[ca@valencia]=Tallafoc horitzontal
Name[da]=Firewall vandret
Name[de]=Firewall waagerecht
Name[el]=Τείχος προστασίας οριζόντιο
diff -Nru calligra-2.9.7/flow/stencils/Cisco/firewall_subdued.desktop calligra-2.9.11/flow/stencils/Cisco/firewall_subdued.desktop
--- calligra-2.9.7/flow/stencils/Cisco/firewall_subdued.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/firewall_subdued.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Firewall subdued
Name[bs]=Podčinjeni Firewall
Name[ca]=Tallafoc suavitzat
-Name[ca@valencia]=Tallafocs suavitzat
+Name[ca@valencia]=Tallafoc suavitzat
Name[da]=Firewall nedtonet
Name[de]=Firewall (inaktiv)
Name[el]=Τείχος προστασίας υποτονικό
diff -Nru calligra-2.9.7/flow/stencils/Cisco/fwsm.desktop calligra-2.9.11/flow/stencils/Cisco/fwsm.desktop
--- calligra-2.9.7/flow/stencils/Cisco/fwsm.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/fwsm.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Firewall Service Module
Name[bs]=Modul Firewall usluge
Name[ca]=Mòdul de serveis del tallafoc
-Name[ca@valencia]=Mòdul de serveis del tallafocs
+Name[ca@valencia]=Mòdul de serveis del tallafoc
Name[da]=Firewall Service Module
Name[de]=Firewall-Dienstmodul
Name[el]=Άρθρωμα υπηρεσίας τείχους προστασίας
diff -Nru calligra-2.9.7/flow/stencils/Cisco/government_building.desktop calligra-2.9.11/flow/stencils/Cisco/government_building.desktop
--- calligra-2.9.7/flow/stencils/Cisco/government_building.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/government_building.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=Vládna budova
Name[sl]=Vladna stavba
Name[sv]=Statlig byggnad
+Name[tr]=Hükümet Binası
Name[uk]=Урядова будівля
Name[x-test]=xxGovernment Buildingxx
Name[zh_CN]=政府建筑
diff -Nru calligra-2.9.7/flow/stencils/Cisco/guard.desktop calligra-2.9.11/flow/stencils/Cisco/guard.desktop
--- calligra-2.9.7/flow/stencils/Cisco/guard.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/guard.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[sk]=Strážca
Name[sl]=Stražar
Name[sv]=Vakt
+Name[tr]=Gözetim
Name[uk]=Охоронець
Name[x-test]=xxGuardxx
Name[zh_CN]=保护
diff -Nru calligra-2.9.7/flow/stencils/Cisco/handheld.desktop calligra-2.9.11/flow/stencils/Cisco/handheld.desktop
--- calligra-2.9.7/flow/stencils/Cisco/handheld.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/handheld.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Handheld
Name[sl]=Ročni računalnik
Name[sv]=Handdator
+Name[tr]=El Bilgisayarı
Name[uk]=Кишеньковий пристрій
Name[x-test]=xxHandheldxx
Name[zh_CN]=手持设备
diff -Nru calligra-2.9.7/flow/stencils/Cisco/home_office.desktop calligra-2.9.11/flow/stencils/Cisco/home_office.desktop
--- calligra-2.9.7/flow/stencils/Cisco/home_office.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/home_office.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[sk]=Home office
Name[sl]=Domača pisarna
Name[sv]=Hemmakontor
+Name[tr]=Ev Ofisi
Name[uk]=Домашній офіс
Name[x-test]=xxHome officexx
Name[zh_CN]=家庭办公室
diff -Nru calligra-2.9.7/flow/stencils/Cisco/hootphone.desktop calligra-2.9.11/flow/stencils/Cisco/hootphone.desktop
--- calligra-2.9.7/flow/stencils/Cisco/hootphone.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/hootphone.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Аппарат гудков
Name[sk]=HootPhone
Name[sv]=Högtalartelefon
+Name[tr]=HootPhone
Name[uk]=Телефон з тоновим дзвінком
Name[x-test]=xxHootPhonexx
Name[zh_CN]=HootPhone
diff -Nru calligra-2.9.7/flow/stencils/Cisco/house_blue.desktop calligra-2.9.11/flow/stencils/Cisco/house_blue.desktop
--- calligra-2.9.7/flow/stencils/Cisco/house_blue.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/house_blue.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=Dom modrý
Name[sl]=Modra hiša
Name[sv]=Hus blått
+Name[tr]=Ev mavi
Name[uk]=Будинок (синім)
Name[x-test]=xxHouse bluexx
Name[zh_CN]=蓝色房子
diff -Nru calligra-2.9.7/flow/stencils/Cisco/house.desktop calligra-2.9.11/flow/stencils/Cisco/house.desktop
--- calligra-2.9.7/flow/stencils/Cisco/house.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/house.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,6 +32,7 @@
Name[sk]=Dom
Name[sl]=Hiša
Name[sv]=Hus
+Name[tr]=Ev
Name[ug]=House مۇزىكىسى
Name[uk]=Будинок
Name[x-test]=xxHousexx
diff -Nru calligra-2.9.7/flow/stencils/Cisco/hub.desktop calligra-2.9.11/flow/stencils/Cisco/hub.desktop
--- calligra-2.9.7/flow/stencils/Cisco/hub.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/hub.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -31,6 +31,7 @@
Name[sk]=Rozbočovač
Name[sl]=Vozlišče
Name[sv]=Nätnav
+Name[tr]=Hub
Name[uk]=Концентратор
Name[x-test]=xxHubxx
Name[zh_CN]=集线器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/hub_subdued.desktop calligra-2.9.11/flow/stencils/Cisco/hub_subdued.desktop
--- calligra-2.9.7/flow/stencils/Cisco/hub_subdued.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/hub_subdued.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Повторитель приглушённый
Name[sk]=Hub tlmený
Name[sv]=Nätnav diskret
+Name[tr]=Hub pasif
Name[uk]=Концентратор (притлумлено)
Name[x-test]=xxHub subduedxx
Name[zh_CN]=集线器(柔和)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/iad_router.desktop calligra-2.9.11/flow/stencils/Cisco/iad_router.desktop
--- calligra-2.9.7/flow/stencils/Cisco/iad_router.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/iad_router.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=IAD router
Name[sl]=Usmerjevalnik IAD
Name[sv]=IAD-router
+Name[tr]=IAD yönlendirici
Name[uk]=Маршрутизатор IAD
Name[x-test]=xxIAD routerxx
Name[zh_CN]=IAD 路由器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/ibm_tower.desktop calligra-2.9.11/flow/stencils/Cisco/ibm_tower.desktop
--- calligra-2.9.7/flow/stencils/Cisco/ibm_tower.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/ibm_tower.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=IBM Tower
Name[sl]=Stolp IBM
Name[sv]=IBM-torn
+Name[tr]=IBM Kule
Name[uk]=Комп’ютер IBM у корпусі «башта»
Name[x-test]=xxIBM Towerxx
Name[zh_CN]=IBM Tower
diff -Nru calligra-2.9.7/flow/stencils/Cisco/intelliswitch_stack.desktop calligra-2.9.11/flow/stencils/Cisco/intelliswitch_stack.desktop
--- calligra-2.9.7/flow/stencils/Cisco/intelliswitch_stack.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/intelliswitch_stack.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Стэк IntelliSwitch
Name[sk]=IntelliSwitch Stack
Name[sv]=IntelliSwitch-stack
+Name[tr]=IntelliSwitch Yığın
Name[uk]=Стек IntelliSwitch
Name[x-test]=xxIntelliSwitch Stackxx
Name[zh_CN]=Intelliswitch 堆栈
diff -Nru calligra-2.9.7/flow/stencils/Cisco/ios_firewall.desktop calligra-2.9.11/flow/stencils/Cisco/ios_firewall.desktop
--- calligra-2.9.7/flow/stencils/Cisco/ios_firewall.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/ios_firewall.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Защитна стена IOS
Name[bs]=IOS Firewall
Name[ca]=Tallafoc IOS
-Name[ca@valencia]=Tallafocs IOS
+Name[ca@valencia]=Tallafoc IOS
Name[cs]=IOS Firewall
Name[da]=IOS Firewall
Name[de]=IOS-Firewall
@@ -29,6 +29,7 @@
Name[sk]=IOS Firewall
Name[sl]=Požarni zid IOS
Name[sv]=IOS-brandvägg
+Name[tr]=IOS Güvenlik Duvarı
Name[uk]=Брандмауер IOS
Name[x-test]=xxIOS Firewallxx
Name[zh_CN]=IOS 防火墙
diff -Nru calligra-2.9.7/flow/stencils/Cisco/isdn_switch.desktop calligra-2.9.11/flow/stencils/Cisco/isdn_switch.desktop
--- calligra-2.9.7/flow/stencils/Cisco/isdn_switch.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/isdn_switch.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Комутатор ISDN
Name[bs]=ISDN prekidač
Name[ca]=XDSI switch
-Name[ca@valencia]=ISDN switch
+Name[ca@valencia]=XDSI switch
Name[da]=ISDN-switch
Name[de]=ISDN-Switch
Name[el]=ISDN switch
diff -Nru calligra-2.9.7/flow/stencils/Cisco/itp.desktop calligra-2.9.11/flow/stencils/Cisco/itp.desktop
--- calligra-2.9.7/flow/stencils/Cisco/itp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/itp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=ITP
Name[sl]=ITP
Name[sv]=ITP
+Name[tr]=ITP
Name[uk]=ITP
Name[x-test]=xxITPxx
Name[zh_CN]=ITP
diff -Nru calligra-2.9.7/flow/stencils/Cisco/jbod.desktop calligra-2.9.11/flow/stencils/Cisco/jbod.desktop
--- calligra-2.9.7/flow/stencils/Cisco/jbod.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/jbod.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=JBOD
Name[sl]=JBOD
Name[sv]=JBOD
+Name[tr]=JBOD
Name[uk]=JBOD
Name[x-test]=xxJBODxx
Name[zh_CN]=JBOD
diff -Nru calligra-2.9.7/flow/stencils/Cisco/key.desktop calligra-2.9.11/flow/stencils/Cisco/key.desktop
--- calligra-2.9.7/flow/stencils/Cisco/key.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/key.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -31,6 +31,7 @@
Name[sk]=Kľúč
Name[sl]=Ključ
Name[sv]=Nyckel
+Name[tr]=Anahtar
Name[ug]=ئاچقۇچ
Name[uk]=Ключ
Name[x-test]=xxKeyxx
diff -Nru calligra-2.9.7/flow/stencils/Cisco/longreach_cpe.desktop calligra-2.9.11/flow/stencils/Cisco/longreach_cpe.desktop
--- calligra-2.9.7/flow/stencils/Cisco/longreach_cpe.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/longreach_cpe.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=LongReach CPE
Name[sk]=LongReach CPE
Name[sv]=Kundlokalenhet med lång räckvidd
+Name[tr]=LongReach CPE
Name[uk]=LongReach CPE
Name[x-test]=xxLongReach CPExx
Name[zh_CN]=LongReach CPE
diff -Nru calligra-2.9.7/flow/stencils/Cisco/medium_building_blue.desktop calligra-2.9.11/flow/stencils/Cisco/medium_building_blue.desktop
--- calligra-2.9.7/flow/stencils/Cisco/medium_building_blue.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/medium_building_blue.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Среднее строение синее
Name[sk]=Stredná budova modrá
Name[sv]=Medelstor byggnad blå
+Name[tr]=OrtaBoy Bina mavi
Name[uk]=Середня будівля (синім)
Name[x-test]=xxMedium Building bluexx
Name[zh_CN]=中型建筑(蓝色)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/medium_building.desktop calligra-2.9.11/flow/stencils/Cisco/medium_building.desktop
--- calligra-2.9.7/flow/stencils/Cisco/medium_building.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/medium_building.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Среднее строение
Name[sk]=Stredná budova
Name[sv]=Medelstor byggnad
+Name[tr]=OrtaBoy Bina
Name[uk]=Середня будівля
Name[x-test]=xxMedium Buildingxx
Name[zh_CN]=中型建筑
diff -Nru calligra-2.9.7/flow/stencils/Cisco/medium_building_subdued.desktop calligra-2.9.11/flow/stencils/Cisco/medium_building_subdued.desktop
--- calligra-2.9.7/flow/stencils/Cisco/medium_building_subdued.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/medium_building_subdued.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Среднее строение приглушённое
Name[sk]=Stredná budova tlmená
Name[sv]=Medelstor byggnad diskret
+Name[tr]=OrtaBoy Bina pasif
Name[uk]=Середня будівля (притлумлено)
Name[x-test]=xxMedium Building subduedxx
Name[zh_CN]=中型建筑(柔和)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop calligra-2.9.11/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop
--- calligra-2.9.7/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Голосовой шлюз серий MGX 8000
Name[sk]=MGX 8000 Series Voice Gateway
Name[sv]=Serie MGX-8000 röstförmedlingsnod
+Name[tr]=MGX 8000 Serisi Ses Geçidi
Name[uk]=Голосовий шлюз серії MGX 8000
Name[x-test]=xxMGX 8000 Series Voice Gatewayxx
Name[zh_CN]=MGX 8000 系统列语音网关
diff -Nru calligra-2.9.7/flow/stencils/Cisco/microwebserver.desktop calligra-2.9.11/flow/stencils/Cisco/microwebserver.desktop
--- calligra-2.9.7/flow/stencils/Cisco/microwebserver.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/microwebserver.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Микровебсервер
Name[sk]=MicroWebserver
Name[sv]=Microwebbserver
+Name[tr]=MikroWebsunucu
Name[uk]=Мікровебсервер
Name[x-test]=xxMicroWebserverxx
Name[zh_CN]=微型网页服务器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/mini_vax.desktop calligra-2.9.11/flow/stencils/Cisco/mini_vax.desktop
--- calligra-2.9.7/flow/stencils/Cisco/mini_vax.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/mini_vax.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=Mini VAX
Name[sl]=Mini VAX
Name[sv]=Mini-VAX
+Name[tr]=Mini VAX
Name[uk]=Mini VAX
Name[x-test]=xxMini VAXxx
Name[zh_CN]=Mini VAX
diff -Nru calligra-2.9.7/flow/stencils/Cisco/mobile_access_ip_phone.desktop calligra-2.9.11/flow/stencils/Cisco/mobile_access_ip_phone.desktop
--- calligra-2.9.7/flow/stencils/Cisco/mobile_access_ip_phone.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/mobile_access_ip_phone.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=IP телефон мобильного доступа
Name[sk]=Mobile Access IP Phone
Name[sv]=Mobil åtkomst IP-telefon
+Name[tr]=Mobil Erişim IP Telefon
Name[uk]=IP-телефон з мобільним доступом
Name[x-test]=xxMobile Access IP Phonexx
Name[zh_CN]=移动存取 IP 电话
diff -Nru calligra-2.9.7/flow/stencils/Cisco/mobile_access_router.desktop calligra-2.9.11/flow/stencils/Cisco/mobile_access_router.desktop
--- calligra-2.9.7/flow/stencils/Cisco/mobile_access_router.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/mobile_access_router.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Маршрутизатор мобильного доступа
Name[sk]=Router mobilného prístupu
Name[sv]=Mobil åtkomstrouter
+Name[tr]=Mobil Erişim Yönlendirici
Name[uk]=Маршрутизатор мобільного доступу
Name[x-test]=xxMobile Access Routerxx
Name[zh_CN]=移动存取路由器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/moh_server.desktop calligra-2.9.11/flow/stencils/Cisco/moh_server.desktop
--- calligra-2.9.7/flow/stencils/Cisco/moh_server.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/moh_server.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=MoH сервер (музыка во время задержки)
Name[sk]=MoH server (Music on Hold)
Name[sv]=Musikserver (väntande musik)
+Name[tr]=MoH sunucu (Bekletme Müziği)
Name[uk]=Сервер MoH (Music on Hold)
Name[x-test]=xxMoH server (Music on Hold)xx
Name[zh_CN]=MoH 服务(Music on Hold)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/multi-fabric_server_switch.desktop calligra-2.9.11/flow/stencils/Cisco/multi-fabric_server_switch.desktop
--- calligra-2.9.7/flow/stencils/Cisco/multi-fabric_server_switch.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/multi-fabric_server_switch.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Сервер коммутации Multi-Fabric
Name[sk]=Multi-Fabric Server Switch
Name[sv]=Flernätverks-serverväxel
+Name[tr]=Multi-Bileşenli Sunucu Anahtar
Name[uk]=Сервер комутації Multi-Fabric
Name[x-test]=xxMulti-Fabric Server Switchxx
Name[zh_CN]=Multi-Fabric 服务器交换机
diff -Nru calligra-2.9.7/flow/stencils/Cisco/multilayer_remote_switch.desktop calligra-2.9.11/flow/stencils/Cisco/multilayer_remote_switch.desktop
--- calligra-2.9.7/flow/stencils/Cisco/multilayer_remote_switch.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/multilayer_remote_switch.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Многоуровневый удалённый коммутатор
Name[sk]=Viacvrstvový vzdialený prepínač
Name[sv]=Flerlagers-fjärrväxel
+Name[tr]=Çokkatmanlı Uzaktan Anahtar
Name[uk]=Віддалений багаторівневий комутатор
Name[x-test]=xxMultilayer Remote Switchxx
Name[zh_CN]=Multilayer 远程交换机
diff -Nru calligra-2.9.7/flow/stencils/Cisco/multilayer_switch.desktop calligra-2.9.11/flow/stencils/Cisco/multilayer_switch.desktop
--- calligra-2.9.7/flow/stencils/Cisco/multilayer_switch.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/multilayer_switch.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Многоуровневый коммутатор
Name[sk]=Viacvrstvový prepínač
Name[sv]=Flerlagersväxel
+Name[tr]=Çokkatmanlı anahtar
Name[uk]=Багаторівневий комутатор
Name[x-test]=xxMultilayer switchxx
Name[zh_CN]=多层交换机
diff -Nru calligra-2.9.7/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop calligra-2.9.11/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop
--- calligra-2.9.7/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Многоуровневый коммутатор с поддержкой Silicon
Name[sk]=Viacvrstvový prepínač s kremíkom
Name[sv]=Flerlagersväxel med kisel
+Name[tr]=Silikonlu Çokkatmanlı Anahtar
Name[uk]=Багаторівневий комутатор з підтримкою Silicon
Name[x-test]=xxMultilayer Switch with Siliconxx
Name[zh_CN]=硅多层交换机
diff -Nru calligra-2.9.7/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop calligra-2.9.11/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop
--- calligra-2.9.7/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Многоуровневый коммутатор с поддержкой Silicon приглушённый
Name[sk]=Viacvrstvový prepínač s kremíkom tlmený
Name[sv]=Flerlagersväxel med kisel diskret
+Name[tr]=Silikonlu Çokkatmanlı Anahtar pasif
Name[uk]=Багаторівневий комутатор з підтримкою Silicon (притлумлено)
Name[x-test]=xxMultilayer Switch with Silicon subduedxx
Name[zh_CN]=硅制服多层交换机
diff -Nru calligra-2.9.7/flow/stencils/Cisco/multiswitch_device.desktop calligra-2.9.11/flow/stencils/Cisco/multiswitch_device.desktop
--- calligra-2.9.7/flow/stencils/Cisco/multiswitch_device.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/multiswitch_device.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Устройство множественной коммутации
Name[sk]=Zariadenie viacnásobného prepínača
Name[sv]=Flerväxelenhet
+Name[tr]=ÇokluAnahtar Aygıtı
Name[uk]=Пристрій мультикомутації
Name[x-test]=xxMultiSwitch Devicexx
Name[zh_CN]=多交换机设备
diff -Nru calligra-2.9.7/flow/stencils/Cisco/optical_fiber.desktop calligra-2.9.11/flow/stencils/Cisco/optical_fiber.desktop
--- calligra-2.9.7/flow/stencils/Cisco/optical_fiber.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/optical_fiber.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -7,7 +7,7 @@
Name[da]=Optisk fiber
Name[de]=Optische Faser
Name[el]=Οπτική ίνα
-Name[en_GB]=Optical Fiber
+Name[en_GB]=Optical Fibre
Name[es]=Fibra óptica
Name[et]=Optiline kaabel
Name[eu]=Zuntz optikoa
diff -Nru calligra-2.9.7/flow/stencils/Cisco/pc_man.desktop calligra-2.9.11/flow/stencils/Cisco/pc_man.desktop
--- calligra-2.9.7/flow/stencils/Cisco/pc_man.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/pc_man.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Человек за персональным компьютером
Name[sk]=PC Man
Name[sv]=Persondatorman
+Name[tr]=PC Adam
Name[uk]=Чоловік за ПК
Name[x-test]=xxPC Manxx
Name[zh_CN]=PC 男性
diff -Nru calligra-2.9.7/flow/stencils/Cisco/pc_man_left.desktop calligra-2.9.11/flow/stencils/Cisco/pc_man_left.desktop
--- calligra-2.9.7/flow/stencils/Cisco/pc_man_left.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/pc_man_left.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Человек за персональным компьютером (левый)
Name[sk]=PC muž vľavo
Name[sv]=Persondatorman vänster
+Name[tr]=PC Adam sol
Name[uk]=Чоловік за ПК (ліворуч)
Name[x-test]=xxPC Man leftxx
Name[zh_CN]=PC 男性(左)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/pc_with_router-based_software.desktop calligra-2.9.11/flow/stencils/Cisco/pc_with_router-based_software.desktop
--- calligra-2.9.7/flow/stencils/Cisco/pc_with_router-based_software.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/pc_with_router-based_software.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=ПК с софтовым маршрутизатором
Name[sk]=PC s Router-Based Software
Name[sv]=Persondator med routerbaserad programvara
+Name[tr]=Yönlendirici-Tabanlı Yazılımlı PC
Name[uk]=ПК з програмним забезпеченням на основі маршрутизатора
Name[x-test]=xxPC with Router-Based Softwarexx
Name[zh_CN]=有路由软件的 PC
diff -Nru calligra-2.9.7/flow/stencils/Cisco/pix_firewall.desktop calligra-2.9.11/flow/stencils/Cisco/pix_firewall.desktop
--- calligra-2.9.7/flow/stencils/Cisco/pix_firewall.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/pix_firewall.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Защитна стена PIX
Name[bs]=PIX Firewall
Name[ca]=Tallafoc PIX
-Name[ca@valencia]=Tallafocs PIX
+Name[ca@valencia]=Tallafoc PIX
Name[da]=PIX Firewall
Name[de]=PIX-Firewall
Name[el]=PIX Firewall
diff -Nru calligra-2.9.7/flow/stencils/Cisco/pix_firewall_left.desktop calligra-2.9.11/flow/stencils/Cisco/pix_firewall_left.desktop
--- calligra-2.9.7/flow/stencils/Cisco/pix_firewall_left.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/pix_firewall_left.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=PIX Firewall Left
Name[bs]=Lijevi PIX Firewall
Name[ca]=Tallafoc PIX esquerra
-Name[ca@valencia]=Tallafocs PIX esquerra
+Name[ca@valencia]=Tallafoc PIX esquerra
Name[da]=PIX Firewall venstre
Name[de]=PIX-Firewall links
Name[el]=PIX Firewall Left
diff -Nru calligra-2.9.7/flow/stencils/Cisco/router_with_firewall.desktop calligra-2.9.11/flow/stencils/Cisco/router_with_firewall.desktop
--- calligra-2.9.7/flow/stencils/Cisco/router_with_firewall.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/router_with_firewall.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Маршрутизатор със защитна стена
Name[bs]=Ruter sa Firewall-om
Name[ca]=Encaminador amb tallafoc
-Name[ca@valencia]=Encaminador amb tallafocs
+Name[ca@valencia]=Encaminador amb tallafoc
Name[cs]=Router s firewallem
Name[da]=Router med firewall
Name[de]=Router mit Firewall
diff -Nru calligra-2.9.7/flow/stencils/Cisco/sonet_mux.desktop calligra-2.9.11/flow/stencils/Cisco/sonet_mux.desktop
--- calligra-2.9.7/flow/stencils/Cisco/sonet_mux.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/sonet_mux.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=Переключатель SONET
Name[sk]=SONET MUX
Name[sv]=SONET-multiplexer
+Name[tr]=SONET Terminal Çoklayıcı
Name[uk]=SONET MUX
Name[x-test]=xxSONET MUXxx
Name[zh_CN]=SONET MUX
diff -Nru calligra-2.9.7/flow/stencils/Cisco/stb.desktop calligra-2.9.11/flow/stencils/Cisco/stb.desktop
--- calligra-2.9.7/flow/stencils/Cisco/stb.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/stb.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=STB (модуль установки)
Name[sk]=STB (set top box)
Name[sv]=Digitalbox
+Name[tr]=STB
Name[uk]=STB (модуль встановлення)
Name[x-test]=xxSTB (set top box)xx
Name[zh_CN]=STB (机顶盒)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/svx.desktop calligra-2.9.11/flow/stencils/Cisco/svx.desktop
--- calligra-2.9.7/flow/stencils/Cisco/svx.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/svx.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=SVX (взаимозаменяем с конечным офисом)
Name[sk]=SVX (zameniteľné s End office)
Name[sv]=SVX (utbytbar mot slutkontorsväxel)
+Name[tr]=SVX
Name[uk]=SVX (з взаємообміном, з кінцевою телефонною станцією)
Name[x-test]=xxSVX (interchangeable with End office)xx
Name[zh_CN]=SVX(与远端办公室可互换)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/switch_processor.desktop calligra-2.9.11/flow/stencils/Cisco/switch_processor.desktop
--- calligra-2.9.7/flow/stencils/Cisco/switch_processor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/switch_processor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=Prepínací procesor
Name[sl]=Preklopi procesor
Name[sv]=Linjeväxelprocessor
+Name[tr]=Anahtar İşlemcisi
Name[uk]=Процесор комутації маршрутів
Name[x-test]=xxSwitch Processorxx
Name[zh_CN]=交换机处理器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/system_controller.desktop calligra-2.9.11/flow/stencils/Cisco/system_controller.desktop
--- calligra-2.9.7/flow/stencils/Cisco/system_controller.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/system_controller.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Контроллер системы
Name[sk]=Systémový ovládač
Name[sv]=Systemstyrenhet
+Name[tr]=Sistem denetleyici
Name[uk]=Системний контролер
Name[x-test]=xxSystem controllerxx
Name[zh_CN]=系统控制器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/tape_array.desktop calligra-2.9.11/flow/stencils/Cisco/tape_array.desktop
--- calligra-2.9.7/flow/stencils/Cisco/tape_array.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/tape_array.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Массив данных на ленте
Name[sk]=Páskové pole
Name[sv]=Bandgrupp
+Name[tr]=Kaset dizisi
Name[uk]=Стрічковий масив
Name[x-test]=xxTape arrayxx
Name[zh_CN]=磁带阵列
diff -Nru calligra-2.9.7/flow/stencils/Cisco/tdm_router.desktop calligra-2.9.11/flow/stencils/Cisco/tdm_router.desktop
--- calligra-2.9.7/flow/stencils/Cisco/tdm_router.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/tdm_router.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=TDM router
Name[sl]=Usmerjevalnik TDM
Name[sv]=Tidsdelningsmultiplexrouter
+Name[tr]=TDM yönlendirici
Name[uk]=Маршрутизатор TDM
Name[x-test]=xxTDM routerxx
Name[zh_CN]=TDM 路由器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/telecommuter.desktop calligra-2.9.11/flow/stencils/Cisco/telecommuter.desktop
--- calligra-2.9.7/flow/stencils/Cisco/telecommuter.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/telecommuter.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Човек, работещ отдалечено
Name[bs]=Telekomjuter
Name[ca]=Tele commutador
-Name[ca@valencia]=Telecommutador
+Name[ca@valencia]=Tele commutador
Name[da]=Distancearbejder
Name[de]=Telearbeiter
Name[el]=Telecommuter
@@ -28,6 +28,7 @@
Name[sk]=Telecommuter
Name[sl]=Delavec na daljavo
Name[sv]=Telependlare
+Name[tr]=Telefonla çalışan
Name[uk]=Кур'єр
Name[x-test]=xxTelecommuterxx
Name[zh_CN]=远程工作者
diff -Nru calligra-2.9.7/flow/stencils/Cisco/telecommuter_house.desktop calligra-2.9.11/flow/stencils/Cisco/telecommuter_house.desktop
--- calligra-2.9.7/flow/stencils/Cisco/telecommuter_house.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/telecommuter_house.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Отдалечено работно място
Name[bs]=Kuća telekomjutera
Name[ca]=Casa de tele commutador
-Name[ca@valencia]=Casa de telecommutador
+Name[ca@valencia]=Casa de tele commutador
Name[da]=Hjemmearbejder
Name[de]=Telearbeiter-Haus
Name[el]=Telecommuter house
@@ -27,6 +27,7 @@
Name[ru]=Телекоммуникационное здание
Name[sk]=Telekomunikačná budova
Name[sv]=Telependlarhus
+Name[tr]=Telefonla çalışan evi
Name[uk]=Будинок надомника
Name[x-test]=xxTelecommuter housexx
Name[zh_CN]=远程工作者之家
diff -Nru calligra-2.9.7/flow/stencils/Cisco/telecommuter_house_router.desktop calligra-2.9.11/flow/stencils/Cisco/telecommuter_house_router.desktop
--- calligra-2.9.7/flow/stencils/Cisco/telecommuter_house_router.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/telecommuter_house_router.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Отдалечено работно място/маршрутизатор
Name[bs]=Kuća/ruter telekomjutera
Name[ca]=Casa de tele commutador/encaminador
-Name[ca@valencia]=Casa de telecommutador/encaminador
+Name[ca@valencia]=Casa de tele commutador/encaminador
Name[da]=Hjemmearbejder/router
Name[de]=Telearbeiter-Haus/-Router
Name[el]=Telecommuter house/router
@@ -26,6 +26,7 @@
Name[ru]=Телекоммуникационное здание/маршрутизатор
Name[sk]=Telekomunikačný dom/router
Name[sv]=Telependlarhus/router
+Name[tr]=Telefonla çalışan evi/yönlendirici
Name[uk]=Домівка/маршрутизатор надомника
Name[x-test]=xxTelecommuter house/routerxx
Name[zh_CN]=远程办公家庭/路由器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/telecommuter_house_subdued.desktop calligra-2.9.11/flow/stencils/Cisco/telecommuter_house_subdued.desktop
--- calligra-2.9.7/flow/stencils/Cisco/telecommuter_house_subdued.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/telecommuter_house_subdued.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Telecommuter house subdued
Name[bs]=Podčinjena kuća tele-mjenjača
Name[ca]=Casa de tele commutador inactiva
-Name[ca@valencia]=Casa de telecommutador inactiva
+Name[ca@valencia]=Casa de tele commutador inactiva
Name[da]=Hjemmearbejder nedtonet
Name[de]=Telearbeiter-Haus (inaktiv)
Name[el]=Telecommuter house subdued
@@ -24,6 +24,7 @@
Name[ru]=Телекоммуникационное здание приглушённое
Name[sk]=Telekomunikačná budova tlmená
Name[sv]=Telependlarhus diskret
+Name[tr]=Telefonla çalışan evi pasif
Name[uk]=Будинок надомника (притлумлено)
Name[x-test]=xxTelecommuter house subduedxx
Name[zh_CN]=远程工作者之家(柔和)
diff -Nru calligra-2.9.7/flow/stencils/Cisco/tokenring.desktop calligra-2.9.11/flow/stencils/Cisco/tokenring.desktop
--- calligra-2.9.7/flow/stencils/Cisco/tokenring.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/tokenring.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=TokenRing
Name[sk]=TokenRing
Name[sv]=Token ring
+Name[tr]=TokenRing
Name[uk]=TokenRing
Name[x-test]=xxTokenRingxx
Name[zh_CN]=令牌环
diff -Nru calligra-2.9.7/flow/stencils/Cisco/transpath.desktop calligra-2.9.11/flow/stencils/Cisco/transpath.desktop
--- calligra-2.9.7/flow/stencils/Cisco/transpath.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/transpath.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Transpath
Name[sk]=Transpath
Name[sv]=Överföringsväg
+Name[tr]=Transpath
Name[uk]=Спосіб зв’язку
Name[x-test]=xxTranspathxx
Name[zh_CN]=变换路径
diff -Nru calligra-2.9.7/flow/stencils/Cisco/truck.desktop calligra-2.9.11/flow/stencils/Cisco/truck.desktop
--- calligra-2.9.7/flow/stencils/Cisco/truck.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/truck.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=Truck
Name[sl]=Tovornjak
Name[sv]=Lastbil
+Name[tr]=Kamyon
Name[uk]=Вантажівка
Name[x-test]=xxTruckxx
Name[zh_CN]=卡车
diff -Nru calligra-2.9.7/flow/stencils/Cisco/turret.desktop calligra-2.9.11/flow/stencils/Cisco/turret.desktop
--- calligra-2.9.7/flow/stencils/Cisco/turret.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/turret.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Башенка
Name[sk]=Turret
Name[sv]=Torn
+Name[tr]=Küçük kule
Name[uk]=Турель
Name[x-test]=xxTurretxx
Name[zh_CN]=塔楼
diff -Nru calligra-2.9.7/flow/stencils/Cisco/umg_series.desktop calligra-2.9.11/flow/stencils/Cisco/umg_series.desktop
--- calligra-2.9.7/flow/stencils/Cisco/umg_series.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/umg_series.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=uMG séria
Name[sl]=serija uMG
Name[sv]=Serie uMG
+Name[tr]=uMG serisi
Name[uk]=Серія uMG
Name[x-test]=xxuMG seriesxx
Name[zh_CN]=uMG 系列
diff -Nru calligra-2.9.7/flow/stencils/Cisco/unity_express.desktop calligra-2.9.11/flow/stencils/Cisco/unity_express.desktop
--- calligra-2.9.7/flow/stencils/Cisco/unity_express.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/unity_express.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=Unity Express
Name[sl]=Unity Express
Name[sv]=Unity Express
+Name[tr]=Unity Express
Name[uk]=Unity Express
Name[x-test]=xxUnity Expressxx
Name[zh_CN]=Unity Express
diff -Nru calligra-2.9.7/flow/stencils/Cisco/unity_server.desktop calligra-2.9.11/flow/stencils/Cisco/unity_server.desktop
--- calligra-2.9.7/flow/stencils/Cisco/unity_server.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/unity_server.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=Серверный модуль
Name[sk]=Unity server
Name[sv]=Unity-server
+Name[tr]=Unity sunucusu
Name[uk]=Сервер Unity
Name[x-test]=xxUnity serverxx
Name[zh_CN]=Unity 服务器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/vpn_concentrator.desktop calligra-2.9.11/flow/stencils/Cisco/vpn_concentrator.desktop
--- calligra-2.9.7/flow/stencils/Cisco/vpn_concentrator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/vpn_concentrator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Концентратор VPN
Name[sk]=VPN koncentrátor
Name[sv]=Koncentrator för virtuellt privat nätverk
+Name[tr]=VPN yoğunlaştırıcı
Name[uk]=Концентратор VPN
Name[x-test]=xxVPN concentratorxx
Name[zh_CN]=VPN 集中器
diff -Nru calligra-2.9.7/flow/stencils/Cisco/woman_red.desktop calligra-2.9.11/flow/stencils/Cisco/woman_red.desktop
--- calligra-2.9.7/flow/stencils/Cisco/woman_red.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/woman_red.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Woman red
Name[bs]=Crvena žena
Name[ca]=Dona vermella
-Name[ca@valencia]=Dona roja
+Name[ca@valencia]=Dona vermella
Name[cs]=Žena - červená
Name[da]=Kvinde rød
Name[de]=Frau, rot
diff -Nru calligra-2.9.7/flow/stencils/Cisco/workgroup_switch_subdued.desktop calligra-2.9.11/flow/stencils/Cisco/workgroup_switch_subdued.desktop
--- calligra-2.9.7/flow/stencils/Cisco/workgroup_switch_subdued.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cisco/workgroup_switch_subdued.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Коммутатор рабочей группы приглушённый
Name[sk]=Prepínač pracovných skupín tlmený
Name[sv]=Arbetsgruppsväxel diskret
+Name[tr]=Çalışma grubu anahtarı Pasif
Name[uk]=Комутатор робочої групи (притлумлено)
Name[x-test]=xxWorkgroup switch Subduedxx
Name[zh_CN]=工作组交换机(柔和)
diff -Nru calligra-2.9.7/flow/stencils/Civil/bvrest.desktop calligra-2.9.11/flow/stencils/Civil/bvrest.desktop
--- calligra-2.9.7/flow/stencils/Civil/bvrest.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Civil/bvrest.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Двусторонняя вертикальная опора
Name[sk]=Bivalentný zvislý zvyšok
Name[sv]=Bivalent vertikalt stöd
+Name[tr]=Çift değerli dikey direkler
Name[uk]=Нерухома опора
Name[x-test]=xxBivalent Vertical Restxx
Name[zh_CN]=二价垂直平衡
diff -Nru calligra-2.9.7/flow/stencils/Civil/civil_aerator.desktop calligra-2.9.11/flow/stencils/Civil/civil_aerator.desktop
--- calligra-2.9.7/flow/stencils/Civil/civil_aerator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Civil/civil_aerator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Аэратор
Name[sk]=Aerátor
Name[sv]=Luftare
+Name[tr]=Fan
Name[uk]=Аератор
Name[x-test]=xxAeratorxx
Name[zh_CN]=曝气器
diff -Nru calligra-2.9.7/flow/stencils/Civil/civil_backflow_preventer.desktop calligra-2.9.11/flow/stencils/Civil/civil_backflow_preventer.desktop
--- calligra-2.9.7/flow/stencils/Civil/civil_backflow_preventer.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Civil/civil_backflow_preventer.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Предохранитель обратного потока
Name[sk]=Backflow Preventer
Name[sv]=Backflödesventil
+Name[tr]=Geri Akış Önleyici
Name[uk]=Запобіжник зворотного потоку
Name[x-test]=xxBackflow Preventerxx
Name[zh_CN]=回路抑止器
diff -Nru calligra-2.9.7/flow/stencils/Civil/civil_basin.desktop calligra-2.9.11/flow/stencils/Civil/civil_basin.desktop
--- calligra-2.9.7/flow/stencils/Civil/civil_basin.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Civil/civil_basin.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=Резервуар
Name[sk]=Povodie
Name[sv]=Bassäng
+Name[tr]=Leğen
Name[uk]=Резервуар
Name[x-test]=xxBasinxx
Name[zh_CN]=水池
diff -Nru calligra-2.9.7/flow/stencils/Civil/civil_container.desktop calligra-2.9.11/flow/stencils/Civil/civil_container.desktop
--- calligra-2.9.7/flow/stencils/Civil/civil_container.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Civil/civil_container.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Kontajner
Name[sl]=Vsebnik
Name[sv]=Behållare
+Name[tr]=Taşıyıcı
Name[ug]=قاچا
Name[uk]=Контейнер
Name[x-test]=xxContainerxx
diff -Nru calligra-2.9.7/flow/stencils/Civil/civil_final-settling_basin.desktop calligra-2.9.11/flow/stencils/Civil/civil_final-settling_basin.desktop
--- calligra-2.9.7/flow/stencils/Civil/civil_final-settling_basin.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Civil/civil_final-settling_basin.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Резервуар конечной обработки
Name[sk]=Koncová odkalovacia nádrž
Name[sv]=Slutsedimenteringsbassäng
+Name[tr]=Son-Durultma Havuzu
Name[uk]=Резервуар для кінцевого продукту
Name[x-test]=xxFinal-Settling Basinxx
Name[zh_CN]=最终沉淀池
diff -Nru calligra-2.9.7/flow/stencils/Contact/c_if.desktop calligra-2.9.11/flow/stencils/Contact/c_if.desktop
--- calligra-2.9.7/flow/stencils/Contact/c_if.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/c_if.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,8 +26,9 @@
Name[pt]=se
Name[pt_BR]=se
Name[ru]=Если
-Name[sk]=if
+Name[sk]=ak
Name[sv]=om
+Name[tr]=if
Name[ug]=if
Name[uk]=if
Name[x-test]=xxifxx
diff -Nru calligra-2.9.7/flow/stencils/Contact/c_ifnot.desktop calligra-2.9.11/flow/stencils/Contact/c_ifnot.desktop
--- calligra-2.9.7/flow/stencils/Contact/c_ifnot.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/c_ifnot.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Если не
Name[sk]=ifnot
Name[sv]=om inte
+Name[tr]=ifnot
Name[uk]=ifnot
Name[x-test]=xxifnotxx
Name[zh_TW]=ifnot
diff -Nru calligra-2.9.7/flow/stencils/Contact/c_lamp.desktop calligra-2.9.11/flow/stencils/Contact/c_lamp.desktop
--- calligra-2.9.7/flow/stencils/Contact/c_lamp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/c_lamp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Лампа
Name[sk]=lampa
Name[sv]=lampa
+Name[tr]=lamba
Name[uk]=lamp
Name[x-test]=xxlampxx
Name[zh_TW]=燈
diff -Nru calligra-2.9.7/flow/stencils/Contact/collection.desktop calligra-2.9.11/flow/stencils/Contact/collection.desktop
--- calligra-2.9.7/flow/stencils/Contact/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Kontakt
Name[sl]=Stik
Name[sv]=Kontakt
+Name[tr]=İletişim
Name[ug]=ئالاقەداش
Name[uk]=Контакт
Name[x-test]=xxContactxx
diff -Nru calligra-2.9.7/flow/stencils/Contact/c_relay.desktop calligra-2.9.11/flow/stencils/Contact/c_relay.desktop
--- calligra-2.9.7/flow/stencils/Contact/c_relay.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/c_relay.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=relé
Name[sl]=relé
Name[sv]=relä
+Name[tr]=röle
Name[ug]=ئۇلاپ تارقاتماق
Name[uk]=реле
Name[x-test]=xxrelayxx
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_if.desktop calligra-2.9.11/flow/stencils/Contact/l_if.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_if.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_if.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,8 +26,9 @@
Name[pt]=se
Name[pt_BR]=se
Name[ru]=Если
-Name[sk]=if
+Name[sk]=ak
Name[sv]=om
+Name[tr]=if
Name[ug]=if
Name[uk]=if
Name[x-test]=xxifxx
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_ifnot.desktop calligra-2.9.11/flow/stencils/Contact/l_ifnot.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_ifnot.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_ifnot.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Если не
Name[sk]=ifnot
Name[sv]=om inte
+Name[tr]=ifnot
Name[uk]=ifnot
Name[x-test]=xxifnotxx
Name[zh_TW]=ifnot
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_out.desktop calligra-2.9.11/flow/stencils/Contact/l_out.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_out.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_out.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=out
Name[sk]=von
Name[sv]=ut
+Name[tr]=basit çıktı değişkeni
Name[uk]=out
Name[x-test]=xxoutxx
Name[zh_TW]=out
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_outj.desktop calligra-2.9.11/flow/stencils/Contact/l_outj.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_outj.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_outj.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=outj
Name[sk]=outj
Name[sv]=ut j
+Name[tr]=jump-çıktı değişkeni
Name[uk]=outj
Name[x-test]=xxoutjxx
Name[zh_TW]=outj
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_outnot.desktop calligra-2.9.11/flow/stencils/Contact/l_outnot.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_outnot.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_outnot.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=outnot
Name[sk]=outnot
Name[sv]=ut inte
+Name[tr]=if not-çıktı değişkeni
Name[uk]=outnot
Name[x-test]=xxoutnotxx
Name[zh_TW]=outnot
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_outrcep.desktop calligra-2.9.11/flow/stencils/Contact/l_outrcep.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_outrcep.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_outrcep.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=outrcep
Name[sk]=outrcep
Name[sv]=ut rcep
+Name[tr]=kapasite-çıktı değişkeni
Name[uk]=outrcep
Name[x-test]=xxoutrcepxx
Name[zh_TW]=outrcep
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_outr.desktop calligra-2.9.11/flow/stencils/Contact/l_outr.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_outr.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_outr.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=outr
Name[sk]=outr
Name[sv]=ut r
+Name[tr]=geri dönüş-çıktı değişkeni
Name[uk]=outr
Name[x-test]=xxoutrxx
Name[zh_TW]=outr
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_outs.desktop calligra-2.9.11/flow/stencils/Contact/l_outs.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_outs.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_outs.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=outs
Name[sk]=outs
Name[sv]=outs
+Name[tr]=ayarla-çıktı değişkeni
Name[uk]=outs
Name[x-test]=xxoutsxx
Name[zh_TW]=outs
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_sout.desktop calligra-2.9.11/flow/stencils/Contact/l_sout.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_sout.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_sout.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=sout
Name[sk]=sout
Name[sv]=s ut
+Name[tr]=enerji-tasarruflu, basit çıktı değişkeni
Name[uk]=sout
Name[x-test]=xxsoutxx
Name[zh_TW]=sout
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_soutnot.desktop calligra-2.9.11/flow/stencils/Contact/l_soutnot.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_soutnot.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_soutnot.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=soutnot
Name[sk]=soutnot
Name[sv]=s ut inte
+Name[tr]=enerji-tasarruflu, negatif çıktı değişkeni
Name[uk]=soutnot
Name[x-test]=xxsoutnotxx
Name[zh_TW]=soutnot
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_soutr.desktop calligra-2.9.11/flow/stencils/Contact/l_soutr.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_soutr.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_soutr.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=soutr
Name[sk]=soutr
Name[sv]=s ut r
+Name[tr]=enerji-tasarruflu, yeniden ayarlama çıktı değişkeni
Name[uk]=soutr
Name[x-test]=xxsoutrxx
Name[zh_TW]=soutr
diff -Nru calligra-2.9.7/flow/stencils/Contact/l_souts.desktop calligra-2.9.11/flow/stencils/Contact/l_souts.desktop
--- calligra-2.9.7/flow/stencils/Contact/l_souts.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Contact/l_souts.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=souts
Name[sk]=souts
Name[sv]=s ut s
+Name[tr]=enerji-tasarruflu, ayarlama çıktı değişkeni
Name[uk]=souts
Name[x-test]=xxsoutsxx
Name[zh_TW]=souts
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/b-sens.desktop calligra-2.9.11/flow/stencils/Cybernetics/b-sens.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/b-sens.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/b-sens.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=b-sens
Name[sk]=b-sens
Name[sv]=b-sensor
+Name[tr]=sensör-aşağı
Name[uk]=Датчик (знизу)
Name[x-test]=xxb-sensxx
Name[zh_TW]=b-sens
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/factor-0to-1.desktop calligra-2.9.11/flow/stencils/Cybernetics/factor-0to-1.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/factor-0to-1.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/factor-0to-1.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=фактор-0к-1
Name[sk]=factor-0to-1
Name[sv]=faktor-0till-1
+Name[tr]=sabit faktörü 0dan-1e
Name[uk]=Сталий множник від 0 до -1
Name[x-test]=xxfactor-0to-1xx
Name[zh_TW]=factor-0to-1
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/factor-0to1.desktop calligra-2.9.11/flow/stencils/Cybernetics/factor-0to1.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/factor-0to1.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/factor-0to1.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=фактор-0к1
Name[sk]=factor-0to1
Name[sv]=faktor-0till1
+Name[tr]=sabit faktörü 0dan1e
Name[uk]=Сталий множник від 0 до 1
Name[x-test]=xxfactor-0to1xx
Name[zh_TW]=factor-0to1
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/factor-greater1.desktop calligra-2.9.11/flow/stencils/Cybernetics/factor-greater1.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/factor-greater1.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/factor-greater1.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=фактор-больше1
Name[sk]=factor-greater1
Name[sv]=faktor-större-än-1
+Name[tr]=sabit faktörü 1den büyük
Name[uk]=Сталий множник, більший за 1
Name[x-test]=xxfactor-greater1xx
Name[zh_TW]=factor-greater1
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/factor-smaller-1.desktop calligra-2.9.11/flow/stencils/Cybernetics/factor-smaller-1.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/factor-smaller-1.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/factor-smaller-1.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=фактор-меньше-1
Name[sk]=factor-smaller-1
Name[sv]=faktor-mindre-än-1
+Name[tr]=sabit faktörü -1den küçük
Name[uk]=Сталий множник, менший за 1
Name[x-test]=xxfactor-smaller-1xx
Name[zh_TW]=factor-smaller-1
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/full-wave-rectifier.desktop calligra-2.9.11/flow/stencils/Cybernetics/full-wave-rectifier.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/full-wave-rectifier.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/full-wave-rectifier.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Выпрямитель полной волны
Name[sk]=full-wave-rectifier
Name[sv]=helvågslikriktare
+Name[tr]=tam-dalga-doğrultucu
Name[uk]=Повний міст (модуль)
Name[x-test]=xxfull-wave-rectifierxx
Name[zh_CN]=全波整流
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/half-wave-rectifier.desktop calligra-2.9.11/flow/stencils/Cybernetics/half-wave-rectifier.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/half-wave-rectifier.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/half-wave-rectifier.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Выпрямитель полуволны
Name[sk]=half-wave-rectifier
Name[sv]=halvvågslikriktare
+Name[tr]=yarım-dalga-doğrultucu
Name[uk]=Напівміст
Name[x-test]=xxhalf-wave-rectifierxx
Name[zh_CN]=半波整流
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/l-integrator.desktop calligra-2.9.11/flow/stencils/Cybernetics/l-integrator.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/l-integrator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/l-integrator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=l-интегратор
Name[sk]=l-integrator
Name[sv]=v-integrator
+Name[tr]=sol entegre eden
Name[uk]=Інтегратор (вхід ліворуч)
Name[x-test]=xxl-integratorxx
Name[zh_CN]=L-积分
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/l-minus.desktop calligra-2.9.11/flow/stencils/Cybernetics/l-minus.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/l-minus.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/l-minus.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=l-menos
Name[sk]=l-minus
Name[sv]=v-minus
+Name[tr]=sol girdi çıkarılarak toplam
Name[uk]=Суматор (віднімання входу ліворуч)
Name[x-test]=xxl-minusxx
Name[zh_CN]=L-减
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/lpf.desktop calligra-2.9.11/flow/stencils/Cybernetics/lpf.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/lpf.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/lpf.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Фильтр низких частот
Name[sk]=lpf
Name[sv]=lågpassfilter
+Name[tr]=alçak geçiren filtre
Name[uk]=Фільтр низьких частот
Name[x-test]=xxlpfxx
Name[zh_CN]=LPF
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/l-sens.desktop calligra-2.9.11/flow/stencils/Cybernetics/l-sens.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/l-sens.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/l-sens.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=l-sensor
Name[sk]=l-sens
Name[sv]=v-sensor
+Name[tr]=sensör-sol
Name[uk]=Датчик (ліворуч)
Name[x-test]=xxl-sensxx
Name[zh_CN]=L-SENS
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/negative-shift.desktop calligra-2.9.11/flow/stencils/Cybernetics/negative-shift.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/negative-shift.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/negative-shift.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Сдвиг влево
Name[sk]=záporný posun
Name[sv]=negativ-skift
+Name[tr]=negatif-kayma
Name[uk]=Стале від’ємне зміщення за Oy
Name[x-test]=xxnegative-shiftxx
Name[zh_CN]=负移
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/positive-shift.desktop calligra-2.9.11/flow/stencils/Cybernetics/positive-shift.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/positive-shift.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/positive-shift.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Сдвиг вправо
Name[sk]=kladný posun
Name[sv]=positiv-skift
+Name[tr]=pozitif-kayma
Name[uk]=Стале додатне зміщення за Oy
Name[x-test]=xxpositive-shiftxx
Name[zh_CN]=正移
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/product.desktop calligra-2.9.11/flow/stencils/Cybernetics/product.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/product.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/product.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=produkt
Name[sl]=produkt
Name[sv]=produkt
+Name[tr]=çarpım
Name[uk]=Добуток
Name[x-test]=xxproductxx
Name[zh_CN]=结果
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/relay.desktop calligra-2.9.11/flow/stencils/Cybernetics/relay.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/relay.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/relay.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=relé
Name[sl]=relé
Name[sv]=relä
+Name[tr]=röle
Name[ug]=ئۇلاپ تارقاتماق
Name[uk]=реле
Name[x-test]=xxrelayxx
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/r-integrator.desktop calligra-2.9.11/flow/stencils/Cybernetics/r-integrator.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/r-integrator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/r-integrator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=r-интегратор
Name[sk]=r-integrator
Name[sv]=h-integrator
+Name[tr]=sağ-entegre eden
Name[uk]=Інтегратор (вхід праворуч)
Name[x-test]=xxr-integratorxx
Name[zh_CN]=R-积分
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/r-minus.desktop calligra-2.9.11/flow/stencils/Cybernetics/r-minus.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/r-minus.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/r-minus.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=r-menos
Name[sk]=r-minus
Name[sv]=h-minus
+Name[tr]=sağ girdi çıkarılarak toplam
Name[uk]=Суматор (віднімання входу праворуч)
Name[x-test]=xxr-minusxx
Name[zh_CN]=R-减
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/r-sens.desktop calligra-2.9.11/flow/stencils/Cybernetics/r-sens.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/r-sens.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/r-sens.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=r-sensor
Name[sk]=r-sens
Name[sv]=h-sensor
+Name[tr]=sensör-sağ
Name[uk]=Датчик (праворуч)
Name[x-test]=xxr-sensxx
Name[zh_CN]=R-SENS
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/sigmoid.desktop calligra-2.9.11/flow/stencils/Cybernetics/sigmoid.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/sigmoid.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/sigmoid.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Сигмовидная
Name[sk]=sigmoid
Name[sv]=sigmoid
+Name[tr]=S-şeklinde karakteristik
Name[uk]=Сігмоїд-характеристика
Name[x-test]=xxsigmoidxx
Name[zh_TW]=sigmoid
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/t-integrator.desktop calligra-2.9.11/flow/stencils/Cybernetics/t-integrator.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/t-integrator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/t-integrator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=t-интегратор
Name[sk]=t-integrator
Name[sv]=t-integrator
+Name[tr]=integratör-yukarı girdi
Name[uk]=Інтегратор (вхід згори)
Name[x-test]=xxt-integratorxx
Name[zh_CN]=T-积分
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/t-minus.desktop calligra-2.9.11/flow/stencils/Cybernetics/t-minus.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/t-minus.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/t-minus.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=t-menos
Name[sk]=t-minus
Name[sv]=t-minus
+Name[tr]=üst girdi soyularak toplam
Name[uk]=Суматор (віднімання входу згори)
Name[x-test]=xxt-minusxx
Name[zh_CN]=T-减
diff -Nru calligra-2.9.7/flow/stencils/Cybernetics/t-sens.desktop calligra-2.9.11/flow/stencils/Cybernetics/t-sens.desktop
--- calligra-2.9.7/flow/stencils/Cybernetics/t-sens.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Cybernetics/t-sens.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=t-sensor
Name[sk]=t-sens
Name[sv]=t-sensor
+Name[tr]=sensör-üst
Name[uk]=Датчик (згори)
Name[x-test]=xxt-sensxx
Name[zh_CN]=T-SENS
diff -Nru calligra-2.9.7/flow/stencils/Digital/add_h.desktop calligra-2.9.11/flow/stencils/Digital/add_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/add_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/add_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=add h
Name[sk]=add h
Name[sv]=addera h
+Name[tr]=yatay toplayıcı
Name[uk]=Додавання (горизонтально)
Name[x-test]=xxadd hxx
Name[zh_TW]=add h
diff -Nru calligra-2.9.7/flow/stencils/Digital/add_v.desktop calligra-2.9.11/flow/stencils/Digital/add_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/add_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/add_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=add v
Name[sk]=add v
Name[sv]=addera v
+Name[tr]=dikey toplayıcı
Name[uk]=Додавання (вертикально)
Name[x-test]=xxadd vxx
Name[zh_TW]=add v
diff -Nru calligra-2.9.7/flow/stencils/Digital/and_h.desktop calligra-2.9.11/flow/stencils/Digital/and_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/and_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/and_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=and h
Name[sk]=and h
Name[sv]=och h
+Name[tr]=yatay VE kapısı
Name[uk]=Логічне «І» (горизонтально)
Name[x-test]=xxand hxx
Name[zh_TW]=and h
diff -Nru calligra-2.9.7/flow/stencils/Digital/and_v.desktop calligra-2.9.11/flow/stencils/Digital/and_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/and_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/and_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=and v
Name[sk]=and v
Name[sv]=och v
+Name[tr]=dikey VE kapısı
Name[uk]=Логічне «І» (вертикально)
Name[x-test]=xxand vxx
Name[zh_TW]=and v
diff -Nru calligra-2.9.7/flow/stencils/Digital/buff_h.desktop calligra-2.9.11/flow/stencils/Digital/buff_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/buff_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/buff_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=buff h
Name[sk]=buff h
Name[sv]=buffer h
+Name[tr]=yatay tampon kapısı
Name[uk]=Надсилання до буфера (горизонтально)
Name[x-test]=xxbuff hxx
Name[zh_TW]=buff h
diff -Nru calligra-2.9.7/flow/stencils/Digital/buff_v.desktop calligra-2.9.11/flow/stencils/Digital/buff_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/buff_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/buff_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=buff v
Name[sk]=buff v
Name[sv]=buffer v
+Name[tr]=dikey tampon kapısı
Name[uk]=Надсилання до буфера (вертикально)
Name[x-test]=xxbuff vxx
Name[zh_TW]=buff v
diff -Nru calligra-2.9.7/flow/stencils/Digital/collection.desktop calligra-2.9.11/flow/stencils/Digital/collection.desktop
--- calligra-2.9.7/flow/stencils/Digital/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=Цифровой
Name[sk]=Digitálne
Name[sv]=Digitalt
+Name[tr]=Sayısal
Name[ug]=رەقەملىك
Name[uk]=Обробка цифрових даних
Name[x-test]=xxDigitalxx
diff -Nru calligra-2.9.7/flow/stencils/Digital/conn.desktop calligra-2.9.11/flow/stencils/Digital/conn.desktop
--- calligra-2.9.7/flow/stencils/Digital/conn.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/conn.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=conn
Name[sk]=conn
Name[sv]=anslutning
+Name[tr]=bağ
Name[uk]=З’єднання
Name[x-test]=xxconnxx
Name[zh_TW]=conn
diff -Nru calligra-2.9.7/flow/stencils/Digital/inv_h.desktop calligra-2.9.11/flow/stencils/Digital/inv_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/inv_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/inv_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=inv h
Name[sk]=inv h
Name[sv]=inv h
+Name[tr]=yatay NOT kapısı
Name[uk]=ІНВ (горизонтально)
Name[x-test]=xxinv hxx
Name[zh_TW]=inv h
diff -Nru calligra-2.9.7/flow/stencils/Digital/inv_v.desktop calligra-2.9.11/flow/stencils/Digital/inv_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/inv_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/inv_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=inv v
Name[sk]=inv v
Name[sv]=inv v
+Name[tr]=dikey NOT kapısı
Name[uk]=ІНВ (вертикально)
Name[x-test]=xxinv vxx
Name[zh_TW]=inv v
diff -Nru calligra-2.9.7/flow/stencils/Digital/mux_h.desktop calligra-2.9.11/flow/stencils/Digital/mux_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/mux_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/mux_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=mux h
Name[sk]=mux h
Name[sv]=mux h
+Name[tr]=yatay çoklayıcı
Name[uk]=Мультиплексор (горизонтально)
Name[x-test]=xxmux hxx
Name[zh_TW]=mux h
diff -Nru calligra-2.9.7/flow/stencils/Digital/mux_v.desktop calligra-2.9.11/flow/stencils/Digital/mux_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/mux_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/mux_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=mux v
Name[sk]=mux v
Name[sv]=mux v
+Name[tr]=dikey çoklayıcı
Name[uk]=Мультиплексор (вертикально)
Name[x-test]=xxmux vxx
Name[zh_TW]=mux v
diff -Nru calligra-2.9.7/flow/stencils/Digital/nand_h.desktop calligra-2.9.11/flow/stencils/Digital/nand_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/nand_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/nand_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=nand h
Name[sk]=nand h
Name[sv]=nand h
+Name[tr]=yatay NAND kapısı
Name[uk]=І-НІ (горизонтально)
Name[x-test]=xxnand hxx
Name[zh_TW]=nand h
diff -Nru calligra-2.9.7/flow/stencils/Digital/nand_v.desktop calligra-2.9.11/flow/stencils/Digital/nand_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/nand_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/nand_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=nand v
Name[sk]=nand v
Name[sv]=nand v
+Name[tr]=dikey NAND kapısı
Name[uk]=І-НІ (вертикально)
Name[x-test]=xxnand vxx
Name[zh_TW]=nand v
diff -Nru calligra-2.9.7/flow/stencils/Digital/nor_h.desktop calligra-2.9.11/flow/stencils/Digital/nor_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/nor_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/nor_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=nor h
Name[sk]=nor h
Name[sv]=nor h
+Name[tr]=yatay NOR kapısı
Name[uk]=Запер. «АБО» (горизонтально)
Name[x-test]=xxnor hxx
Name[zh_TW]=nor h
diff -Nru calligra-2.9.7/flow/stencils/Digital/nor_v.desktop calligra-2.9.11/flow/stencils/Digital/nor_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/nor_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/nor_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=nor v
Name[sk]=nor v
Name[sv]=nor v
+Name[tr]=dikey NOR kapısı
Name[uk]=Запер. «АБО» (вертикально)
Name[x-test]=xxnor vxx
Name[zh_TW]=nor v
diff -Nru calligra-2.9.7/flow/stencils/Digital/or_h.desktop calligra-2.9.11/flow/stencils/Digital/or_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/or_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/or_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=or h
Name[sk]=or h
Name[sv]=or h
+Name[tr]=yatay OR kapısı
Name[uk]=Логічне «АБО» (горизонтально)
Name[x-test]=xxor hxx
Name[zh_TW]=or h
diff -Nru calligra-2.9.7/flow/stencils/Digital/or_v.desktop calligra-2.9.11/flow/stencils/Digital/or_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/or_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/or_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=or v
Name[sk]=or v
Name[sv]=or v
+Name[tr]=dikey OR kapısı
Name[uk]=Логічне «АБО» (вертикально)
Name[x-test]=xxor vxx
Name[zh_TW]=or v
diff -Nru calligra-2.9.7/flow/stencils/Digital/reg_h.desktop calligra-2.9.11/flow/stencils/Digital/reg_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/reg_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/reg_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=reg h
Name[sk]=reg h
Name[sv]=reg h
+Name[tr]=yatay regülatör
Name[uk]=Регістр (горизонтально)
Name[x-test]=xxreg hxx
Name[zh_TW]=reg h
diff -Nru calligra-2.9.7/flow/stencils/Digital/reg_v.desktop calligra-2.9.11/flow/stencils/Digital/reg_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/reg_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/reg_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=reg v
Name[sk]=reg v
Name[sv]=reg v
+Name[tr]=dikey regülatör
Name[uk]=Регістр (вертикально)
Name[x-test]=xxreg vxx
Name[zh_TW]=reg v
diff -Nru calligra-2.9.7/flow/stencils/Digital/xnor_h.desktop calligra-2.9.11/flow/stencils/Digital/xnor_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/xnor_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/xnor_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=xnor h
Name[sk]=xnor h
Name[sv]=xnor h
+Name[tr]=yatay XNOR kapısı
Name[uk]=Виключне запер. «АБО» (горизонтально)
Name[x-test]=xxxnor hxx
Name[zh_TW]=xnor h
diff -Nru calligra-2.9.7/flow/stencils/Digital/xnor_v.desktop calligra-2.9.11/flow/stencils/Digital/xnor_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/xnor_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/xnor_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=xnor v
Name[sk]=xnor v
Name[sv]=xnor v
+Name[tr]=dikey XNOR kapısı
Name[uk]=Виключне запер. «АБО» (вертикально)
Name[x-test]=xxxnor vxx
Name[zh_TW]=xnor v
diff -Nru calligra-2.9.7/flow/stencils/Digital/xor_h.desktop calligra-2.9.11/flow/stencils/Digital/xor_h.desktop
--- calligra-2.9.7/flow/stencils/Digital/xor_h.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/xor_h.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=xor h
Name[sk]=xor h
Name[sv]=xor h
+Name[tr]=yatay XOR kapısı
Name[uk]=Виключне «АБО» (горизонтально)
Name[x-test]=xxxor hxx
Name[zh_TW]=xor h
diff -Nru calligra-2.9.7/flow/stencils/Digital/xor_v.desktop calligra-2.9.11/flow/stencils/Digital/xor_v.desktop
--- calligra-2.9.7/flow/stencils/Digital/xor_v.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Digital/xor_v.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=xor v
Name[sk]=xor v
Name[sv]=xor v
+Name[tr]=dikey XOR kapısı
Name[uk]=Виключне «АБО» (вертикально)
Name[x-test]=xxxor vxx
Name[zh_TW]=xor v
diff -Nru calligra-2.9.7/flow/stencils/Edpc/and.desktop calligra-2.9.11/flow/stencils/Edpc/and.desktop
--- calligra-2.9.7/flow/stencils/Edpc/and.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Edpc/and.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Оператор «И»
Name[sk]=And operátor
Name[sv]=Och-operator
+Name[tr]=VE Operatörü
Name[uk]=Оператор «І»
Name[x-test]=xxAnd Operatorxx
Name[zh_CN]=与运算符
diff -Nru calligra-2.9.7/flow/stencils/Edpc/collection.desktop calligra-2.9.11/flow/stencils/Edpc/collection.desktop
--- calligra-2.9.7/flow/stencils/Edpc/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Edpc/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Вычислительный центр
Name[sk]=Edpc
Name[sv]=EDPC
+Name[tr]=Olaya dayalı süreç zinciri
Name[uk]=Керовані подіями ланцюжки обробки
Name[x-test]=xxEdpcxx
Name[zh_TW]=Edpc
diff -Nru calligra-2.9.7/flow/stencils/Edpc/function.desktop calligra-2.9.11/flow/stencils/Edpc/function.desktop
--- calligra-2.9.7/flow/stencils/Edpc/function.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Edpc/function.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,6 +32,7 @@
Name[sk]=Funkcia
Name[sl]=Funkcija
Name[sv]=Funktion
+Name[tr]=Fonksiyon
Name[ug]=فۇنكسىيە
Name[uk]=Функція
Name[x-test]=xxFunctionxx
diff -Nru calligra-2.9.7/flow/stencils/Edpc/or.desktop calligra-2.9.11/flow/stencils/Edpc/or.desktop
--- calligra-2.9.7/flow/stencils/Edpc/or.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Edpc/or.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=Or operátor
Name[sl]=Operator ali (Or)
Name[sv]=Eller-operator
+Name[tr]=VEYA Operatörü
Name[uk]=Оператор «АБО»
Name[x-test]=xxOr Operatorxx
Name[zh_CN]=或运算符
diff -Nru calligra-2.9.7/flow/stencils/Edpc/organisation_unit.desktop calligra-2.9.11/flow/stencils/Edpc/organisation_unit.desktop
--- calligra-2.9.7/flow/stencils/Edpc/organisation_unit.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Edpc/organisation_unit.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[sk]=Organizačná jednotka
Name[sl]=Organizacijska enota
Name[sv]=Organisationsenhet
+Name[tr]=Organizasyon Birimi
Name[uk]=Модуль впорядкування
Name[x-test]=xxOrganisation Unitxx
Name[zh_CN]=组织单元
diff -Nru calligra-2.9.7/flow/stencils/Edpc/xor.desktop calligra-2.9.11/flow/stencils/Edpc/xor.desktop
--- calligra-2.9.7/flow/stencils/Edpc/xor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Edpc/xor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=XOR operátor
Name[sl]=Operator XOR
Name[sv]=XOR-operator
+Name[tr]=XOR Operatörü
Name[uk]=Оператор виключного «АБО»
Name[x-test]=xxXOR Operatorxx
Name[zh_CN]=异或运算符
diff -Nru calligra-2.9.7/flow/stencils/Electric/cnx.desktop calligra-2.9.11/flow/stencils/Electric/cnx.desktop
--- calligra-2.9.7/flow/stencils/Electric/cnx.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/cnx.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=точка соединения
Name[sk]=connpoint
Name[sv]=anslutningspunkt
+Name[tr]=bağlantı noktası
Name[uk]=Точка з’єднання
Name[x-test]=xxconnpointxx
Name[zh_TW]=連接點
diff -Nru calligra-2.9.7/flow/stencils/Electric/collection.desktop calligra-2.9.11/flow/stencils/Electric/collection.desktop
--- calligra-2.9.7/flow/stencils/Electric/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=Elektrické
Name[sl]=Električno
Name[sv]=Elektriskt
+Name[tr]=Elektrik
Name[uk]=Електрика
Name[x-test]=xxElectricxx
Name[zh_CN]=电
diff -Nru calligra-2.9.7/flow/stencils/Electric/command.desktop calligra-2.9.11/flow/stencils/Electric/command.desktop
--- calligra-2.9.7/flow/stencils/Electric/command.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/command.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,6 +32,7 @@
Name[sk]=príkaz
Name[sl]=ukaz
Name[sv]=kommando
+Name[tr]=komut
Name[ug]=بۇيرۇق
Name[uk]=Керівний механізм реле (горизонтально)
Name[x-test]=xxcommandxx
diff -Nru calligra-2.9.7/flow/stencils/Electric/contact_f.desktop calligra-2.9.11/flow/stencils/Electric/contact_f.desktop
--- calligra-2.9.7/flow/stencils/Electric/contact_f.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/contact_f.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=контакт f
Name[sk]=kontakt f
Name[sv]=kontakt f
+Name[tr]=kapalı devre
Name[uk]=Нормально замкнутий контакт (горизонтально)
Name[x-test]=xxcontact fxx
Name[zh_TW]=contact f
diff -Nru calligra-2.9.7/flow/stencils/Electric/contact_o.desktop calligra-2.9.11/flow/stencils/Electric/contact_o.desktop
--- calligra-2.9.7/flow/stencils/Electric/contact_o.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/contact_o.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=контакт o
Name[sk]=kontakt o
Name[sv]=kontakt öppen
+Name[tr]=açık devre
Name[uk]=Нормально розімкнутий контакт (горизонтально)
Name[x-test]=xxcontact oxx
Name[zh_TW]=contact o
diff -Nru calligra-2.9.7/flow/stencils/Electric/intpos_f.desktop calligra-2.9.11/flow/stencils/Electric/intpos_f.desktop
--- calligra-2.9.7/flow/stencils/Electric/intpos_f.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/intpos_f.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=intpos f
Name[sk]=intpos f
Name[sv]=mellanlägg f
+Name[tr]=kapalı anahtar
Name[uk]=Нормально замкнутий перемикач (горизонтально)
Name[x-test]=xxintpos fxx
Name[zh_TW]=intpos f
diff -Nru calligra-2.9.7/flow/stencils/Electric/intpos_o.desktop calligra-2.9.11/flow/stencils/Electric/intpos_o.desktop
--- calligra-2.9.7/flow/stencils/Electric/intpos_o.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/intpos_o.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=intpos o
Name[sk]=intpos o
Name[sv]=mellanlägg öppet
+Name[tr]=açık anahtar
Name[uk]=Нормально розімкнутий перемикач (горизонтально)
Name[x-test]=xxintpos oxx
Name[zh_TW]=intpos o
diff -Nru calligra-2.9.7/flow/stencils/Electric/lamp.desktop calligra-2.9.11/flow/stencils/Electric/lamp.desktop
--- calligra-2.9.7/flow/stencils/Electric/lamp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/lamp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Лампа
Name[sk]=lampa
Name[sv]=lampa
+Name[tr]=lamba
Name[uk]=lamp
Name[x-test]=xxlampxx
Name[zh_TW]=燈
diff -Nru calligra-2.9.7/flow/stencils/Electric/relay.desktop calligra-2.9.11/flow/stencils/Electric/relay.desktop
--- calligra-2.9.7/flow/stencils/Electric/relay.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/relay.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=relé
Name[sl]=relé
Name[sv]=relä
+Name[tr]=röle
Name[ug]=ئۇلاپ تارقاتماق
Name[uk]=реле
Name[x-test]=xxrelayxx
diff -Nru calligra-2.9.7/flow/stencils/Electric/vcommand.desktop calligra-2.9.11/flow/stencils/Electric/vcommand.desktop
--- calligra-2.9.7/flow/stencils/Electric/vcommand.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/vcommand.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=vcommand
Name[sk]=vcommand
Name[sv]=vertikalt kommando
+Name[tr]=Kontrol parçası Röle, dik
Name[uk]=Керівний механізм реле (вертикально)
Name[x-test]=xxvcommandxx
Name[zh_TW]=vcommand
diff -Nru calligra-2.9.7/flow/stencils/Electric/vcontact_f.desktop calligra-2.9.11/flow/stencils/Electric/vcontact_f.desktop
--- calligra-2.9.7/flow/stencils/Electric/vcontact_f.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/vcontact_f.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=vcontact f
Name[sk]=vcontact f
Name[sv]=vertikal kontakt f
+Name[tr]=kapalı devre, dik
Name[uk]=Нормально замкнутий контакт (вертикально)
Name[x-test]=xxvcontact fxx
Name[zh_TW]=vcontact f
diff -Nru calligra-2.9.7/flow/stencils/Electric/vcontact_o.desktop calligra-2.9.11/flow/stencils/Electric/vcontact_o.desktop
--- calligra-2.9.7/flow/stencils/Electric/vcontact_o.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/vcontact_o.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=vcontact o
Name[sk]=vcontact o
Name[sv]=vertikal kontakt öppen
+Name[tr]=açık devre, dik
Name[uk]=Нормально розімкнутий контакт (вертикально)
Name[x-test]=xxvcontact oxx
Name[zh_TW]=vcontact o
diff -Nru calligra-2.9.7/flow/stencils/Electric/vintpos_f.desktop calligra-2.9.11/flow/stencils/Electric/vintpos_f.desktop
--- calligra-2.9.7/flow/stencils/Electric/vintpos_f.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/vintpos_f.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=vintpos f
Name[sk]=vintpos f
Name[sv]=vertikalt mellanlägg f
+Name[tr]=kapalı anahtar, dik
Name[uk]=Нормально замкнутий перемикач (вертикально)
Name[x-test]=xxvintpos fxx
Name[zh_TW]=vintpos f
diff -Nru calligra-2.9.7/flow/stencils/Electric/vintpos_o.desktop calligra-2.9.11/flow/stencils/Electric/vintpos_o.desktop
--- calligra-2.9.7/flow/stencils/Electric/vintpos_o.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/vintpos_o.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=vintpos o
Name[sk]=vintpos o
Name[sv]=vertikalt mellanlägg öppet
+Name[tr]=açık anahtar, dik
Name[uk]=Нормально розімкнутий перемикач (вертикально)
Name[x-test]=xxvintpos oxx
Name[zh_TW]=vintpos o
diff -Nru calligra-2.9.7/flow/stencils/Electric/vlamp.desktop calligra-2.9.11/flow/stencils/Electric/vlamp.desktop
--- calligra-2.9.7/flow/stencils/Electric/vlamp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/vlamp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=lâmpada-v
Name[sk]=vlamp
Name[sv]=vertikal lampa
+Name[tr]=dikey lamba
Name[uk]=Лампа або світловий індикатор (вертикально)
Name[x-test]=xxvlampxx
Name[zh_TW]=vlamp
diff -Nru calligra-2.9.7/flow/stencils/Electric/vrelay.desktop calligra-2.9.11/flow/stencils/Electric/vrelay.desktop
--- calligra-2.9.7/flow/stencils/Electric/vrelay.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric/vrelay.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=v-реле
Name[sk]=vrelay
Name[sv]=vertikalt relä
+Name[tr]=dikey röle
Name[uk]=Реле (вертикально)
Name[x-test]=xxvrelayxx
Name[zh_TW]=vrelay
diff -Nru calligra-2.9.7/flow/stencils/Electric2/ckt-breaker.desktop calligra-2.9.11/flow/stencils/Electric2/ckt-breaker.desktop
--- calligra-2.9.7/flow/stencils/Electric2/ckt-breaker.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric2/ckt-breaker.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Автоматический выключатель
Name[sk]=ckt-breaker
Name[sv]=strömbrytare
+Name[tr]=devre kesici
Name[uk]=Автоматичний вимикач
Name[x-test]=xxckt-breakerxx
Name[zh_TW]=ckt-breaker
diff -Nru calligra-2.9.7/flow/stencils/Electric2/collection.desktop calligra-2.9.11/flow/stencils/Electric2/collection.desktop
--- calligra-2.9.7/flow/stencils/Electric2/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric2/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[sk]=Electric2
Name[sl]=Električno2
Name[sv]=Elektriskt 2
+Name[tr]=Electric2
Name[uk]=Електрика 2
Name[x-test]=xxElectric2xx
Name[zh_CN]=电子2
diff -Nru calligra-2.9.7/flow/stencils/Electric2/isolator.desktop calligra-2.9.11/flow/stencils/Electric2/isolator.desktop
--- calligra-2.9.7/flow/stencils/Electric2/isolator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric2/isolator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=izolant
Name[sl]=izolator
Name[sv]=isolator
+Name[tr]=yalıtıcı
Name[uk]=Ізолятор
Name[x-test]=xxisolatorxx
Name[zh_CN]=隔离器
diff -Nru calligra-2.9.7/flow/stencils/Electric2/transformer.desktop calligra-2.9.11/flow/stencils/Electric2/transformer.desktop
--- calligra-2.9.7/flow/stencils/Electric2/transformer.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electric2/transformer.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=transformátor
Name[sl]=transformator
Name[sv]=transformator
+Name[tr]=dönüştürücü
Name[uk]=Трансформатор
Name[x-test]=xxtransformerxx
Name[zh_CN]=转换器
diff -Nru calligra-2.9.7/flow/stencils/Electronic/ampermeter.desktop calligra-2.9.11/flow/stencils/Electronic/ampermeter.desktop
--- calligra-2.9.7/flow/stencils/Electronic/ampermeter.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/ampermeter.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=ampérmeter
Name[sl]=ampermeter
Name[sv]=amperemätare
+Name[tr]=ampermetre
Name[uk]=Амперметр
Name[x-test]=xxampermeterxx
Name[zh_TW]=ampermeter
diff -Nru calligra-2.9.7/flow/stencils/Electronic/antenna.desktop calligra-2.9.11/flow/stencils/Electronic/antenna.desktop
--- calligra-2.9.7/flow/stencils/Electronic/antenna.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/antenna.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=антена
Name[bs]=antena
Name[ca]=antena
-Name[ca@valencia]=antenna
+Name[ca@valencia]=antena
Name[cs]=anténa
Name[da]=antenne
Name[de]=Antenne
@@ -29,6 +29,7 @@
Name[sk]=anténa
Name[sl]=antena
Name[sv]=antenn
+Name[tr]=anten
Name[uk]=Антенна
Name[x-test]=xxantennaxx
Name[zh_CN]=天线
diff -Nru calligra-2.9.7/flow/stencils/Electronic/bell.desktop calligra-2.9.11/flow/stencils/Electronic/bell.desktop
--- calligra-2.9.7/flow/stencils/Electronic/bell.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/bell.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[sk]=zvonček
Name[sl]=zvonec
Name[sv]=ringklocka
+Name[tr]=zil
Name[ug]=قوڭغۇراق
Name[uk]=Дзвінок
Name[x-test]=xxbellxx
diff -Nru calligra-2.9.7/flow/stencils/Electronic/button.desktop calligra-2.9.11/flow/stencils/Electronic/button.desktop
--- calligra-2.9.7/flow/stencils/Electronic/button.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/button.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[sk]=tlačidlo
Name[sl]=gumb
Name[sv]=knapp
+Name[tr]=düğme
Name[ug]=توپچا
Name[uk]=Кнопка
Name[x-test]=xxbuttonxx
diff -Nru calligra-2.9.7/flow/stencils/Electronic/capacitor.desktop calligra-2.9.11/flow/stencils/Electronic/capacitor.desktop
--- calligra-2.9.7/flow/stencils/Electronic/capacitor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/capacitor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=Конденсатор
Name[sk]=kondenzátor
Name[sv]=kondensator
+Name[tr]=kapasitör
Name[uk]=Конденсатор
Name[x-test]=xxcapacitorxx
Name[zh_CN]=电容
diff -Nru calligra-2.9.7/flow/stencils/Electronic/capacitor_electrolytic.desktop calligra-2.9.11/flow/stencils/Electronic/capacitor_electrolytic.desktop
--- calligra-2.9.7/flow/stencils/Electronic/capacitor_electrolytic.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/capacitor_electrolytic.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Электролитический конденсатор
Name[sk]=kondenzátor elektrolytický
Name[sv]=elektrolytkondensator
+Name[tr]=kondansatör elektrolitik
Name[uk]=Електролітичний конденсатор
Name[x-test]=xxcapacitor electrolyticxx
Name[zh_CN]=电容电解
diff -Nru calligra-2.9.7/flow/stencils/Electronic/collection.desktop calligra-2.9.11/flow/stencils/Electronic/collection.desktop
--- calligra-2.9.7/flow/stencils/Electronic/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,9 +29,10 @@
Name[pt]=Electrónico
Name[pt_BR]=Eletrônico
Name[ru]=Электронные
-Name[sk]=Elektronické
+Name[sk]=Elektronická
Name[sl]=Elektronika
Name[sv]=Elektronik
+Name[tr]=Elektronik
Name[ug]=ئېلېكترونلۇق مۇزىكا
Name[uk]=Електроніка
Name[x-test]=xxElectronicxx
diff -Nru calligra-2.9.7/flow/stencils/Electronic/contact.desktop calligra-2.9.11/flow/stencils/Electronic/contact.desktop
--- calligra-2.9.7/flow/stencils/Electronic/contact.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/contact.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=kontakt
Name[sl]=stik
Name[sv]=kontakt
+Name[tr]=bağlantı
Name[ug]=ئالاقەداش
Name[uk]=Контакт
Name[x-test]=xxcontactxx
diff -Nru calligra-2.9.7/flow/stencils/Electronic/contact_pair.desktop calligra-2.9.11/flow/stencils/Electronic/contact_pair.desktop
--- calligra-2.9.7/flow/stencils/Electronic/contact_pair.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/contact_pair.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Контактная пара
Name[sk]=kontaktný pár
Name[sv]=kontaktpar
+Name[tr]=bağlantı çifti
Name[uk]=Пара контактів
Name[x-test]=xxcontact pairxx
Name[zh_CN]=接触对
diff -Nru calligra-2.9.7/flow/stencils/Electronic/diac.desktop calligra-2.9.11/flow/stencils/Electronic/diac.desktop
--- calligra-2.9.7/flow/stencils/Electronic/diac.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/diac.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Динистор
Name[sk]=diak
Name[sv]=diac
+Name[tr]=iki yönlü diyot anahtarlama
Name[uk]=Діністор
Name[x-test]=xxdiacxx
Name[zh_CN]=DIAC
diff -Nru calligra-2.9.7/flow/stencils/Electronic/di_gate.desktop calligra-2.9.11/flow/stencils/Electronic/di_gate.desktop
--- calligra-2.9.7/flow/stencils/Electronic/di_gate.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/di_gate.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Диодный клапан
Name[sk]=di brána
Name[sv]=dubbelgrind
+Name[tr]=diyot kapısı
Name[uk]=DI-шлюз
Name[x-test]=xxdi gatexx
Name[zh_TW]=di gate
diff -Nru calligra-2.9.7/flow/stencils/Electronic/diode_inverse.desktop calligra-2.9.11/flow/stencils/Electronic/diode_inverse.desktop
--- calligra-2.9.7/flow/stencils/Electronic/diode_inverse.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/diode_inverse.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=diode inverse
Name[bs]=inverzna dioda
Name[ca]=díode invertit
-Name[ca@valencia]=diode invertit
+Name[ca@valencia]=díode invertit
Name[da]=diode inverse
Name[de]=Backward-Diode
Name[el]=αντίστροφη δίοδος
@@ -23,6 +23,7 @@
Name[ru]=Обратный диод
Name[sk]=dióda inverzná
Name[sv]=diod invers
+Name[tr]=diyot ters
Name[uk]=Обернений діод
Name[x-test]=xxdiode inversexx
Name[zh_CN]=反向二极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/diode_schottky.desktop calligra-2.9.11/flow/stencils/Electronic/diode_schottky.desktop
--- calligra-2.9.7/flow/stencils/Electronic/diode_schottky.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/diode_schottky.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=diode schottky
Name[bs]=schottky-eva dioda
Name[ca]=díode schottky
-Name[ca@valencia]=diode schottky
+Name[ca@valencia]=díode schottky
Name[cs]=Schottkyho dioda
Name[da]=schottkydiode
Name[de]=Schottky-Diode
@@ -25,6 +25,7 @@
Name[ru]=Диод Шоттки
Name[sk]=Schottkyho dióda
Name[sv]=diod Schottky
+Name[tr]=diyot schottky
Name[uk]=Діод Шоткі
Name[x-test]=xxdiode schottkyxx
Name[zh_CN]=肖特基二极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/diode_tunnel.desktop calligra-2.9.11/flow/stencils/Electronic/diode_tunnel.desktop
--- calligra-2.9.7/flow/stencils/Electronic/diode_tunnel.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/diode_tunnel.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=diode tunnel
Name[bs]=tunel dioda
Name[ca]=díode tunnel
-Name[ca@valencia]=diode tunnel
+Name[ca@valencia]=díode tunnel
Name[da]=tunneldiode
Name[de]=Tunneldiode
Name[el]=δίαυλος διόδου
@@ -24,6 +24,7 @@
Name[ru]=Туннельный диод
Name[sk]=dióda tunelová
Name[sv]=diod tunnel
+Name[tr]=diyot tünel
Name[uk]=Тунельний діод
Name[x-test]=xxdiode tunnelxx
Name[zh_CN]=隧道二极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/diode_zenner.desktop calligra-2.9.11/flow/stencils/Electronic/diode_zenner.desktop
--- calligra-2.9.7/flow/stencils/Electronic/diode_zenner.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/diode_zenner.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=ценеров диод
Name[bs]=zener dioda
Name[ca]=díode zener
-Name[ca@valencia]=diode zener
+Name[ca@valencia]=díode zener
Name[cs]=Zenerova dioda
Name[da]=zenerdiode
Name[de]=Zener-Diode
@@ -28,6 +28,7 @@
Name[ru]=Зенеровский диод
Name[sk]=dióda zenerova
Name[sv]=diod Zener
+Name[tr]=zener diyodu
Name[uk]=Стабілітрон
Name[x-test]=xxdiode zenerxx
Name[zh_CN]=齐纳二极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/engine.desktop calligra-2.9.11/flow/stencils/Electronic/engine.desktop
--- calligra-2.9.7/flow/stencils/Electronic/engine.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/engine.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=motor
Name[sl]=motor
Name[sv]=motor
+Name[tr]=motor
Name[ug]=ماتور
Name[uk]=Двигун
Name[x-test]=xxenginexx
diff -Nru calligra-2.9.7/flow/stencils/Electronic/ground.desktop calligra-2.9.11/flow/stencils/Electronic/ground.desktop
--- calligra-2.9.7/flow/stencils/Electronic/ground.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/ground.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=Земля
Name[sk]=zem
Name[sv]=jord
+Name[tr]=toprak
Name[uk]=Земля
Name[x-test]=xxgroundxx
Name[zh_CN]=地
diff -Nru calligra-2.9.7/flow/stencils/Electronic/headphone.desktop calligra-2.9.11/flow/stencils/Electronic/headphone.desktop
--- calligra-2.9.7/flow/stencils/Electronic/headphone.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/headphone.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[ru]=Наушники
Name[sk]=slúchadlá
Name[sv]=hörlur
+Name[tr]=kulaklık
Name[uk]=Навушники
Name[x-test]=xxheadphonexx
Name[zh_CN]=耳机
diff -Nru calligra-2.9.7/flow/stencils/Electronic/inductor.desktop calligra-2.9.11/flow/stencils/Electronic/inductor.desktop
--- calligra-2.9.7/flow/stencils/Electronic/inductor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/inductor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=Катушка индуктивности
Name[sk]=vodič
Name[sv]=induktans
+Name[tr]=indüktör
Name[uk]=Індуктивна котушка
Name[x-test]=xxinductorxx
Name[zh_CN]=电感器
diff -Nru calligra-2.9.7/flow/stencils/Electronic/led_display.desktop calligra-2.9.11/flow/stencils/Electronic/led_display.desktop
--- calligra-2.9.7/flow/stencils/Electronic/led_display.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/led_display.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=led displej
Name[sl]=prikazovalnik led
Name[sv]=lysdiodskärm
+Name[tr]=led monitör
Name[uk]=Рідкокристалічний дисплей
Name[x-test]=xxled displayxx
Name[zh_CN]=LED 显示
diff -Nru calligra-2.9.7/flow/stencils/Electronic/microphone.desktop calligra-2.9.11/flow/stencils/Electronic/microphone.desktop
--- calligra-2.9.7/flow/stencils/Electronic/microphone.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/microphone.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,6 +32,7 @@
Name[sk]=mikrofón
Name[sl]=mikrofon
Name[sv]=mikrofon
+Name[tr]=mikrofon
Name[uk]=Мікрофон
Name[x-test]=xxmicrophonexx
Name[zh_CN]=麦克风
diff -Nru calligra-2.9.7/flow/stencils/Electronic/photo_emiting_part.desktop calligra-2.9.11/flow/stencils/Electronic/photo_emiting_part.desktop
--- calligra-2.9.7/flow/stencils/Electronic/photo_emiting_part.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/photo_emiting_part.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Фотоизлучательный элемент
Name[sk]=svetlo emitujúca časť
Name[sv]=fotoemitter
+Name[tr]=ışık yayan diyot
Name[uk]=Випромінювач світла
Name[x-test]=xxphoto emitting partxx
Name[zh_CN]=照片发射部分
diff -Nru calligra-2.9.7/flow/stencils/Electronic/photo_sensitive_part.desktop calligra-2.9.11/flow/stencils/Electronic/photo_sensitive_part.desktop
--- calligra-2.9.7/flow/stencils/Electronic/photo_sensitive_part.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/photo_sensitive_part.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Фоточувствительный элемент
Name[sk]=svetlocitlivá časť
Name[sv]=fotokänslig komponent
+Name[tr]=ışık duyarlı diyot
Name[uk]=Фоточутлива деталь
Name[x-test]=xxphoto sensitive partxx
Name[zh_CN]=照片感光部分
diff -Nru calligra-2.9.7/flow/stencils/Electronic/port_in.desktop calligra-2.9.11/flow/stencils/Electronic/port_in.desktop
--- calligra-2.9.7/flow/stencils/Electronic/port_in.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/port_in.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Входящий порт
Name[sk]=port in
Name[sv]=port in
+Name[tr]=girdi portu
Name[uk]=Вхідний порт
Name[x-test]=xxport inxx
Name[zh_CN]=IN 端口
diff -Nru calligra-2.9.7/flow/stencils/Electronic/port_inout.desktop calligra-2.9.11/flow/stencils/Electronic/port_inout.desktop
--- calligra-2.9.7/flow/stencils/Electronic/port_inout.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/port_inout.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Двусторонний порт
Name[sk]=port inout
Name[sv]=port in-ut
+Name[tr]=girdi/çıktı portu
Name[uk]=Вхідний/Вихідний порт
Name[x-test]=xxport inoutxx
Name[zh_CN]=INOUT 端口
diff -Nru calligra-2.9.7/flow/stencils/Electronic/port_out.desktop calligra-2.9.11/flow/stencils/Electronic/port_out.desktop
--- calligra-2.9.7/flow/stencils/Electronic/port_out.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/port_out.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Исходящий порт
Name[sk]=port out
Name[sv]=port ut
+Name[tr]=çıktı portu
Name[uk]=Вихідний порт
Name[x-test]=xxport outxx
Name[zh_CN]=OUT 端口
diff -Nru calligra-2.9.7/flow/stencils/Electronic/potenciometer.desktop calligra-2.9.11/flow/stencils/Electronic/potenciometer.desktop
--- calligra-2.9.7/flow/stencils/Electronic/potenciometer.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/potenciometer.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[ru]=Потенциометр
Name[sk]=potenciometer
Name[sv]=potentiometer
+Name[tr]=potansiyometre (gerilim ölçer)
Name[uk]=Потенціометр
Name[x-test]=xxpotentiometerxx
Name[zh_CN]=电位计
diff -Nru calligra-2.9.7/flow/stencils/Electronic/source_current.desktop calligra-2.9.11/flow/stencils/Electronic/source_current.desktop
--- calligra-2.9.7/flow/stencils/Electronic/source_current.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/source_current.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Источник тока
Name[sk]=zdroj prúdu
Name[sv]=källa ström
+Name[tr]=kaynak akımı
Name[uk]=Джерело струму
Name[x-test]=xxsource currentxx
Name[zh_CN]=电流源
diff -Nru calligra-2.9.7/flow/stencils/Electronic/source_substitution.desktop calligra-2.9.11/flow/stencils/Electronic/source_substitution.desktop
--- calligra-2.9.7/flow/stencils/Electronic/source_substitution.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/source_substitution.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[pt_BR]=substituição de fonte
Name[sk]=nahradenie zdroja
Name[sv]=källersättning
+Name[tr]=kaynak ikamesi
Name[uk]=Замінник лінеаризованого джерела струму
Name[x-test]=xxsource substitutionxx
Name[zh_CN]=源替代
diff -Nru calligra-2.9.7/flow/stencils/Electronic/source_voltage_alternating.desktop calligra-2.9.11/flow/stencils/Electronic/source_voltage_alternating.desktop
--- calligra-2.9.7/flow/stencils/Electronic/source_voltage_alternating.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/source_voltage_alternating.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Источник переменного тока
Name[sk]=zdroj striedavého napätia
Name[sv]=källa växelspänning
+Name[tr]=kaynak gerilim alternatif
Name[uk]=Джерело змінного струму
Name[x-test]=xxsource voltage alternatingxx
Name[zh_CN]=交流电压源
diff -Nru calligra-2.9.7/flow/stencils/Electronic/source_voltage.desktop calligra-2.9.11/flow/stencils/Electronic/source_voltage.desktop
--- calligra-2.9.7/flow/stencils/Electronic/source_voltage.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/source_voltage.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Источник напряжения
Name[sk]=zdroj napätia
Name[sv]=källa spänning
+Name[tr]=kaynak gerilim
Name[uk]=Джерело напруги
Name[x-test]=xxsource voltagexx
Name[zh_CN]=电压源
diff -Nru calligra-2.9.7/flow/stencils/Electronic/source_voltage_direct.desktop calligra-2.9.11/flow/stencils/Electronic/source_voltage_direct.desktop
--- calligra-2.9.7/flow/stencils/Electronic/source_voltage_direct.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/source_voltage_direct.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Источник постоянного тока
Name[sk]=zdroj jednosmerného napätia
Name[sv]=direktspänningskälla
+Name[tr]=kaynak gerilimi doğrudan
Name[uk]=Джерело постійного струму
Name[x-test]=xxsource voltage directxx
Name[zh_CN]=直流电压源
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Биполярный транзистор npn 1
Name[sk]=tranzistor bipolárny npn 1
Name[sv]=transistor bipolär NPN 1
+Name[tr]=NPN transistör
Name[uk]=Біполярний транзистор NPN 1
Name[x-test]=xxtransistor bipolar npn 1xx
Name[zh_CN]=晶体管双极 NPN 1
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Биполярный транзистор npn 2
Name[sk]=tranzistor bipolárny npn 2
Name[sv]=transistor bipolär NPN 2
+Name[tr]=NPN transistör 2
Name[uk]=Біполярний транзистор NPN 2
Name[x-test]=xxtransistor bipolar npn 2xx
Name[zh_CN]=晶体管双极 NPN 2
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Биполярный транзистор pnp 1
Name[sk]=tranzistor bipolárny pnp 1
Name[sv]=transistor bipolär PNP 1
+Name[tr]=PNP transistör
Name[uk]=Біполярний транзистор PNP 1
Name[x-test]=xxtransistor bipolar pnp 1xx
Name[zh_CN]=晶体管双极 PNP 1
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Биполярный транзистор pnp 2
Name[sk]=tranzistor bipolárny pnp 2
Name[sv]=transistor bipolär PNP 2
+Name[tr]=PNP transistör 2
Name[uk]=Біполярний транзистор PNP 2
Name[x-test]=xxtransistor bipolar pnp 2xx
Name[zh_CN]=晶体管双极 PNP 2
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_jfe_n.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_jfe_n.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_jfe_n.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_jfe_n.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Транзистор jfe n
Name[sk]=tranzistor jfe n
Name[sv]=transistor jfe n
+Name[tr]=transistör N-JFET
Name[uk]=Польовий N-канальний транзистор
Name[x-test]=xxtransistor jfe nxx
Name[zh_CN]=晶体管 JFE N
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_jfe_p.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_jfe_p.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_jfe_p.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_jfe_p.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Транзистор jfe p
Name[sk]=tranzistor jfe p
Name[sv]=transistor jfe p
+Name[tr]=transistör P-JFET
Name[uk]=Польовий P-канальний транзистор
Name[x-test]=xxtransistor jfe pxx
Name[zh_CN]=晶体管 JFE P
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_c_n.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_c_n.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_c_n.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_c_n.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Транзистор misfe c n
Name[sk]=tranzistor misfe c n
Name[sv]=transistor misfe c n
+Name[tr]=transistör N-IGFET
Name[uk]=Метал-оксидний (збіднення) N-канальний транзистор
Name[x-test]=xxtransistor misfe c nxx
Name[zh_TW]=transistor misfe c n
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_c_p.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_c_p.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_c_p.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_c_p.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Транзистор misfe c p
Name[sk]=tranzistor misfe c p
Name[sv]=transistor misfe c p
+Name[tr]=transistör P-IGFET
Name[uk]=Метал-оксидний (збіднення) P-канальний транзистор
Name[x-test]=xxtransistor misfe c pxx
Name[zh_TW]=transistor misfe c p
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_i_n.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_i_n.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_i_n.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_i_n.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Транзистор misfe i n
Name[sk]=tranzistor misfe i n
Name[sv]=transistor misfe i n
+Name[tr]=transistör N-MOSFET
Name[uk]=Метал-оксидний (збагачення) N-канальний транзистор
Name[x-test]=xxtransistor misfe i nxx
Name[zh_TW]=transistor misfe i n
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_i_p.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_i_p.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_misfe_i_p.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_misfe_i_p.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Транзистор misfe i p
Name[sk]=tranzistor misfe i p
Name[sv]=transistor misfe i p
+Name[tr]=transistör P-MOSFET
Name[uk]=Метал-оксидний (збагачення) P-канальний транзистор
Name[x-test]=xxtransistor misfe i pxx
Name[zh_TW]=transistor misfe i p
diff -Nru calligra-2.9.7/flow/stencils/Electronic/transistor_single_pn.desktop calligra-2.9.11/flow/stencils/Electronic/transistor_single_pn.desktop
--- calligra-2.9.7/flow/stencils/Electronic/transistor_single_pn.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/transistor_single_pn.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Транзистор single pn
Name[sk]=tranzistor jednoduchý pn
Name[sv]=transistor enkel pn
+Name[tr]=PN transistör
Name[uk]=Єдине позначення PN-канального транзистора
Name[x-test]=xxtransistor single pnxx
Name[zh_TW]=transistor single pn
diff -Nru calligra-2.9.7/flow/stencils/Electronic/triac.desktop calligra-2.9.11/flow/stencils/Electronic/triac.desktop
--- calligra-2.9.7/flow/stencils/Electronic/triac.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/triac.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=Симистор
Name[sk]=triak
Name[sv]=triac
+Name[tr]=çift transistör
Name[uk]=Симістор
Name[x-test]=xxtriacxx
Name[zh_CN]=三端可控硅器件
diff -Nru calligra-2.9.7/flow/stencils/Electronic/tyristor_diode.desktop calligra-2.9.11/flow/stencils/Electronic/tyristor_diode.desktop
--- calligra-2.9.7/flow/stencils/Electronic/tyristor_diode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/tyristor_diode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=tyristor diode
Name[bs]=tiristor dioda
Name[ca]=díode tiristor
-Name[ca@valencia]=diode tiristor
+Name[ca@valencia]=díode tiristor
Name[cs]=tyristorová dioda
Name[da]=tyristordiode
Name[de]=Tyristor-Diode
@@ -24,6 +24,7 @@
Name[ru]=Динистор
Name[sk]=tyristor dióda
Name[sv]=tyristordiod
+Name[tr]=tristör diyot
Name[uk]=Тиристорний діод
Name[x-test]=xxtyristor diodexx
Name[zh_CN]=可控硅二极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/tyristor_triode.desktop calligra-2.9.11/flow/stencils/Electronic/tyristor_triode.desktop
--- calligra-2.9.7/flow/stencils/Electronic/tyristor_triode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/tyristor_triode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Тринистор
Name[sk]=tyristor trióda
Name[sv]=tyristortriod
+Name[tr]=tristör triyot
Name[uk]=Тиристорний тріод
Name[x-test]=xxtyristor triodexx
Name[zh_CN]=可控硅三极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/vacuum_diode.desktop calligra-2.9.11/flow/stencils/Electronic/vacuum_diode.desktop
--- calligra-2.9.7/flow/stencils/Electronic/vacuum_diode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/vacuum_diode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=vacuum diode
Name[bs]=vakum dioda
Name[ca]=díode de buit
-Name[ca@valencia]=diode de buit
+Name[ca@valencia]=díode de buit
Name[cs]=vakuová dioda
Name[da]=vacuumdiode
Name[de]=Vakuum-Diode
@@ -26,6 +26,7 @@
Name[sk]=vákuová dióda
Name[sl]=vakuumska dioda
Name[sv]=vakuumdiod
+Name[tr]=vakum diyot
Name[uk]=Вакуумний діод
Name[x-test]=xxvacuum diodexx
Name[zh_CN]=真空二极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/vacuum_pentode.desktop calligra-2.9.11/flow/stencils/Electronic/vacuum_pentode.desktop
--- calligra-2.9.7/flow/stencils/Electronic/vacuum_pentode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/vacuum_pentode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Вакуумный пентод
Name[sk]=vákuová pentóda
Name[sv]=vakuumpentod
+Name[tr]=vakum pentot
Name[uk]=Вакуумний пентод
Name[x-test]=xxvacuum pentodexx
Name[zh_CN]=真空五极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/vacuum_triode.desktop calligra-2.9.11/flow/stencils/Electronic/vacuum_triode.desktop
--- calligra-2.9.7/flow/stencils/Electronic/vacuum_triode.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/vacuum_triode.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Вакуумный триод
Name[sk]=vákuová trióda
Name[sv]=vakuumtriod
+Name[tr]=vakum triyot
Name[uk]=Вакуумний тріод
Name[x-test]=xxvacuum triodexx
Name[zh_CN]=真空三极管
diff -Nru calligra-2.9.7/flow/stencils/Electronic/variable_linear_part.desktop calligra-2.9.11/flow/stencils/Electronic/variable_linear_part.desktop
--- calligra-2.9.7/flow/stencils/Electronic/variable_linear_part.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/variable_linear_part.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Переменная линейная часть
Name[sk]=premenná lineárna časť
Name[sv]=variabel linjär komponent
+Name[tr]=değişken doğrusal eleman
Name[uk]=Лінійно змінна деталь
Name[x-test]=xxvariable linear partxx
Name[zh_CN]=可变线性部分
diff -Nru calligra-2.9.7/flow/stencils/Electronic/variable_nonlinear_part.desktop calligra-2.9.11/flow/stencils/Electronic/variable_nonlinear_part.desktop
--- calligra-2.9.7/flow/stencils/Electronic/variable_nonlinear_part.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/variable_nonlinear_part.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Переменная нелинейная часть
Name[sk]=premenná nelineárna časť
Name[sv]=variabel icke-linjär komponent
+Name[tr]=değişken doğrusal olmayan elema
Name[uk]=Нелінійно змінна деталь
Name[x-test]=xxvariable nonlinear partxx
Name[zh_CN]=可变非线性部分
diff -Nru calligra-2.9.7/flow/stencils/Electronic/varicap.desktop calligra-2.9.11/flow/stencils/Electronic/varicap.desktop
--- calligra-2.9.7/flow/stencils/Electronic/varicap.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/varicap.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Варикап
Name[sk]=varikap
Name[sv]=variabel kondensator
+Name[tr]=tuning diyot
Name[uk]=Варіконд
Name[x-test]=xxvaricapxx
Name[zh_CN]=变容
diff -Nru calligra-2.9.7/flow/stencils/Electronic/voltmeter.desktop calligra-2.9.11/flow/stencils/Electronic/voltmeter.desktop
--- calligra-2.9.7/flow/stencils/Electronic/voltmeter.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Electronic/voltmeter.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=voltmeter
Name[sl]=voltmeter
Name[sv]=voltmätare
+Name[tr]=voltmetre
Name[uk]=Вольтметр
Name[x-test]=xxvoltmeterxx
Name[zh_CN]=电压计
diff -Nru calligra-2.9.7/flow/stencils/Flags/antarctica.desktop calligra-2.9.11/flow/stencils/Flags/antarctica.desktop
--- calligra-2.9.7/flow/stencils/Flags/antarctica.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/antarctica.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Антарктика
Name[bs]=Antarktik
Name[ca]=Antàrtida
-Name[ca@valencia]=Antàrtica
+Name[ca@valencia]=Antàrtida
Name[cs]=Antarktida
Name[da]=Antarktis
Name[de]=Antarktis
diff -Nru calligra-2.9.7/flow/stencils/Flags/azerbaijan.desktop calligra-2.9.11/flow/stencils/Flags/azerbaijan.desktop
--- calligra-2.9.7/flow/stencils/Flags/azerbaijan.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/azerbaijan.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Азербайджан
Name[bs]=Azerbejdžan
Name[ca]=Azerbaidjan
-Name[ca@valencia]=Azerbaitjan
+Name[ca@valencia]=Azerbaidjan
Name[cs]=Ázerbájdžán
Name[da]=Azerbajdjan
Name[de]=Aserbaidschan
diff -Nru calligra-2.9.7/flow/stencils/Flags/bangladesh.desktop calligra-2.9.11/flow/stencils/Flags/bangladesh.desktop
--- calligra-2.9.7/flow/stencils/Flags/bangladesh.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/bangladesh.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Бангладеш
Name[bs]=Bangladeš
Name[ca]=Bangla Desh
-Name[ca@valencia]=Bangladesh
+Name[ca@valencia]=Bangla Desh
Name[cs]=Bangladéš
Name[da]=Bangladesh
Name[de]=Bangladesch
diff -Nru calligra-2.9.7/flow/stencils/Flags/central_african_republic.desktop calligra-2.9.11/flow/stencils/Flags/central_african_republic.desktop
--- calligra-2.9.7/flow/stencils/Flags/central_african_republic.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/central_african_republic.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Централноафриканска република
Name[bs]=Srednjoafrička Republika
Name[ca]=República Centreafricana
-Name[ca@valencia]=República Central Africana
+Name[ca@valencia]=República Centreafricana
Name[cs]=Středoafrická republika
Name[da]=Central-afrikanske Republik
Name[de]=Zentralafrikanische Republik
diff -Nru calligra-2.9.7/flow/stencils/Flags/china_prc.desktop calligra-2.9.11/flow/stencils/Flags/china_prc.desktop
--- calligra-2.9.7/flow/stencils/Flags/china_prc.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/china_prc.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=China (PRC)
Name[bs]=Kina(PRC)
Name[ca]=Xina (RPX)
-Name[ca@valencia]=Xina (RPC)
+Name[ca@valencia]=Xina (RPX)
Name[cs]=Čína (ČLR)
Name[da]=Kina (PRC)
Name[de]=Volksrepublik China
diff -Nru calligra-2.9.7/flow/stencils/Flags/china_roc.desktop calligra-2.9.11/flow/stencils/Flags/china_roc.desktop
--- calligra-2.9.7/flow/stencils/Flags/china_roc.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/china_roc.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=China (ROC)
Name[bs]=Kina (ROC)
Name[ca]=Xina (RDX)
-Name[ca@valencia]=Xina (ROC)
+Name[ca@valencia]=Xina (RDX)
Name[da]=Kina (ROC)
Name[de]=Republik China (Taiwan)
Name[el]=Κίνα (Δημοκρατία)
diff -Nru calligra-2.9.7/flow/stencils/Flags/djibouti.desktop calligra-2.9.11/flow/stencils/Flags/djibouti.desktop
--- calligra-2.9.7/flow/stencils/Flags/djibouti.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/djibouti.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -13,7 +13,7 @@
Name[es]=Yibuti
Name[et]=Djibouti
Name[eu]=Djibuti
-Name[fi]=Džibuti
+Name[fi]=Djibouti
Name[fr]=Djibouti
Name[ga]=Djibouti
Name[gl]=Xibutí
diff -Nru calligra-2.9.7/flow/stencils/Flags/ecuador.desktop calligra-2.9.11/flow/stencils/Flags/ecuador.desktop
--- calligra-2.9.7/flow/stencils/Flags/ecuador.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/ecuador.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Еквадор
Name[bs]=Ekvador
Name[ca]=Equador
-Name[ca@valencia]=Ecuador
+Name[ca@valencia]=Equador
Name[cs]=Ekvádor
Name[da]=Ecuador
Name[de]=Ecuador
diff -Nru calligra-2.9.7/flow/stencils/Flags/guyana.desktop calligra-2.9.11/flow/stencils/Flags/guyana.desktop
--- calligra-2.9.7/flow/stencils/Flags/guyana.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/guyana.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,7 +2,7 @@
Name=Guyana
Name[bs]=Gvajana
Name[ca]=Guyana
-Name[ca@valencia]=Guaiana
+Name[ca@valencia]=Guyana
Name[cs]=Guyana
Name[da]=Guyana
Name[de]=Guyana
diff -Nru calligra-2.9.7/flow/stencils/Flags/honduras.desktop calligra-2.9.11/flow/stencils/Flags/honduras.desktop
--- calligra-2.9.7/flow/stencils/Flags/honduras.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/honduras.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Хондурас
Name[bs]=Honduras
Name[ca]=Hondures
-Name[ca@valencia]=Honduras
+Name[ca@valencia]=Hondures
Name[cs]=Honduras
Name[da]=Honduras
Name[de]=Honduras
diff -Nru calligra-2.9.7/flow/stencils/Flags/papua_new_guinea.desktop calligra-2.9.11/flow/stencils/Flags/papua_new_guinea.desktop
--- calligra-2.9.7/flow/stencils/Flags/papua_new_guinea.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/papua_new_guinea.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,7 +32,7 @@
Name[pt_BR]=Papua Nova Guiné
Name[ru]=Папуа-Новая Гвинея
Name[se]=Papua Ođđa-Guinea
-Name[sk]=Papua - Nová Guinea
+Name[sk]=Papua Nová Guinea
Name[sl]=Papua Nova Gvineja
Name[sv]=Papua Nya Guinea
Name[tr]=Papua Yeni Gine
diff -Nru calligra-2.9.7/flow/stencils/Flags/russian_federation.desktop calligra-2.9.11/flow/stencils/Flags/russian_federation.desktop
--- calligra-2.9.7/flow/stencils/Flags/russian_federation.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/russian_federation.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Руска федерация
Name[bs]=Ruska federacija
Name[ca]=Rússia
-Name[ca@valencia]=Federació Russa
+Name[ca@valencia]=Rússia
Name[cs]=Ruská federace
Name[da]=Russiske Føderation
Name[de]=Russische Föderation
diff -Nru calligra-2.9.7/flow/stencils/Flags/sao_tome_and_principe.desktop calligra-2.9.11/flow/stencils/Flags/sao_tome_and_principe.desktop
--- calligra-2.9.7/flow/stencils/Flags/sao_tome_and_principe.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/sao_tome_and_principe.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Сан Томе и Принципи
Name[bs]=Sveti Toma i Princip
Name[ca]=Sao Tomé i Príncipe
-Name[ca@valencia]=São Tomé i Príncipe
+Name[ca@valencia]=Sao Tomé i Príncipe
Name[cs]=Ostrov Svatého Tomáše a Princův ostrov
Name[da]=Sao Tome og Principe
Name[de]=São Tomé und Príncipe
diff -Nru calligra-2.9.7/flow/stencils/Flags/syrian_arab_republic.desktop calligra-2.9.11/flow/stencils/Flags/syrian_arab_republic.desktop
--- calligra-2.9.7/flow/stencils/Flags/syrian_arab_republic.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/syrian_arab_republic.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Сирийска Арабска Република
Name[bs]=Sirija
Name[ca]=Síria
-Name[ca@valencia]=República Àrab Síria
+Name[ca@valencia]=Síria
Name[cs]=Syrská arabská republika
Name[da]=Syrien
Name[de]=Arabische Republik Syrien
diff -Nru calligra-2.9.7/flow/stencils/Flags/united_arab_emirates.desktop calligra-2.9.11/flow/stencils/Flags/united_arab_emirates.desktop
--- calligra-2.9.7/flow/stencils/Flags/united_arab_emirates.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/united_arab_emirates.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Обединени Арабски Емирства
Name[bs]=Ujedinjeni Arapski Emirati
Name[ca]=Unió dels Emirats Àrabs
-Name[ca@valencia]=Emirats Àrabs Units
+Name[ca@valencia]=Unió dels Emirats Àrabs
Name[cs]=Spojené arabské emiráty
Name[da]=Forenende Arabiske Emirater
Name[de]=Vereinigte Arabische Emirate
diff -Nru calligra-2.9.7/flow/stencils/Flags/unitednations.desktop calligra-2.9.11/flow/stencils/Flags/unitednations.desktop
--- calligra-2.9.7/flow/stencils/Flags/unitednations.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/unitednations.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -12,7 +12,7 @@
Name[es]=Naciones Unidas
Name[et]=ÜRO
Name[eu]=Nazio Batuak
-Name[fi]=Yhdistyneet Kansakunnat
+Name[fi]=Yhdistyneet kansakunnat
Name[fr]=Nations unies
Name[gl]=Nacións Unidas
Name[hu]=ENSZ
diff -Nru calligra-2.9.7/flow/stencils/Flags/wake_island.desktop calligra-2.9.11/flow/stencils/Flags/wake_island.desktop
--- calligra-2.9.7/flow/stencils/Flags/wake_island.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/wake_island.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=о-в Уейк
Name[bs]=Otok Wake
Name[ca]=Illes Wake
-Name[ca@valencia]=Illa Wake
+Name[ca@valencia]=Illes Wake
Name[cs]=Ostrov Wake
Name[da]=Wake-øen
Name[de]=Wake Island
diff -Nru calligra-2.9.7/flow/stencils/Flags/yemen.desktop calligra-2.9.11/flow/stencils/Flags/yemen.desktop
--- calligra-2.9.7/flow/stencils/Flags/yemen.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/yemen.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Йемен
Name[bs]=Jemen
Name[ca]=Iemen
-Name[ca@valencia]=Yemen
+Name[ca@valencia]=Iemen
Name[cs]=Jemen
Name[da]=Yemen
Name[de]=Jemen
diff -Nru calligra-2.9.7/flow/stencils/Flags/zimbabwe.desktop calligra-2.9.11/flow/stencils/Flags/zimbabwe.desktop
--- calligra-2.9.7/flow/stencils/Flags/zimbabwe.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Flags/zimbabwe.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Зимбабве
Name[bs]=Zimbabwe
Name[ca]=Zimbàbue
-Name[ca@valencia]=Zimbabwe
+Name[ca@valencia]=Zimbàbue
Name[cs]=Zimbabwe
Name[da]=Zimbabwe
Name[de]=Simbabwe
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_iiii.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_iiii.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_iiii.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_iiii.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть iiii
Name[sk]=časť iii
Name[sv]=iiii-del
+Name[tr]=parça iiii
Name[uk]=Частинка iiii
Name[x-test]=xxpart iiiixx
Name[zh_TW]=part iiii
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_iiio.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_iiio.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_iiio.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_iiio.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть iiio
Name[sk]=časť iiio
Name[sv]=iiio-del
+Name[tr]=parça iiio
Name[uk]=Частинка iiio
Name[x-test]=xxpart iiioxx
Name[zh_TW]=part iiio
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_iioi.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_iioi.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_iioi.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_iioi.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть iioi
Name[sk]=časť iioi
Name[sv]=iiui-del
+Name[tr]=parça iioi
Name[uk]=Частинка iioi
Name[x-test]=xxpart iioixx
Name[zh_TW]=part iioi
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_iioo.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_iioo.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_iioo.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_iioo.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть iioo
Name[sk]=časť iioo
Name[sv]=iiuu-del
+Name[tr]=parça iioo
Name[uk]=Частинка iioo
Name[x-test]=xxpart iiooxx
Name[zh_TW]=part iioo
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_ioii.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_ioii.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_ioii.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_ioii.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть ioii
Name[sk]=časť ioii
Name[sv]=iuii-del
+Name[tr]=parça ioii
Name[uk]=Частинка ioii
Name[x-test]=xxpart ioiixx
Name[zh_TW]=part ioii
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_ioio.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_ioio.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_ioio.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_ioio.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть ioio
Name[sk]=časť ioio
Name[sv]=iuiu-del
+Name[tr]=parça ioio
Name[uk]=Частинка ioio
Name[x-test]=xxpart ioioxx
Name[zh_TW]=part ioio
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_iooi.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_iooi.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_iooi.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_iooi.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть iooi
Name[sk]=časť iooi
Name[sv]=iuui-del
+Name[tr]=parça iooi
Name[uk]=Частинка iooi
Name[x-test]=xxpart iooixx
Name[zh_TW]=part iooi
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_iooo.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_iooo.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_iooo.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_iooo.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть iooo
Name[sk]=časť iooo
Name[sv]=iuuu-del
+Name[tr]=parça iooo
Name[uk]=Частинка iooo
Name[x-test]=xxpart ioooxx
Name[zh_TW]=part iooo
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_oiii.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_oiii.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_oiii.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_oiii.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть oiii
Name[sk]=časť oiii
Name[sv]=uiii-del
+Name[tr]=parça oiii
Name[uk]=Частинка oiii
Name[x-test]=xxpart oiiixx
Name[zh_TW]=part oiii
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_oiio.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_oiio.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_oiio.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_oiio.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть oiio
Name[sk]=časť oiio
Name[sv]=uiiu-del
+Name[tr]=parça oiio
Name[uk]=Частинка oiio
Name[x-test]=xxpart oiioxx
Name[zh_TW]=part oiio
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_oioi.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_oioi.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_oioi.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_oioi.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть oioi
Name[sk]=časť oioi
Name[sv]=uiui-del
+Name[tr]=parça oioi
Name[uk]=Частинка oioi
Name[x-test]=xxpart oioixx
Name[zh_TW]=part oioi
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_oioo.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_oioo.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_oioo.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_oioo.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть oioo
Name[sk]=časť oioo
Name[sv]=uiuu-del
+Name[tr]=parça oioo
Name[uk]=Частинка oioo
Name[x-test]=xxpart oiooxx
Name[zh_TW]=part oioo
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_ooii.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_ooii.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_ooii.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_ooii.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть ooii
Name[sk]=časť ooii
Name[sv]=uuii-del
+Name[tr]=parça ooii
Name[uk]=Частинка ooii
Name[x-test]=xxpart ooiixx
Name[zh_TW]=part ooii
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_ooio.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_ooio.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_ooio.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_ooio.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть ooio
Name[sk]=časť ooio
Name[sv]=uuiu-del
+Name[tr]=parça ooio
Name[uk]=Частинка ooio
Name[x-test]=xxpart ooioxx
Name[zh_TW]=part ooio
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_oooi.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_oooi.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_oooi.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_oooi.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть oooi
Name[sk]=časť oooi
Name[sv]=uuui-del
+Name[tr]=parça oooi
Name[uk]=Частинка oooi
Name[x-test]=xxpart oooixx
Name[zh_TW]=part oooi
diff -Nru calligra-2.9.7/flow/stencils/Jigsaw/part_oooo.desktop calligra-2.9.11/flow/stencils/Jigsaw/part_oooo.desktop
--- calligra-2.9.7/flow/stencils/Jigsaw/part_oooo.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Jigsaw/part_oooo.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=часть oooo
Name[sk]=časť oooo
Name[sv]=uuuu-del
+Name[tr]=parça oooo
Name[uk]=Частинка oooo
Name[x-test]=xxpart ooooxx
Name[zh_TW]=part oooo
diff -Nru calligra-2.9.7/flow/stencils/Lights/ACL.desktop calligra-2.9.11/flow/stencils/Lights/ACL.desktop
--- calligra-2.9.7/flow/stencils/Lights/ACL.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/ACL.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,7 +28,7 @@
Name[ru]=Список контроля доступа (ACL)
Name[sk]=ACL
Name[sv]=ACL
-Name[tr]=EKL
+Name[tr]=ACL
Name[uk]=ACL
Name[x-test]=xxACLxx
Name[zh_CN]=ACL
diff -Nru calligra-2.9.7/flow/stencils/Lights/Blinders.desktop calligra-2.9.11/flow/stencils/Lights/Blinders.desktop
--- calligra-2.9.7/flow/stencils/Lights/Blinders.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/Blinders.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Боковые экраны антенны
Name[sk]=Blinders
Name[sv]=Bländljus
+Name[tr]=Körleştiriciler
Name[uk]=Прожектори з екрануванням
Name[x-test]=xxBlindersxx
Name[zh_CN]=眼罩
diff -Nru calligra-2.9.7/flow/stencils/Lights/collection.desktop calligra-2.9.11/flow/stencils/Lights/collection.desktop
--- calligra-2.9.7/flow/stencils/Lights/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -31,6 +31,7 @@
Name[sk]=Svetlá
Name[sl]=Luči
Name[sv]=Ljus
+Name[tr]=Işıklar
Name[uk]=Освітлення
Name[x-test]=xxLightsxx
Name[zh_CN]=灯
diff -Nru calligra-2.9.7/flow/stencils/Lights/ERS.desktop calligra-2.9.11/flow/stencils/Lights/ERS.desktop
--- calligra-2.9.7/flow/stencils/Lights/ERS.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/ERS.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=ERS
Name[sk]=ERS
Name[sv]=Profilstrålkastare
+Name[tr]=Eliptik reflektör ile farlar
Name[uk]=Еліпсоїдальне світло від рефлектора
Name[x-test]=xxERSxx
Name[zh_TW]=ERS
diff -Nru calligra-2.9.7/flow/stencils/Lights/Fresnel.desktop calligra-2.9.11/flow/stencils/Lights/Fresnel.desktop
--- calligra-2.9.7/flow/stencils/Lights/Fresnel.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/Fresnel.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Френель
Name[sk]=Fresnel
Name[sv]=Fresnel
+Name[tr]=Fresnel lens ile far
Name[uk]=Освітлювач Френеля
Name[x-test]=xxFresnelxx
Name[zh_TW]=Fresnel
diff -Nru calligra-2.9.7/flow/stencils/Lights/Moving_head.desktop calligra-2.9.11/flow/stencils/Lights/Moving_head.desktop
--- calligra-2.9.7/flow/stencils/Lights/Moving_head.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/Moving_head.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Движение вперёд
Name[sk]=Pohyblivá hlava
Name[sv]=Rörligt ljus
+Name[tr]=Hareketli kafa
Name[uk]=Рухома голівка
Name[x-test]=xxMoving headxx
Name[zh_TW]=移動頭
diff -Nru calligra-2.9.7/flow/stencils/Lights/PAR.desktop calligra-2.9.11/flow/stencils/Lights/PAR.desktop
--- calligra-2.9.7/flow/stencils/Lights/PAR.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/PAR.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[ru]=РЛС
Name[sk]=PAR
Name[sv]=PAR
+Name[tr]=PAR Işık
Name[uk]=PAR-прожектор
Name[x-test]=xxPARxx
Name[zh_CN]=PAR
diff -Nru calligra-2.9.7/flow/stencils/Lights/PAR_floor.desktop calligra-2.9.11/flow/stencils/Lights/PAR_floor.desktop
--- calligra-2.9.7/flow/stencils/Lights/PAR_floor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/PAR_floor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Пол РЛС
Name[sk]=PAR floor
Name[sv]=PAR golv
+Name[tr]=Far standı
Name[uk]=PAR-прожектор на підставці
Name[x-test]=xxPAR floorxx
Name[zh_TW]=PAR floor
diff -Nru calligra-2.9.7/flow/stencils/Lights/PC.desktop calligra-2.9.11/flow/stencils/Lights/PC.desktop
--- calligra-2.9.7/flow/stencils/Lights/PC.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/PC.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Каркас Pebble Convex
Name[sk]=Konvexná lampa Pebble
Name[sv]=PC-strålkastare
+Name[tr]=PC spot
Name[uk]=Освітлювач з опуклою лінзою
Name[x-test]=xxPebble Convex lanternxx
Name[zh_TW]=Pebble Convex lantern
diff -Nru calligra-2.9.7/flow/stencils/Lights/Striplight.desktop calligra-2.9.11/flow/stencils/Lights/Striplight.desktop
--- calligra-2.9.7/flow/stencils/Lights/Striplight.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/Striplight.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Узконаправленный свет
Name[sk]=Striplight
Name[sv]=Flodljus
+Name[tr]=Tüp lambası
Name[uk]=Вузькоспрямоване світло
Name[x-test]=xxStriplightxx
Name[zh_CN]=长条状灯
diff -Nru calligra-2.9.7/flow/stencils/Lights/Stroboscope.desktop calligra-2.9.11/flow/stencils/Lights/Stroboscope.desktop
--- calligra-2.9.7/flow/stencils/Lights/Stroboscope.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Lights/Stroboscope.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=Stroboskopové svetlo
Name[sl]=Stroboskopska luč
Name[sv]=Stroboskopljus
+Name[tr]=Strobe ışığı
Name[uk]=Стробоскопічне світло
Name[x-test]=xxStroboscope lightxx
Name[zh_CN]=频闪灯
diff -Nru calligra-2.9.7/flow/stencils/Logic/and.desktop calligra-2.9.11/flow/stencils/Logic/and.desktop
--- calligra-2.9.7/flow/stencils/Logic/and.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/and.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,7 +26,7 @@
Name[pt]=E
Name[pt_BR]=E
Name[ru]=И
-Name[sk]=And
+Name[sk]=A
Name[sl]=In
Name[sv]=Och
Name[tr]=Ve
diff -Nru calligra-2.9.7/flow/stencils/Logic/connector.desktop calligra-2.9.11/flow/stencils/Logic/connector.desktop
--- calligra-2.9.7/flow/stencils/Logic/connector.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/connector.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[sk]=Konektor
Name[sl]=Povezovalnik
Name[sv]=Kontakt
+Name[tr]=Bağlayıcı
Name[ug]=ئۇلىغۇچ
Name[uk]=З'єднувач
Name[x-test]=xxConnectorxx
diff -Nru calligra-2.9.7/flow/stencils/Logic/inverter.desktop calligra-2.9.11/flow/stencils/Logic/inverter.desktop
--- calligra-2.9.7/flow/stencils/Logic/inverter.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/inverter.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=Инвертор
Name[sk]=Invertor
Name[sv]=Inverterare
+Name[tr]=Çevirici
Name[uk]=Інвертор
Name[x-test]=xxInverterxx
Name[zh_CN]=换流器
diff -Nru calligra-2.9.7/flow/stencils/Logic/nand.desktop calligra-2.9.11/flow/stencils/Logic/nand.desktop
--- calligra-2.9.7/flow/stencils/Logic/nand.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/nand.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[ru]=И-НЕТ
Name[sk]=Nand
Name[sv]=Icke och
+Name[tr]=Nand
Name[uk]=І-НІ
Name[x-test]=xxNandxx
Name[zh_CN]=与非
diff -Nru calligra-2.9.7/flow/stencils/Logic/nor.desktop calligra-2.9.11/flow/stencils/Logic/nor.desktop
--- calligra-2.9.7/flow/stencils/Logic/nor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/nor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[ru]=ИЛИ-НЕ
Name[sk]=Nor
Name[sv]=Icke eller
+Name[tr]=Nor
Name[uk]=Запер. АБО
Name[x-test]=xxNorxx
Name[zh_CN]=或非
diff -Nru calligra-2.9.7/flow/stencils/Logic/not.desktop calligra-2.9.11/flow/stencils/Logic/not.desktop
--- calligra-2.9.7/flow/stencils/Logic/not.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/not.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,9 +28,10 @@
Name[pt]=Não
Name[pt_BR]=Não
Name[ru]=НЕ
-Name[sk]=Not
+Name[sk]=Nie
Name[sl]=Ne
Name[sv]=Icke
+Name[tr]=Not
Name[ug]=Not
Name[uk]=НІ
Name[x-test]=xxNotxx
diff -Nru calligra-2.9.7/flow/stencils/Logic/or.desktop calligra-2.9.11/flow/stencils/Logic/or.desktop
--- calligra-2.9.7/flow/stencils/Logic/or.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/or.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,7 +32,7 @@
Name[sk]=Alebo
Name[sl]=Ali
Name[sv]=Eller
-Name[tr]=Veya
+Name[tr]=Or
Name[ug]=ياكى
Name[uk]=Або
Name[x-test]=xxOrxx
diff -Nru calligra-2.9.7/flow/stencils/Logic/xor.desktop calligra-2.9.11/flow/stencils/Logic/xor.desktop
--- calligra-2.9.7/flow/stencils/Logic/xor.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Logic/xor.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -31,6 +31,7 @@
Name[sk]=Xor
Name[sl]=Xor
Name[sv]=Exklusiv eller
+Name[tr]=Xor
Name[ug]=غەيرىي - ياكى
Name[uk]=Викл. АБО
Name[x-test]=xxXorxx
diff -Nru calligra-2.9.7/flow/stencils/LST/associator_subsystem.desktop calligra-2.9.11/flow/stencils/LST/associator_subsystem.desktop
--- calligra-2.9.7/flow/stencils/LST/associator_subsystem.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/associator_subsystem.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Ассоциатор
Name[sk]=Asociátor
Name[sv]=Associator
+Name[tr]=İlişkilendirici
Name[uk]=Асоціативна підсистема
Name[x-test]=xxAssociatorxx
Name[zh_TW]=結合子
diff -Nru calligra-2.9.7/flow/stencils/LST/decode_subsystem.desktop calligra-2.9.11/flow/stencils/LST/decode_subsystem.desktop
--- calligra-2.9.7/flow/stencils/LST/decode_subsystem.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/decode_subsystem.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Подсистема декодирования
Name[sk]=Dekódovať sybsystém
Name[sv]=Avkodningsdelsystem
+Name[tr]=KodÇözme Altsistemi
Name[uk]=Підсистема декодування
Name[x-test]=xxDecode Subsystemxx
Name[zh_CN]=解码子系统
diff -Nru calligra-2.9.7/flow/stencils/LST/encode_subsystem.desktop calligra-2.9.11/flow/stencils/LST/encode_subsystem.desktop
--- calligra-2.9.7/flow/stencils/LST/encode_subsystem.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/encode_subsystem.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Подсистема кодирования
Name[sk]=Zakódovať subsystém
Name[sv]=Kodningsdelsystem
+Name[tr]=Kodlama Altsistemi
Name[uk]=Підсистема кодування
Name[x-test]=xxEncode Subsystemxx
Name[zh_CN]=编码子系统
diff -Nru calligra-2.9.7/flow/stencils/LST/extruder.desktop calligra-2.9.11/flow/stencils/LST/extruder.desktop
--- calligra-2.9.7/flow/stencils/LST/extruder.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/extruder.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Экструдер
Name[sk]=Extrudér
Name[sv]=Extruder
+Name[tr]=Uzatıcı
Name[uk]=Підсистема видобування
Name[x-test]=xxExtruderxx
Name[zh_CN]=挤压机
diff -Nru calligra-2.9.7/flow/stencils/LST/ingestor_subsystem.desktop calligra-2.9.11/flow/stencils/LST/ingestor_subsystem.desktop
--- calligra-2.9.7/flow/stencils/LST/ingestor_subsystem.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/ingestor_subsystem.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=Ingestão
Name[sk]=Ingestor
Name[sv]=Intag
+Name[tr]=Pikap
Name[uk]=Підсистема харчування
Name[x-test]=xxIngestorxx
Name[zh_TW]=吸收器
diff -Nru calligra-2.9.7/flow/stencils/LST/internal_subsystem.desktop calligra-2.9.11/flow/stencils/LST/internal_subsystem.desktop
--- calligra-2.9.7/flow/stencils/LST/internal_subsystem.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/internal_subsystem.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Внутренний преобразователь
Name[sk]=Interný prevodník
Name[sv]=Intern omvandlare
+Name[tr]=Dahili Sinyal Üretici
Name[uk]=Внутрішній перетворювач
Name[x-test]=xxInternal Transducerxx
Name[zh_CN]=内部换能器
diff -Nru calligra-2.9.7/flow/stencils/LST/it_subsystem.desktop calligra-2.9.11/flow/stencils/LST/it_subsystem.desktop
--- calligra-2.9.7/flow/stencils/LST/it_subsystem.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/it_subsystem.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Преобразователь ввода
Name[sk]=Vstupný prevodník
Name[sv]=Ingångsomvandlare
+Name[tr]=Girdi Sinyal Vericisi
Name[uk]=Перетворювач входу
Name[x-test]=xxInput Transducerxx
Name[zh_CN]=输入换能器
diff -Nru calligra-2.9.7/flow/stencils/LST/mestorage.desktop calligra-2.9.11/flow/stencils/LST/mestorage.desktop
--- calligra-2.9.7/flow/stencils/LST/mestorage.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/mestorage.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Хранилище ME
Name[sk]=ME úložisko
Name[sv]=ME-lagring
+Name[tr]=ME Depolama Aygıt
Name[uk]=Підсистема зберігання пам’яті
Name[x-test]=xxME Storagexx
Name[zh_CN]=ME存储
diff -Nru calligra-2.9.7/flow/stencils/LST/ot_subsystem.desktop calligra-2.9.11/flow/stencils/LST/ot_subsystem.desktop
--- calligra-2.9.7/flow/stencils/LST/ot_subsystem.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/LST/ot_subsystem.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Преобразователь вывода
Name[sk]=Výstupný prevodník
Name[sv]=Utgångsomvandlare
+Name[tr]=Çıktı Sinyal Vericisi
Name[uk]=Перетворювач виходу
Name[x-test]=xxOutput Transducerxx
Name[zh_CN]=输出换能器
diff -Nru calligra-2.9.7/flow/stencils/Map/Corner2.desktop calligra-2.9.11/flow/stencils/Map/Corner2.desktop
--- calligra-2.9.7/flow/stencils/Map/Corner2.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Map/Corner2.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Roh2
Name[sl]=Vogal2
Name[sv]=Hörn 2
+Name[tr]=Köşe 2
Name[uk]=Кут 2
Name[x-test]=xxCorner2xx
Name[zh_TW]=角落2
diff -Nru calligra-2.9.7/flow/stencils/Map/Elevated.desktop calligra-2.9.11/flow/stencils/Map/Elevated.desktop
--- calligra-2.9.7/flow/stencils/Map/Elevated.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Map/Elevated.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=Zvýšený
Name[sl]=Dvignjeno
Name[sv]=Upphöjd
+Name[tr]=Yükseltilmiş
Name[uk]=Підйом
Name[x-test]=xxElevatedxx
Name[zh_TW]=高架
diff -Nru calligra-2.9.7/flow/stencils/Map/T-Junction.desktop calligra-2.9.11/flow/stencils/Map/T-Junction.desktop
--- calligra-2.9.7/flow/stencils/Map/T-Junction.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Map/T-Junction.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[ru]=Тройник
Name[sk]=T-uzol
Name[sv]=T-korsning
+Name[tr]=T-Kavşak
Name[uk]=«T»-перетин доріг
Name[x-test]=xxT-Junctionxx
Name[zh_CN]=三叉路
diff -Nru calligra-2.9.7/flow/stencils/Misc/expended-node.desktop calligra-2.9.11/flow/stencils/Misc/expended-node.desktop
--- calligra-2.9.7/flow/stencils/Misc/expended-node.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Misc/expended-node.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=расширенный узел
Name[sk]=vynaložený uzol
Name[sv]=expanderad nod
+Name[tr]=katlanmamış düğüm
Name[uk]=Розширений вузол
Name[x-test]=xxexpended nodexx
Name[zh_CN]=扩展节点
diff -Nru calligra-2.9.7/flow/stencils/Misc/expensible-node.desktop calligra-2.9.11/flow/stencils/Misc/expensible-node.desktop
--- calligra-2.9.7/flow/stencils/Misc/expensible-node.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Misc/expensible-node.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[sk]=rozpínavý uzol
Name[sl]=razširljivo vozlišče
Name[sv]=expanderbar nod
+Name[tr]=açılabilir düğüm
Name[uk]=Придатний до розширення вузол
Name[x-test]=xxexpansible nodexx
Name[zh_CN]=可展开节点
diff -Nru calligra-2.9.7/flow/stencils/Misc/folder.desktop calligra-2.9.11/flow/stencils/Misc/folder.desktop
--- calligra-2.9.7/flow/stencils/Misc/folder.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Misc/folder.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,7 +30,7 @@
Name[pt]=Pasta
Name[pt_BR]=Pasta
Name[ru]=Папка
-Name[sk]=Priečinok
+Name[sk]=priečinok
Name[sl]=Mapa
Name[sv]=Mapp
Name[tr]=Klasör
diff -Nru calligra-2.9.7/flow/stencils/MSE/collection.desktop calligra-2.9.11/flow/stencils/MSE/collection.desktop
--- calligra-2.9.7/flow/stencils/MSE/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/MSE/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=MSE
Name[sk]=MSE
Name[sv]=MSE
+Name[tr]=MSE
Name[uk]=MSE
Name[x-test]=xxMSExx
Name[zh_CN]=MSE
diff -Nru calligra-2.9.7/flow/stencils/MSE/demultiplexer.desktop calligra-2.9.11/flow/stencils/MSE/demultiplexer.desktop
--- calligra-2.9.7/flow/stencils/MSE/demultiplexer.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/MSE/demultiplexer.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Демултиплексор
Name[bs]=Demultiplekser
Name[ca]=Desmultiplexor
-Name[ca@valencia]=Demultiplexor
+Name[ca@valencia]=Desmultiplexor
Name[da]=Demultiplexer
Name[de]=Demultiplexer
Name[el]=Απο-πολυπλέκτης
@@ -25,6 +25,7 @@
Name[ru]=Демультиплексор
Name[sk]=Demultiplexor
Name[sv]=Demultiplexer
+Name[tr]=Azlayıcı
Name[uk]=Демультиплексор
Name[x-test]=xxDemultiplexerxx
Name[zh_CN]=信号分离器
diff -Nru calligra-2.9.7/flow/stencils/MSE/large_extension_node.desktop calligra-2.9.11/flow/stencils/MSE/large_extension_node.desktop
--- calligra-2.9.7/flow/stencils/MSE/large_extension_node.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/MSE/large_extension_node.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Узел большого расширения
Name[sk]=Veľký rozširujúci uzol
Name[sv]=Stor utökningsnod
+Name[tr]=Büyük Uzantı Düğümü
Name[uk]=Великий розширений вузол
Name[x-test]=xxLarge Extension Nodexx
Name[zh_CN]=大扩展结点
diff -Nru calligra-2.9.7/flow/stencils/MSE/node_center.desktop calligra-2.9.11/flow/stencils/MSE/node_center.desktop
--- calligra-2.9.7/flow/stencils/MSE/node_center.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/MSE/node_center.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -6,7 +6,7 @@
Name[da]=Node Center
Name[de]=Knotenzentrum
Name[el]=Κέντρο κόμβου
-Name[en_GB]=Node Center
+Name[en_GB]=Node Centre
Name[es]=Nodo central
Name[et]=Sõlme keskus
Name[eu]=Nodo-zentroa
@@ -24,6 +24,7 @@
Name[ru]=Центр узлов
Name[sk]=Centrum uzla
Name[sv]=Nodcentral
+Name[tr]=Düğüm Merkezi
Name[uk]=Центр вузла
Name[x-test]=xxNode Centerxx
Name[zh_CN]=节点中心
diff -Nru calligra-2.9.7/flow/stencils/Network/antenna.desktop calligra-2.9.11/flow/stencils/Network/antenna.desktop
--- calligra-2.9.7/flow/stencils/Network/antenna.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/antenna.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Антена
Name[bs]=Antena
Name[ca]=Antena
-Name[ca@valencia]=Antenna
+Name[ca@valencia]=Antena
Name[cs]=Anténa
Name[da]=Antenne
Name[de]=Antenne
diff -Nru calligra-2.9.7/flow/stencils/Network/digitizing_board.desktop calligra-2.9.11/flow/stencils/Network/digitizing_board.desktop
--- calligra-2.9.7/flow/stencils/Network/digitizing_board.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/digitizing_board.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=Плата оцифровки
Name[sk]=Digitalizačná karta
Name[sv]=Digitaliseringsbord
+Name[tr]=Sayısallaştırma Panosu
Name[uk]=Картка оцифровування
Name[x-test]=xxDigitizing Boardxx
Name[zh_TW]=數位版
diff -Nru calligra-2.9.7/flow/stencils/Network/firewall.desktop calligra-2.9.11/flow/stencils/Network/firewall.desktop
--- calligra-2.9.7/flow/stencils/Network/firewall.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/firewall.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Защитна стена
Name[bs]=Firewall
Name[ca]=Tallafoc
-Name[ca@valencia]=Tallafocs
+Name[ca@valencia]=Tallafoc
Name[cs]=Firewall
Name[da]=Firewall
Name[de]=Firewall
diff -Nru calligra-2.9.7/flow/stencils/Network/hub.desktop calligra-2.9.11/flow/stencils/Network/hub.desktop
--- calligra-2.9.7/flow/stencils/Network/hub.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/hub.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -31,6 +31,7 @@
Name[sk]=Rozbočovač
Name[sl]=Vozlišče
Name[sv]=Nätnav
+Name[tr]=Hub
Name[uk]=Концентратор
Name[x-test]=xxHubxx
Name[zh_CN]=集线器
diff -Nru calligra-2.9.7/flow/stencils/Network/pc_minitower.desktop calligra-2.9.11/flow/stencils/Network/pc_minitower.desktop
--- calligra-2.9.7/flow/stencils/Network/pc_minitower.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/pc_minitower.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Компютър в малка кутия
Name[bs]=Malo kućište PC-a
Name[ca]=Una mini torre de PC
-Name[ca@valencia]=Una minitorre de PC
+Name[ca@valencia]=Una mini torre de PC
Name[da]=En minitower-pc
Name[de]=Minitower-PC
Name[el]=Υπολογιστής πύργος μικρού μεγέθους
diff -Nru calligra-2.9.7/flow/stencils/Network/plotter.desktop calligra-2.9.11/flow/stencils/Network/plotter.desktop
--- calligra-2.9.7/flow/stencils/Network/plotter.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/plotter.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=Plotter
Name[sl]=Risalnik
Name[sv]=Kurvritare
+Name[tr]=Çizici
Name[uk]=Плотер
Name[x-test]=xxPlotterxx
Name[zh_TW]=繪圖器
diff -Nru calligra-2.9.7/flow/stencils/Network/printer.desktop calligra-2.9.11/flow/stencils/Network/printer.desktop
--- calligra-2.9.7/flow/stencils/Network/printer.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/printer.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=Všeobecná tlačiareň
Name[sl]=Splošni tiskalnik
Name[sv]=Allmän skrivare
+Name[tr]=Genel Yazıcı
Name[uk]=Типовий принтер
Name[x-test]=xxGeneral Printerxx
Name[zh_TW]=一般印表機
diff -Nru calligra-2.9.7/flow/stencils/Network/rj45plug.desktop calligra-2.9.11/flow/stencils/Network/rj45plug.desktop
--- calligra-2.9.7/flow/stencils/Network/rj45plug.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/rj45plug.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[sk]=RJ45 Wall-Plug
Name[sl]=Zidna vtičnica RJ45
Name[sv]=RJ45-väggkontakt
+Name[tr]=RJ45 duvar-fişi
Name[uk]=Розетка RJ45
Name[x-test]=xxRJ45 Wall-Plugxx
Name[zh_TW]=RJ45 牆上插座
diff -Nru calligra-2.9.7/flow/stencils/Network/router-symbol.desktop calligra-2.9.11/flow/stencils/Network/router-symbol.desktop
--- calligra-2.9.7/flow/stencils/Network/router-symbol.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/router-symbol.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[sk]=Symbol routera
Name[sl]=Simbol za usmerjevalnik
Name[sv]=Routersymbol
+Name[tr]=Yönlendirici Sembolü
Name[uk]=Символ маршрутизатора
Name[x-test]=xxRouter Symbolxx
Name[zh_TW]=路由器符號
diff -Nru calligra-2.9.7/flow/stencils/Network/sceadplug.desktop calligra-2.9.11/flow/stencils/Network/sceadplug.desktop
--- calligra-2.9.7/flow/stencils/Network/sceadplug.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/sceadplug.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[sk]=Stenová zásuvka RJ45
Name[sl]=Zidna vtičnica scEAD
Name[sv]=scEAD-väggkontakt
+Name[tr]=scEAD duvar-fişi
Name[uk]=Розетка scEAD
Name[x-test]=xxscEAD Wall-Plugxx
Name[zh_TW]=scEAD 牆上插座
diff -Nru calligra-2.9.7/flow/stencils/Network/speaker_amp.desktop calligra-2.9.11/flow/stencils/Network/speaker_amp.desktop
--- calligra-2.9.7/flow/stencils/Network/speaker_amp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/speaker_amp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Колонки со встроенным усилителем
Name[sk]=Reproduktor zosilňovača
Name[sv]=En högtalare till förstärkare
+Name[tr]=Bir amplifikatör hoparlör
Name[uk]=Гучномовець з підсилювачем
Name[x-test]=xxAn amplifier speakerxx
Name[zh_TW]=擴音器
diff -Nru calligra-2.9.7/flow/stencils/Network/switch-atm-symbol.desktop calligra-2.9.11/flow/stencils/Network/switch-atm-symbol.desktop
--- calligra-2.9.7/flow/stencils/Network/switch-atm-symbol.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/switch-atm-symbol.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=Switch ATM Symbol
Name[sl]=Simbol za stikalo ATM
Name[sv]=ATM-växelsymbol
+Name[tr]=Anahtar ATM Sembolü
Name[uk]=Символ комутатора ATM
Name[x-test]=xxSwitch ATM Symbolxx
Name[zh_TW]=交換器 ATM 符號
diff -Nru calligra-2.9.7/flow/stencils/Network/switch-symbol.desktop calligra-2.9.11/flow/stencils/Network/switch-symbol.desktop
--- calligra-2.9.7/flow/stencils/Network/switch-symbol.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/switch-symbol.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=Switch Symbol
Name[sl]=Simbol za stikalo
Name[sv]=Växelsymbol
+Name[tr]=Anahtar Sembolü
Name[uk]=Символ комутатора
Name[x-test]=xxSwitch Symbolxx
Name[zh_TW]=交換器符號
diff -Nru calligra-2.9.7/flow/stencils/Network/workstation.desktop calligra-2.9.11/flow/stencils/Network/workstation.desktop
--- calligra-2.9.7/flow/stencils/Network/workstation.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Network/workstation.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=Pracovná stanica
Name[sl]=Delovna postaja
Name[sv]=En arbetsstation
+Name[tr]=Bir İş istasyonu
Name[uk]=Робоча станція
Name[x-test]=xxA Workstationxx
Name[zh_TW]=工作站
diff -Nru calligra-2.9.7/flow/stencils/Optics/atten.desktop calligra-2.9.11/flow/stencils/Optics/atten.desktop
--- calligra-2.9.7/flow/stencils/Optics/atten.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/atten.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Переменный аттенюатор
Name[sk]=Premenlivý zoslabovač
Name[sv]=Variabel dämpare
+Name[tr]=Değişken Zayıflatıcı
Name[uk]=Регульований послаблювач
Name[x-test]=xxVariable Attenuatorxx
Name[zh_TW]=變量衰減器
diff -Nru calligra-2.9.7/flow/stencils/Optics/beam.desktop calligra-2.9.11/flow/stencils/Optics/beam.desktop
--- calligra-2.9.7/flow/stencils/Optics/beam.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/beam.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Луч
Name[sk]=Lúč
Name[sv]=Stråle
+Name[tr]=Işın
Name[uk]=Промінь
Name[x-test]=xxBeamxx
Name[zh_TW]=光束
diff -Nru calligra-2.9.7/flow/stencils/Optics/circulator.desktop calligra-2.9.11/flow/stencils/Optics/circulator.desktop
--- calligra-2.9.7/flow/stencils/Optics/circulator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/circulator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Распространитель
Name[sk]=Cirkulátor
Name[sv]=Cirkulator
+Name[tr]=Devir ettirici
Name[uk]=Циркулятор
Name[x-test]=xxCirculatorxx
Name[zh_TW]=循環器
diff -Nru calligra-2.9.7/flow/stencils/Optics/coupler.desktop calligra-2.9.11/flow/stencils/Optics/coupler.desktop
--- calligra-2.9.7/flow/stencils/Optics/coupler.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/coupler.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Муфта
Name[sk]=Násobič
Name[sv]=Kopplare
+Name[tr]=Çoğaltıcı
Name[uk]=Освітлуювач
Name[x-test]=xxCouplerxx
Name[zh_TW]=聯結器
diff -Nru calligra-2.9.7/flow/stencils/Optics/coupler_vert.desktop calligra-2.9.11/flow/stencils/Optics/coupler_vert.desktop
--- calligra-2.9.7/flow/stencils/Optics/coupler_vert.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/coupler_vert.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Муфта (вертикальная)
Name[sk]=Násobič (zvislý)
Name[sv]=Kopplare (vertikal)
+Name[tr]=Çoğaltıcı (dikey)
Name[uk]=Освітлювач (вертикально)
Name[x-test]=xxCoupler (vertical)xx
Name[zh_TW]=聯結器(垂直)
diff -Nru calligra-2.9.7/flow/stencils/Optics/detector.desktop calligra-2.9.11/flow/stencils/Optics/detector.desktop
--- calligra-2.9.7/flow/stencils/Optics/detector.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/detector.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[sk]=Detektor
Name[sl]=Detektor
Name[sv]=Detektor
+Name[tr]=Algılayıcı
Name[uk]=Індикатор
Name[x-test]=xxDetectorxx
Name[zh_CN]=检测器
diff -Nru calligra-2.9.7/flow/stencils/Optics/detector_vert.desktop calligra-2.9.11/flow/stencils/Optics/detector_vert.desktop
--- calligra-2.9.7/flow/stencils/Optics/detector_vert.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/detector_vert.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=Detektor (zvislý)
Name[sl]=Detektor (navpičen)
Name[sv]=Detektor (vertikal)
+Name[tr]=Detektör (dikey)
Name[uk]=Детектор (вертикально)
Name[x-test]=xxDetector (vertical)xx
Name[zh_TW]=偵測器(垂直)
diff -Nru calligra-2.9.7/flow/stencils/Optics/mod.desktop calligra-2.9.11/flow/stencils/Optics/mod.desktop
--- calligra-2.9.7/flow/stencils/Optics/mod.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/mod.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Модулятор MZ
Name[sk]=MZ modulátor
Name[sv]=MZ-modulator
+Name[tr]=MZ Modülatör
Name[uk]=Модулятор Маха-Цендера
Name[x-test]=xxMZ Modulatorxx
Name[zh_TW]=MZ 調節器
diff -Nru calligra-2.9.7/flow/stencils/Optics/mod_vert.desktop calligra-2.9.11/flow/stencils/Optics/mod_vert.desktop
--- calligra-2.9.7/flow/stencils/Optics/mod_vert.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/mod_vert.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Модулятор MZ (вертикальный)
Name[sk]=MZ modulátor (zvislý)
Name[sv]=MZ-modulator (vertikal)
+Name[tr]=MZ Modülatör (dikey)
Name[uk]=Модулятор Маха-Цендера (вертикально)
Name[x-test]=xxMZ Modulator (vertical)xx
Name[zh_TW]=MZ 調節器(垂直)
diff -Nru calligra-2.9.7/flow/stencils/Optics/phasemod.desktop calligra-2.9.11/flow/stencils/Optics/phasemod.desktop
--- calligra-2.9.7/flow/stencils/Optics/phasemod.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/phasemod.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[sk]=Fázový modulátor
Name[sl]=Fazni modulator
Name[sv]=Fasmodulator
+Name[tr]=Faz Modülatör
Name[uk]=Фазовий модулятор
Name[x-test]=xxPhase Modulatorxx
Name[zh_TW]=相位調節器
diff -Nru calligra-2.9.7/flow/stencils/Optics/phasemod_vert.desktop calligra-2.9.11/flow/stencils/Optics/phasemod_vert.desktop
--- calligra-2.9.7/flow/stencils/Optics/phasemod_vert.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/phasemod_vert.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[sk]=Fázový modulátor (zvislý)
Name[sl]=Fazni modulator (navpični)
Name[sv]=Fasmodulator (vertikal)
+Name[tr]=Faz Modülatör (dikey)
Name[uk]=Фазовий модулятор (вертикально)
Name[x-test]=xxPhase Modulator (vertical)xx
Name[zh_TW]=相位調節器(垂直)
diff -Nru calligra-2.9.7/flow/stencils/Optics/polarisation_control.desktop calligra-2.9.11/flow/stencils/Optics/polarisation_control.desktop
--- calligra-2.9.7/flow/stencils/Optics/polarisation_control.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/polarisation_control.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Контроль поляризации
Name[sk]=Polarizačný ovládač
Name[sv]=Polariseringskontroll
+Name[tr]=Polarizasyon Kontrol
Name[uk]=Керування поляризацією
Name[x-test]=xxPolarisation Controlxx
Name[zh_TW]=極化控制
diff -Nru calligra-2.9.7/flow/stencils/Optics/polarisation_control_vert.desktop calligra-2.9.11/flow/stencils/Optics/polarisation_control_vert.desktop
--- calligra-2.9.7/flow/stencils/Optics/polarisation_control_vert.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/polarisation_control_vert.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Вертикальный контроль поляризации
Name[sk]=Polarizačný ovládač (zvislý)
Name[sv]=Polariseringskontroll (vertikal)
+Name[tr]=Polarizasyon Kontrol (dikey)
Name[uk]=Керування поляризацією (вертикально)
Name[x-test]=xxPolarisation Control (vertical)xx
Name[zh_TW]=極化控制(垂直)
diff -Nru calligra-2.9.7/flow/stencils/Optics/scope.desktop calligra-2.9.11/flow/stencils/Optics/scope.desktop
--- calligra-2.9.7/flow/stencils/Optics/scope.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/scope.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,7 +28,7 @@
Name[sk]=Osciloskop
Name[sl]=Osciloskop
Name[sv]=Oscilloskop
-Name[tr]=Osiloskop
+Name[tr]=Osiloskop
Name[ug]=Oscilloscope
Name[uk]=Осцилоскоп
Name[x-test]=xxOscilloscopexx
diff -Nru calligra-2.9.7/flow/stencils/Optics/spectrum.desktop calligra-2.9.11/flow/stencils/Optics/spectrum.desktop
--- calligra-2.9.7/flow/stencils/Optics/spectrum.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/spectrum.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=Spektrum
Name[sl]=Spekter
Name[sv]=Spektrum
+Name[tr]=Tayf
Name[uk]=Аналізатор спектра
Name[x-test]=xxSpectrumxx
Name[zh_CN]=光谱
diff -Nru calligra-2.9.7/flow/stencils/Optics/tuneable.desktop calligra-2.9.11/flow/stencils/Optics/tuneable.desktop
--- calligra-2.9.7/flow/stencils/Optics/tuneable.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Optics/tuneable.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Настраиваемые муфты
Name[sk]=Nastaviteľný násobič
Name[sv]=Avstämningsbar kopplare
+Name[tr]=Ayarlanabilir Çoğaltıcı
Name[uk]=Освітлювач з можливістю налаштування
Name[x-test]=xxTuneable Couplerxx
Name[zh_TW]=可調整聯結器
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/cnx.desktop calligra-2.9.11/flow/stencils/Pneumatic/cnx.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/cnx.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/cnx.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -25,6 +25,7 @@
Name[ru]=точка соединения
Name[sk]=connpoint
Name[sv]=anslutningspunkt
+Name[tr]=bağlantı noktası
Name[uk]=Точка з’єднання
Name[x-test]=xxconnpointxx
Name[zh_TW]=連接點
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/collection.desktop calligra-2.9.11/flow/stencils/Pneumatic/collection.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=Pneumatické
Name[sl]=Pnevmatsko
Name[sv]=Pneumatik
+Name[tr]=Havalı/Pnömatik
Name[uk]=Пневматика
Name[x-test]=xxPneumaticxx
Name[zh_TW]=充氣裝置
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/comelec1.desktop calligra-2.9.11/flow/stencils/Pneumatic/comelec1.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/comelec1.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/comelec1.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=comelec1
Name[sk]=comelec1
Name[sv]=comelec1
+Name[tr]=Elektrik kontrol (basit bobin)
Name[uk]=Електрична команда (одинарна котушка)
Name[x-test]=xxcomelec1xx
Name[zh_TW]=comelec1
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/comelec2.desktop calligra-2.9.11/flow/stencils/Pneumatic/comelec2.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/comelec2.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/comelec2.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=comelec2
Name[sk]=comelec2
Name[sv]=comelec2
+Name[tr]=Elektrik kontrol (çift bobin)
Name[uk]=Електрична команда (подвійна котушка)
Name[x-test]=xxcomelec2xx
Name[zh_TW]=comelec2
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/commusc.desktop calligra-2.9.11/flow/stencils/Pneumatic/commusc.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/commusc.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/commusc.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=commusc
Name[sk]=commusc
Name[sv]=commusc
+Name[tr]=Kas kontrolü
Name[uk]=Мускульна команда
Name[x-test]=xxcommuscxx
Name[zh_TW]=commusc
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/compb.desktop calligra-2.9.11/flow/stencils/Pneumatic/compb.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/compb.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/compb.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=compb
Name[sk]=compb
Name[sv]=compb
+Name[tr]=Buton kontrolü
Name[uk]=Команда натисканням кнопки
Name[x-test]=xxcompbxx
Name[zh_TW]=compb
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/compilh.desktop calligra-2.9.11/flow/stencils/Pneumatic/compilh.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/compilh.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/compilh.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=compilh
Name[sk]=compilh
Name[sv]=compilh
+Name[tr]=hidrolik tahrikli aracılığıyla dolaylı kontrol
Name[uk]=Непряма команда від гідравлічного керування
Name[x-test]=xxcompilhxx
Name[zh_TW]=compilh
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/compilp.desktop calligra-2.9.11/flow/stencils/Pneumatic/compilp.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/compilp.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/compilp.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=compilp
Name[sk]=compilp
Name[sv]=compilp
+Name[tr]=pnömatik sürücüsü ile dolaylı kontrol
Name[uk]=Непряма команда від пневматичного керування
Name[x-test]=xxcompilpxx
Name[zh_TW]=compilp
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/compush.desktop calligra-2.9.11/flow/stencils/Pneumatic/compush.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/compush.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/compush.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=compush
Name[sk]=compush
Name[sv]=compush
+Name[tr]=iticisinin üzerinde mekanik kontrolü
Name[uk]=Механічна команда (від кулачкового механізму)
Name[x-test]=xxcompushxx
Name[zh_TW]=compush
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/comspr.desktop calligra-2.9.11/flow/stencils/Pneumatic/comspr.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/comspr.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/comspr.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=comspr
Name[sk]=comspr
Name[sv]=comspr
+Name[tr]=Yay üzerinde mekanik kontrol
Name[uk]=Механічна команда від пружини
Name[x-test]=xxcomsprxx
Name[zh_TW]=comspr
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/dejack.desktop calligra-2.9.11/flow/stencils/Pneumatic/dejack.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/dejack.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/dejack.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=DEJack
Name[sk]=DEJack
Name[sv]=DEJack
+Name[tr]=İki uzak silindir
Name[uk]=Поршень подвійної дії
Name[x-test]=xxDEJackxx
Name[zh_TW]=DEJack
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/drain.desktop calligra-2.9.11/flow/stencils/Pneumatic/drain.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/drain.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/drain.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=dreno
Name[sk]=drain
Name[sv]=avlopp
+Name[tr]=hava çıkış memesi
Name[uk]=Вихідний потік повітря
Name[x-test]=xxdrainxx
Name[zh_TW]=drain
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/press.desktop calligra-2.9.11/flow/stencils/Pneumatic/press.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/press.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/press.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
Name[pt_BR]=pressão
Name[sk]=press
Name[sv]=press
+Name[tr]=genel basınç kaynağı
Name[ug]=باس
Name[uk]=Типове джерело тиску
Name[x-test]=xxpressxx
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/presshy.desktop calligra-2.9.11/flow/stencils/Pneumatic/presshy.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/presshy.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/presshy.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=presshy
Name[sk]=presshy
Name[sv]=presshy
+Name[tr]=Hidrolik basınç kaynağı
Name[uk]=Джерело гідравлічного тиску
Name[x-test]=xxpresshyxx
Name[zh_TW]=presshy
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/presspn.desktop calligra-2.9.11/flow/stencils/Pneumatic/presspn.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/presspn.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/presspn.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=presspn
Name[sk]=presspn
Name[sv]=presspn
+Name[tr]=Pnömatik basınç kaynağı
Name[uk]=Джерело пневматичного тиску
Name[x-test]=xxpresspnxx
Name[zh_TW]=presspn
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/seijack.desktop calligra-2.9.11/flow/stencils/Pneumatic/seijack.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/seijack.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/seijack.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=SEIJack
Name[sk]=SEIJack
Name[sv]=SEIJack
+Name[tr]=Tek yönlü tekli silindir
Name[uk]=Поршень одинарної дії з нормальним впусканням
Name[x-test]=xxSEIJackxx
Name[zh_TW]=SEIJack
diff -Nru calligra-2.9.7/flow/stencils/Pneumatic/seojack.desktop calligra-2.9.11/flow/stencils/Pneumatic/seojack.desktop
--- calligra-2.9.7/flow/stencils/Pneumatic/seojack.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Pneumatic/seojack.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=SEOJack
Name[sk]=SEOJack
Name[sv]=SEOJack
+Name[tr]=Tek yönlü tek kulllanımlık silindir
Name[uk]=Поршень одинарної дії з нормальним випусканням
Name[x-test]=xxSEOJackxx
Name[zh_TW]=SEOJack
diff -Nru calligra-2.9.7/flow/stencils/Racks/collection.desktop calligra-2.9.11/flow/stencils/Racks/collection.desktop
--- calligra-2.9.7/flow/stencils/Racks/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Racks/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Стойки
Name[sk]=Racky
Name[sv]=Ställ
+Name[tr]=Raflar
Name[uk]=Стійки
Name[x-test]=xxRacksxx
Name[zh_TW]=機架
diff -Nru calligra-2.9.7/flow/stencils/Racks/power_strip_bs_7.desktop calligra-2.9.11/flow/stencils/Racks/power_strip_bs_7.desktop
--- calligra-2.9.7/flow/stencils/Racks/power_strip_bs_7.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Racks/power_strip_bs_7.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=Extensão de energia BS 7
Name[sk]=Power Strip BS 7
Name[sv]=Grenuttag BS 7
+Name[tr]=Çoklu soket BS 7
Name[uk]=Подовжувач (британський стандарт), 7 гнізд
Name[x-test]=xxPower Strip BS 7xx
Name[zh_TW]=發電站 BS 7
diff -Nru calligra-2.9.7/flow/stencils/Racks/power_strip_schuko_8.desktop calligra-2.9.11/flow/stencils/Racks/power_strip_schuko_8.desktop
--- calligra-2.9.7/flow/stencils/Racks/power_strip_schuko_8.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Racks/power_strip_schuko_8.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=Extensão de energia Schuko 8
Name[sk]=Power Strip Schuko 8
Name[sv]=Grenuttag Schuko 8
+Name[tr]=Çoklu soket schuko 8
Name[uk]=Подовжувач Schuko, 8 гнізд
Name[x-test]=xxPower Strip Schuko 8xx
Name[zh_TW]=發電站 Schuko 8
diff -Nru calligra-2.9.7/flow/stencils/Racks/power_strip_ute_8.desktop calligra-2.9.11/flow/stencils/Racks/power_strip_ute_8.desktop
--- calligra-2.9.7/flow/stencils/Racks/power_strip_ute_8.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Racks/power_strip_ute_8.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=Extensão de energia UTE 8
Name[sk]=Power Strip UTE 8
Name[sv]=Grenuttag UTE 8
+Name[tr]=Çoklu soket UTE 8
Name[uk]=Подовжувач UTE 8 гнізд
Name[x-test]=xxPower Strip UTE 8xx
Name[zh_TW]=發電站 UTE 8
diff -Nru calligra-2.9.7/flow/stencils/Racks/rack_label_anchors_42u.desktop calligra-2.9.11/flow/stencils/Racks/rack_label_anchors_42u.desktop
--- calligra-2.9.7/flow/stencils/Racks/rack_label_anchors_42u.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Racks/rack_label_anchors_42u.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Якори этикеток 42U
Name[sk]=Label Anchors 42U
Name[sv]=Etikettfästen 42U
+Name[tr]=Etiket sabitleyici 42U
Name[uk]=Фіксатори, 42 одиниці
Name[x-test]=xxLabel Anchors 42Uxx
Name[zh_TW]=標籤定錨 42U
diff -Nru calligra-2.9.7/flow/stencils/RDP/place.desktop calligra-2.9.11/flow/stencils/RDP/place.desktop
--- calligra-2.9.7/flow/stencils/RDP/place.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/RDP/place.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -28,6 +28,7 @@
Name[sk]=miesto
Name[sl]=kraj
Name[sv]=plats
+Name[tr]=konum
Name[ug]=ئورۇن
Name[uk]=Місце
Name[x-test]=xxplacexx
diff -Nru calligra-2.9.7/flow/stencils/RDP/place_marquee.desktop calligra-2.9.11/flow/stencils/RDP/place_marquee.desktop
--- calligra-2.9.7/flow/stencils/RDP/place_marquee.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/RDP/place_marquee.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=marcador de local
Name[sk]=umiestnenie v rámčeku
Name[sv]=markerad plats
+Name[tr]=yer işareti
Name[uk]=Область
Name[x-test]=xxplace marqueexx
Name[zh_TW]=place marquee
diff -Nru calligra-2.9.7/flow/stencils/RDP/transition.desktop calligra-2.9.11/flow/stencils/RDP/transition.desktop
--- calligra-2.9.7/flow/stencils/RDP/transition.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/RDP/transition.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=prechod
Name[sl]=prehod
Name[sv]=övergång
+Name[tr]=geçiş
Name[uk]=Передача
Name[x-test]=xxtransitionxx
Name[zh_TW]=transition
diff -Nru calligra-2.9.7/flow/stencils/RDP/t_transition.desktop calligra-2.9.11/flow/stencils/RDP/t_transition.desktop
--- calligra-2.9.7/flow/stencils/RDP/t_transition.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/RDP/t_transition.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Размеренный по времени переход
Name[sk]=časový prechod
Name[sv]=tidtagen övergång
+Name[tr]=zamanlı geçiş
Name[uk]=Відкладена передача
Name[x-test]=xxtimed transitionxx
Name[zh_TW]=timed transition
diff -Nru calligra-2.9.7/flow/stencils/Renewable_Energy/cup_anemometer.desktop calligra-2.9.11/flow/stencils/Renewable_Energy/cup_anemometer.desktop
--- calligra-2.9.7/flow/stencils/Renewable_Energy/cup_anemometer.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Renewable_Energy/cup_anemometer.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Чашечный анемометр
Name[sk]=Pohárový anemometer
Name[sv]=Skålvindmätare
+Name[tr]=Fincan Anemometre
Name[uk]=Чашковий анемометр
Name[x-test]=xxCup Anemometerxx
Name[zh_TW]=杯型風速計
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/callback.desktop calligra-2.9.11/flow/stencils/Scenegraph/callback.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/callback.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/callback.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[sk]=spätné volanie
Name[sl]=povratni klic
Name[sv]=återanrop
+Name[tr]=geriçağırma
Name[uk]=Повернення
Name[x-test]=xxcallbackxx
Name[zh_TW]=回撥
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/collection.desktop calligra-2.9.11/flow/stencils/Scenegraph/collection.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Сценограф
Name[sk]=Scénograf
Name[sv]=Scendiagram
+Name[tr]=Skenograf
Name[uk]=Сценічна графіка
Name[x-test]=xxScenegraphxx
Name[zh_TW]=場景圖片
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/component.desktop calligra-2.9.11/flow/stencils/Scenegraph/component.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/component.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/component.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=komponent
Name[sl]=komponenta
Name[sv]=komponent
+Name[tr]=bileşen
Name[ug]=بۆلەك
Name[uk]=Компонент
Name[x-test]=xxcomponentxx
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/engine.desktop calligra-2.9.11/flow/stencils/Scenegraph/engine.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/engine.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/engine.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -29,6 +29,7 @@
Name[sk]=motor
Name[sl]=motor
Name[sv]=motor
+Name[tr]=motor
Name[ug]=ماتور
Name[uk]=Двигун
Name[x-test]=xxenginexx
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/manipulator.desktop calligra-2.9.11/flow/stencils/Scenegraph/manipulator.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/manipulator.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/manipulator.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Манипулятор
Name[sk]=manipulátor
Name[sv]=manipulator
+Name[tr]=manipülatör
Name[uk]=Маніпулятор
Name[x-test]=xxmanipulatorxx
Name[zh_TW]=操作者
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/nodekit.desktop calligra-2.9.11/flow/stencils/Scenegraph/nodekit.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/nodekit.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/nodekit.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[ru]=Комплект узла
Name[sk]=nodekit
Name[sv]=styrsats
+Name[tr]=bağgrubu
Name[uk]=Набір вузлів
Name[x-test]=xxnodekitxx
Name[zh_TW]=nodekit
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/realtimeglobalfield.desktop calligra-2.9.11/flow/stencils/Scenegraph/realtimeglobalfield.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/realtimeglobalfield.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/realtimeglobalfield.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[ru]=Глобальное поле реального времени
Name[sk]=realtimeglobalfield
Name[sv]=globalt realtidsfält
+Name[tr]=gerçekzamanlıgenelalan
Name[uk]=Загальне поле у режимі реального часу
Name[x-test]=xxrealtimeglobalfieldxx
Name[zh_TW]=即時全景
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/shape.desktop calligra-2.9.11/flow/stencils/Scenegraph/shape.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/shape.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/shape.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,6 +32,7 @@
Name[sk]=tvar
Name[sl]=oblika
Name[sv]=form
+Name[tr]=şekil
Name[ug]=شەكىل
Name[uk]=Форма
Name[x-test]=xxshapexx
diff -Nru calligra-2.9.7/flow/stencils/Scenegraph/soselection.desktop calligra-2.9.11/flow/stencils/Scenegraph/soselection.desktop
--- calligra-2.9.7/flow/stencils/Scenegraph/soselection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Scenegraph/soselection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -21,6 +21,7 @@
Name[pt_BR]=seleção-so
Name[sk]=soselection
Name[sv]=soselection
+Name[tr]=sahne seçimi
Name[uk]=Вибір сцени
Name[x-test]=xxsoselectionxx
Name[zh_TW]=soselection
diff -Nru calligra-2.9.7/flow/stencils/SDL/function.desktop calligra-2.9.11/flow/stencils/SDL/function.desktop
--- calligra-2.9.7/flow/stencils/SDL/function.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/SDL/function.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -32,6 +32,7 @@
Name[sk]=Funkcia
Name[sl]=Funkcija
Name[sv]=Funktion
+Name[tr]=Fonksiyon
Name[ug]=فۇنكسىيە
Name[uk]=Функція
Name[x-test]=xxFunctionxx
diff -Nru calligra-2.9.7/flow/stencils/SDL/inout.desktop calligra-2.9.11/flow/stencils/SDL/inout.desktop
--- calligra-2.9.7/flow/stencils/SDL/inout.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/SDL/inout.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -27,6 +27,7 @@
Name[ru]=Ввод/вывод
Name[sk]=InOut
Name[sv]=In-ut
+Name[tr]=GirdiÇıktı
Name[uk]=Вхід-вихід
Name[x-test]=xxInOutxx
Name[zh_TW]=輸出入
diff -Nru calligra-2.9.7/flow/stencils/SDL/receive.desktop calligra-2.9.11/flow/stencils/SDL/receive.desktop
--- calligra-2.9.7/flow/stencils/SDL/receive.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/SDL/receive.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -30,6 +30,7 @@
Name[sk]=Prijať
Name[sl]=Prejmi
Name[sv]=Mottagning
+Name[tr]=Al
Name[uk]=Отримання
Name[x-test]=xxReceivexx
Name[zh_CN]=接收
diff -Nru calligra-2.9.7/flow/stencils/SDL/stop.desktop calligra-2.9.11/flow/stencils/SDL/stop.desktop
--- calligra-2.9.7/flow/stencils/SDL/stop.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/SDL/stop.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,7 @@
Name[bg]=Спиране
Name[bs]=Stop
Name[ca]=Atura
-Name[ca@valencia]=Para
+Name[ca@valencia]=Atura
Name[cs]=Zastavit
Name[da]=Stop
Name[de]=Anhalten
diff -Nru calligra-2.9.7/flow/stencils/Sybase/ltm.desktop calligra-2.9.11/flow/stencils/Sybase/ltm.desktop
--- calligra-2.9.7/flow/stencils/Sybase/ltm.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Sybase/ltm.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -24,6 +24,7 @@
Name[ru]=Менеждер переноса файлов журнала
Name[sk]=Log Transfer Manager/Rep Agent
Name[sv]=Loggöverföringshantering/repligeringsagent
+Name[tr]=Sistem Günlüğü Aktarma Yöneticisi/Çoğaltma Aracı
Name[uk]=Керування перенесенням журналу/Агент реплікації
Name[x-test]=xxLog Transfer Manager/Rep Agentxx
Name[zh_TW]=紀錄轉換管理/複製代理程式
diff -Nru calligra-2.9.7/flow/stencils/Value_Stream_Mapping/collection.desktop calligra-2.9.11/flow/stencils/Value_Stream_Mapping/collection.desktop
--- calligra-2.9.7/flow/stencils/Value_Stream_Mapping/collection.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/stencils/Value_Stream_Mapping/collection.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -23,6 +23,7 @@
Name[pt_BR]=Mapeamento de sequência de valores
Name[sk]=Mapovanie prúdu hodnôt
Name[sv]=Värdeströmsavbildning
+Name[tr]=Değer Akışı Haritalama
Name[uk]=Показ потоків даних
Name[x-test]=xxValue Stream Mappingxx
Name[zh_TW]=數值串流映射
diff -Nru calligra-2.9.7/flow/templates/basic/basicflow.desktop calligra-2.9.11/flow/templates/basic/basicflow.desktop
--- calligra-2.9.7/flow/templates/basic/basicflow.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/flow/templates/basic/basicflow.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -87,7 +87,7 @@
Comment[nl]=Maakt een document met de basis-stencils voor stroomdiagrammen geladen.
Comment[pl]=Tworzy dokument zawierający podstawowe szablony do diagramów przepływu.
Comment[pt]=Cria um documento com os 'stencils' básicos para fluxogramas carregados.
-Comment[pt_BR]=Cria um documento com os estêncis básicos para fluxogramas carregados.
+Comment[pt_BR]=Cria um documento com os estênceis básicos para fluxogramas carregados.
Comment[ru]=Пустой документ с набором шаблонов для организационной структуры
Comment[se]=Ráhkada dokumeanta masa oktageardaneamus stensiillat leat juo viežžojuvvon.
Comment[sk]=Vytvorí dokument so základnými šablónami pre kreslenie diagramov.
diff -Nru calligra-2.9.7/flow/templates/basic/empty-landscape.desktop calligra-2.9.11/flow/templates/basic/empty-landscape.desktop
--- calligra-2.9.7/flow/templates/basic/empty-landscape.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/flow/templates/basic/empty-landscape.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -60,5 +60,6 @@
Comment[pt_BR]=Cria um documento no formato de paisagem sem qualquer estêncil carregado.
Comment[sk]=Vytvorí dokument orientovaný na šírku bez načítaných šablón.
Comment[sv]=Skapar ett dokument med liggande orientering utan att ladda några schabloner.
+Comment[tr]=Şablon yüklenmemiş bir enine belge oluşturur.
Comment[uk]=Створює порожній документ з альбомною орієнтацією сторінки без завантаження трафаретів.
Comment[x-test]=xxCreates a landscape-oriented document with no stencils loaded.xx
diff -Nru calligra-2.9.7/flow/templates/basic/empty-portrait.desktop calligra-2.9.11/flow/templates/basic/empty-portrait.desktop
--- calligra-2.9.7/flow/templates/basic/empty-portrait.desktop 2015-08-29 14:38:23.000000000 +0000
+++ calligra-2.9.11/flow/templates/basic/empty-portrait.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -30,6 +30,7 @@
Name[pt_BR]=Documento em retrato vazio
Name[sk]=Prázdny stojatý dokument
Name[sv]=Tomt stående dokument
+Name[tr]=Boş Portre Belge
Name[uk]=Порожній книжковий документ
Name[x-test]=xxEmpty Portrait Documentxx
Comment=Creates a portrait-oriented document with no stencils loaded.
@@ -59,5 +60,6 @@
Comment[pt_BR]=Cria um documento no formato de retrato sem qualquer estêncil carregado.
Comment[sk]=Vytvorí dokument orientovaný na výšku bez načítaných šablón.
Comment[sv]=Skapar ett dokument med stående orientering utan att ladda några schabloner.
+Comment[tr]=Şablon yüklenmemiş bir portre-tipi belge oluşturur.
Comment[uk]=Створює порожній документ з книжковою орієнтацією сторінки без завантаження трафаретів.
Comment[x-test]=xxCreates a portrait-oriented document with no stencils loaded.xx
diff -Nru calligra-2.9.7/gemini/calligragemini.desktop calligra-2.9.11/gemini/calligragemini.desktop
--- calligra-2.9.7/gemini/calligragemini.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/gemini/calligragemini.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -3,6 +3,7 @@
Name=Calligra Gemini
Name[bs]=Calligra Gemini
Name[ca]=Calligra Gemini
+Name[ca@valencia]=Calligra Gemini
Name[cs]=Calligra Gemini
Name[da]=Calligra Gemini
Name[de]=Calligra Gemini
@@ -10,6 +11,7 @@
Name[es]=Calligra Gemini
Name[et]=Calligra Gemini
Name[fi]=Calligra Gemini
+Name[gl]=Calligra Gemini
Name[ia]=Calligra Gemini
Name[it]=Calligra Gemini
Name[ja]=Calligra Gemini
@@ -27,6 +29,7 @@
GenericName=Word Processing and Presentation
GenericName[bs]=Obrada teksta i prezentacije
GenericName[ca]=Processament de texts i presentacions
+GenericName[ca@valencia]=Processament de texts i presentacions
GenericName[cs]=Práce s textem a prezentacemi
GenericName[da]=Tekstbehandling og præsentation
GenericName[de]=Textverarbeitung und Präsentation
@@ -34,6 +37,7 @@
GenericName[es]=Procesador de texto y presentaciones
GenericName[et]=Tekstitöötlus ja esitlused
GenericName[fi]=Tekstinkäsittely ja esitykset
+GenericName[gl]=Procesador de texto e presentacións
GenericName[it]=Elaboratore di testi e presentazioni
GenericName[ja]=ワードプロセッサとプレゼンテーション
GenericName[nb]=Tekstbehandling og presentasjoner
diff -Nru calligra-2.9.7/gemini/CMakeLists.txt calligra-2.9.11/gemini/CMakeLists.txt
--- calligra-2.9.7/gemini/CMakeLists.txt 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/gemini/CMakeLists.txt 2016-02-02 19:53:13.000000000 +0000
@@ -56,7 +56,7 @@
if (WIN32)
set(calligragemini_SRCS ${calligragemini_SRCS} calligrageminiwin.rc)
else ()
- kde4_add_app_icon(calligragemini_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/calligragemini.png")
+ kde4_add_app_icon(calligragemini_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-calligragemini.png")
endif ()
# Thumbnail helper application
@@ -94,6 +94,9 @@
#install(FILES calligragemini.rc DESTINATION ${DATA_INSTALL_DIR}/calligragemini)
install(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/calligragemini)
install(DIRECTORY themes DESTINATION ${DATA_INSTALL_DIR}/calligragemini)
+if(APPLE)
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/calligragemini_SRCS.icns DESTINATION ${BUNDLE_INSTALL_DIR}/calligragemini.app/Contents/Resources)
+endif()
add_subdirectory(pics)
add_subdirectory(cloud)
diff -Nru calligra-2.9.7/karbon/CMakeLists.txt calligra-2.9.11/karbon/CMakeLists.txt
--- calligra-2.9.7/karbon/CMakeLists.txt 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/CMakeLists.txt 2016-02-02 19:53:13.000000000 +0000
@@ -50,10 +50,11 @@
kde4_add_app_icon( karbon_KDEINIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/hi*-app-calligrakarbon.png" )
kde4_add_kdeinit_executable( karbon ${karbon_KDEINIT_SRCS})
-if (Q_WS_MAC)
+if (APPLE)
set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.calligra.karbon")
set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Karbon 2")
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/karbon_KDEINIT_SRCS.icns DESTINATION ${BUNDLE_INSTALL_DIR}/karbon.app/Contents/Resources)
endif ()
target_link_libraries(kdeinit_karbon karbonui)
diff -Nru calligra-2.9.7/karbon/common/commands/KarbonBooleanCommand.cpp calligra-2.9.11/karbon/common/commands/KarbonBooleanCommand.cpp
--- calligra-2.9.7/karbon/common/commands/KarbonBooleanCommand.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/common/commands/KarbonBooleanCommand.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -28,7 +28,7 @@
#include
-class Q_DECL_HIDDEN KarbonBooleanCommand::Private
+class KarbonBooleanCommand::Private
{
public:
Private(KoShapeBasedDocumentBase * c)
diff -Nru calligra-2.9.7/karbon/data/karbon.appdata.xml calligra-2.9.11/karbon/data/karbon.appdata.xml
--- calligra-2.9.7/karbon/data/karbon.appdata.xml 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/data/karbon.appdata.xml 2016-02-02 19:53:13.000000000 +0000
@@ -6,6 +6,7 @@
Karbon
Karbon
Karbon
+ Karbon
Karbon
Karbon
Karbon
@@ -14,6 +15,7 @@
Karbon
Karbon
Karbon
+ Karbon
Karbon
Karbon
Karbon
@@ -29,6 +31,7 @@
Scalable Graphics
Grafika koja se može skalirati
Gràfics escalables
+ Gràfics escalables
Škálovatelná grafika
Skalierbare Vektorgrafik
Scalable Graphics
@@ -36,6 +39,7 @@
Vektorgraafika
Skaalautuva grafiikka
Graphisme vectoriel
+ Editor de imaxes vectoriais
Graphicos scalabile
Grafica scalabile
画像の寸法
@@ -56,6 +60,7 @@
Karbon je vektorska aplikacija za crtanje s korisničkim sučeljem koje je jednostavno za korištenje , vrlo prilagodljivo i proširivo . To čini Karbon odličnom aplikacijom za korisnike koji počinju istraživati svijet vektorske grafike , kao i za umjetnike koji žele stvoriti prekrasnu vektorsku umjetnost .
El Karbon és una aplicació de dibuix vectorial amb una interfície d'usuari senzilla d'utilitzar, que es pot personalitzar i ampliar molt. Això converteix el Karbon en una gran aplicació per usuaris que comencin a explorar el món dels gràfics vectorials i també pels artistes que volen crear art vectorial que deixi bocabadat.
+ El Karbon és una aplicació de dibuix vectorial amb una interfície d'usuari senzilla d'utilitzar, que es pot personalitzar i ampliar molt. Això converteix el Karbon en una gran aplicació per usuaris que comencen a explorar el món dels gràfics vectorials i també pels artistes que volen crear art vectorial que deixi bocabadat.
Karbon is a vector drawing application with a user interface that is easy to use, highly customisable and extensible. That makes Karbon a great application for users starting to explore the world of vector graphics as well as for artists wanting to create breathtaking vector art.
Karbon es una aplicación de dibujo vectorial que dispone de una interfaz de usuario intuitiva, altamente personalizable y extensible. Todo ello hace que Karbon sea una gran aplicación para aquellos usuarios que empiezan a explorar el mundo de los gráficos vectoriales, así como para los artistas que desean crear impresionantes piezas de arte vectorial.
Karbon on vektorgraafikarakendus hõlpsasti kasutatava, äärmiselt kohandatava ja laiendatava kasutajaliidesega. See muudab Karboni imeheaks abivahendiks algajale, kes alles uudistab vektorgraafika maailma, aga ka kunstnikele, kes soovivad luua hingematvalt kaunist vektorgraafikat.
@@ -74,6 +79,7 @@
Features:
Svojstva:
Característiques:
+ Característiques:
Vlastnosti:
Funktionen:
Features:
@@ -81,6 +87,7 @@
Omadused:
Ominaisuuksia:
Fonctionnalités :
+ Funcionalidades:
Characteristicas
Funzionalità:
機能:
@@ -99,12 +106,14 @@
Učitavanje podrške za ODG, SVG, WPG, WMF, EPS/PS
Permet llegir ODG, SVG, WPG, WMF, EPS/PS
+ Permet llegir ODG, SVG, WPG, WMF, EPS/PS
Unterstützung für das Laden von ODG, SVG, WPG, WMF, EPS/PS
Loading support for ODG, SVG, WPG, WMF, EPS/PS
Admite la carga de ODG, SVG, WPG, WMF, EPS/PS
ODG, SVG, WPG, WMF, EPS/PS laadimise toetamine
Lukutuki ODG-, SVG-, WPG-, WMF- ja EPS/PS-muodoista
Lecture des formats ODG, SVG, WPG, WMF, EPS/PS
+ Capacidade para cargar ODG, SVG, WPG, WMF e EPS/PS.
Cargante supporto pro ODG, SVG, WPG, WMF, EPS/PS
Supporto per il caricamento di ODG, SVG, WPG, WMF, EPS/PS
読み込み可能な形式: ODG, SVG, WPG, WMF, EPS/PS
@@ -122,12 +131,14 @@
Pisanje podrške za ODG, SVG, WPG, WMF, EPS/PS
Permet gravar ODG, SVG, PNG, PDF, WMF
+ Permet gravar ODG, SVG, PNG, PDF, WMF
Unterstützung für das Schreiben von ODG, SVG, PNG, PDF, WMF
Writing support for ODG, SVG, PNG, PDF, WMF
Admite la escritura de ODG, SVG, PNG, PDF, WMF
ODG, SVG, PNG, PDF, WMF kirjutamine toetamine
Kirjoitustuki ODG-, SVG-, PNG-, PDF- ja WMF-muotoihin
Écriture des formats ODG, SVG, PNG, PDF, WMF
+ Capacidade de xeración de ODG, SVG, PNG, PDF e WMF.
Supporto de scriber pro ODG, SVG, PNG, PDF, WMF
Supporto per la scrittura di ODG, SVG, PNG, PDF, WMF
書き込み可能な形式: ODG, SVG, PNG, PDF, WMF
@@ -145,12 +156,14 @@
Prilagodljiv korisnički interfejs sa gdje se moze slobodno staviti alatne trake i dockers
Interfície d'usuari que es pot personalitzar que permet situar lliurement barres d'eines i acobladors
+ Interfície d'usuari que es pot personalitzar que permet situar lliurement barres d'eines i acobladors
Anpassungsfähige Bedienungsoberfläche mit frei platzierbaren Werkzeugleisten und andockbaren Fenstern
Customisable user interface with freely placeable toolbars and dockers
Interfaz de usuario personalizable con barras de herramientas y paneles que se pueden posicionar libremente en cualquier lugar.
Kohandatav kasutajaliides vabalt liigutatavate tööriistaribade ja dokkidega
Mukautettava käyttöliittymä, jonka työkalurivit ja telakat ovat vapaasti sijoitettavissa
Interface utilisateur personnalisable avec des barres d'outil librement déplaçables.
+ Interface de usuario personalizábel con barras de ferramentas e docas que poden recolocarse libremente.
Interfacie de usator personalisabile con barra de instrumentos e stivatores (dockers) liberemente positionabile
Interfaccia utente personalizzabile con barre degli strumenti posizionabili liberamente e aree di aggancio
Aan te passen gebruikersinterface met vrij te plaatsen werkbalken en verankeringen
@@ -168,11 +181,12 @@
Sloj lučki radnik za jednostavno rukovanje složenim dokumentima , uključujući pregled sličica , podršku za grupiranje oblika putem drag and drop , kontroliranje vidljivost oblika ili zaključavanje
Acoblador de capa per a una gestió senzilla de documents complexos incloent la vista prèvia de miniatures, permet agrupar formes via arrossegar i deixar anar, controlar la visibilitat de les formes o el bloqueig.
+ Acoblador de capa per a una gestió senzilla de documents complexos incloent la vista prèvia de miniatures, permet agrupar formes via arrossegar i deixar anar, controlar la visibilitat de les formes o el bloqueig.
Layer docker for easy handling of complex documents including preview thumbnails, support for grouping shapes via drag and drop, controlling visibility of shapes or locking
- Panel de capas para un sencillo manejo de documentos complejos, que incluye vista previa de miniaturas, soporte para la agrupación de figuras mediante la operación de arrastrar y soltar, control de la visibilidad de las figuras o bloqueo.
+ Panel de capas para un sencillo manejo de documentos complejos, que incluye vista previa de miniaturas y agrupación de figuras mediante la operación de arrastrar y soltar, controlando la visibilidad de las figuras o su bloqueo.
Kihtide dokk keerukamate dokumentide hõlpsaks töötlemiseks, kaasa arvatud pisipiltide eelvaatlus, kujundite rühmitamise toetamine ainult lohistamisega, kujundite nähtavuse ja lukustamise määramine
Monimutkaisten tiedostojen helppoon hallintaan tasotelakka, joka sisältää esikatselukuvat, muotojen ryhmittelyn tuen vetämällä ja pudottamalla sekä muotojen näkyvyyden ja lukitsemisen hallinnan
- Conteneurs de calques pour la manipulation facile de documents complexes incluant les vignettes de prévisualisation, la prise en charge du groupement de formes par glisser-déposer, contrôle de la visibilité des formes et verrouillage
+ Conteneurs de calques pour la manipulation facile de documents complexes incluant les vignettes d'aperçu, la prise en charge du groupement de formes par glisser-déposer, contrôle de la visibilité des formes et verrouillage
Area di aggancio di livelli per una facile gestione di documenti complessi incluse miniature di anteprima, supporto di forme raggruppate tramite il trascinamento e rilascio, controllo della visibilità delle forme e blocco
Laagverankering voor gemakkelijke behandeling van complexe documenten inclusief voorbeeldminiaturen, ondersteuning voor groeperen van vormen via slepen en laten vallen, besturing van zichtbaarheid van vormen of vastzetten
Dokowanie warstw dla łatwiejszej obsługi złożonych dokumentów zawierający: podgląd miniatur, obsługę grupowania kształtów poprzez przeciągnij i upuść, sterowanie widocznością kształtów czy blokowanie.
@@ -180,6 +194,7 @@
Área de camadas para tratamento de documentos complexos, incluindo miniaturas, suporte a agrupamento de formas com arrastar e soltar, controle de visibilidade das formas ou seu bloqueio
Docker vrstiev pre ľahkú manipuláciu so zložitými dokumentami vrátane náhľadu miniatúr, podpora pre zoskupovanie tvarov cez drag and drop, ovládanie viditeľnosti tvarov alebo zamykanie
Lagerpanel för enkel hantering av komplexa dokument inklusive miniatyrbilder för förhandsgranskning, stöd för att gruppera former via drag och släpp, styra eller låsning synlighet av former
+ Küçük resimleri görüntüleme, sürükle bırak ile şekilleri gruplandırma desteği, şekillerin görünürlüklerini kontrol etme veya kilitleme dahil karmaşık belgeleri kolay kullanma araci
Панель шарів для полегшення обробки складних документів з мініатюрами об’єктів, підтримка групування форм перетягуванням зі скиданням, керування показом форм та блокуванням.
xxLayer docker for easy handling of complex documents including preview thumbnails, support for grouping shapes via drag and drop, controlling visibility of shapes or lockingxx
@@ -187,11 +202,13 @@
Alat za napredno uređivanje puta s velikom mogućnosti uređivanja na platnu
Eina avançada d'edició de camins amb una gran capacitat d'edició en el llenç
+ Eina avançada d'edició de camins amb una gran capacitat d'edició en el llenç
Advanced path editing tool with great on-canvas editing capabilities
Herramienta de edición avanzada de rutas con grandes capacidades de edición en el lienzo
Täiustatud kompleksjoone muutmise tööriist suurepäraste otse lõuendil redigeerimise võimalustega
Edistynyt polunmuokkaustyökalu, jolla on erinomaiset muokkausominaisuudet
Outil d'édition de chemin avancé avec des capacités d'édition dans les canevas performantes
+ Ferramenta avanzada de edición de camiños cunha gran funcionalidade de edición sobre o lenzo.
Strumento avanzato di modifica di tracciati con grandi capacità di modifica sul posto
Geavanceerde padbewerkingsgereedschap met prima bewerkingsmiddelen op het werkblad
Zaawansowane narzędzia edytowania ścieżki z szerokimi możliwościami edytowania na płótnie
@@ -199,6 +216,7 @@
Ferramenta avançada para edição de caminhos, com ótima capacidade de edição no local
Pokročilý nástroj na úpravu ciest s výbornými schopnosťami editácie na plátne
Avancerat konturredigeringsverktyg med utmärkta redigeringsmöjligheter direkt på duken
+ Önemli tuval düzenleme yetenekleri ile gelişmiş yol düzenleme aracı
Інструмент редагування контурів з чудовими можливостями редагування безпосередньо на полотні.
xxAdvanced path editing tool with great on-canvas editing capabilitiesxx
@@ -206,8 +224,9 @@
Razni alati za crtanje za kreiranje put oblike uključujući i put alat nacrtati ,olovka alat , kao i kaligrafija alat za crtanje
Diverses eines de dibuix per crear formes de camí incloent una eina de dibuix de camins, una eina de llapis i també una eina de dibuix de cal·ligrafia.
+ Diverses eines de dibuix per crear formes de camí incloent una eina de dibuix de camins, una eina de llapis i també una eina de dibuix de cal·ligrafia.
Various drawing tools for creating path shapes including a draw path tool, a pencil tool as well as a calligraphy drawing tool
- Varias herramientas de dibujo para crear figuras con rutas, entre otras una herramienta de dibujo de rutas, una herramienta de pincel y una herramienta de dibujo caligráfico.
+ Diversas herramientas de dibujo para crear figuras con rutas, entre las que se incluyen una herramienta de dibujo de rutas, una herramienta de pincel y una herramienta de dibujo caligráfico.
Mitmesugused kompleksjoontest kujundite loomise vahendid, sealhulgas kompleksjoone joonistamise tööriist, pliiatsitööriist ning kalligraafia loomise tööriist
Eri piirrostyökalut polkumuotojen luontiin: polunpiirto-, kynä- ja kalligrafinen piirrostyökalu
Outils de dessin variés incluant un outil de création de chemin, un crayon ainsi qu'un outil pour la calligraphie
@@ -218,6 +237,7 @@
Diversas ferramentas de desenho para criar formas de caminhos, incluindo uma ferramenta de desenho de caminhos, uma ferramenta de lápis e uma ferramenta de desenho caligráfico
Rôzne kresliace nástroje na vytváranie tvarov ciest vrátane nástroja na kreslenie cesty, nástroja ceruzky ako aj kaligrafického kresliaceho nástroja
Diverse ritverktyg för att skapa konturformer som inkluderar ett konturritverktyg, ett pennverktyg samt ett kalligrafiskt ritverktyg
+ Yol şekilleri yaratmak için, kaligrafi çizim aracı ile birlikte bir kalem aracı, bir yol çizim aracı dahil çeşitli çizim araçları
Різноманітні інструменти малювання для створення контурів, зокрема інструмент малювання контуру, олівець та інструмент каліграфічного малювання.
xxVarious drawing tools for creating path shapes including a draw path tool, a pencil tool as well as a calligraphy drawing toolxx
@@ -225,6 +245,7 @@
Gradijent i uzorak alata za jednostavno na - platnu uređivanje gradijent i uzorak stilova
Eines de degradats i patrons per a una edició senzilla sobre el llenç d'estils de degradats i patrons
+ Eines de degradats i patrons per a una edició senzilla sobre el llenç d'estils de degradats i patrons
Gradient and pattern tools for easy on-canvas editing of gradient and pattern styles
Herramientas de degradados y patrones para una sencilla edición de estilos de degradados y patrones en el lienzo
Ülemineku- ja mustritööriistad üleminekute ja mustrite stiilide hõlpsaks redigeerimiseks otse lõuendil
@@ -245,8 +266,9 @@
Vrhunska snapping objekti za vođene crtanje i uređivanje ( npr snapping na mrežu , vodič linije , staze čvorova , granični kutije , okomita pozicija , preplitanja put oblikuje ili proširenja linija i staze )
Capacitats òptimes d'ajust per dibuix guiat i edició (p.e. ajust a graella, línies de guia, nodes de camins, caixes contenidores, posicions ortogonals, interseccions de formes de camí o extensions de línies i camins)
+ Capacitats òptimes d'ajust per dibuix guiat i edició (p.e. ajust a graella, línies de guia, nodes de camins, caixes contenidores, posicions ortogonals, interseccions de formes de camí o extensions de línies i camins)
Top notch snapping facilities for guided drawing and editing (e.g. snapping to grid, guide lines, path nodes, bounding boxes, orthogonal positions, intersections of path shapes or extensions of lines and paths)
- Capacidades de ajuste óptimas para el dibujo y la edición guiados (por ejemplo ajustar a la rejilla, líneas guías, nodos de ruta, cuadros delimitadores, posiciones ortogonales, intersecciones de formas de rutas o extensiones de líneas y rutas)
+ Capacidades de ajuste óptimas para el dibujo y la edición guiados (por ejemplo, ajustar a la rejilla, líneas guías, nodos de ruta, cuadros delimitadores, posiciones ortogonales, intersecciones de formas de rutas o extensiones de líneas y rutas)
Äärmiselt tulusad haardetööriistad juhtjoonte järgi joonistamiseks ja redigeerimiseks (nt tõmme alusvõrgule, juhtjooned, kompleksjoone sõlmed, piirdekastid, kompleksjoontest kujundite lõikekohad jms)
Huippulaatuinen kiinnitysominaisuus ohjattuun piirtämiseen ja muokkaukseen (esim. kiinnitys ruudukkoon, apuviivoihin, rajauslaatikkoon, kohtisuoraan asemaan, leikkaukseen, polkumuotoon tai viivojen ja polkujen jatkeisiin)
Fonctionnalités d'alignement top-niveau pour guider le dessin et l'édition (p.ex. alignement sur la grille, chemin nodal, boîtes, positions orthogonales, intersections de formes ou extensions de lignes ou de formes)
@@ -264,6 +286,7 @@
Uključuje mnoge predefinisane oblike uključujući i osnovne oblike poput zvijezda , krugova / elipsa, pravougaonika, slika
Inclou moltes formes predefinides bàsiques com estels, cercles/el·lipses, rectangles, imatges
+ Inclou moltes formes predefinides bàsiques com estels, cercles/el·lipses, rectangles, imatges
Enthält viele vordefinierte Objekte einschließlich einfacher Objekte wie Sterne, Kreise, Ellipsen, Rechtecke und Bilder
Includes many predefined shapes including basic shapes like stars, circle/ellipse, rectangle, image
Incluye muchas formas predefinidas, entre otras figuras básicas como estrellas, círculos/elipses, rectángulos, imágenes
@@ -277,6 +300,7 @@
Inclui diversas formas predefinidas, incluindo formas básicas como estrelas, círculos/elipses, retângulos e imagens
Obsahuje mnoho preddefinovaných tvarov vrátane základných tvarov ako hviezdy, kružnica/elipsa, obdĺžnik, obrázok
Innehåller många fördefinierade former inklusive grundläggande former som stjärnor, cirkel/ellips, rektangel, bild
+ Yıldız, daire/elips, dikdörtgen, resim gibi birçok öntanımlı basit şekil icerir
Передбачено багато готових форм, зокрема базові форми зірки, кола або еліпса, прямокутника та зображення.
xxIncludes many predefined shapes including basic shapes like stars, circle/ellipse, rectangle, imagexx
@@ -284,8 +308,9 @@
Umjetnički oblik tekst s podrškom za sljedeći put naglašava ( tj tekst na putu )
Formes de text artístic que permeten camins de contorns de seguiment (p.e. text en camins)
+ Formes de text artístic que permeten camins de contorns de seguiment (p.e. text en camins)
Artistic text shape with support for following path outlines (i.e. text on path)
- Forma de texto artístico con soporte para contornos de seguimiento de rutas (es decir texto sobre una ruta)
+ Forma de texto artístico con soporte para contornos de seguimiento de rutas (es decir, texto sobre una ruta)
Kunstiline tekstikujund, mis toetab kompleksjooni, st võimaldab asetada teksti kompleksjoonele
Taiteelliset tekstimuodot polunseurantatuella
Formes de texte artistiques prenant par exemple en charge la création de texte le long d'une courbe
@@ -303,6 +328,7 @@
Kompleksne staze poslovanja i učinci poput Booleova postavljanje poslovanja , put ravnanje , zaokruživanje i rafiniranje kao vrtlog / za hvatanje učinci
Operacions complexes de camins i efectes com operacions de conjunts booleans, aplanament de camins, arrodoniment i afinació i també efectes de gir i pessic
+ Operacions complexes de camins i efectes com operacions de conjunts booleans, aplanament de camins, arrodoniment i afinació i també efectes de gir i pessic
Complex path operations and effects like boolean set operations, path flattening, rounding and refining as well as whirl/pinch effects
Operaciones de ruta complejas y efectos como operaciones booleanas con conjuntos, aplanamiento de rutas, redondeo y refinación así como también efectos de arremolinar/apretar
Ka keerukamad kompleksjoone operatsioonid ja efektid, näiteks tõeväärtustega operatsioonid, kompleksjoonte lamendamine, ümardamine ja täpsustamine, keerise efekt jms
@@ -322,12 +348,14 @@
Extensible pisanjem dodataka za novim alatima , oblika i modnog brenda Dockers
Ampliable mitjançant l'escriptura de connectors per eines noves, formes i acobladors
+ Ampliable mitjançant l'escriptura de connectors per eines noves, formes i acobladors
Erweiterbar durch das Schreiben von Modulen für neue Werkzeuge, Objekte und andockbaren Dialogen
Extensible by writing plugins for new tools, shapes and dockers
Extensible mediante la escritura de complementos para nuevas herramientas, formas y paneles
Laiendamisvõimalus pluginate kirjutamise abil uute tööriistade, kujundite ja dokkide tarbeks
Laajennettavissa kirjoittamalla liitännäisiä uusille työkaluille, muodoille ja telakoille
Extensible par l'écriture de modules pour de nouveaux outils, formes et conteneurs
+ Permite ampliar as súas funcionalidades mediante complementos de ferramentas novas, de formas e de docas.
Espandibile tramite la scrittura di estensioni per nuovi strumenti, forme e aree di aggancio
Uit te breiden dor het schrijven van plug-ins voor nieuwe hulpmiddelen, vormen en verankering
Rozszerzalne wtyczki zapisu dla nowych narzędzi, kształtów i dokowań
@@ -335,6 +363,7 @@
Expansível através da criação de plugins para novas ferramentas, formas e áreas acopláveis
Rozšíriteľný pomocou písania pluginov pre nové nástroje, tvary a dockery
Utökningsbart genom att skriva insticksprogram för nya verktyg, former och paneler
+ Yeni araçlar, şekiller ve dockerlar için eklenti yazarak genişletilebilir
Можливість розширення додатками нових інструментів, форм та панелей.
xxExtensible by writing plugins for new tools, shapes and dockersxx
diff -Nru calligra-2.9.7/karbon/data/karbon_dock.desktop calligra-2.9.11/karbon/data/karbon_dock.desktop
--- calligra-2.9.7/karbon/data/karbon_dock.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/data/karbon_dock.desktop 2016-02-02 16:57:46.000000000 +0000
@@ -15,6 +15,7 @@
Comment[eu]=Karbon-erako panela
Comment[fi]=Karbon-telakka
Comment[fr]=Panneau pour Karbon
+Comment[gl]=Doca para Karbon.
Comment[hu]=Dokkoló a Karbonhoz
Comment[it]=Area di aggancio per Krita
Comment[ja]=Karbon のドッキングパネル
diff -Nru calligra-2.9.7/karbon/plugins/flattenpath/karbonflattenpathplugin.desktop calligra-2.9.11/karbon/plugins/flattenpath/karbonflattenpathplugin.desktop
--- calligra-2.9.7/karbon/plugins/flattenpath/karbonflattenpathplugin.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/plugins/flattenpath/karbonflattenpathplugin.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=Plugin de redução de caminhos do Karbon
Name[sk]=Plugin vyrovnanie cesty pre Karbon
Name[sv]=Karbon-insticksprogram för platta ut kontur
+Name[tr]=Karbon Düzleştirilmiş Yol eklentisi
Name[uk]=Додаток спрощення контурів для Karbon
Name[x-test]=xxKarbon Flatten Path pluginxx
X-KDE-ServiceTypes=Karbon/ViewPlugin
diff -Nru calligra-2.9.7/karbon/plugins/refinepath/karbonrefinepathplugin.desktop calligra-2.9.11/karbon/plugins/refinepath/karbonrefinepathplugin.desktop
--- calligra-2.9.7/karbon/plugins/refinepath/karbonrefinepathplugin.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/plugins/refinepath/karbonrefinepathplugin.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=Plugin de ajuste de caminhos do Karbon
Name[sk]=Plugin zjemnenie cesty pre Karbon
Name[sv]=Karbon-insticksprogram för förfina kontur
+Name[tr]=Karbon Daraltılmış Yol eklentisi
Name[uk]=Додаток покращення контурів для Karbon
Name[x-test]=xxKarbon Refine Path pluginxx
X-KDE-ServiceTypes=Karbon/ViewPlugin
diff -Nru calligra-2.9.7/karbon/plugins/roundcorners/karbonroundcornersplugin.desktop calligra-2.9.11/karbon/plugins/roundcorners/karbonroundcornersplugin.desktop
--- calligra-2.9.7/karbon/plugins/roundcorners/karbonroundcornersplugin.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/plugins/roundcorners/karbonroundcornersplugin.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -22,6 +22,7 @@
Name[pt_BR]=Plugin de cantos arredondados do Karbon
Name[sk]=Plugin oblé rohy pre Karbon
Name[sv]=Karbon-insticksprogram för runda hörn
+Name[tr]=Karbon Yuvarlatılmış Köşe eklentisi
Name[uk]=Додаток скруглення кутів для Karbon
Name[x-test]=xxKarbon Round Corners pluginxx
X-KDE-ServiceTypes=Karbon/ViewPlugin
diff -Nru calligra-2.9.7/karbon/plugins/whirlpinch/karbonwhirlpinchplugin.desktop calligra-2.9.11/karbon/plugins/whirlpinch/karbonwhirlpinchplugin.desktop
--- calligra-2.9.7/karbon/plugins/whirlpinch/karbonwhirlpinchplugin.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/plugins/whirlpinch/karbonwhirlpinchplugin.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -11,6 +11,7 @@
Name[et]=Karboni keerise efekti plugin
Name[fi]=Karbonin pyörrenipistämisliitännäinen
Name[fr]=Module externe pour Karbon de tourbillon et pincement
+Name[gl]=Complemento para Karbon de xiro e picada
Name[it]=Estensione Vortice e Pizzico di Karbon
Name[ja]=Karbon 回転/つまみ変形プラグイン
Name[kk]=Karbon-ның бұрау және қысу плагині
@@ -21,6 +22,7 @@
Name[pt_BR]=Plugin de punção do Karbon
Name[sk]=Plugin rozštiepený vír pre Karbon
Name[sv]=Karbon-insticksprogram för virvla och kläm
+Name[tr]=Karbon Burgaç eklentisi
Name[uk]=Додаток вихору для Karbon
Name[x-test]=xxKarbon Whirl Pinch pluginxx
X-KDE-ServiceTypes=Karbon/ViewPlugin
diff -Nru calligra-2.9.7/karbon/ui/KarbonDocument.cpp calligra-2.9.11/karbon/ui/KarbonDocument.cpp
--- calligra-2.9.7/karbon/ui/KarbonDocument.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/ui/KarbonDocument.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -97,7 +97,7 @@
// Make sure an appropriate DTD is available in www/calligra/DTD if changing this value
// static const char * CURRENT_DTD_VERSION = "1.2";
-class Q_DECL_HIDDEN KarbonDocument::Private
+class KarbonDocument::Private
{
public:
Private()
diff -Nru calligra-2.9.7/karbon/ui/KarbonView.cpp calligra-2.9.11/karbon/ui/KarbonView.cpp
--- calligra-2.9.7/karbon/ui/KarbonView.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/ui/KarbonView.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -152,7 +152,7 @@
#include
-class Q_DECL_HIDDEN KarbonView::Private
+class KarbonView::Private
{
public:
Private(KarbonPart *part, KarbonDocument * doc)
diff -Nru calligra-2.9.7/karbon/ui/widgets/KarbonPatternOptionsWidget.cpp calligra-2.9.11/karbon/ui/widgets/KarbonPatternOptionsWidget.cpp
--- calligra-2.9.7/karbon/ui/widgets/KarbonPatternOptionsWidget.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/karbon/ui/widgets/KarbonPatternOptionsWidget.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -20,7 +20,7 @@
#include "KarbonPatternOptionsWidget.h"
#include "ui_KarbonPatternOptionsWidget.h"
-class Q_DECL_HIDDEN KarbonPatternOptionsWidget::Private
+class KarbonPatternOptionsWidget::Private
{
public:
Ui_PatternOptionsWidget widget;
diff -Nru calligra-2.9.7/kexi/core/kexiblobbuffer.cpp calligra-2.9.11/kexi/core/kexiblobbuffer.cpp
--- calligra-2.9.7/kexi/core/kexiblobbuffer.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/core/kexiblobbuffer.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -291,7 +291,7 @@
if (item || !d->conn)
return KexiBLOBBuffer::Handle(item);
//retrieve stored BLOB:
- assert(d->conn);
+ Q_ASSERT(d->conn);
KexiDB::TableSchema *blobsTable = d->conn->tableSchema("kexi__blobs");
if (!blobsTable) {
//! @todo err msg
@@ -362,7 +362,7 @@
void KexiBLOBBuffer::takeItem(Item *item)
{
- assert(item);
+ Q_ASSERT(item);
if (item->stored)
d->storedItems.take(item->id);
else
@@ -371,7 +371,7 @@
void KexiBLOBBuffer::insertItem(Item *item)
{
- assert(item);
+ Q_ASSERT(item);
if (item->stored)
d->storedItems.insert(item->id, item);
else
diff -Nru calligra-2.9.7/kexi/core/kexi.cpp calligra-2.9.11/kexi/core/kexi.cpp
--- calligra-2.9.7/kexi/core/kexi.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/core/kexi.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -198,11 +198,12 @@
|| (dynamic_cast((QObject*)dbObj) && dynamic_cast((QObject*)dbObj)->error());
}
-void ObjectStatus::setStatus(const QString& message, const QString& description)
+void ObjectStatus::setStatus(const QString& message, const QString& description, const QString& errorSql)
{
this->dbObj = 0;
this->message = message;
this->description = description;
+ this->errorSql = errorSql;
}
void ObjectStatus::setStatus(KexiDB::Object* dbObject, const QString& message, const QString& description)
diff -Nru calligra-2.9.7/kexi/core/kexi.h calligra-2.9.11/kexi/core/kexi.h
--- calligra-2.9.7/kexi/core/kexi.h 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/core/kexi.h 2016-02-02 19:53:13.000000000 +0000
@@ -110,7 +110,8 @@
bool error() const;
- void setStatus(const QString& message, const QString& description);
+ void setStatus(const QString& message, const QString& description,
+ const QString& errorSql = QString());
//! Note: for safety, \a dbObject needs to be derived from QObject,
//! otherwise it won't be assigned
@@ -137,7 +138,9 @@
//! by receiving a message
operator KexiDB::MessageHandler*();
- QString message, description;
+ QString message;
+ QString description;
+ QString errorSql; //!< Recently executed SQL, overrides information from dbObject()
protected:
QPointer dbObj; //! This is in fact KexiDB::Object
KexiDB::MessageHandler* msgHandler;
diff -Nru calligra-2.9.7/kexi/core/kexipartinfo.cpp calligra-2.9.11/kexi/core/kexipartinfo.cpp
--- calligra-2.9.7/kexi/core/kexipartinfo.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/core/kexipartinfo.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -82,7 +82,7 @@
: broken(false)
, isVisibleInNavigator(false)
, idStoredInPartDatabase(false)
- , isPropertyEditorAlwaysVisibleInDesignMode(false)
+ , isPropertyEditorAlwaysVisibleInDesignMode(true)
{
}
@@ -240,10 +240,11 @@
QAction* Info::newObjectAction()
{
- if (!KexiMainWindowIface::global() || !KexiMainWindowIface::global()->actionCollection()
- || !isVisibleInNavigator())
- {
- kWarning();
+ if (!isVisibleInNavigator()) {
+ return 0;
+ }
+ if (!KexiMainWindowIface::global() || !KexiMainWindowIface::global()->actionCollection()) {
+ kWarning() << "Missing Kexi's global action collection";
return 0;
}
QAction *act = KexiMainWindowIface::global()->actionCollection()->action(nameForCreateAction(*this));
diff -Nru calligra-2.9.7/kexi/core/kexipartinfo.h calligra-2.9.11/kexi/core/kexipartinfo.h
--- calligra-2.9.7/kexi/core/kexipartinfo.h 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/core/kexipartinfo.h 2016-02-02 19:53:13.000000000 +0000
@@ -133,7 +133,9 @@
bool isPropertyEditorAlwaysVisibleInDesignMode() const;
/**
- * \return "New object" action for this part.
+ * \return "New object" action for this part. nullptr is returned if this part could
+ * not create instances (e.g. CSV import) or if global structures such as action
+ * collection are not (yet) set up.
*/
QAction* newObjectAction();
diff -Nru calligra-2.9.7/kexi/core/kexiproject.cpp calligra-2.9.11/kexi/core/kexiproject.cpp
--- calligra-2.9.7/kexi/core/kexiproject.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/core/kexiproject.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -861,10 +861,12 @@
return 0;
KexiWindow *window = part->openInstance(parent, item, viewMode, staticObjectArgs);
if (!window) {
- if (part->lastOperationStatus().error())
+ if (part->lastOperationStatus().error()) {
+ m_sql = part->lastOperationStatus().errorSql; // pass proper SQL error
setError(i18n("Opening object \"%1\" failed.", item.name()) + "
"
+ part->lastOperationStatus().message,
part->lastOperationStatus().description);
+ }
return 0;
}
return window;
diff -Nru calligra-2.9.7/kexi/core/KexiView.cpp calligra-2.9.11/kexi/core/KexiView.cpp
--- calligra-2.9.7/kexi/core/KexiView.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/core/KexiView.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -26,6 +26,7 @@
#include
#include
+#include
#include
#include
#include
@@ -149,7 +150,7 @@
btn->setText(text);
btn->setIcon(a->icon());
QFont f(KGlobalSettings::toolBarFont());
- f.setPixelSize(KexiUtils::smallFont().pixelSize());
+ f.setPointSizeF(KGlobalSettings::smallestReadableFont().pointSizeF());
btn->setFont(f);
btn->setToolTip(a->toolTip());
btn->setWhatsThis(a->whatsThis());
@@ -240,7 +241,7 @@
if (parentWidget()->inherits("KexiWindow")) {
d->topBarHWidget = new QWidget(this);
- d->topBarHWidget->setFont(KexiUtils::smallFont());
+ d->topBarHWidget->setFont(KGlobalSettings::smallestReadableFont());
d->mainLyr->addWidget(d->topBarHWidget);
QHBoxLayout *topBarHLyr = new QHBoxLayout(d->topBarHWidget); //needed unless KexiFlowLayout properly handles contents margins
topBarHLyr->setContentsMargins(0, 0, 0, 0);
@@ -555,6 +556,32 @@
window()->removeView(mode);
}
+bool KexiView::setWidgetData(KexiDB::Cursor *cursor)
+{
+ return cursor->open();
+}
+
+bool KexiView::setData(KexiDB::Cursor *cursor)
+{
+ bool ok = setWidgetData(cursor);
+ if (!ok && cursor) {
+ // A simple workaround needed because the cursor will be destroyed before
+ // the error message is built. Kexi 3 would have cleaner solution.
+ // See https://bugs.kde.org/show_bug.cgi?id=356888
+ QString msg = cursor->errorMsg();
+ QString desc;
+ if (!cursor->serverErrorMsg().isEmpty()) {
+ if (msg.isEmpty()) {
+ msg = cursor->serverErrorMsg();
+ } else {
+ desc = cursor->serverErrorMsg();
+ }
+ }
+ window()->setStatus(msg, desc, cursor->recentSQLString());
+ }
+ return ok;
+}
+
void KexiView::setFocus()
{
if (!d->lastFocusedChildBeforeFocusOut.isNull()) {
diff -Nru calligra-2.9.7/kexi/core/KexiView.h calligra-2.9.11/kexi/core/KexiView.h
--- calligra-2.9.7/kexi/core/KexiView.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/core/KexiView.h 2016-02-02 19:53:13.000000000 +0000
@@ -35,6 +35,7 @@
namespace KexiDB
{
+class Cursor;
class SchemaData;
}
@@ -148,6 +149,9 @@
Q_DECLARE_FLAGS(StoreNewDataOptions, StoreNewDataOption)
public Q_SLOTS:
+ /*! Sets data. Only works for db-aware view. */
+ bool setData(KexiDB::Cursor *cursor);
+
virtual void setFocus();
/*! Call this in your view's implementation whenever current property set
@@ -176,6 +180,11 @@
void focus(bool in);
protected:
+ /*! Sets data to the widget. Default implementation just calls KexiDB::Cursor::open().
+ Used internally by setData(KexiDB::Cursor*).
+ @return true on success. */
+ virtual bool setWidgetData(KexiDB::Cursor *cursor);
+
virtual bool eventFilter(QObject *o, QEvent *e);
/*! called by KexiWindow::switchToViewMode() right before window is switched to new mode
diff -Nru calligra-2.9.7/kexi/core/KexiWindow.cpp calligra-2.9.11/kexi/core/KexiWindow.cpp
--- calligra-2.9.7/kexi/core/KexiWindow.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/core/KexiWindow.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -415,6 +415,7 @@
QMap* staticObjectArgs,
bool& proposeOpeningInTextViewModeBecauseOfProblems)
{
+ clearStatus();
KexiMainWindowIface::global()->acceptPropertySetEditing();
const bool designModePreloadedForTextModeHack = isDesignModePreloadedForTextModeHackUsed(newViewMode);
diff -Nru calligra-2.9.7/kexi/formeditor/commands.cpp calligra-2.9.11/kexi/formeditor/commands.cpp
--- calligra-2.9.7/kexi/formeditor/commands.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/formeditor/commands.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1585,7 +1585,8 @@
{
DeleteWidgetCommand::execute();
delete d2->data;
- d2->data = KFormDesigner::deepCopyOfClipboardData(); // save clipboard contents
+ QClipboard *cb = QApplication::clipboard();
+ d2->data = KFormDesigner::deepCopyOfMimeData(cb->mimeData()); // save clipboard contents
// d->domDoc has been filled in DeleteWidgetCommand ctor
KFormDesigner::copyToClipboard(d->domDoc.toString());
}
@@ -1594,7 +1595,7 @@
{
DeleteWidgetCommand::undo();
QClipboard *cb = QApplication::clipboard();
- cb->setMimeData( d2->data ); // restore prev. clipboard contents
+ cb->setMimeData(KFormDesigner::deepCopyOfMimeData(d2->data)); // restore prev. clipboard contents
}
KFORMEDITOR_EXPORT QDebug KFormDesigner::operator<<(QDebug dbg, const CutWidgetCommand &c)
diff -Nru calligra-2.9.7/kexi/formeditor/factories/kformdesigner_containers.desktop calligra-2.9.11/kexi/formeditor/factories/kformdesigner_containers.desktop
--- calligra-2.9.7/kexi/formeditor/factories/kformdesigner_containers.desktop 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/formeditor/factories/kformdesigner_containers.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -6,7 +6,6 @@
Name[bs]=Kontejnerski dodaci
Name[ca]=Estris contenidors
Name[ca@valencia]=Estris contenidors
-Name[cs]=Kontejnerové widgety
Name[cy]=Celfigion Cynhwysydd
Name[da]=Container-kontroller
Name[de]=Container-Elemente
@@ -18,7 +17,6 @@
Name[eu]=Edukitzaile-trepetak
Name[fa]=عناصر محتوی
Name[fi]=Säiliön osat
-Name[fr]=Composants graphiques conteneurs
Name[fy]=Kontainerwidgets
Name[gl]=Trebellos contedores
Name[he]=כלי קיבול
diff -Nru calligra-2.9.7/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop calligra-2.9.11/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop
--- calligra-2.9.7/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -7,7 +7,6 @@
Name[bs]=Osnovni dodaci
Name[ca]=Estris estàndard
Name[ca@valencia]=Estris estàndard
-Name[cs]=Základní widgety
Name[cy]=Celfigion Sylfaenol
Name[da]=Basale kontroller
Name[de]=Basis-Elemente
@@ -18,8 +17,7 @@
Name[et]=Standardvidinad
Name[eu]=Oinarrizko trepetak
Name[fa]=عناصر پایهای
-Name[fi]=yleiset elementit
-Name[fr]=Composants graphiques basiques
+Name[fi]=Yleiset elementit
Name[fy]=Basiswidgets
Name[ga]=Bunghiuirléidí
Name[gl]=Trebellos básicos
diff -Nru calligra-2.9.7/kexi/formeditor/utils.cpp calligra-2.9.11/kexi/formeditor/utils.cpp
--- calligra-2.9.7/kexi/formeditor/utils.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/formeditor/utils.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -197,14 +197,13 @@
// ----
-QMimeData *KFormDesigner::deepCopyOfClipboardData()
+QMimeData *KFormDesigner::deepCopyOfMimeData(const QMimeData *data)
{
- //QClipboard *cb = QApplication::clipboard();
- QMimeData *data = new QMimeData();
+ QMimeData *newData = new QMimeData();
foreach(const QString& format, data->formats()) {
- data->setData(format, data->data(format));
+ newData->setData(format, data->data(format));
}
- return data;
+ return newData;
}
void KFormDesigner::copyToClipboard(const QString& xml)
diff -Nru calligra-2.9.7/kexi/formeditor/utils.h calligra-2.9.11/kexi/formeditor/utils.h
--- calligra-2.9.7/kexi/formeditor/utils.h 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/formeditor/utils.h 2016-02-02 19:53:13.000000000 +0000
@@ -122,8 +122,8 @@
//! @return mimetype for the forms XML format
inline QString mimeType() { return "application/x-kexi-form"; }
-//! @returns deep copy of the current clipboard contents (for all formats)
-KFORMEDITOR_EXPORT QMimeData *deepCopyOfClipboardData();
+//! @return deep copy of the mime data @a data (for all formats)
+KFORMEDITOR_EXPORT QMimeData *deepCopyOfMimeData(const QMimeData *data);
//! Copies @a xml data to the clipboard both in the plain text format and forms XML format
KFORMEDITOR_EXPORT void copyToClipboard(const QString& xml);
diff -Nru calligra-2.9.7/kexi/kexi.appdata.xml calligra-2.9.11/kexi/kexi.appdata.xml
--- calligra-2.9.7/kexi/kexi.appdata.xml 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexi.appdata.xml 2016-02-02 19:53:13.000000000 +0000
@@ -6,6 +6,7 @@
Kexi
Kexi
Kexi
+ Kexi
Kexi
Kexi
Kexi
@@ -14,6 +15,7 @@
Kexi
Kexi
Kexi
+ Kexi
Kexi
Kexi
Kexi
@@ -30,6 +32,7 @@
Database Creator
Kreator baze podataka
Generador de bases de dades
+ Generador de bases de dades
Tvůrce databází
Datenbank-Erstellung
Database Creator
@@ -37,6 +40,7 @@
Andmebaaside imelihtne loomine
Tietokantojen luonti
Créateur de base de données
+ Editor de bases da datos
Creator de base de datos
Creazione di basi di dati
データベース作成
@@ -59,6 +63,7 @@
Kexi je vizualni kreator baze podataka , dio Calligra Suite . Može se koristiti za izradu aplikacije baze podataka , umetanje i uređivanje podataka , obavljanje upita i obradu podataka. Obrasci se mogu kreirati da pružite prilagođeno sučelje vašim podacima . Svi objekti baze podataka - tablice , upiti , obrazaci , izvještaji - čuvaju se u bazi podataka , što ih čini lakim za dijeljenje podataka i dizajn.
El Kexi és un generador visual de base de dades, part del paquet ofimàtic Calligra. Es pot utilitzar per dissenyar aplicacions de bases de dades, inserció i edició de dades, execució de consultes, i procés de dades. Es poden generar formularis per proporcionar una interfície personalitzada a les dades. Tots els objectes de les bases de dades -taules, consultes, formularis, informes- s'emmagatzemen en la base de dades, facilitant compartir les dades i el disseny.
+ El Kexi és un generador visual de base de dades, part del paquet ofimàtic Calligra. Es pot utilitzar per dissenyar aplicacions de bases de dades, inserció i edició de dades, execució de consultes, i procés de dades. Es poden generar formularis per proporcionar una interfície personalitzada a les dades. Tots els objectes de les bases de dades -taules, consultes, formularis, informes- s'emmagatzemen en la base de dades, facilitant compartir les dades i el disseny.
Kexi is a visual database creator, part of the Calligra Suite. It can be used for designing database applications, inserting and editing data, performing queries, and processing data. Forms can be created to provide a custom interface to your data. All database objects - tables, queries, forms, reports - are stored in the database, making it easy to share data and design.
Kexi es un creador visual de bases de datos, que forma parte de la suite Calligra. Se puede utilizar para diseñar aplicaciones de bases de datos, insertar y editar datos, realizar consultas y procesar datos. Se pueden crear formularios para proporcionar una interfaz personalizada para sus datos. Todos los objetos de la base de datos - tablas, consultas, formularios, informes - se almacenan en la base de datos, facilitando el intercambio de datos y diseños.
Kexi on Calligra visuaalne andmebaaside loomise rakendus. Selle abil saab kujundada andmebaasirakendusi, sisestada ja muuta andmeid, sooritada päringuid ning töödelda andmeid. Saab luua vorme, mis kindlustada andmetele kohandatava liidese. Kõik andmebaasiobjektid - tabelid, päringud, vormid, aruanded - salvestatakse andmebaasi, mis muudab andmete ja kujunduse jagamise õige lihtsaks.
@@ -78,6 +83,7 @@
Features:
Osobine:
Característiques:
+ Característiques:
Vlastnosti:
Funktionen:
Features:
@@ -85,6 +91,7 @@
Omadused:
Ominaisuuksia:
Fonctionnalités :
+ Funcionalidades:
Characteristicas
Funzionalità:
機能:
@@ -102,11 +109,13 @@
Full visual designers for tables, queries, forms and reports
Potpuni vizualni dizajneri za tablice , upite , obrasce i izvještaje
Dissenyadors visuals complets per taules, consultes, formularis i informes
+ Dissenyadors visuals complets per taules, consultes, formularis i informes
Full visual designers for tables, queries, forms and reports
Herramientas de diseño completamente visuales para las tablas, consultas, formularios e informes.
Tabelite, päringute, vormide ja aruannete täielikult visuaalne kujundamine
Täysin visuaalinen taulukoiden, kyselyjen, lomakkeiden ja raporttien suunnittelu
Conception complètement visuelle pour les tables, requêtes, formulaires et rapports
+ Deseñadores completamente visuais para táboas, consultas, formularios e informes.
Progettazione completamente visuale di tabelle, query e report
テーブル、クエリー、フォームおよびレポートをすべて視覚的にでデザインできます
Fullstendig visuell utforming for tabeller, spøøringer, skjemaer og rapporter
@@ -122,12 +131,14 @@
Running queries, support for parametrized queries
Potrebno upite , podršku za parametrizovan upite
Execució de consultes, implementació de consultes paramètriques
+ Execució de consultes, implementació de consultes paramètriques
Ausführung von Abfragen, Unterstützung für parametrisierte Abfragen
Running queries, support for parametrised queries
Ejecución de consultas, soporte de consultas parametrizadas
Päringute sooritamine, parameetritega päringute toetamine
Kyselyjen suoritus ja parametroitavien kyselyjen tuki
Exécution de requêtes, prise en charge des requêtes paramétrées
+ Execución de consultas, e funcionalidade de consultas parametrizadas.
Esecuzione di query, supporto per le query parametriche
クエリーの実行、パラメータ化クエリーのサポート
Kjøre spørriner, støtte for parametriserte spørringer
@@ -143,6 +154,7 @@
Supports SQLite, MySQL, PostgreSQL and MS SQL Server databases
Podržava SQLite, MySQL, PostgreSQL i MS SQL baze podataka
Permet bases de dades SQLite, MySQL, PostgreSQL i MS SQL Server
+ Permet bases de dades SQLite, MySQL, PostgreSQL i MS SQL Server
Unterstützt Datenbanken wie SQLite, MySQL, PostgreSQL und MS SQL Server
Supports SQLite, MySQL, PostgreSQL and MS SQL Server databases
Soporte de bases de datos SQLite, MySQL, PostgreSQL y MS SQL Server
@@ -164,6 +176,7 @@
The only multiplatform graphical tool importing data from MS Access databases
Jedini Multiplatform grafički alat koji uvozi podatke iz MS Access baze podataka
L'única eina gràfica multiplataforma d'importació de dades des de les bases de dades MS Access
+ L'única eina gràfica multiplataforma d'importació de dades des de les bases de dades MS Access
The only multiplatform graphical tool importing data from MS Access databases
La única herramienta gráfica multiplataforma que importa datos de bases de datos MS Access
Ainuke mitmel platvormil töötav graafiline rakendus MS Accessi andmebaaside andmete importimiseks
@@ -184,6 +197,7 @@
Supports query design in dedicated SQL view
Podržava dizajn upita u posvećenom SQL view-u
Permet el disseny de consultes en vistes SQL dedicades
+ Permet el disseny de consultes en vistes SQL dedicades
Supports query design in dedicated SQL view
Soporta el diseño de consultas en una vista SQL dedicada
Päringute kujundamise toetamine SQL-vaates
@@ -204,11 +218,13 @@
Designing and displaying relational data using combo boxes (lookup columns)
Izrada i prikazivanje relacijskih podataka pomoću combo kutije ( pregledavanje kolone)
Disseny i visualització de dades relacionals usant quadres combinats (columnes de cerca)
+ Disseny i visualització de dades relacionals usant quadres combinats (columnes de cerca)
Designing and displaying relational data using combo boxes (lookup columns)
Diseño y presentación de datos relacionales utilizando listas desplegables (columnas de búsqueda)
Relatsiooniliste andmete kujundamine ja kuvamine liitkastide abil (päringuveerud)
Relaatiotiedon suunnittelu ja näyttö yhdistelmäkenttiä käyttäen (hakusarakkeet)
Conception et affichage de données relationnelles à l'aide de listes déroulantes (colonnes de consultation)
+ Deseño e mostra de datos relacionais mediante caixas despregábeis (columnas de busca).
Progettazione e visualizzazione dei dati relazionali utilizzando caselle combinate (colonne di ricerca)
コンボボックスを使用した関係データのデザインと表示(参照列)
Utforming og visning av relasjonsdata vhja kombo-bokser (oppslagskolonner)
@@ -224,12 +240,14 @@
Direct data entry or import using CSV format
Unos podataka direktno ili uvoz pomoću CSV formata
Entrada directa de dades o importació usant el format CSV
+ Entrada directa de dades o importació usant el format CSV
Direkte Dateneingabe oder Import aus dem CSV-Format
Direct data entry or import using CSV format
Entrada directa de datos o importación utilizando el formato CSV
Otsene andmete sisestamine või importimine CSV-vormingus
Suora tiedon syöttö tai tuonti CSV-muodossa
Saisie directe de données ou import utilisant le format CSV
+ Introdución directa de datos ou importación en formato CSV.
Inserimento diretto dei dati o importazione utilizzando il formato CSV
CSV を使用したダイレクトデータの入力もしくはインポート
Direkte datainnskriving eller import med CSV-format
@@ -245,11 +263,13 @@
Locked down User Mode, allowing you to switch off all commands related to editing your project's design
Zatvoreni korisnički režim, omogućavajući vam da isključite sve naredbe koje se odnose na uređivanje dizajna vašeg projekta
Mode reduït d'usuari, que permet deshabilitar totes les ordres relacionades amb l'edició del disseny del projecte
+ Mode reduït d'usuari, que permet deshabilitar totes les ordes relacionades amb l'edició del disseny del projecte
Locked down User Mode, allowing you to switch off all commands related to editing your project's design
Modo de usuario limitado, que permite desactivar todas las ordenes relacionadas con la edición del diseño de su proyecto
Piiratud õigustega kasutajarežiim, mis võimaldab lülitada välja kõik projekti kujunduse muutmisega seotud käsud
Lukittu käyttäjätila, jossa voit poistaa käytöstä projektin suunnitteluun liittyvät komennot
Mode utilisateur verrouillé, vous permettant de désactiver toutes les commandes liées à la modification de la conception de votre projet
+ Modo de usuario bloqueado, que permite desactivar todas as ordes de edición do deseño do proxecto.
Modalità utente bloccata, che ti consente di disattivare tutti i comandi in grado di modificare la struttura del tuo progetto.
プロジェクトデザインの編集スイッチをオフにする事でユーザモードへのロックダウンが可能
Låst brukermodus, slik at du kan slå av alle kommandoer som gjelder endring av prosjektets utforming
@@ -265,12 +285,14 @@
Scripting using JavaScript, Python or Ruby programming languages (experimental)
Scripting koristeći JavaScript, Python ili Ruby programskim jezicima (eksperimentalno)
Crear scripts usant els llenguatges de programació JavaScript, Python o Ruby (experimental)
+ Crear scripts usant els llenguatges de programació JavaScript, Python o Ruby (experimental)
Unterstützung für Skripte in den Programmsprachen JavaScript, Python oder Ruby (experimentell)
Scripting using JavaScript, Python or Ruby programming languages (experimental)
Programación de scripts escritos en los lenguajes de programación JavaScript, Python o Ruby (experimental)
Skriptimisvõimalused JavaScripti, Pythoni või Ruby programmeerimiskeeles (eksperimentaalne)
Skriptaus JavaScript-, Python- tai Ruby-ohjelmointikielillä (kokeellinen)
Pilotage par scripts utilisant les les langages JavaScript, Python ou Ruby (expérimental)
+ Uso de scripts nas linguaxes de programación JavaScript, Python e Ruby (experimental).
Creazione script utilizzando i linguaggi di programmazione JavaScript, Python o Ruby (sperimentale)
JavaScript, Python や Ruby を使用してのスクリプティング(実験的)
Skripting ved bruk av JavaScript, Python eller Ruby programmeringsspråk (eksperimentelt)
@@ -296,12 +318,14 @@
Table View storing images
Tabela View čuvanje slika
Vista de taula emmagatzemant imatges
+ Vista de taula emmagatzemant imatges
Tabellenansicht mit Bildern
Table View storing images
Una vista de tabla para almacenar imágenes
Tabelivaates piltide salvestamise võimalus
Kuvien tallennus taulukkonäkymään
Affichage de tables stockant des images
+ Vista de táboa que almacena imaxes.
Vista tabella per archiviare immagini
イメージを格納するテーブルビュー
Tabellvisning som lagrer bilder
@@ -320,12 +344,14 @@
Form Designer
Obrazac Designer
Dissenyador de formularis
+ Dissenyador de formularis
Formular-Designer
Form Designer
Diseñador de formularios
Vormikujundaja
Lomakkeiden suunnittelu
Concepteur de formulaires
+ Deseñador de formularios
Progettazione moduli
フォームデザイナー
Skjemautformer
diff -Nru calligra-2.9.7/kexi/kexidb/alter.cpp calligra-2.9.11/kexi/kexidb/alter.cpp
--- calligra-2.9.7/kexi/kexidb/alter.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/alter.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1025,6 +1025,7 @@
foreach(Field* f, *newTable->fields()) {
QString renamedFieldName(fieldHash.value(f->name()));
QString sourceSQLString;
+ const Field::Type type = f->type(); // cache: evaluating type of expressions can be expensive
if (!renamedFieldName.isEmpty()) {
//this field should be renamed
sourceSQLString = d->conn->escapeIdentifier(renamedFieldName);
@@ -1033,15 +1034,15 @@
//! @todo support expressions (eg. TODAY()) as a default value
//! @todo this field can be notNull or notEmpty - check whether the default is ok
//! (or do this checking also in the Table Designer?)
- sourceSQLString = d->conn->driver()->valueToSQL(f->type(), f->defaultValue());
+ sourceSQLString = d->conn->driver()->valueToSQL(type, f->defaultValue());
} else if (f->isNotNull()) {
//this field cannot be null
sourceSQLString = d->conn->driver()->valueToSQL(
- f->type(), KexiDB::emptyValueForType(f->type()));
+ type, KexiDB::emptyValueForType(type));
} else if (f->isNotEmpty()) {
//this field cannot be empty - use any nonempty value..., e.g. " " for text or 0 for number
sourceSQLString = d->conn->driver()->valueToSQL(
- f->type(), KexiDB::notEmptyValueForType(f->type()));
+ type, KexiDB::notEmptyValueForType(type));
}
//! @todo support unique, validatationRule, unsigned flags...
//! @todo check for foreignKey values...
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/mysql/kexidb_mysqldriver.desktop calligra-2.9.11/kexi/kexidb/drivers/mysql/kexidb_mysqldriver.desktop
--- calligra-2.9.7/kexi/kexidb/drivers/mysql/kexidb_mysqldriver.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/mysql/kexidb_mysqldriver.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -47,7 +47,7 @@
Name[ro]=MySQL
Name[ru]=MySQL
Name[se]=MySQL
-Name[sk]=mySQL
+Name[sk]=MySQL
Name[sl]=MySQL
Name[sv]=MySQL
Name[tg]=MySQL
@@ -64,7 +64,6 @@
Comment[bs]=Kexi drajver baze podataka za pristup MYSQL serverima
Comment[ca]=Controlador de bases de dades Kexi per a accedir a servidors MySQL
Comment[ca@valencia]=Controlador de bases de dades Kexi per a accedir a servidors MySQL
-Comment[cs]=Databázový ovladač pro přístup k serverům MySQL
Comment[da]=Databasedriver til at tilgå MySQL-servere til Kexi
Comment[de]=Kexi-Datenbanktreiber für Zugriff auf MySQL-Server
Comment[el]=Οδηγός βάσης δεδομένων του Kexi για πρόσβαση σε εξυπηρετητές MySQL
@@ -73,13 +72,12 @@
Comment[et]=Kexi andmebaasidraiver MySQL serverite kasutamiseks
Comment[eu]=MySQL zerbitzariak atzitzeko Kexi datu-base kontrolatzailea
Comment[fi]=Kexi-tietokanta-ajuri MySQL-palvelinten käyttämiseksi
-Comment[fr]=Pilote de base de données Kexi pour accéder aux serveurs MySQL
Comment[fy]=Kexi databank stjoerprogramma foar tagong ta MySQL-tsjinners
Comment[gl]=Controlador de Kexi para o acceso a bases de datos MySQL.
Comment[hi]=माईएसक्यूएल सर्वरों पर पहुंच के लिए केएक्साई डाटाबेस ड्राइवर
Comment[hne]=माईएसक्यूएल सर्वरों मं पहुंच बर केएक्साई डाटाबेस ड्राइवर
Comment[hu]=Kexi adatbázis-meghajtó a MySQL kiszolgálók eléréséhez
-Comment[it]=Driver per banche dati Kexi per accedere ai server MySQL
+Comment[it]=Driver per banche dati di Kexi per accedere ai server MySQL
Comment[ja]=MySQL サーバにアクセスするための Kexi データベースドライバ
Comment[kk]=Kexi деректер қорының MySQL серверлерге қатынау драйвері
Comment[lv]=Kexi datubāzes draiveris piekļūšanai MySQL serveriem
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqlconnection_p.cpp calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqlconnection_p.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqlconnection_p.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqlconnection_p.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -44,14 +44,14 @@
, mysql_owned(true)
, res(0)
, lowerCaseTableNames(false)
+ , serverVersion(0)
{
}
MySqlConnectionInternal::~MySqlConnectionInternal()
{
if (mysql_owned && mysql) {
- mysql_close(mysql);
- mysql = 0;
+ db_disconnect();
}
}
@@ -106,8 +106,10 @@
QByteArray pwd(data.password.isNull() ? QByteArray() : data.password.toLatin1());
mysql_real_connect(mysql, hostName.toLatin1(), data.userName.toLatin1(),
pwd.constData(), 0, data.port, localSocket, 0);
- if (mysql_errno(mysql) == 0)
+ if (mysql_errno(mysql) == 0) {
+ serverVersion = mysql_get_server_version(mysql);
return true;
+ }
storeResult(); //store error msg, if any - can be destroyed after disconnect()
db_disconnect();
@@ -120,6 +122,7 @@
{
mysql_close(mysql);
mysql = 0;
+ serverVersion = 0;
KexiDBDrvDbg;
return true;
}
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqlconnection_p.h calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqlconnection_p.h
--- calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqlconnection_p.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqlconnection_p.h 2016-02-02 19:53:13.000000000 +0000
@@ -85,6 +85,12 @@
int res; //!< result code of last operation on server
//! Get lower_case_table_name variable value so we know if there's case sensitivity supported for table and database names
bool lowerCaseTableNames;
+ //! Server version known after successfull connection.
+ //! Equal to major_version*10000 + release_level*100 + sub_version
+ //! 0 if not known.
+ //! See https://dev.mysql.com/doc/refman/5.7/en/mysql-get-server-version.html
+ //! @todo store in Connection base class as a property or as public server info
+ unsigned long serverVersion;
};
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqlcursor.cpp calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqlcursor.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqlcursor.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqlcursor.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Joseph Wenninger
- Copyright (C) 2005 Jarosław Staniek
+ Copyright (C) 2005-2016 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -112,8 +112,8 @@
if (!d->mysqlrow || pos >= m_fieldCount || d->mysqlrow[pos] == 0)
return QVariant();
- KexiDB::Field *f = (m_fieldsExpanded && pos < (uint)m_fieldsExpanded->count())
- ? m_fieldsExpanded->at(pos)->field : 0;
+ const KexiDB::Field *f = (m_visibleFieldsExpanded && pos < uint(m_visibleFieldsExpanded->count()))
+ ? m_visibleFieldsExpanded->at(pos)->field : 0;
//! @todo js: use MYSQL_FIELD::type here!
@@ -130,15 +130,15 @@
if (d->numRows == 0)
return false;
-//! @todo js: use MYSQL_FIELD::type here!
-//! see SQLiteCursor::storeCurrentRow()
+ if (!m_visibleFieldsExpanded) {//simple version: without types
+ for (uint i = 0; i < m_fieldCount; i++) {
+ data[i] = QString::fromUtf8(d->mysqlrow[i], d->lengths[i]);
+ }
+ return true;
+ }
- const uint fieldsExpandedCount = m_fieldsExpanded ? m_fieldsExpanded->count() : UINT_MAX;
- const uint realCount = qMin(fieldsExpandedCount, m_fieldsToStoreInRow);
- for (uint i = 0; i < realCount; i++) {
- Field *f = m_fieldsExpanded ? m_fieldsExpanded->at(i)->field : 0;
- if (m_fieldsExpanded && !f)
- continue;
+ for (int i = 0; i < int(m_fieldCount); ++i) {
+ Field *f = m_visibleFieldsExpanded->at(i)->field;
data[i] = KexiDB::cstringToVariant(d->mysqlrow[i], f, d->lengths[i]);
}
return true;
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqldriver.cpp calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqldriver.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqldriver.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqldriver.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -2,6 +2,7 @@
Copyright (C) 2002 Lucijan Busch
Daniel Molkentin
Copyright (C) 2003 Joseph Wenninger
+Copyright (C) 2003-2016 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -25,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
@@ -64,14 +66,16 @@
beh->QUOTATION_MARKS_FOR_IDENTIFIER = '`';
//! @todo add configuration option
beh->TEXT_TYPE_MAX_LENGTH = 255;
+ beh->RANDOM_FUNCTION = "RAND";
initDriverSpecificKeywords(keywords);
//predefined properties
#if MYSQL_VERSION_ID < 40000
d->properties["client_library_version"] = MYSQL_SERVER_VERSION; //nothing better
d->properties["default_server_encoding"] = MYSQL_CHARSET; //nothing better
-#elif MYSQL_VERSION_ID < 50000
-//! @todo ??? d->properties["client_library_version"] = mysql_get_client_version();
+#else
+ // https://dev.mysql.com/doc/refman/5.7/en/mysql-get-client-version.html
+ d->properties["client_library_version"] = int(mysql_get_client_version());
#endif
d->typeNames[Field::Byte] = "TINYINT";
@@ -201,5 +205,28 @@
return QByteArray(str).replace('`', '\'');
}
-#include "mysqldriver.moc"
+QString MySqlDriver::lengthFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const
+{
+ return KexiDB::FunctionExpr::toString(QLatin1String("CHAR_LENGTH"), this, args, params);
+}
+QString MySqlDriver::greatestOrLeastFunctionToString(const QString &name,
+ KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const
+{
+ return KexiDB::FunctionExpr::greatestOrLeastFunctionUsingCaseToString(name, this, args, params);
+}
+
+QString MySqlDriver::unicodeFunctionToString(KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const
+{
+ return QString::fromLatin1("ORD(CONVERT(%1 USING UTF16))").arg(args->arg(0)->toString(this, params));
+}
+
+QString MySqlDriver::concatenateFunctionToString(KexiDB::BinaryExpr *args, QuerySchemaParameterValueListIterator* params) const
+{
+ return QString::fromLatin1("CONCAT(%1, %2)").arg(args->left()->toString(this, params))
+ .arg(args->right()->toString(this, params));
+}
+
+#include "mysqldriver.moc"
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqldriver.h calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqldriver.h
--- calligra-2.9.7/kexi/kexidb/drivers/mysql/mysqldriver.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/mysql/mysqldriver.h 2016-02-02 19:53:13.000000000 +0000
@@ -2,6 +2,7 @@
Copyright (C) 2002 Lucijan Busch
Daniel Molkentin
Copyright (C) 2003 Joseph Wenninger
+Copyright (C) 2003-2016 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -46,6 +47,30 @@
//! Escape BLOB value \a array
virtual QString escapeBLOB(const QByteArray& array) const;
+ //! Generates native (driver-specific) LENGTH() function call.
+ //! char_length(val) is used because length(val) in mysql returns number of bytes,
+ //! what is not right for multibyte (unicode) encodings. */
+ virtual QString lengthFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const;
+
+ //! Generates native (driver-specific) GREATEST() and LEAST() function call.
+ //! Since MySQL's LEAST()/GREATEST() function ignores NULL values, it only returns NULL
+ //! if all the expressions evaluate to NULL. So this is used for F(v0,..,vN):
+ //! (CASE WHEN (v0) IS NULL OR .. OR (vN) IS NULL THEN NULL ELSE F(v0,..,vN) END)
+ //! where F == GREATEST or LEAST.
+ virtual QString greatestOrLeastFunctionToString(const QString &name,
+ KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const;
+
+ //! Generates native (driver-specific) UNICODE() function call.
+ //! Uses ORD(CONVERT(X USING UTF16)).
+ virtual QString unicodeFunctionToString(KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const;
+
+ //! Generates native (driver-specific) function call for concatenation of two strings.
+ //! Uses CONCAT().
+ virtual QString concatenateFunctionToString(KexiDB::BinaryExpr *args,
+ QuerySchemaParameterValueListIterator* params) const;
+
protected:
virtual QString drv_escapeIdentifier(const QString& str) const;
virtual QByteArray drv_escapeIdentifier(const QByteArray& str) const;
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop calligra-2.9.11/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop
--- calligra-2.9.7/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -63,7 +63,6 @@
Comment[bs]=Kexi drajver baze podataka za pristup PostgreSQL serverima
Comment[ca]=Controlador de bases de dades Kexi per a accedir a servidors PostgreSQL
Comment[ca@valencia]=Controlador de bases de dades Kexi per a accedir a servidors PostgreSQL
-Comment[cs]=Databázový ovladač pro přístup k serverům PostgreSQL
Comment[da]=Databasedriver til at tilgå PostgreSQL-servere til Kexi
Comment[de]=Kexi-Datenbanktreiber für Zugriff auf PostgreSQL-Server
Comment[el]=Οδηγός βάσης δεδομένων του Kexi για πρόσβαση σε εξυπηρετητές PostgreSQL
@@ -72,13 +71,12 @@
Comment[et]=Kexi andmebaasidraiver PostgreSQL serverite kasutamiseks
Comment[eu]=PostgreSQL zerbitzariak atzitzeko Kexi datu-base kontrolatzailea
Comment[fi]=Kexi-tietokanta-ajuri PostgreSQL-palvelinten käyttämiseksi
-Comment[fr]=Pilote de base de données Kexi pour accéder aux serveurs PostgreSQL
Comment[fy]=Kexi databank stjoerprogramma foar tagong ta PostgreSQL-tsjinners
Comment[gl]=Controlador de Kexi para o acceso a bases de datos PostgreSQL.
Comment[hi]=पोस्टग्रेएसक्यूएल सर्वरों पर पहुँच के लिए केएक्साई डाटाबेस ड्राइवर
Comment[hne]=पोस्टग्रेएसक्यूएल सर्वरों मं पहुंचे बर केएक्साई डाटाबेस ड्राइवर
Comment[hu]=Kexi adatbázis-meghajtó a PostgreSQL kiszolgálók eléréséhez
-Comment[it]=Driver per banche dati Kexi per accedere ai server PostgreSQL
+Comment[it]=Driver per banche dati di Kexi per accedere ai server PostgreSQL
Comment[ja]=PostgreSQL サーバにアクセスするための Kexi データベースドライバ
Comment[kk]=Kexi деректер қорының PostgreSQL серверлерге қатынау драйвері
Comment[lv]=Kexi datubāzu draiveris PostgreSQL serveriem
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Adam Pigg
+ Copyright (C) 2003-2015 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -196,6 +197,10 @@
if (d->version) {
//! @todo set version using the connection pointer when we drop libpqxx for libpq
}
+ //! @todo call on first use of SOUNDEX(), etc.;
+ //! it's not possible now because we don't have connection context in FunctionExpr
+ drv_executeSQL("CREATE EXTENSION fuzzystrmatch");
+
return true;
} catch (const std::exception &e) {
KexiDBDrvDbg << "exception -" << e.what();
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -174,21 +174,23 @@
return QVariant();
}
- KexiDB::Field *f = (m_fieldsExpanded && pos < qMin((uint)m_fieldsExpanded->count(), m_fieldCount))
- ? m_fieldsExpanded->at(pos)->field : 0;
-
// KexiDBDrvDbg << pos;
//from most to least frequently used types:
+ const Field *f = (m_visibleFieldsExpanded && pos < uint(m_visibleFieldsExpanded->count()))
+ ? m_visibleFieldsExpanded->at(pos)->field : 0;
if (f) { //We probably have a schema type query so can use kexi to determin the row type
- if ((f->isIntegerType()) || (/*ROWID*/!f && m_containsROWIDInfo && pos == m_fieldCount)) {
+ const Field::Type type = f->type(); // cache: evaluating type of expressions can be expensive
+ if (type == Field::Null || type == Field::InvalidType) {
+ return QVariant();
+ } else if (Field::isIntegerType(type) || (/*ROWID*/!f && m_containsROWIDInfo && pos == m_fieldCount)) {
return (*m_res)[at()][pos].as(int());
- } else if (f->isTextType()) {
+ } else if (Field::isTextType(type)) {
return QString::fromUtf8((*m_res)[at()][pos].c_str()); //utf8?
- } else if (f->isFPNumericType()) {
+ } else if (Field::isFPNumericType(type)) {
return (*m_res)[at()][pos].as(double());
- } else if (f->type() == Field::Boolean) {
+ } else if (type == Field::Boolean) {
return QString((*m_res)[at()][pos].c_str()).toLower() == "t" ? QVariant(true) : QVariant(false);
- } else if (f->typeGroup() == Field::BLOBGroup) {
+ } else if (Field::typeGroup(type) == Field::BLOBGroup) {
// pqxx::result::field r = (*m_res)[at()][pos];
// kDebug() << r.name() << ", " << r.c_str() << ", " << r.type() << ", " << r.size();
return ::pgsqlByteaToByteArray((*m_res)[at()][pos]);
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Adam Pigg
+ Copyright (C) 2003-2015 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -21,6 +22,7 @@
#include
#include
#include
+#include
#include "pqxxdriver.h"
#include "pqxxconnection.h"
@@ -164,7 +166,7 @@
//
QString pqxxSqlDriver::escapeBLOB(const QByteArray& array) const
{
- return KexiDB::escapeBLOB(array, KexiDB::BLOBEscapeOctal);
+ return KexiDB::escapeBLOB(array, KexiDB::BLOBEscapeByteaHex);
}
QString pqxxSqlDriver::valueToSQL(uint ftype, const QVariant& v) const
@@ -178,4 +180,36 @@
return Driver::valueToSQL(ftype, v);
}
+QString pqxxSqlDriver::hexFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const
+{
+ return QString::fromLatin1("UPPER(ENCODE(%1, 'hex'))").arg(args->arg(0)->toString(this, params));
+}
+
+QString pqxxSqlDriver::ifnullFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const
+{
+ return KexiDB::FunctionExpr::toString(QLatin1String("COALESCE"), this, args, params);
+}
+
+QString pqxxSqlDriver::lengthFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const
+{
+ KexiDB::BaseExpr *arg = args->arg(0);
+ if (arg->type() == KexiDB::Field::BLOB) {
+ return KexiDB::FunctionExpr::toString(QLatin1String("OCTET_LENGTH"), this, args, params);
+ }
+ return Driver::lengthFunctionToString(args, params); // default
+}
+
+QString pqxxSqlDriver::greatestOrLeastFunctionToString(const QString &name,
+ KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const
+{
+ return KexiDB::FunctionExpr::greatestOrLeastFunctionUsingCaseToString(name, this, args, params);
+}
+
+QString pqxxSqlDriver::unicodeFunctionToString(KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const
+{
+ return QString::fromLatin1("ASCII(%1)").arg(args->arg(0)->toString(this, params));
+}
+
#include "pqxxdriver.moc"
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxdriver.h calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxdriver.h
--- calligra-2.9.7/kexi/kexidb/drivers/pqxx/pqxxdriver.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/pqxx/pqxxdriver.h 2016-02-02 19:53:13.000000000 +0000
@@ -1,5 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Adam Pigg
+ Copyright (C) 2003-2015 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -53,6 +54,34 @@
Reimplemented for boolean type only to use SQL compliant TRUE or FALSE */
virtual QString valueToSQL(uint ftype, const QVariant& v) const;
+ //! Generates native (driver-specific) HEX() function call.
+ //! Uses UPPER(ENCODE(val, 'hex')).
+ //! See http://www.postgresql.org/docs/9.3/static/functions-string.html#FUNCTIONS-STRING-OTHER */
+ virtual QString hexFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const;
+
+ //! Generates native (driver-specific) IFNULL() function call.
+ //! Uses COALESCE().
+ virtual QString ifnullFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const;
+
+ //! Generates native (driver-specific) LENGTH() function call.
+ //! For text types default LENGTH(val) is used, for BLOBs OCTET_LENGTH(val) is used because
+ //! LENGTH(val) for BLOB returns number of bits.
+ virtual QString lengthFunctionToString(KexiDB::NArgExpr *args, QuerySchemaParameterValueListIterator* params) const;
+
+ //! Generates native (driver-specific) GREATEST() and LEAST() function calls.
+ //! Since PostgreSQL's LEAST()/GREATEST() function ignores NULL values, it only returns NULL
+ //! if all the expressions evaluate to NULL. So this is used for F(v0,..,vN):
+ //! (CASE WHEN (v0) IS NULL OR .. OR (vN) IS NULL THEN NULL ELSE F(v0,..,vN) END)
+ //! where F == GREATEST or LEAST.
+ virtual QString greatestOrLeastFunctionToString(const QString &name,
+ KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const;
+
+ //! Generates native (driver-specific) UNICODE() function call.
+ //! Uses ASCII(X).
+ virtual QString unicodeFunctionToString(KexiDB::NArgExpr *args,
+ QuerySchemaParameterValueListIterator* params) const;
+
protected:
virtual QString drv_escapeIdentifier(const QString& str) const;
virtual QByteArray drv_escapeIdentifier(const QByteArray& str) const;
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop calligra-2.9.11/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop
--- calligra-2.9.7/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -52,7 +52,6 @@
Comment[bs]=Kexi drajver baze podataka za pristup Sybase serverima
Comment[ca]=Controlador de bases de dades Kexi per a accedir a servidors Sybase
Comment[ca@valencia]=Controlador de bases de dades Kexi per a accedir a servidors Sybase
-Comment[cs]=Databázový ovladač pro přístup k serverům Sybase
Comment[da]=Databasedriver til at tilgå Sybase-servere til Kexi
Comment[de]=Kexi-Datenbanktreiber für Zugriff auf Sybase-Server
Comment[el]=Οδηγός βάσης δεδομένων του Kexi για πρόσβαση σε εξυπηρετητές Sybase
@@ -61,14 +60,13 @@
Comment[et]=Kexi andmebaasidraiver Sybase serverite kasutamiseks
Comment[eu]=Sybase zerbitzariak atzitzeko Kexi datu-base kontrolatzailea
Comment[fi]=Kexi-tietokanta-ajuri Sybase-palvelinten käyttämiseksi
-Comment[fr]=Pilote de base de données Kexi pour accéder aux serveurs Sybase
Comment[fy]=Kexi databank stjoerprogramma foar tagong ta Sybase-tsjinners
Comment[ga]=Tiománaí bunachair sonraí Kexi lenar féidir freastalaithe Sybase a rochtain
Comment[gl]=Controlador de Kexi para o acceso a bases de datos Sybase.
Comment[hi]=साइबेस सर्वरों पर पहुँच के लिए केएक्जाई डाटाबेस ड्राइवर
Comment[hne]=साइबेस सर्वरों मं पहुंचे बर केएक्जाई डाटाबेस ड्राइवर
Comment[hu]=Kexi adatbázis-meghajtó a Sybase kiszolgálók eléréséhez
-Comment[it]=Driver per banche dati Kexi per accedere ai server Sybase
+Comment[it]=Driver per banche dati di Kexi per accedere ai server Sybase
Comment[ja]=Sybase サーバにアクセスするための Kexi データベースドライバ
Comment[kk]=Kexi деректер қорының Sybase серверлерге қатынау драйвері
Comment[lv]=Kexi datubāzu draiveris Sybase serveriem
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/sybase/sybasecursor.cpp calligra-2.9.11/kexi/kexidb/drivers/sybase/sybasecursor.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/sybase/sybasecursor.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/sybase/sybasecursor.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -147,8 +147,8 @@
if (!d->dbProcess || pos >= m_fieldCount)
return QVariant();
- KexiDB::Field *f = (m_fieldsExpanded && pos < uint(m_fieldsExpanded->count()))
- ? m_fieldsExpanded->at(pos)->field : 0;
+ KexiDB::Field *f = (m_visibleFieldsExpanded && pos < uint(m_visibleFieldsExpanded->count()))
+ ? m_visibleFieldsExpanded->at(pos)->field : 0;
// db-library indexes its columns from 1
pos = pos + 1;
@@ -182,11 +182,11 @@
// if (d->numRows<=0)
// return false;
- const uint fieldsExpandedCount = m_fieldsExpanded ? m_fieldsExpanded->count() : UINT_MAX;
+ const uint fieldsExpandedCount = m_visibleFieldsExpanded ? m_visibleFieldsExpanded->count() : UINT_MAX;
const uint realCount = qMin(fieldsExpandedCount, m_fieldsToStoreInRow);
for (uint i = 0; i < realCount; i++) {
- Field *f = m_fieldsExpanded ? m_fieldsExpanded->at(i)->field : 0;
- if (m_fieldsExpanded && !f)
+ Field *f = m_visibleFieldsExpanded ? m_visibleFieldsExpanded->at(i)->field : 0;
+ if (m_visibleFieldsExpanded && !f)
continue;
long int columnDataLength = dbdatlen(d->dbProcess, i + 1);
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop calligra-2.9.11/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop
--- calligra-2.9.7/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -48,7 +48,6 @@
Comment[bs]=Kexi drajver baze podataka za pristup xBase serverima
Comment[ca]=Controlador de bases de dades Kexi per a accedir a fitxers de bases de dades xBase
Comment[ca@valencia]=Controlador de bases de dades Kexi per a accedir a fitxers de bases de dades xBase
-Comment[cs]=Databázový ovladač pro přístup k databázovým souborům xBase
Comment[da]=Databasedriver til at tilgå xBase-servere til Kexi
Comment[de]=Kexi-Datenbanktreiber für Zugriff auf xBase-Datenbankdateien
Comment[el]=Οδηγός βάσης δεδομένων του Kexi για πρόσβαση σε αρχεία βάσεων xBase
@@ -57,7 +56,6 @@
Comment[et]=Kexi andmebaasidraiver xBase andmebaasifailide kasutamiseks
Comment[eu]=xBase zerbitzariak atzitzeko Kexi datu-base kontrolatzailea
Comment[fi]=Kexi-tietokanta-ajuri xBase-palvelinten käyttämiseksi
-Comment[fr]=Pilote de base de données Kexi pour accéder aux fichiers xBase
Comment[ga]=Tiománaí bunachair sonraí Kexi lenar féidir comhaid bhunachar sonraí xBase a rochtain
Comment[gl]=Controlador de Kexi para o acceso a ficheiros de bases de datos xBase.
Comment[hne]=एक्सबेस सर्वर मं पहुंचे बर केएक्जाई डाटाबेस ड्राइवर
diff -Nru calligra-2.9.7/kexi/kexidb/drivers/xbase/xbaseexport.cpp calligra-2.9.11/kexi/kexidb/drivers/xbase/xbaseexport.cpp
--- calligra-2.9.7/kexi/kexidb/drivers/xbase/xbaseexport.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/drivers/xbase/xbaseexport.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -152,13 +152,15 @@
return true;
}
-int xBaseExportPrivate::fieldLength(KexiDB::Field* f ) {
- if ( f->type() == KexiDB::Field::Text ) {
+int xBaseExportPrivate::fieldLength(KexiDB::Field* f)
+{
+ const Field::Type t = f->type(); // cache: evaluating type of expressions can be expensive
+ if (KexiDB::Field::isTextType(t)) {
return f->maxLength();
}
// return the max possible (string)length of the types
// see http://linux.techass.com/projects/xdb/xbasedocs/xbase_c3.html
- switch(type( f->type())) {
+ switch(type(t)) {
case XB_CHAR_FLD:
return 254;
case XB_LOGICAL_FLD:
diff -Nru calligra-2.9.7/kexi/kexidb/fieldvalidator.cpp calligra-2.9.11/kexi/kexidb/fieldvalidator.cpp
--- calligra-2.9.7/kexi/kexidb/fieldvalidator.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexidb/fieldvalidator.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -32,8 +32,8 @@
//! @todo merge this code with KexiTableEdit code!
//! @todo set maximum length validator
//! @todo handle input mask (via QLineEdit::setInputMask()
- const Field::Type t = field.type();
- if (field.isIntegerType()) {
+ const Field::Type t = field.type(); // cache: evaluating type of expressions can be expensive
+ if (Field::isIntegerType(t)) {
QValidator *validator = 0;
const bool u = field.isUnsigned();
int bottom = 0, top = 0;
@@ -54,7 +54,7 @@
if (!validator)
validator = new KIntValidator(bottom, top, 0); //the default
addSubvalidator(validator);
- } else if (field.isFPNumericType()) {
+ } else if (Field::isFPNumericType(t)) {
QValidator *validator;
if (t == Field::Float) {
if (field.isUnsigned()) //ok?
diff -Nru calligra-2.9.7/kexi/kexi.desktop calligra-2.9.11/kexi/kexi.desktop
--- calligra-2.9.7/kexi/kexi.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexi.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -68,8 +68,7 @@
GenericName[br]=Aozer ar stlennvon
GenericName[bs]=Kreator baze podataka
GenericName[ca]=Generador de bases de dades
-GenericName[ca@valencia]=Creador de bases de dades
-GenericName[cs]=Tvůrce databází
+GenericName[ca@valencia]=Generador de bases de dades
GenericName[cy]=Creuydd Cronfa Ddata
GenericName[da]=Opretter af databaser
GenericName[de]=Datenbank-Erstellung
@@ -81,7 +80,6 @@
GenericName[eu]=Datu-base sortzailea
GenericName[fa]=ایجادکننده دادگان
GenericName[fi]=Tietokantojen luonti
-GenericName[fr]=Créateur de base de données
GenericName[fy]=Databank oanmeitsje
GenericName[ga]=Cruthaitheoir Bunachar Sonraí
GenericName[gl]=Editor de bases da datos
@@ -125,7 +123,6 @@
Comment[bs]=Razvijte stone programe za baze podataka
Comment[ca]=Aplicacions de desenvolupament de bases de dades d'escriptori
Comment[ca@valencia]=Aplicacions de desenvolupament de bases de dades d'escriptori
-Comment[cs]=Vyvíjejte databázové grafické aplikace
Comment[da]=Udvikl databaseprogrammer for desktoppen
Comment[de]=Desktop-Datenbankanwendungen entwickeln
Comment[el]=Ανάπτυξη εφαρμογών βάσεων δεδομένων
@@ -136,7 +133,6 @@
Comment[eu]=Garatu mahaigaineko datu-base aplikazioak
Comment[fa]=توسعه کاربردهای دادگان رومیزی
Comment[fi]=Kehitä tietokantasovelluksia
-Comment[fr]=Développer des applications de bases de données de bureau
Comment[fy]=Untwikkel databankapplikaasjes
Comment[ga]=Forbair feidhmchláir bhunachair sonraí don deasc
Comment[gl]=Desenvolva aplicativos de escritorio empregando bases de dados.
diff -Nru calligra-2.9.7/kexi/kexiutils/completer/KexiCompleter.cpp calligra-2.9.11/kexi/kexiutils/completer/KexiCompleter.cpp
--- calligra-2.9.7/kexi/kexiutils/completer/KexiCompleter.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/kexiutils/completer/KexiCompleter.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -148,7 +148,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -929,26 +928,27 @@
showPopup(popupRect);
}
-void KexiCompleterPrivate::showPopup(const QRect& rect)
+static void adjustPopupGeometry(QWidget *popupWidget, QWidget *widget, int widthHint,
+ int heightHint, const QRect ¤tRect)
{
const QRect screen = QApplication::desktop()->availableGeometry(widget);
- Qt::LayoutDirection dir = widget->layoutDirection();
+ const Qt::LayoutDirection dir = widget->layoutDirection();
QPoint pos;
int rh, w;
- int h = (popup->sizeHintForRow(0) * qMin(maxVisibleItems, popup->model()->rowCount()) + 3) + 3;
- QScrollBar *hsb = popup->horizontalScrollBar();
- if (hsb && hsb->isVisible())
- h += popup->horizontalScrollBar()->sizeHint().height();
+ int h = heightHint;
- if (rect.isValid()) {
- rh = rect.height();
- w = rect.width();
- pos = widget->mapToGlobal(dir == Qt::RightToLeft ? rect.bottomRight() : rect.bottomLeft());
+ if (currentRect.isValid()) {
+ rh = currentRect.height();
+ w = currentRect.width();
+ pos = widget->mapToGlobal(dir == Qt::RightToLeft ? currentRect.bottomRight() : currentRect.bottomLeft());
} else {
rh = widget->height();
pos = widget->mapToGlobal(QPoint(0, widget->height() - 2));
w = widget->width();
}
+ if (widthHint > w) {
+ w = widthHint;
+ }
if (w > screen.width())
w = screen.width();
@@ -959,7 +959,7 @@
int top = pos.y() - rh - screen.top() + 2;
int bottom = screen.bottom() - pos.y();
- h = qMax(h, popup->minimumHeight());
+ h = qMax(h, popupWidget->minimumHeight());
if (h > bottom) {
h = qMin(qMax(top, bottom), h);
@@ -967,8 +967,22 @@
pos.setY(pos.y() - h - rh + 2);
}
- popup->setGeometry(pos.x(), pos.y(), w, h);
+ popupWidget->setGeometry(pos.x(), pos.y(), w, h);
+}
+void KexiCompleterPrivate::showPopup(const QRect& rect)
+{
+ int widthHint = popup->sizeHintForColumn(0);
+ QScrollBar *vsb = popup->verticalScrollBar();
+ if (vsb) {
+ widthHint += vsb->sizeHint().width() + 3 + 3;
+ }
+ int heightHint = (popup->sizeHintForRow(0) * qMin(maxVisibleItems, popup->model()->rowCount()) + 3) + 3;
+ QScrollBar *hsb = popup->horizontalScrollBar();
+ if (hsb && hsb->isVisible()) {
+ heightHint += hsb->sizeHint().height();
+ }
+ adjustPopupGeometry(popup, widget, widthHint, heightHint, rect);
if (!popup->isVisible())
popup->show();
}
diff -Nru calligra-2.9.7/kexi/kexiutils/debuggui.cpp calligra-2.9.11/kexi/kexiutils/debuggui.cpp
--- calligra-2.9.7/kexi/kexiutils/debuggui.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/kexiutils/debuggui.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include
static DebugWindow* debugWindow = 0;
@@ -51,7 +52,7 @@
if (!kexiDBDebugPage) {
QWidget *page = new QWidget(debugWindowTab);
QVBoxLayout *vbox = new QVBoxLayout(page);
- QHBoxLayout *hbox = new QHBoxLayout(page);
+ QHBoxLayout *hbox = new QHBoxLayout;
vbox->addLayout(hbox);
hbox->addStretch(1);
KPushButton *btn_copy = new KPushButton(page);
@@ -62,7 +63,7 @@
kexiDBDebugPage = new KexiDBDebugTreeWidget(page);
kexiDBDebugPage->setObjectName("kexiDbDebugPage");
- kexiDBDebugPage->setFont(KexiUtils::smallFont(kexiDBDebugPage));
+ kexiDBDebugPage->setFont(KGlobalSettings::smallestReadableFont());
QObject::connect(btn_copy, SIGNAL(clicked()), kexiDBDebugPage, SLOT(copy()));
QObject::connect(btn_clear, SIGNAL(clicked()), kexiDBDebugPage, SLOT(clear()));
vbox->addWidget(kexiDBDebugPage);
@@ -115,7 +116,7 @@
hbox->addWidget(btn_sim);
kexiAlterTableActionDebugPage = new QTreeWidget(page);
- kexiAlterTableActionDebugPage->setFont(KexiUtils::smallFont(kexiAlterTableActionDebugPage));
+ kexiAlterTableActionDebugPage->setFont(KGlobalSettings::smallestReadableFont());
kexiAlterTableActionDebugPage->setObjectName("kexiAlterTableActionDebugPage");
QObject::connect(btn_clear, SIGNAL(clicked()), kexiAlterTableActionDebugPage, SLOT(clear()));
vbox->addWidget(kexiAlterTableActionDebugPage);
diff -Nru calligra-2.9.7/kexi/kexiutils/SmallToolButton.cpp calligra-2.9.11/kexi/kexiutils/SmallToolButton.cpp
--- calligra-2.9.7/kexi/kexiutils/SmallToolButton.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/kexiutils/SmallToolButton.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -112,7 +112,7 @@
{
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
QFont f(KGlobalSettings::toolBarFont());
- f.setPixelSize(KexiUtils::smallFont().pixelSize());
+ f.setPointSizeF(KGlobalSettings::smallestReadableFont().pointSizeF());
setFont(f);
setAutoRaise(true);
QToolButton::setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
diff -Nru calligra-2.9.7/kexi/kexiutils/utils.cpp calligra-2.9.11/kexi/kexiutils/utils.cpp
--- calligra-2.9.7/kexi/kexiutils/utils.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexiutils/utils.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -563,23 +563,6 @@
//---------
-K_GLOBAL_STATIC(QFont, _smallFont)
-
-QFont KexiUtils::smallFont(QWidget *init)
-{
- if (init) {
- *_smallFont = init->font();
- const int wdth = KGlobalSettings::desktopGeometry(init).width();
- int size = 10 + qMax(0, wdth - 1100) / 100;
- size = qMin(init->fontInfo().pixelSize(), size);
- size = qMax(KGlobalSettings::smallestReadableFont().pixelSize(), size);
- _smallFont->setPixelSize(size);
- }
- return *_smallFont;
-}
-
-//---------------------
-
KTextEditorFrame::KTextEditorFrame(QWidget * parent, Qt::WindowFlags f)
: QFrame(parent, f)
{
diff -Nru calligra-2.9.7/kexi/kexiutils/utils.h calligra-2.9.11/kexi/kexiutils/utils.h
--- calligra-2.9.7/kexi/kexiutils/utils.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/kexiutils/utils.h 2016-02-02 19:53:13.000000000 +0000
@@ -199,12 +199,6 @@
but returns a list of filter strings. */
KEXIUTILS_EXPORT QString fileDialogFilterStrings(const QStringList& mimeStrings, bool kdeFormat);
-/*! A global setting for minimal readable font.
- \a init is a widget that should be passed if no qApp->mainWidget() is available yet.
- The size of font is not smaller than the one returned by
- KGlobalSettings::smallestReadableFont(). */
-KEXIUTILS_EXPORT QFont smallFont(QWidget *init = 0);
-
/*! \return a color being a result of blending \a c1 with \a c2 with \a factor1
and \a factor1 factors: (c1*factor1+c2*factor2)/(factor1+factor2). */
KEXIUTILS_EXPORT QColor blendedColors(const QColor& c1, const QColor& c2, int factor1 = 1, int factor2 = 1);
diff -Nru calligra-2.9.7/kexi/main/KexiMainWindow.cpp calligra-2.9.11/kexi/main/KexiMainWindow.cpp
--- calligra-2.9.7/kexi/main/KexiMainWindow.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/main/KexiMainWindow.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Lucijan Busch
- Copyright (C) 2003-2014 Jarosław Staniek
+ Copyright (C) 2003-2015 Jarosław Staniek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -419,8 +419,6 @@
setupMainWidget();
updateAppCaption();
- (void)KexiUtils::smallFont(this/*init*/);
-
if (!d->userMode) {
setupContextHelp();
setupPropertyEditor();
@@ -1939,10 +1937,16 @@
//! @todo REMOVE? d->propEditor->installEventFilter(this);
KConfigGroup propertyEditorGroup(d->config->group("PropertyEditor"));
- int size = propertyEditorGroup.readEntry("FontSize", -1);
- QFont f(KexiUtils::smallFont());
- if (size > 0)
- f.setPixelSize(size);
+ QFont f(KGlobalSettings::smallestReadableFont());
+ const int pointSize = propertyEditorGroup.readEntry("FontPointSize", -1); // points are more accurate
+ if (pointSize > 0) {
+ f.setPointSize(pointSize);
+ } else {
+ const int pixelSize = propertyEditorGroup.readEntry("FontSize", -1); // compatibility with Kexi 2.x
+ if (pixelSize > 0) {
+ f.setPixelSize(pixelSize);
+ }
+ }
d->propEditorTabWidget->setFont(f);
d->enable_slotPropertyEditorVisibilityChanged = false;
@@ -2961,6 +2965,7 @@
hideDesignTab(previousItemId, QString());
d->removeWindow(window_id);
+ d->setWindowContainerExistsFor(window->partItem()->identifier(), false);
QWidget *windowContainer = window->parentWidget();
d->mainWidget->tabWidget()->removeTab(
d->mainWidget->tabWidget()->indexOf(windowContainer));
@@ -3118,6 +3123,10 @@
activateWindow(*window);
alreadyOpened = true;
} else {
+ if (d->windowContainerExistsFor(item->identifier())) {
+ // window not yet present but window container exists: return 0 and wait
+ return 0;
+ }
KexiPart::Part *part = Kexi::partManager().partForClass(item->partClass());
d->updatePropEditorVisibility(viewMode, part ? part->info() : 0);
//update tabs before opening
@@ -3127,6 +3136,7 @@
// open new tab earlier
windowContainer = new KexiWindowContainer(d->mainWidget->tabWidget());
+ d->setWindowContainerExistsFor(item->identifier(), true);
const int tabIndex = d->mainWidget->tabWidget()->addTab(
windowContainer,
KIcon(part ? part->info()->itemIconName() : QString()),
@@ -3163,6 +3173,7 @@
#ifndef KEXI_NO_PENDING_DIALOGS
d->removePendingWindow(item->identifier());
#endif
+ d->setWindowContainerExistsFor(item->identifier(), false);
d->mainWidget->tabWidget()->removeTab(
d->mainWidget->tabWidget()->indexOf(windowContainer));
delete windowContainer;
diff -Nru calligra-2.9.7/kexi/main/KexiMainWindow.h calligra-2.9.11/kexi/main/KexiMainWindow.h
--- calligra-2.9.7/kexi/main/KexiMainWindow.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/main/KexiMainWindow.h 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Lucijan Busch
- Copyright (C) 2003-2014 Jarosław Staniek
+ Copyright (C) 2003-2015 Jarosław Staniek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -203,7 +203,11 @@
(only works when part for this item is of type KexiPart::StaticPart).
\a openingCancelled is set to true is opening has been cancelled.
\a errorMessage, if not 0, points to a string that can be set to error message
- if one encountered. */
+ if one encountered.
+ @c nullptr can be returned if the KexiWindow object for @a item is not yet fully constructed
+ but openObject() has been quickly called again for the same @a item. This can happen if user
+ clicked multiple times on the same Project navigator's item. In this case @a openingCancelled
+ is not set; the caller should not display error message but the opening should be silently abandoned. */
virtual KexiWindow* openObject(KexiPart::Item *item, Kexi::ViewMode viewMode,
bool &openingCancelled, QMap* staticObjectArgs = 0,
QString* errorMessage = 0);
diff -Nru calligra-2.9.7/kexi/main/KexiMainWindow_p.h calligra-2.9.11/kexi/main/KexiMainWindow_p.h
--- calligra-2.9.7/kexi/main/KexiMainWindow_p.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/main/KexiMainWindow_p.h 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Lucijan Busch
- Copyright (C) 2003-2014 Jarosław Staniek
+ Copyright (C) 2003-2015 Jarosław Staniek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -374,9 +374,11 @@
m_menuWidget->addSeparator();
m_menuWidget->addAction(ac->action("project_new"));
m_menuWidget->addAction(ac->action("project_import_export_send"));
+#ifdef KEXI_SHOW_UNIMPLEMENTED
m_menuWidget->addAction(ac->action("project_properties"));
//! @todo project information
m_menuWidget->addAction(ac->action("settings"));
+#endif
m_menuWidget->addSeparator();
m_menuWidget->addAction(ac->action("quit"));
hlyr->addWidget(m_menuWidget);
@@ -830,7 +832,6 @@
const bool userMode = KexiMainWindowIface::global()->userMode();
KToolBar *tbar;
- KexiUtils::smallFont(this/*init*/);
slotSettingsChanged(KGlobalSettings::FontChanged);
connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)), this, SLOT(slotSettingsChanged(int)));
@@ -1542,6 +1543,19 @@
#endif
}
+ bool windowContainerExistsFor(int identifier) {
+ return windowContainers.contains(identifier);
+ }
+
+ void setWindowContainerExistsFor(int identifier, bool set) {
+ if (set) {
+ windowContainers.insert(identifier);
+ }
+ else {
+ windowContainers.remove(identifier);
+ }
+ }
+
#ifndef KEXI_NO_PENDING_DIALOGS
void addItemToPendingWindows(const KexiPart::Item* item, PendingJobType jobType) {
//! @todo (threads) QMutexLocker dialogsLocker( &dialogsMutex );
@@ -1941,6 +1955,10 @@
private:
//! @todo move to KexiProject
KexiWindowDict windows;
+ //! A set of item identifiers for whose there are KexiWindowContainer instances already.
+ //! This lets to verify that KexiWindow is about to be constructed and opened so multiple
+ //! opening can be avoided.
+ QSet windowContainers;
#ifndef KEXI_NO_PROCESS_EVENTS
QHash pendingWindows; //!< part item identifiers for windows whoose opening has been started
//! @todo QMutex dialogsMutex; //!< used for locking windows and pendingWindows dicts
diff -Nru calligra-2.9.7/kexi/main/KexiSearchLineEdit.cpp calligra-2.9.11/kexi/main/KexiSearchLineEdit.cpp
--- calligra-2.9.7/kexi/main/KexiSearchLineEdit.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/main/KexiSearchLineEdit.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,5 +1,5 @@
/* This file is part of the KDE project
- Copyright (C) 2011-2015 Jarosław Staniek
+ Copyright (C) 2011-2016 Jarosław Staniek
Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
This program is free software; you can redistribute it and/or
@@ -199,6 +199,7 @@
}
KexiSearchLineEditCompleter *completer;
+ QTreeView *popupTreeView;
KexiSearchLineEditCompleterPopupModel *model;
KexiSearchLineEditPopupItemDelegate *delegate;
QPointer previouslyFocusedWidget;
@@ -237,6 +238,17 @@
{
}
+ //! Implemented to improve width hint
+ QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+ {
+ QSize size(QStyledItemDelegate::sizeHint(option, index));
+ QStyleOptionViewItemV4 v4 = option;
+ QStyledItemDelegate::initStyleOption(&v4, index);
+ const QSize s = v4.widget->style()->sizeFromContents(QStyle::CT_ItemViewItem, &v4, size, v4.widget);
+ size.setWidth(s.width());
+ return size;
+ }
+
virtual void paint(QPainter *painter, const QStyleOptionViewItem &option,
const QModelIndex &index) const
{
@@ -352,10 +364,10 @@
: KLineEdit(parent), d(new Private(this))
{
d->completer = new KexiSearchLineEditCompleter(this);
- QTreeView *treeView = new QTreeView;
- kexiTester() << KexiTestObject(treeView, "globalSearch.treeView");
+ d->popupTreeView = new QTreeView;
+ kexiTester() << KexiTestObject(d->popupTreeView, "globalSearch.treeView");
- d->completer->setPopup(treeView);
+ d->completer->setPopup(d->popupTreeView);
d->completer->setModel(d->model = new KexiSearchLineEditCompleterPopupModel(d->completer));
d->completer->setCaseSensitivity(Qt::CaseInsensitive);
d->completer->setSubstringCompletion(true);
@@ -365,10 +377,10 @@
// filtering so only table names are displayed.
d->completer->setModelSorting(KexiCompleter::UnsortedModel);
- treeView->setHeaderHidden(true);
- treeView->setRootIsDecorated(false);
- treeView->setItemDelegate(
- d->delegate = new KexiSearchLineEditPopupItemDelegate(treeView, d->completer));
+ d->popupTreeView->setHeaderHidden(true);
+ d->popupTreeView->setRootIsDecorated(false);
+ d->popupTreeView->setItemDelegate(
+ d->delegate = new KexiSearchLineEditPopupItemDelegate(d->popupTreeView, d->completer));
// forked initialization like in QLineEdit::setCompleter:
d->completer->setWidget(this);
@@ -809,6 +821,7 @@
d->completer->setCompletionPrefix(text);
}
+ d->popupTreeView->resizeColumnToContents(0);
d->completer->complete();
}
diff -Nru calligra-2.9.7/kexi/migration/AlterSchemaWidget.cpp calligra-2.9.11/kexi/migration/AlterSchemaWidget.cpp
--- calligra-2.9.7/kexi/migration/AlterSchemaWidget.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/migration/AlterSchemaWidget.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -127,10 +127,12 @@
m_newSchema->field(m_selectedColumn)->setType(KexiDB::Field::Type(m_columnType->itemData(typ).toInt()));
//Only set the pkey check enabled if the field type is integer
- m_columnPKey->setEnabled(KexiDB::Field::isIntegerType(KexiDB::Field::Type(m_columnType->itemData(typ).toInt())));
+ const bool isInteger = KexiDB::Field::isIntegerType(
+ KexiDB::Field::Type(m_columnType->itemData(typ).toInt()));
+ m_columnPKey->setEnabled(isInteger);
//If the field type is not integer, then the field cannot be a pkey
- if (!KexiDB::Field::isIntegerType(KexiDB::Field::Type(m_columnType->itemData(typ).toInt()))) {
+ if (!isInteger) {
m_newSchema->field(m_selectedColumn)->setPrimaryKey(false);
}
}
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/include/mdbtools.h calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/include/mdbtools.h 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/include/mdbtools.h 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _mdbtools_h_
#define _mdbtools_h_
@@ -33,14 +32,18 @@
#include
#include
-
#ifdef HAVE_ICONV
#include
#endif
+#ifdef _WIN32
+#include
+#endif
+
#define MDB_DEBUG 0
#define MDB_PGSIZE 4096
+//#define MDB_MAX_OBJ_NAME (256*3) /* unicode 16 -> utf-8 worst case */
#define MDB_MAX_OBJ_NAME 256
#define MDB_MAX_COLS 256
#define MDB_MAX_IDX_COLS 10
@@ -51,6 +54,11 @@
#define MDB_NO_BACKENDS 1
#define MDB_NO_STATS 1
+// Theses 2 atrbutes are not supported by all compilers:
+// M$VC see http://stackoverflow.com/questions/1113409/attribute-constructor-equivalent-in-vc
+#define MDB_DEPRECATED(type, funcname) type __attribute__((deprecated)) funcname
+#define MDB_CONSTRUCTOR(funcname) void __attribute__((constructor)) funcname()
+
enum {
MDB_PAGE_DB = 0,
MDB_PAGE_DATA,
@@ -61,7 +69,9 @@
};
enum {
MDB_VER_JET3 = 0,
- MDB_VER_JET4 = 1
+ MDB_VER_JET4 = 1,
+ MDB_VER_ACCDB_2007 = 0x02,
+ MDB_VER_ACCDB_2010 = 0x0103
};
enum {
MDB_FORM = 0,
@@ -74,7 +84,7 @@
MDB_MODULE,
MDB_RELATIONSHIP,
MDB_UNKNOWN_09,
- MDB_UNKNOWN_0A,
+ MDB_UNKNOWN_0A, /* User access */
MDB_DATABASE_PROPERTY,
MDB_ANY = -1
};
@@ -86,12 +96,14 @@
MDB_MONEY = 0x05,
MDB_FLOAT = 0x06,
MDB_DOUBLE = 0x07,
- MDB_SDATETIME = 0x08,
+ MDB_DATETIME = 0x08,
+ MDB_BINARY = 0x09,
MDB_TEXT = 0x0a,
MDB_OLE = 0x0b,
MDB_MEMO = 0x0c,
MDB_REPID = 0x0f,
- MDB_NUMERIC = 0x10
+ MDB_NUMERIC = 0x10,
+ MDB_COMPLEX = 0x12
};
/* SARG operators */
@@ -126,8 +138,9 @@
MDB_DEBUG_USAGE = 0x0004,
MDB_DEBUG_OLE = 0x0008,
MDB_DEBUG_ROW = 0x0010,
- MDB_USE_INDEX = 0x0020,
- MDB_NO_MEMO = 0x0040 /* don't follow memo fields */
+ MDB_DEBUG_PROPS = 0x0020,
+ MDB_USE_INDEX = 0x0040,
+ MDB_NO_MEMO = 0x0080, /* don't follow memo fields */
};
#define mdb_is_logical_op(x) (x == MDB_OR || \
@@ -154,13 +167,27 @@
MDB_IDX_REQUIRED = 0x08
};
-#define IS_JET4(mdb) (mdb->f->jet_version==MDB_VER_JET4)
-#define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
+/* export schema options */
+enum {
+ MDB_SHEXP_DROPTABLE = 1<<0, /* issue drop table during export */
+ MDB_SHEXP_CST_NOTNULL = 1<<1, /* generate NOT NULL constraints */
+ MDB_SHEXP_CST_NOTEMPTY = 1<<2, /* <>'' constraints */
+ MDB_SHEXP_COMMENTS = 1<<3, /* export comments on columns & tables */
+ MDB_SHEXP_DEFVALUES = 1<<4, /* export default values */
+ MDB_SHEXP_INDEXES = 1<<5, /* export indices */
+ MDB_SHEXP_RELATIONS = 1<<6 /* export relation (foreign keys) */
+};
+#define MDB_SHEXP_DEFAULT (MDB_SHEXP_CST_NOTNULL | MDB_SHEXP_COMMENTS | MDB_SHEXP_INDEXES | MDB_SHEXP_RELATIONS)
-#if !MDB_NO_BACKENDS
-/* hash to store registered backends */
-extern GHashTable *mdb_backends;
-#endif
+/* csv export binary options */
+enum {
+ MDB_BINEXPORT_STRIP,
+ MDB_BINEXPORT_RAW,
+ MDB_BINEXPORT_OCTAL
+};
+
+#define IS_JET4(mdb) (mdb->f->jet_version==MDB_VER_JET4) /* obsolete */
+#define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
/* forward declarations */
typedef struct mdbindex MdbIndex;
@@ -175,7 +202,18 @@
} MdbBackendType;
typedef struct {
- MdbBackendType *types_table;
+ guint32 capabilities; /* see MDB_SHEXP_* */
+ MdbBackendType *types_table;
+ MdbBackendType *type_shortdate;
+ MdbBackendType *type_autonum;
+ const char *short_now;
+ const char *long_now;
+ const char *charset_statement;
+ const char *drop_statement;
+ const char *constaint_not_empty_statement;
+ const char *column_comment_statement;
+ const char *table_comment_statement;
+ gchar* (*quote_schema_name)(const gchar*, const gchar*);
} MdbBackend;
#endif
@@ -219,7 +257,7 @@
guint16 tab_first_dpg_offset;
guint16 tab_cols_start_offset;
guint16 tab_ridx_entry_size;
- guint16 col_fixed_offset;
+ guint16 col_flags_offset;
guint16 col_size_offset;
guint16 col_num_offset;
guint16 tab_col_entry_size;
@@ -258,10 +296,8 @@
char object_name[MDB_MAX_OBJ_NAME+1];
int object_type;
unsigned long table_pg; /* misnomer since object may not be a table */
- unsigned long kkd_pg;
- unsigned int kkd_rowid;
- int num_props;
- GArray *props;
+ //int num_props; please use props->len
+ GArray *props; /* GArray of MdbProperties */
GArray *columns;
int flags;
} MdbCatalogEntry;
@@ -277,7 +313,9 @@
char s[256];
} MdbAny;
+struct S_MdbTableDef; /* forward definition */
typedef struct {
+ struct S_MdbTableDef *table;
char name[MDB_MAX_OBJ_NAME+1];
int col_type;
int col_size;
@@ -300,6 +338,8 @@
/* numerics only */
int col_prec;
int col_scale;
+ unsigned char is_long_auto;
+ unsigned char is_uuid_auto;
MdbProperties *props;
/* info needed for handling deleted/added columns */
int fixed_offset;
@@ -338,7 +378,7 @@
MdbIndexPage pages[MDB_MAX_INDEX_DEPTH];
} MdbIndexChain;
-typedef struct {
+typedef struct S_MdbTableDef {
MdbCatalogEntry *entry;
char name[MDB_MAX_OBJ_NAME+1];
unsigned int num_cols;
@@ -407,8 +447,8 @@
} MdbSarg;
/* mem.c */
-extern void mdb_init();
-extern void mdb_exit();
+extern MDB_DEPRECATED(void, mdb_init());
+extern MDB_DEPRECATED(void, mdb_exit());
/* file.c */
extern ssize_t mdb_read_pg(MdbHandle *mdb, unsigned long pg);
@@ -433,8 +473,9 @@
/* catalog.c */
extern void mdb_free_catalog(MdbHandle *mdb);
extern GPtrArray *mdb_read_catalog(MdbHandle *mdb, int obj_type);
+MdbCatalogEntry *mdb_get_catalogentry_by_name(MdbHandle *mdb, const gchar* name);
extern void mdb_dump_catalog(MdbHandle *mdb, int obj_type);
-extern char *mdb_get_objtype_string(int obj_type);
+extern const char *mdb_get_objtype_string(int obj_type);
/* table.c */
extern MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry);
@@ -451,10 +492,13 @@
extern void *read_pg_if_n(MdbHandle *mdb, void *buf, int *cur_pos, size_t len);
extern int mdb_is_user_table(MdbCatalogEntry *entry);
extern int mdb_is_system_table(MdbCatalogEntry *entry);
+extern const char *mdb_table_get_prop(const MdbTableDef *table, const gchar *key);
+extern const char *mdb_col_get_prop(const MdbColumn *col, const gchar *key);
/* data.c */
-extern int mdb_bind_column_by_name(MdbTableDef *table, gchar *col_name, void *bind_ptr, int *len_ptr);
+extern int mdb_bind_column_by_name(MdbTableDef *table, const gchar *col_name, void *bind_ptr, int *len_ptr);
extern void mdb_data_dump(MdbTableDef *table);
+extern void mdb_date_to_tm(double td, struct tm *t);
extern void mdb_bind_column(MdbTableDef *table, int col_num, void *bind_ptr, int *len_ptr);
extern int mdb_rewind_table(MdbTableDef *table);
extern int mdb_fetch_row(MdbTableDef *table);
@@ -467,21 +511,25 @@
extern int mdb_col_disp_size(MdbColumn *col);
extern size_t mdb_ole_read_next(MdbHandle *mdb, MdbColumn *col, void *ole_ptr);
extern size_t mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_ptr, int chunk_size);
+extern void* mdb_ole_read_full(MdbHandle *mdb, MdbColumn *col, size_t *size);
extern void mdb_set_date_fmt(const char *);
extern int mdb_read_row(MdbTableDef *table, unsigned int row);
/* dump.c */
-extern void buffer_dump(const void *buf, int start, size_t len);
+extern void mdb_buffer_dump(const void *buf, int start, size_t len);
#if !MDB_NO_BACKENDS
/* backend.c */
-extern char *mdb_get_coltype_string(MdbBackend *backend, int col_type);
-extern int mdb_coltype_takes_length(MdbBackend *backend, int col_type);
-extern void mdb_init_backends();
-extern void mdb_register_backend(MdbBackendType *backend, char *backend_name);
-extern void mdb_remove_backends();
+extern MDB_DEPRECATED(char*, mdb_get_coltype_string(MdbBackend *backend, int col_type));
+extern MDB_DEPRECATED(int, mdb_coltype_takes_length(MdbBackend *backend, int col_type));
+extern const MdbBackendType* mdb_get_colbacktype(const MdbColumn *col);
+extern const char* mdb_get_colbacktype_string(const MdbColumn *col);
+extern int mdb_colbacktype_takes_length(const MdbColumn *col);
+extern MDB_DEPRECATED(void, mdb_init_backends());
+extern void mdb_register_backend(char *backend_name, guint32 capabilities, MdbBackendType *backend_type, MdbBackendType *type_shortdate, MdbBackendType *type_autonum, const char *short_now, const char *long_now, const char *charset_statement, const char *drop_statement, const char *constaint_not_empty_statement, const char *column_comment_statement, const char *table_comment_statement, gchar* (*quote_schema_name)(const gchar*, const gchar*));
+extern MDB_DEPRECATED(void, mdb_remove_backends());
extern int mdb_set_default_backend(MdbHandle *mdb, const char *backend_name);
-extern char *mdb_get_relationships(MdbHandle *mdb);
+extern void mdb_print_schema(MdbHandle *mdb, FILE *outfile, char *tabname, char *dbnamespace, guint32 export_options);
#endif
/* sargs.c */
@@ -521,9 +569,13 @@
extern int mdb_like_cmp(char *s, char *r);
/* write.c */
+extern void mdb_put_int16(void *buf, guint32 offset, guint32 value);
+extern void mdb_put_int32(void *buf, guint32 offset, guint32 value);
+extern void mdb_put_int32_msb(void *buf, guint32 offset, guint32 value);
extern int mdb_crack_row(MdbTableDef *table, int row_start, int row_end, MdbField *fields);
extern guint16 mdb_add_row_to_pg(MdbTableDef *table, unsigned char *row_buffer, int new_row_size);
extern int mdb_update_index(MdbTableDef *table, MdbIndex *idx, unsigned int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum);
+extern int mdb_insert_row(MdbTableDef *table, int num_fields, MdbField *fields);
extern int mdb_pack_row(MdbTableDef *table, unsigned char *row_buffer, unsigned int num_fields, MdbField *fields);
extern int mdb_replace_row(MdbTableDef *table, int row, void *new_row, int new_row_size);
extern int mdb_pg_get_freespace(MdbHandle *mdb);
@@ -532,12 +584,13 @@
/* map.c */
extern guint32 mdb_map_find_next_freepage(MdbTableDef *table, int row_size);
-extern guint32 mdb_map_find_next(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg);
+extern gint32 mdb_map_find_next(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg);
/* props.c */
-extern GPtrArray *mdb_read_props_list(gchar *kkd, int len);
extern void mdb_free_props(MdbProperties *props);
-extern MdbProperties *mdb_read_props(MdbHandle *mdb, GPtrArray *names, gchar *kkd, int len);
+extern void mdb_dump_props(MdbProperties *props, FILE *outfile, int show_name);
+extern GArray* mdb_kkd_to_props(MdbHandle *mdb, void *kkd, size_t len);
+
/* worktable.c */
extern MdbTableDef *mdb_create_temp_table(MdbHandle *mdb, char *name);
@@ -548,13 +601,14 @@
/* options.c */
extern int mdb_get_option(unsigned long optnum);
-extern void mdb_debug(int klass, char *fmt, ...);
+extern void mdb_debug(int klass, const char *fmt, ...);
/* iconv.c */
extern int mdb_unicode2ascii(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen);
extern int mdb_ascii2unicode(MdbHandle *mdb, char *src, size_t slen, char *dest, size_t dlen);
extern void mdb_iconv_init(MdbHandle *mdb);
extern void mdb_iconv_close(MdbHandle *mdb);
+extern const char* mdb_target_charset(MdbHandle *mdb);
#ifdef __cplusplus
}
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/catalog.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/catalog.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/catalog.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/catalog.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mdbtools.h"
@@ -23,10 +22,10 @@
#include "dmalloc.h"
#endif
-char *
+const char *
mdb_get_objtype_string(int obj_type)
{
-static char *type_name[] = {"Form",
+static const char *type_name[] = {"Form",
"Table",
"Macro",
"System Table",
@@ -36,7 +35,7 @@
"Module",
"Relationship",
"Unknown 0x09",
- "Unknown 0x0a",
+ "User Info",
"Database"
};
@@ -49,11 +48,21 @@
void mdb_free_catalog(MdbHandle *mdb)
{
- unsigned int i;
+ unsigned int i, j;
+ MdbCatalogEntry *entry;
if ((!mdb) || (!mdb->catalog)) return;
- for (i=0; icatalog->len; i++)
- g_free (g_ptr_array_index(mdb->catalog, i));
+ for (i=0; icatalog->len; i++) {
+ entry = (MdbCatalogEntry *)g_ptr_array_index(mdb->catalog, i);
+ if (entry) {
+ if (entry->props) {
+ for (j=0; jprops->len; j++)
+ mdb_free_props(g_array_index(entry->props, MdbProperties*, j));
+ g_array_free(entry->props, TRUE);
+ }
+ g_free(entry);
+ }
+ }
g_ptr_array_free(mdb->catalog, TRUE);
mdb->catalog = NULL;
}
@@ -63,10 +72,14 @@
MdbCatalogEntry *entry, msysobj;
MdbTableDef *table;
char obj_id[256];
- char obj_name[256];
+ char obj_name[MDB_MAX_OBJ_NAME];
char obj_type[256];
char obj_flags[256];
+ char obj_props[MDB_BIND_SIZE];
int type;
+ unsigned int i;
+ MdbColumn *col_props;
+ int kkd_size_ole;
if (!mdb) return NULL;
if (mdb->catalog) mdb_free_catalog(mdb);
@@ -91,14 +104,16 @@
mdb_bind_column_by_name(table, "Name", obj_name, NULL);
mdb_bind_column_by_name(table, "Type", obj_type, NULL);
mdb_bind_column_by_name(table, "Flags", obj_flags, NULL);
+ i = mdb_bind_column_by_name(table, "LvProp", obj_props, &kkd_size_ole);
+ col_props = g_ptr_array_index(table->columns, i-1);
mdb_rewind_table(table);
while (mdb_fetch_row(table)) {
type = atoi(obj_type);
if (objtype==MDB_ANY || type == objtype) {
-
-
+ //fprintf(stderr, "obj_id: %10ld objtype: %-3d (0x%04x) obj_name: %s\n",
+ // (atol(obj_id) & 0x00FFFFFF), type, type, obj_name);
entry = (MdbCatalogEntry *) g_malloc0(sizeof(MdbCatalogEntry));
entry->mdb = mdb;
strcpy(entry->object_name, obj_name);
@@ -106,16 +121,38 @@
entry->table_pg = atol(obj_id) & 0x00FFFFFF;
entry->flags = atol(obj_flags);
mdb->num_catalog++;
- g_ptr_array_add(mdb->catalog, entry);
+ g_ptr_array_add(mdb->catalog, entry);
+ if (kkd_size_ole) {
+ size_t kkd_len;
+ void *kkd = mdb_ole_read_full(mdb, col_props, &kkd_len);
+ //mdb_buffer_dump(kkd, 0, kkd_len);
+ entry->props = mdb_kkd_to_props(mdb, kkd, kkd_len);
+ free(kkd);
+ }
}
}
-
+ //mdb_dump_catalog(mdb, MDB_TABLE);
mdb_free_tabledef(table);
return mdb->catalog;
}
+
+MdbCatalogEntry *
+mdb_get_catalogentry_by_name(MdbHandle *mdb, const gchar* name)
+{
+ unsigned int i;
+ MdbCatalogEntry *entry;
+
+ for (i=0; inum_catalog; i++) {
+ entry = g_ptr_array_index(mdb->catalog, i);
+ if (!strcasecmp(entry->object_name, name))
+ return entry;
+ }
+ return NULL;
+}
+
void
mdb_dump_catalog(MdbHandle *mdb, int obj_type)
{
@@ -126,14 +163,12 @@
for (i=0;inum_catalog;i++) {
entry = g_ptr_array_index(mdb->catalog,i);
if (obj_type==MDB_ANY || entry->object_type==obj_type) {
- fprintf(stdout,"Type: %-10s Name: %-18s T pg: %04x KKD pg: %04x row: %2d\n",
+ printf("Type: %-12s Name: %-48s Page: %06lx\n",
mdb_get_objtype_string(entry->object_type),
entry->object_name,
- (unsigned int) entry->table_pg,
- (unsigned int) entry->kkd_pg,
- entry->kkd_rowid);
+ entry->table_pg);
}
- }
+ }
return;
}
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/data.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/data.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/data.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/data.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,14 +12,13 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include
+#include
#include "mdbtools.h"
-#include "time.h"
-#include "math.h"
#ifdef DMALLOC
#include "dmalloc.h"
@@ -28,9 +27,10 @@
#define OFFSET_MASK 0x1fff
char *mdb_money_to_string(MdbHandle *mdb, int start);
+char *mdb_numeric_to_string(MdbHandle *mdb, int start, int prec, int scale);
+
static int _mdb_attempt_bind(MdbHandle *mdb,
MdbColumn *col, unsigned char isnull, int offset, int len);
-static char *mdb_num_to_string(MdbHandle *mdb, int start, int datatype, int prec, int scale);
static char *mdb_date_to_string(MdbHandle *mdb, int start);
#ifdef MDB_COPY_OLE
static size_t mdb_copy_ole(MdbHandle *mdb, void *dest, int start, int size);
@@ -59,7 +59,7 @@
col->len_ptr = len_ptr;
}
int
-mdb_bind_column_by_name(MdbTableDef *table, gchar *col_name, void *bind_ptr, int *len_ptr)
+mdb_bind_column_by_name(MdbTableDef *table, const gchar *col_name, void *bind_ptr, int *len_ptr)
{
unsigned int i;
int col_num = -1;
@@ -139,12 +139,12 @@
if (row > 1000) return -1;
/* if lookupflag is not set, it's good (deleteflag is ok) */
- for (i = row; i > 0; i--) {
- row_start = mdb_get_int16(mdb->pg_buf, (rco + i*2));
- if (!(row_start & 0x8000)) {
- break;
- }
- }
+ for (i = row; i > 0; i--) {
+ row_start = mdb_get_int16(mdb->pg_buf, (rco + i*2));
+ if (!(row_start & 0x8000)) {
+ break;
+ }
+ }
row_end = (i == 0) ? mdb->fmt->pg_size : row_start & OFFSET_MASK;
#endif
@@ -206,9 +206,9 @@
mdb_xfer_bound_data(MdbHandle *mdb, int start, MdbColumn *col, int len)
{
int ret;
-
-
-
+ //if (!strcmp("Name",col->name)) {
+ //printf("start %d %d\n",start, len);
+ //}
if (len) {
col->cur_value_start = start;
col->cur_value_len = len;
@@ -220,22 +220,12 @@
if (!len) {
strcpy(col->bind_ptr, "");
} else {
-
+ //fprintf(stdout,"len %d size %d\n",len, col->col_size);
char *str;
if (col->col_type == MDB_NUMERIC) {
- /*fprintf(stdout,"MDB_NUMERIC\n");*/
- str = mdb_num_to_string(mdb, start,
- col->col_type, col->col_prec,
- col->col_scale);
- /*fprintf(stdout,"mdb_num_to_string()=%d '%s'\n", strlen(str), str);*/
+ str = mdb_numeric_to_string(mdb, start, col->col_prec, col->col_scale);
} else {
- /*fprintf(stdout,"!MDB_NUMERIC : %d len=%d\n", col->col_type, len);*/
- str = mdb_col_to_string(mdb, mdb->pg_buf, start,
- col->col_type, len);
- /*if (strlen(str) > MDB_BIND_SIZE) {
- fprintf(stdout, "!!!!!!\n");
- }
- fprintf(stdout,"mdb_col_to_string()=%d '%s'\n", strlen(str), str);*/
+ str = mdb_col_to_string(mdb, mdb->pg_buf, start, col->col_type, len);
}
strcpy(col->bind_ptr, str);
g_free(str);
@@ -253,7 +243,6 @@
MdbHandle *mdb = table->entry->mdb;
MdbColumn *col;
unsigned int i;
- int rc;
int row_start;
size_t row_size;
int delflag, lookupflag;
@@ -263,7 +252,10 @@
if (table->num_rows == 0)
return 0;
- mdb_find_row(mdb, row, &row_start, &row_size);
+ if (mdb_find_row(mdb, row, &row_start, &row_size)) {
+ fprintf(stderr, "warning: mdb_find_row failed.");
+ return 0;
+ }
delflag = lookupflag = 0;
if (row_start & 0x8000) lookupflag++;
@@ -289,14 +281,14 @@
#endif
#if MDB_DEBUG
- buffer_dump(mdb->pg_buf, row_start, row_size);
+ mdb_buffer_dump(mdb->pg_buf, row_start, row_size);
#endif
/* take advantage of mdb_crack_row() to clean up binding */
/* use num_cols instead of num_fields -- bsb 03/04/02 */
for (i = 0; i < table->num_cols; i++) {
col = g_ptr_array_index(table->columns,fields[i].colnum);
- rc = _mdb_attempt_bind(mdb, col, fields[i].is_null,
+ _mdb_attempt_bind(mdb, col, fields[i].is_null,
fields[i].start, fields[i].siz);
}
@@ -315,13 +307,15 @@
} else if (col->col_type == MDB_OLE) {
mdb_xfer_bound_ole(mdb, offset, col, len);
} else {
-
-
-
+ //if (!mdb_test_sargs(mdb, col, offset, len)) {
+ //return 0;
+ //}
mdb_xfer_bound_data(mdb, offset, col, len);
}
return 1;
}
+
+/* Read next data page into mdb->pg_buf */
int mdb_read_next_dpg(MdbTableDef *table)
{
MdbCatalogEntry *entry = table->entry;
@@ -329,16 +323,28 @@
int next_pg;
#ifndef SLOW_READ
- next_pg = mdb_map_find_next(mdb, table->usage_map,
- table->map_sz, table->cur_phys_pg);
+ while (1) {
+ next_pg = mdb_map_find_next(mdb, table->usage_map,
+ table->map_sz, table->cur_phys_pg);
+ if (next_pg < 0)
+ break; /* unknow map type: goto fallback */
+ if (!next_pg)
+ return 0;
- if (next_pg >= 0) {
- if (mdb_read_pg(mdb, next_pg)) {
- table->cur_phys_pg = next_pg;
- return table->cur_phys_pg;
- } else {
+ if (!mdb_read_pg(mdb, next_pg)) {
+ fprintf(stderr, "error: reading page %d failed.\n", next_pg);
return 0;
}
+
+ table->cur_phys_pg = next_pg;
+ if (mdb->pg_buf[0]==MDB_PAGE_DATA && mdb_get_int32(mdb->pg_buf, 4)==entry->table_pg)
+ return table->cur_phys_pg;
+
+ /* On rare occasion, mdb_map_find_next will return a wrong page */
+ /* Found in a big file, over 4,000,000 records */
+ fprintf(stderr,
+ "warning: page %d from map doesn't match: Type=%d, buf[4..7]=%ld Expected table_pg=%ld\n",
+ next_pg, mdb->pg_buf[0], mdb_get_int32(mdb->pg_buf, 4), entry->table_pg);
}
fprintf(stderr, "Warning: defaulting to brute force read\n");
#endif
@@ -346,7 +352,7 @@
do {
if (!mdb_read_pg(mdb, table->cur_phys_pg++))
return 0;
- } while (mdb->pg_buf[0]!=0x01 || mdb_get_int32(mdb->pg_buf, 4)!=entry->table_pg);
+ } while (mdb->pg_buf[0]!=MDB_PAGE_DATA || mdb_get_int32(mdb->pg_buf, 4)!=entry->table_pg);
/* fprintf(stderr,"returning new page %ld\n", table->cur_phys_pg); */
return table->cur_phys_pg;
}
@@ -403,7 +409,7 @@
} else {
rows = mdb_get_int16(mdb->pg_buf,fmt->row_count_offset);
- /* if at end of page, find a new page */
+ /* if at end of page, find a new data page */
if (table->cur_row >= rows) {
table->cur_row=0;
@@ -457,6 +463,12 @@
return text;
}
#endif
+/*
+ * ole_ptr should point to the original blob value of the field.
+ * If omited, there will be no multi-page check to that the caller is
+ * responsible for not calling this function. Then, it doesn't have to
+ * preserve the original value.
+ */
size_t
mdb_ole_read_next(MdbHandle *mdb, MdbColumn *col, void *ole_ptr)
{
@@ -465,24 +477,30 @@
int row_start;
size_t len;
- ole_len = mdb_get_int32(ole_ptr, 0);
-
- if ((ole_len & 0x80000000)
- || (ole_len & 0x40000000)) {
- /* inline or single-page fields don't have a next */
- return 0;
- } else {
- if (mdb_find_pg_row(mdb, col->cur_blob_pg_row,
- &buf, &row_start, &len)) {
+ if (ole_ptr) {
+ ole_len = mdb_get_int32(ole_ptr, 0);
+ mdb_debug(MDB_DEBUG_OLE,"ole len = %d ole flags = %02x",
+ ole_len & 0x00ffffff, ole_len >> 24);
+
+ if ((ole_len & 0x80000000)
+ || (ole_len & 0x40000000))
+ /* inline or single-page fields don't have a next */
return 0;
- }
- if (col->bind_ptr)
- memcpy(col->bind_ptr, (char*)buf + row_start + 4, len - 4);
- col->cur_blob_pg_row = mdb_get_int32(buf, row_start);
-
- return len;
}
- return 0;
+ mdb_debug(MDB_DEBUG_OLE, "pg_row %d", col->cur_blob_pg_row);
+ if (!col->cur_blob_pg_row)
+ return 0; /* we are done */
+ if (mdb_find_pg_row(mdb, col->cur_blob_pg_row,
+ &buf, &row_start, &len)) {
+ return 0;
+ }
+ mdb_debug(MDB_DEBUG_OLE,"start %d len %d", row_start, len);
+
+ if (col->bind_ptr)
+ memcpy(col->bind_ptr, (char*)buf + row_start + 4, len - 4);
+ col->cur_blob_pg_row = mdb_get_int32(buf, row_start);
+
+ return len - 4;
}
size_t
mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_ptr, int chunk_size)
@@ -526,26 +544,64 @@
if (col->bind_ptr) {
memcpy(col->bind_ptr, (char*)buf + row_start, len);
if (mdb_get_option(MDB_DEBUG_OLE))
- buffer_dump(col->bind_ptr, 0, 16);
+ mdb_buffer_dump(col->bind_ptr, 0, 16);
}
return len;
} else if ((ole_len & 0xff000000) == 0) {
col->cur_blob_pg_row = mdb_get_int32(ole_ptr, 4);
+ mdb_debug(MDB_DEBUG_OLE,"ole row = %d ole pg = %ld",
+ col->cur_blob_pg_row & 0xff,
+ col->cur_blob_pg_row >> 8);
if (mdb_find_pg_row(mdb, col->cur_blob_pg_row,
&buf, &row_start, &len)) {
return 0;
}
+ mdb_debug(MDB_DEBUG_OLE,"start %d len %d", row_start, len);
+
if (col->bind_ptr)
memcpy(col->bind_ptr, (char*)buf + row_start + 4, len - 4);
col->cur_blob_pg_row = mdb_get_int32(buf, row_start);
+ mdb_debug(MDB_DEBUG_OLE, "next pg_row %d", col->cur_blob_pg_row);
- return len;
+ return len - 4;
} else {
fprintf(stderr,"Unhandled ole field flags = %02x\n", ole_len >> 24);
return 0;
}
}
+/*
+ * mdb_ole_read_full calls mdb_ole_read then loop over mdb_ole_read_next as much as necessary.
+ * returns the result in a big buffer.
+ * The call must free it.
+ * Note that this function is not indempotent: It may be called only once per column after each bind.
+ */
+void*
+mdb_ole_read_full(MdbHandle *mdb, MdbColumn *col, size_t *size)
+{
+ char ole_ptr[MDB_MEMO_OVERHEAD];
+ char *result = malloc(MDB_BIND_SIZE);
+ size_t result_buffer_size = MDB_BIND_SIZE;
+ size_t len, pos;
+
+ memcpy(ole_ptr, col->bind_ptr, MDB_MEMO_OVERHEAD);
+
+ len = mdb_ole_read(mdb, col, ole_ptr, MDB_BIND_SIZE);
+ memcpy(result, col->bind_ptr, len);
+ pos = len;
+ while ((len = mdb_ole_read_next(mdb, col, ole_ptr))) {
+ if (pos+len >= result_buffer_size) {
+ result_buffer_size += MDB_BIND_SIZE;
+ result = realloc(result, result_buffer_size);
+ }
+ memcpy(result + pos, col->bind_ptr, len);
+ pos += len;
+ }
+ if (size)
+ *size = pos;
+ return result;
+}
+
#ifdef MDB_COPY_OLE
static size_t mdb_copy_ole(MdbHandle *mdb, void *dest, int start, int size)
{
@@ -617,17 +673,15 @@
gint32 row_start, pg_row;
size_t len;
void *buf, *pg_buf = mdb->pg_buf;
- char *text = 0;
+ char *text = (char *) g_malloc(MDB_BIND_SIZE);
- /*printf("mdb_memo_to_string: size=%d\n", size);*/
if (sizepg_buf+start+13, 4);
- negative = (*(mdb->pg_buf+start) & 0x80) ? 1 : 0;
- text = (char *) g_malloc(prec+2+negative);
- if (negative) {
- sprintf(text, "-%0*" G_GINT32_FORMAT, prec, GINT32_FROM_LE(l));
- } else {
- sprintf(text, "%0*" G_GINT32_FORMAT, prec, GINT32_FROM_LE(l));
- }
- if (scale) {
- memmove(text+prec-scale+1+negative, text+prec-scale+negative, scale+1);
- text[prec-scale+negative] = '.';
- }
- return text;
-}
+#if 0
static int trim_trailing_zeros(char * buff)
{
char *p;
@@ -746,66 +772,96 @@
return 0;
}
+#endif
/* Date/Time is stored as a double, where the whole
part is the days from 12/30/1899 and the fractional
part is the fractional part of one day. */
-static char *
-mdb_date_to_string(MdbHandle *mdb, int start)
+
+void
+mdb_date_to_tm(double td, struct tm *t)
{
- struct tm t;
long int day, time;
int yr, q;
int *cal;
int noleap_cal[] = {0,31,59,90,120,151,181,212,243,273,304,334,365};
int leap_cal[] = {0,31,60,91,121,152,182,213,244,274,305,335,366};
- char *text = (char *) g_malloc(MDB_BIND_SIZE);
- double td = mdb_get_double(mdb->pg_buf, start);
-
day = (long int)(td);
time = (long int)(fabs(td - day) * 86400.0 + 0.5);
- t.tm_hour = time / 3600;
- t.tm_min = (time / 60) % 60;
- t.tm_sec = time % 60;
- t.tm_year = 1 - 1900;
+ t->tm_hour = time / 3600;
+ t->tm_min = (time / 60) % 60;
+ t->tm_sec = time % 60;
+ t->tm_year = 1 - 1900;
day += 693593; /* Days from 1/1/1 to 12/31/1899 */
- t.tm_wday = (day+1) % 7;
+ t->tm_wday = (day+1) % 7;
q = day / 146097; /* 146097 days in 400 years */
- t.tm_year += 400 * q;
+ t->tm_year += 400 * q;
day -= q * 146097;
q = day / 36524; /* 36524 days in 100 years */
if (q > 3) q = 3;
- t.tm_year += 100 * q;
+ t->tm_year += 100 * q;
day -= q * 36524;
q = day / 1461; /* 1461 days in 4 years */
- t.tm_year += 4 * q;
+ t->tm_year += 4 * q;
day -= q * 1461;
q = day / 365; /* 365 days in 1 year */
if (q > 3) q = 3;
- t.tm_year += q;
+ t->tm_year += q;
day -= q * 365;
- yr = t.tm_year + 1900;
+ yr = t->tm_year + 1900;
cal = ((yr)%4==0 && ((yr)%100!=0 || (yr)%400==0)) ?
leap_cal : noleap_cal;
- for (t.tm_mon=0; t.tm_mon<12; t.tm_mon++) {
- if (day < cal[t.tm_mon+1]) break;
+ for (t->tm_mon=0; t->tm_mon<12; t->tm_mon++) {
+ if (day < cal[t->tm_mon+1]) break;
}
- t.tm_mday = day - cal[t.tm_mon] + 1;
- t.tm_yday = day;
- t.tm_isdst = -1;
+ t->tm_mday = day - cal[t->tm_mon] + 1;
+ t->tm_yday = day;
+ t->tm_isdst = -1;
+}
+
+static char *
+mdb_date_to_string(MdbHandle *mdb, int start)
+{
+ struct tm t;
+ char *text = (char *) g_malloc(MDB_BIND_SIZE);
+ double td = mdb_get_double(mdb->pg_buf, start);
+
+ mdb_date_to_tm(td, &t);
strftime(text, MDB_BIND_SIZE, date_fmt, &t);
return text;
}
+static char *
+mdb_uuid_to_string(MdbHandle *mdb, int start)
+{
+ char *text = NULL;
+ unsigned short uuid1, uuid2, uuid3, uuid4, uuid5, uuid6, uuid7, uuid8;
+
+ uuid1 = mdb_get_int16(mdb->pg_buf, start);
+ uuid2 = mdb_get_int16(mdb->pg_buf, start + 2);
+ uuid3 = mdb_get_int16(mdb->pg_buf, start + 4);
+ uuid4 = mdb_get_int16(mdb->pg_buf, start + 6);
+ uuid5 = mdb_get_int16(mdb->pg_buf, start + 8);
+ uuid6 = mdb_get_int16(mdb->pg_buf, start + 10);
+ uuid7 = mdb_get_int16(mdb->pg_buf, start + 12);
+ uuid8 = mdb_get_int16(mdb->pg_buf, start + 14);
+
+ text = g_strdup_printf("{%04x%04x-%04x-%04x-%04x-%04x%04x%04x}",
+ uuid1, uuid2, uuid3, uuid4, uuid5, uuid6, uuid7, uuid8);
+
+ return text;
+}
+
+#if 0
int floor_log10(double f, int is_single)
{
unsigned int i;
@@ -814,7 +870,7 @@
if (f < 0.0)
f = -f;
- if ((f == 0.0) || (f == 1.0)) {
+ if ((f == 0.0) || (f == 1.0) || isinf(f)) {
return 0;
} else if (f < 1.0) {
if (is_single) {
@@ -834,6 +890,7 @@
return (int)i;
}
}
+#endif
char *mdb_col_to_string(MdbHandle *mdb, void *buf, int start, int datatype, int size)
{
@@ -850,24 +907,29 @@
text = g_strdup_printf("%d", mdb_get_byte(buf, start));
break;
case MDB_INT:
- text = g_strdup_printf("%ld",
- (long)mdb_get_int16(buf, start));
+ text = g_strdup_printf("%hd",
+ (short)mdb_get_int16(buf, start));
break;
case MDB_LONGINT:
+ case MDB_COMPLEX:
text = g_strdup_printf("%ld",
mdb_get_int32(buf, start));
break;
case MDB_FLOAT:
tf = mdb_get_single(buf, start);
- text = g_strdup_printf("%.*f",
- FLT_DIG - floor_log10(tf,1) - 1, tf);
- trim_trailing_zeros(text);
+ text = g_strdup_printf("%.8e", tf);
break;
case MDB_DOUBLE:
td = mdb_get_double(buf, start);
- text = g_strdup_printf("%.*f",
- DBL_DIG - floor_log10(td,0) - 1, td);
- trim_trailing_zeros(text);
+ text = g_strdup_printf("%.16e", td);
+ break;
+ case MDB_BINARY:
+ if (size<0) {
+ text = g_strdup("");
+ } else {
+ text = g_malloc(size);
+ memcpy((char*)buf+start, text, size);
+ }
break;
case MDB_TEXT:
if (size<0) {
@@ -878,7 +940,7 @@
size, text, MDB_BIND_SIZE);
}
break;
- case MDB_SDATETIME:
+ case MDB_DATETIME:
text = mdb_date_to_string(mdb, start);
break;
case MDB_MEMO:
@@ -888,6 +950,9 @@
text = mdb_money_to_string(mdb, start);
case MDB_NUMERIC:
break;
+ case MDB_REPID:
+ text = mdb_uuid_to_string(mdb, start);
+ break;
default:
text = g_strdup("");
break;
@@ -907,6 +972,7 @@
return 6;
break;
case MDB_LONGINT:
+ case MDB_COMPLEX:
return 11;
break;
case MDB_FLOAT:
@@ -918,7 +984,7 @@
case MDB_TEXT:
return col->col_size;
break;
- case MDB_SDATETIME:
+ case MDB_DATETIME:
return 20;
break;
case MDB_MEMO:
@@ -943,6 +1009,7 @@
return 2;
break;
case MDB_LONGINT:
+ case MDB_COMPLEX:
return 4;
break;
case MDB_FLOAT:
@@ -954,9 +1021,12 @@
case MDB_TEXT:
return -1;
break;
- case MDB_SDATETIME:
+ case MDB_DATETIME:
return 4;
break;
+ case MDB_BINARY:
+ return -1;
+ break;
case MDB_MEMO:
return -1;
break;
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/dump.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/dump.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/dump.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/dump.c 2016-02-02 19:53:13.000000000 +0000
@@ -1,3 +1,21 @@
+/* MDB Tools - A library for reading MS Access database files
+ * Copyright (C) 2000-2011 Brian Bruns and others
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
#include
#include
#include
@@ -6,7 +24,7 @@
#include "dmalloc.h"
#endif
-void buffer_dump(const void* buf, int start, size_t len)
+void mdb_buffer_dump(const void* buf, int start, size_t len)
{
char asc[20];
int j, k;
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/file.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/file.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/file.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/file.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,11 +12,11 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include
#include "mdbtools.h"
#ifdef DMALLOC
@@ -35,7 +35,7 @@
guint16 tab_first_dpg_offset;
guint16 tab_cols_start_offset;
guint16 tab_ridx_entry_size;
- guint16 col_fixed_offset;
+ guint16 col_flags_offset;
guint16 col_size_offset;
guint16 col_num_offset;
guint16 tab_col_entry_size;
@@ -52,8 +52,69 @@
2048, 0x08, 12, 25, 27, 31, 35, 36, 43, 8, 13, 16, 1, 18, 39, 3, 14, 5
};
+typedef struct _RC4_KEY
+{
+ unsigned char state[256];
+ unsigned char x;
+ unsigned char y;
+} RC4_KEY;
+
+#define swap_byte(x,y) t = *(x); *(x) = *(y); *(y) = t
+
static ssize_t _mdb_read_pg(MdbHandle *mdb, void *pg_buf, unsigned long pg);
+static void RC4_set_key(RC4_KEY *key, int key_data_len, unsigned char *key_data_ptr)
+{
+ unsigned char t;
+ unsigned char index1;
+ unsigned char index2;
+ unsigned char* state;
+ short counter;
+
+ state = &key->state[0];
+ for(counter = 0; counter < 256; counter++)
+ state[counter] = counter;
+ key->x = 0;
+ key->y = 0;
+ index1 = 0;
+ index2 = 0;
+ for(counter = 0; counter < 256; counter++) {
+ index2 = (key_data_ptr[index1] + state[counter] + index2) % 256;
+ swap_byte(&state[counter], &state[index2]);
+ index1 = (index1 + 1) % key_data_len;
+ }
+}
+
+/*
+ * this algorithm does 'encrypt in place' instead of inbuff/outbuff
+ * note also: encryption and decryption use same routine
+ * implementation supplied by (Adam Back) at
+ */
+
+static void RC4(RC4_KEY *key, int buffer_len, unsigned char * buff)
+{
+ unsigned char t;
+ unsigned char x;
+ unsigned char y;
+ unsigned char* state;
+ unsigned char xorIndex;
+ short counter;
+
+ x = key->x;
+ y = key->y;
+ state = &key->state[0];
+ for(counter = 0; counter < buffer_len; counter++) {
+ x = (x + 1) % 256;
+ y = (state[x] + y) % 256;
+ swap_byte(&state[x], &state[y]);
+ xorIndex = (state[x] + state[y]) % 256;
+ buff[counter] ^= state[xorIndex];
+ }
+ key->x = x;
+ key->y = y;
+}
+
+
/**
* mdb_find_file:
* @filename: path to MDB (database) file
@@ -73,7 +134,11 @@
/* try the provided file name first */
if (!stat(file_name, &status)) {
- return g_strdup(file_name);
+ char *result;
+ result = g_strdup(file_name);
+ if (!result)
+ fprintf(stderr, "Can't alloc filename\n");
+ return result;
}
/* Now pull apart $MDBPATH and try those */
@@ -134,6 +199,8 @@
MdbHandle *mdb_open(const char *filename, MdbFileFlags flags)
{
MdbHandle *mdb;
+ int key[] = {0x86, 0xfb, 0xec, 0x37, 0x5d, 0x44, 0x9c, 0xfa, 0xc6, 0x5e, 0x28, 0xe6, 0x13, 0xb6};
+ int j, pos;
int open_flags;
mdb = (MdbHandle *) g_malloc0(sizeof(MdbHandle));
@@ -152,7 +219,7 @@
mdb->f->fd = -1;
mdb->f->filename = mdb_find_file(filename);
if (!mdb->f->filename) {
- fprintf(stderr, "Can't alloc filename\n");
+ fprintf(stderr, "File not found\n");
mdb_close(mdb);
return NULL;
}
@@ -184,15 +251,56 @@
return NULL;
}
mdb->f->jet_version = mdb_get_int32(mdb->pg_buf, 0x14);
- if (IS_JET4(mdb)) {
- mdb->fmt = &MdbJet4Constants;
- } else if (IS_JET3(mdb)) {
+ switch(mdb->f->jet_version) {
+ case MDB_VER_JET3:
mdb->fmt = &MdbJet3Constants;
- } else {
+ break;
+ case MDB_VER_JET4:
+ case MDB_VER_ACCDB_2007:
+ case MDB_VER_ACCDB_2010:
+ mdb->fmt = &MdbJet4Constants;
+ break;
+ default:
fprintf(stderr,"Unknown Jet version.\n");
mdb_close(mdb);
return NULL;
}
+ mdb->f->db_key = mdb_get_int32(mdb->pg_buf, 0x3e);
+ /* I don't know if this value is valid for some versions?
+ * it doesn't seem to be valid for the databases I have
+ *
+ * f->db_key ^= 0xe15e01b9;
+ */
+ mdb->f->db_key ^= 0x4ebc8afb;
+ /* fprintf(stderr, "Encrypted file, RC4 key seed= %d\n", mdb->f->db_key); */
+ if (mdb->f->db_key) {
+ /* write is not supported for encrypted files yet */
+ mdb->f->writable = FALSE;
+ /* that should be enought, but reopen the file read only just to be
+ * sure we don't write invalid data */
+ close(mdb->f->fd);
+ open_flags = O_RDONLY;
+#ifdef _WIN32
+ open_flags |= O_BINARY;
+#endif
+ mdb->f->fd = open(mdb->f->filename, open_flags);
+ if (mdb->f->fd==-1) {
+ fprintf(stderr, "Couldn't ropen file %s in read only\n", mdb->f->filename);
+ mdb_close(mdb);
+ return NULL;
+ }
+ }
+
+ /* get the db password located at 0x42 bytes into the file */
+ for (pos=0;pos<14;pos++) {
+ j = mdb_get_int32(mdb->pg_buf, 0x42+pos);
+ j ^= key[pos];
+ if ( j != 0)
+ mdb->f->db_passwd[pos] = j;
+ else
+ mdb->f->db_passwd[pos] = '\0';
+ }
+
mdb_iconv_init(mdb);
return mdb;
@@ -282,7 +390,7 @@
if (pg && mdb->cur_pg == pg) return mdb->fmt->pg_size;
len = _mdb_read_pg(mdb, mdb->pg_buf, pg);
-
+ //fprintf(stderr, "read page %d type %02x\n", pg, mdb->pg_buf[0]);
mdb->cur_pg = pg;
/* kan - reset the cur_pos on a new page read */
mdb->cur_pos = 0; /* kan */
@@ -303,7 +411,7 @@
fstat(mdb->f->fd, &status);
if (status.st_size < offset) {
- fprintf(stderr,"offset %lu is beyond EOF\n",offset);
+ fprintf(stderr,"offset %jd is beyond EOF\n",(intmax_t)offset);
return 0;
}
#if !MDB_NO_STATS
@@ -320,6 +428,18 @@
/* fprintf(stderr,"EOF reached %d bytes returned.\n",len, mdb->fmt->pg_size); */
return 0;
}
+ /*
+ * unencrypt the page if necessary.
+ * it might make sense to cache the unencrypted data blocks?
+ */
+ if (pg != 0 && mdb->f->db_key != 0)
+ {
+ RC4_KEY rc4_key;
+ unsigned int tmp_key = mdb->f->db_key ^ pg;
+ RC4_set_key(&rc4_key, 4, (unsigned char *)&tmp_key);
+ RC4(&rc4_key, mdb->fmt->pg_size, pg_buf);
+ }
+
return len;
}
void mdb_swap_pgbuf(MdbHandle *mdb)
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/iconv.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,13 +12,12 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include
#include "mdbtools.h"
-#include "errno.h"
#ifdef DMALLOC
#include "dmalloc.h"
@@ -43,7 +42,7 @@
return 0;
/* Uncompress 'Unicode Compressed' string into tmp */
- if (IS_JET4(mdb) && (slen>=2)
+ if (!IS_JET3(mdb) && (slen>=2)
&& ((src[0]&0xff)==0xff) && ((src[1]&0xff)==0xfe)) {
unsigned int compress=1;
src += 2;
@@ -72,22 +71,25 @@
len_out = dlen;
#if HAVE_ICONV
-
+ //printf("1 len_in %d len_out %d\n",len_in, len_out);
while (1) {
iconv(mdb->iconv_in, &in_ptr, &len_in, &out_ptr, &len_out);
if ((!len_in) || (errno == E2BIG)) break;
/* Don't bail if impossible conversion is encountered */
- in_ptr += (IS_JET4(mdb)) ? 2 : 1;
- len_in -= (IS_JET4(mdb)) ? 2 : 1;
+ in_ptr += (IS_JET3(mdb)) ? 1 : 2;
+ len_in -= (IS_JET3(mdb)) ? 1 : 2;
*out_ptr++ = '?';
len_out--;
}
-
+ //printf("2 len_in %d len_out %d\n",len_in, len_out);
dlen -= len_out;
#else
if (IS_JET3(mdb)) {
- strncpy(out_ptr, in_ptr, len_in);
- dlen = len_in;
+ size_t copy_len = len_in;
+ if (copy_len > dlen)
+ copy_len = dlen;
+ strncpy(out_ptr, in_ptr, copy_len);
+ dlen = copy_len;
} else {
/* rough UCS-2LE to ISO-8859-1 conversion */
unsigned int i;
@@ -99,7 +101,7 @@
if (tmp) g_free(tmp);
dest[dlen]='\0';
-
+ //printf("dest %s\n",dest);
return dlen;
}
@@ -123,7 +125,7 @@
#ifdef HAVE_ICONV
iconv(mdb->iconv_out, &in_ptr, &len_in, &out_ptr, &len_out);
-
+ //printf("len_in %d len_out %d\n", len_in, len_out);
dlen -= len_out;
#else
if (IS_JET3(mdb)) {
@@ -141,7 +143,7 @@
#endif
/* Unicode Compression */
- if(IS_JET4(mdb) && (dlen>4)) {
+ if(!IS_JET3(mdb) && (dlen>4)) {
unsigned char *tmp = g_malloc(dlen);
unsigned int tptr = 0, dptr = 0;
int comp = 1;
@@ -182,6 +184,21 @@
return dlen;
}
+const char*
+mdb_target_charset(MdbHandle *mdb)
+{
+#ifdef HAVE_ICONV
+ const char *iconv_code = getenv("MDBICONV");
+ if (!iconv_code)
+ iconv_code = "UTF-8";
+ return iconv_code;
+#else
+ if (!IS_JET3(mdb))
+ return "ISO-8859-1";
+ return NULL; // same as input: unknown
+#endif
+}
+
void mdb_iconv_init(MdbHandle *mdb)
{
const char *iconv_code;
@@ -192,10 +209,10 @@
}
#ifdef HAVE_ICONV
- if (IS_JET4(mdb)) {
- mdb->iconv_out = iconv_open("UCS-2LE", iconv_code);
- mdb->iconv_in = iconv_open(iconv_code, "UCS-2LE");
- } else {
+ if (!IS_JET3(mdb)) {
+ mdb->iconv_out = iconv_open("UCS-2LE", iconv_code);
+ mdb->iconv_in = iconv_open(iconv_code, "UCS-2LE");
+ } else {
/* According to Microsoft Knowledge Base pages 289525 and */
/* 202427, code page info is not contained in the database */
@@ -207,9 +224,10 @@
#ifdef _WIN32
// get the default from OS
char default_encoding[] = "CP ";
- if (GetLocaleInfoA( MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), SORT_DEFAULT),
- LOCALE_IDEFAULTANSICODEPAGE, default_encoding+2, sizeof(default_encoding)-2-1 ))
+ if (GetLocaleInfoA( MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), SORT_DEFAULT),
+ LOCALE_IDEFAULTANSICODEPAGE, default_encoding+2, sizeof(default_encoding)-2-1 )) {
mdb->jet3_iconv_code = g_strdup(default_encoding);
+ }
else
#endif
mdb->jet3_iconv_code = g_strdup("CP1252");
@@ -223,7 +241,9 @@
void mdb_iconv_close(MdbHandle *mdb)
{
#ifdef HAVE_ICONV
- if (mdb->iconv_out != (iconv_t)-1) iconv_close(mdb->iconv_out);
- if (mdb->iconv_in != (iconv_t)-1) iconv_close(mdb->iconv_in);
+ if (mdb->iconv_out != (iconv_t)-1) iconv_close(mdb->iconv_out);
+ if (mdb->iconv_in != (iconv_t)-1) iconv_close(mdb->iconv_in);
#endif
}
+
+
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/index.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/index.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/index.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/index.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mdbtools.h"
@@ -69,71 +68,95 @@
MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
MdbIndex *pidx;
- unsigned int i, j;
- int idx_num, key_num, col_num;
+ unsigned int i, j, k;
+ int key_num, col_num, cleaned_col_num;
int cur_pos, name_sz, idx2_sz, type_offset;
int index_start_pg = mdb->cur_pg;
gchar *tmpbuf;
- table->indices = g_ptr_array_new();
+ table->indices = g_ptr_array_new();
- if (IS_JET4(mdb)) {
- cur_pos = table->index_start + 52 * table->num_real_idxs;
- idx2_sz = 28;
- type_offset = 23;
- } else {
+ if (IS_JET3(mdb)) {
cur_pos = table->index_start + 39 * table->num_real_idxs;
idx2_sz = 20;
type_offset = 19;
+ } else {
+ cur_pos = table->index_start + 52 * table->num_real_idxs;
+ idx2_sz = 28;
+ type_offset = 23;
}
+ //fprintf(stderr, "num_idxs:%d num_real_idxs:%d\n", table->num_idxs, table->num_real_idxs);
+ /* num_real_idxs should be the number of indexes of type 2.
+ * It's not always the case. Happens on Northwind Orders table.
+ */
+ table->num_real_idxs = 0;
tmpbuf = (gchar *) g_malloc(idx2_sz);
for (i=0;inum_idxs;i++) {
read_pg_if_n(mdb, tmpbuf, &cur_pos, idx2_sz);
pidx = (MdbIndex *) g_malloc0(sizeof(MdbIndex));
pidx->table = table;
pidx->index_num = mdb_get_int16(tmpbuf, 4);
- pidx->index_type = tmpbuf[type_offset];
+ pidx->index_type = tmpbuf[type_offset];
g_ptr_array_add(table->indices, pidx);
+ /*
+ {
+ gint32 dumy0 = mdb_get_int32(tmpbuf, 0);
+ gint8 dumy1 = tmpbuf[8];
+ gint32 dumy2 = mdb_get_int32(tmpbuf, 9);
+ gint32 dumy3 = mdb_get_int32(tmpbuf, 13);
+ gint16 dumy4 = mdb_get_int16(tmpbuf, 17);
+ fprintf(stderr, "idx #%d: num2:%d type:%d\n", i, pidx->index_num, pidx->index_type);
+ fprintf(stderr, "idx #%d: %d %d %d %d %d\n", i, dumy0, dumy1, dumy2, dumy3, dumy4);
+ }*/
+ if (pidx->index_type!=2)
+ table->num_real_idxs++;
}
+ //fprintf(stderr, "num_idxs:%d num_real_idxs:%d\n", table->num_idxs, table->num_real_idxs);
g_free(tmpbuf);
for (i=0;inum_idxs;i++) {
pidx = g_ptr_array_index (table->indices, i);
- if (IS_JET4(mdb)) {
- name_sz=read_pg_if_16(mdb, &cur_pos);
- } else {
+ if (IS_JET3(mdb)) {
name_sz=read_pg_if_8(mdb, &cur_pos);
+ } else {
+ name_sz=read_pg_if_16(mdb, &cur_pos);
}
tmpbuf = g_malloc(name_sz);
read_pg_if_n(mdb, tmpbuf, &cur_pos, name_sz);
mdb_unicode2ascii(mdb, tmpbuf, name_sz, pidx->name, MDB_MAX_OBJ_NAME);
g_free(tmpbuf);
-
+ //fprintf(stderr, "index %d type %d name %s\n", pidx->index_num, pidx->index_type, pidx->name);
}
mdb_read_alt_pg(mdb, entry->table_pg);
mdb_read_pg(mdb, index_start_pg);
cur_pos = table->index_start;
- idx_num=0;
for (i=0;inum_real_idxs;i++) {
- if (IS_JET4(mdb)) cur_pos += 4;
- do {
- pidx = g_ptr_array_index (table->indices, idx_num++);
- } while (idx_num < table->num_real_idxs && pidx /*&& pidx != 0x736e6f6300616d65 && pidx!=(MdbIndex*)0xbaadf00d*/ /*(js) temp? hack*/&& pidx->index_type==2);
-
- /* if there are more real indexes than index entries left after
- removing type 2's decrement real indexes and continue. Happens
- on Northwind Orders table.
- */
- if (idx_num == table->num_real_idxs || !pidx /*|| pidx==(MdbIndex*)0xbaadf00d*/ /*(js) temp? hack*/ /*|| pidx != 0x736e6f6300616d65*/) {
- table->num_real_idxs--;
+ if (!IS_JET3(mdb)) cur_pos += 4;
+ /* look for index number i */
+ for (j=0; jnum_idxs; ++j) {
+ pidx = g_ptr_array_index (table->indices, j);
+ if (pidx->index_type!=2 && pidx->index_num==i)
+ break;
+ }
+ if (j==table->num_idxs) {
+ fprintf(stderr, "ERROR: can't find index #%d.\n", i);
continue;
}
+ //fprintf(stderr, "index %d #%d (%s) index_type:%d\n", i, pidx->index_num, pidx->name, pidx->index_type);
pidx->num_rows = mdb_get_int32(mdb->alt_pg_buf,
fmt->tab_cols_start_offset +
- (i*fmt->tab_ridx_entry_size));
+ (pidx->index_num*fmt->tab_ridx_entry_size));
+ /*
+ fprintf(stderr, "ridx block1 i:%d data1:0x%08x data2:0x%08x\n",
+ i,
+ mdb_get_int32(mdb->pg_buf,
+ fmt->tab_cols_start_offset + pidx->index_num * fmt->tab_ridx_entry_size),
+ mdb_get_int32(mdb->pg_buf,
+ fmt->tab_cols_start_offset + pidx->index_num * fmt->tab_ridx_entry_size +4));
+ fprintf(stderr, "pidx->num_rows:%d\n", pidx->num_rows);*/
key_num=0;
for (j=0;jnum_cols; k++) {
+ MdbColumn *col = g_ptr_array_index(table->columns,k);
+ if (col->col_num == col_num) {
+ cleaned_col_num = k;
+ break;
+ }
+ }
+ if (cleaned_col_num==-1) {
+ fprintf(stderr, "CRITICAL: can't find column with internal id %d in index %s\n",
+ col_num, pidx->name);
+ cur_pos++;
+ continue;
+ }
/* set column number to a 1 based column number and store */
- pidx->key_col_num[key_num] = col_num + 1;
+ pidx->key_col_num[key_num] = cleaned_col_num + 1;
pidx->key_col_order[key_num] =
(read_pg_if_8(mdb, &cur_pos)) ? MDB_ASC : MDB_DESC;
+ //fprintf(stderr, "component %d using column #%d (internally %d)\n", j, cleaned_col_num, col_num);
key_num++;
}
pidx->num_keys = key_num;
cur_pos += 4;
+ //fprintf(stderr, "pidx->unknown_pre_first_pg:0x%08x\n", read_pg_if_32(mdb, &cur_pos));
pidx->first_pg = read_pg_if_32(mdb, &cur_pos);
pidx->flags = read_pg_if_8(mdb, &cur_pos);
- if (IS_JET4(mdb)) cur_pos += 9;
+ //fprintf(stderr, "pidx->first_pg:%d pidx->flags:0x%02x\n", pidx->first_pg, pidx->flags);
+ if (!IS_JET3(mdb)) cur_pos += 9;
}
return NULL;
}
@@ -185,7 +227,7 @@
void
mdb_index_cache_sarg(MdbColumn *col, MdbSarg *sarg, MdbSarg *idx_sarg)
{
-
+ //guint32 cache_int;
unsigned char *c;
switch (col->col_type) {
@@ -195,10 +237,10 @@
case MDB_LONGINT:
idx_sarg->value.i = GUINT32_SWAP_LE_BE(sarg->value.i);
-
+ //cache_int = sarg->value.i * -1;
c = (unsigned char *) &(idx_sarg->value.i);
c[0] |= 0x80;
-
+ //printf("int %08x %02x %02x %02x %02x\n", sarg->value.i, c[0], c[1], c[2], c[3]);
break;
case MDB_INT:
@@ -247,25 +289,25 @@
MdbSarg *sarg;
MdbField field;
MdbSargNode node;
-
+ //int c_offset = 0,
int c_len;
-
-
-
-
+ //fprintf(stderr,"mdb_index_test_sargs called on ");
+ //for (i=0;ipg_buf[offset+i]);
+ //fprintf(stderr,"\n");
for (i=0;inum_keys;i++) {
-
+ //c_offset++; /* the per column null indicator/flags */
col=g_ptr_array_index(table->columns,idx->key_col_num[i]-1);
/*
* This will go away eventually
*/
if (col->col_type==MDB_TEXT) {
-
+ //c_len = strlen(&mdb->pg_buf[offset + c_offset]);
c_len = strlen(buf);
} else {
c_len = col->col_size;
-
+ //fprintf(stderr,"Only text types currently supported. How did we get here?\n");
}
/*
* If we have no cached index values for this column,
@@ -276,7 +318,7 @@
for (j=0;jnum_sargs;j++) {
sarg = g_ptr_array_index (col->sargs, j);
idx_sarg = g_memdup(sarg,sizeof(MdbSarg));
-
+ //printf("calling mdb_index_cache_sarg\n");
mdb_index_cache_sarg(col, sarg, idx_sarg);
g_ptr_array_add(col->idx_sarg_cache, idx_sarg);
}
@@ -287,7 +329,7 @@
/* XXX - kludge */
node.op = sarg->op;
node.value = sarg->value;
-
+ //field.value = &mdb->pg_buf[offset + c_offset];
field.value = buf;
field.siz = c_len;
field.is_null = FALSE;
@@ -314,9 +356,9 @@
start = ipg->idx_starts[elem++];
while (start) {
-
+ //fprintf(stdout, "elem %d is %d\n", elem, ipg->idx_starts[elem]);
len = ipg->idx_starts[elem] - start;
-
+ //fprintf(stdout, "len is %d\n", len);
for (i=0; i < len; i++) {
mask_bit++;
if (mask_bit==8) {
@@ -327,7 +369,7 @@
/* upon reaching the len, set the bit */
}
mask_byte = (1 << mask_bit) | mask_byte;
-
+ //fprintf(stdout, "mask byte is %02x at %d\n", mask_byte, mask_pos);
start = ipg->idx_starts[elem++];
}
/* flush the last byte if any */
@@ -353,7 +395,7 @@
ipg->idx_starts[elem++]=start;
-
+ //fprintf(stdout, "Unpacking index page %lu\n", ipg->pg);
do {
len = 0;
do {
@@ -365,7 +407,7 @@
mask_byte = mdb->pg_buf[mask_pos];
len++;
} while (mask_pos <= 0xf8 && !((1 << mask_bit) & mask_byte));
-
+ //fprintf(stdout, "%d %d %d %d\n", mask_pos, mask_bit, mask_byte, len);
start += len;
if (mask_pos < 0xf8) ipg->idx_starts[elem++]=start;
@@ -388,7 +430,7 @@
/* if this page has not been unpacked to it */
if (!ipg->idx_starts[0]){
-
+ //fprintf(stdout, "Unpacking page %d\n", ipg->pg);
mdb_index_unpack_bitmap(mdb, ipg);
}
@@ -396,7 +438,7 @@
if (ipg->idx_starts[ipg->start_pos + 1]==0) return 0;
ipg->len = ipg->idx_starts[ipg->start_pos+1] - ipg->idx_starts[ipg->start_pos];
ipg->start_pos++;
-
+ //fprintf(stdout, "Start pos %d\n", ipg->start_pos);
return ipg->len;
}
@@ -443,13 +485,13 @@
*/
do {
ipg->len = 0;
-
+ //printf("finding next on pg %lu\n", ipg->pg);
if (!mdb_index_find_next_on_page(mdb, ipg)) {
-
+ //printf("find_next_on_page returned 0\n");
return 0;
}
pg = mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 3) >> 8;
-
+ //printf("Looking at pg %lu at %lu %d\n", pg, ipg->offset, ipg->len);
ipg->offset += ipg->len;
/*
@@ -458,7 +500,7 @@
*/
newipg = mdb_chain_add_page(mdb, chain, pg);
newipg = mdb_find_next_leaf(mdb, idx, chain);
-
+ //printf("returning pg %lu\n",newipg->pg);
return newipg;
} while (!passed);
/* no more pages */
@@ -517,9 +559,9 @@
{
MdbIndexPage *ipg;
-
+ //printf("page %lu finished\n",ipg->pg);
if (chain->cur_depth==1) {
-
+ //printf("cur_depth == 1 we're out\n");
return NULL;
}
/*
@@ -528,13 +570,13 @@
*/
ipg = NULL;
while (chain->cur_depth>1 && ipg==NULL) {
-
+ //printf("chain depth %d\n", chain->cur_depth);
chain->cur_depth--;
ipg = mdb_find_next_leaf(mdb, idx, chain);
if (ipg) mdb_index_find_next_on_page(mdb, ipg);
}
if (chain->cur_depth==1) {
-
+ //printf("last leaf %lu\n", chain->last_leaf_found);
return NULL;
}
return ipg;
@@ -577,20 +619,20 @@
chain->clean_up_mode = 1;
}
if (chain->clean_up_mode) {
-
+ //fprintf(stdout,"in cleanup mode\n");
if (!chain->last_leaf_found) return 0;
mdb_read_pg(mdb, chain->last_leaf_found);
chain->last_leaf_found = mdb_get_int32(
mdb->pg_buf, 0x0c);
-
+ //printf("next leaf %lu\n", chain->last_leaf_found);
mdb_read_pg(mdb, chain->last_leaf_found);
/* reuse the chain for cleanup mode */
chain->cur_depth = 1;
ipg = &chain->pages[0];
mdb_index_page_init(ipg);
ipg->pg = chain->last_leaf_found;
-
+ //printf("next on page %d\n",
if (!mdb_index_find_next_on_page(mdb, ipg))
return 0;
}
@@ -598,28 +640,28 @@
pg_row = mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 4);
*row = pg_row & 0xff;
*pg = pg_row >> 8;
-
+ //printf("row = %d pg = %lu ipg->pg = %lu offset = %lu len = %d\n", *row, *pg, ipg->pg, ipg->offset, ipg->len);
col=g_ptr_array_index(idx->table->columns,idx->key_col_num[0]-1);
idx_sz = mdb_col_fixed_size(col);
/* handle compressed indexes, single key indexes only? */
if (idx->num_keys==1 && idx_sz>0 && ipg->len - 4 < idx_sz) {
-
-
+ //printf("short index found\n");
+ //mdb_buffer_dump(ipg->cache_value, 0, idx_sz);
memcpy(&ipg->cache_value[idx_sz - (ipg->len - 4)], &mdb->pg_buf[ipg->offset], ipg->len);
-
+ //mdb_buffer_dump(ipg->cache_value, 0, idx_sz);
} else {
idx_start = ipg->offset + (ipg->len - 4 - idx_sz);
memcpy(ipg->cache_value, &mdb->pg_buf[idx_start], idx_sz);
}
-
+ //idx_start = ipg->offset + (ipg->len - 4 - idx_sz);
passed = mdb_index_test_sargs(mdb, idx, (char *)(ipg->cache_value), idx_sz);
ipg->offset += ipg->len;
} while (!passed);
-
-
+ //fprintf(stdout,"len = %d pos %d\n", ipg->len, ipg->mask_pos);
+ //mdb_buffer_dump(mdb->pg_buf, ipg->offset, ipg->len);
return ipg->len;
}
@@ -677,11 +719,12 @@
void mdb_index_walk(MdbTableDef *table, MdbIndex *idx)
{
-MdbHandle *mdb = table->entry->mdb;
-int cur_pos = 0;
-unsigned char marker;
-MdbColumn *col;
-unsigned int i;
+/*
+ MdbHandle *mdb = table->entry->mdb;
+ int cur_pos = 0;
+ unsigned char marker;
+ MdbColumn *col;
+ unsigned int i;
if (idx->num_keys!=1) return;
@@ -691,8 +734,9 @@
for (i=0;inum_keys;i++) {
marker = mdb->pg_buf[cur_pos++];
col=g_ptr_array_index(table->columns,idx->key_col_num[i]-1);
-
+ //printf("column %d coltype %d col_size %d (%d)\n",i,col->col_type, mdb_col_fixed_size(col), col->col_size);
}
+*/
}
void
mdb_index_dump(MdbTableDef *table, MdbIndex *idx)
@@ -759,7 +803,7 @@
*/
if (idx->flags & MDB_IDX_UNIQUE) {
if (idx->num_keys == 1) {
-
+ //printf("op is %d\n", sarg->op);
switch (sarg->op) {
case MDB_EQUAL:
return 1; break;
@@ -831,7 +875,7 @@
for (i=0;inum_idxs;i++) {
idx = g_ptr_array_index (table->indices, i);
cost = mdb_index_compute_cost(table, idx);
-
+ //printf("cost for %s is %d\n", idx->name, cost);
if (cost && cost < least) {
least = cost;
*choice = i;
@@ -852,9 +896,9 @@
table->chain = g_malloc0(sizeof(MdbIndexChain));
table->mdbidx = mdb_clone_handle(mdb);
mdb_read_pg(table->mdbidx, table->scan_idx->first_pg);
-
+ //printf("best index is %s\n",table->scan_idx->name);
}
-
+ //printf("TABLE SCAN? %d\n", table->strategy);
}
void
mdb_index_scan_free(MdbTableDef *table)
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/like.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/like.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/like.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/like.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,14 +12,13 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include
#include
-#include
+#include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/map.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/map.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/map.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/map.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mdbtools.h"
@@ -23,7 +22,7 @@
#include "dmalloc.h"
#endif
-static guint32
+static gint32
mdb_map_find_next0(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg)
{
guint32 pgnum, i, usage_bitlen;
@@ -42,7 +41,7 @@
/* didn't find anything */
return 0;
}
-static int
+static gint32
mdb_map_find_next1(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg)
{
guint32 map_ind, max_map_pgs, offset, usage_bitlen;
@@ -83,7 +82,10 @@
/* didn't find anything */
return 0;
}
-guint32
+
+/* returns 0 on EOF */
+/* returns -1 on error (unsupported map type) */
+gint32
mdb_map_find_next(MdbHandle *mdb, unsigned char *map, unsigned int map_sz, guint32 start_pg)
{
if (map[0] == 0) {
@@ -114,11 +116,14 @@
pgnum = mdb_map_find_next(mdb,
table->free_usage_map,
table->freemap_sz, cur_pg);
-
+ //printf("looking at page %d\n", pgnum);
if (!pgnum) {
/* allocate new page */
pgnum = mdb_alloc_page(table);
return pgnum;
+ } else if (pgnum==-1) {
+ fprintf(stderr, "Error: mdb_map_find_next_freepage error while reading maps.\n");
+ exit(1);
}
cur_pg = pgnum;
@@ -127,7 +132,7 @@
} while (free_space < row_size);
-
+ //printf("page %d has %d bytes left\n", pgnum, free_space);
return pgnum;
}
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/mem.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/mem.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/mem.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/mem.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,45 +12,20 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef JAVA
-#include "javadefines.h"
-#else
+
#include "mdbtools.h"
-#include
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-#endif /* JAVA */
-/**
- * mdb_init:
- *
- * Initializes the LibMDB library. This function should be called exactly once
- * by calling program and prior to any other function.
- *
- **/
-/* METHOD */ void mdb_init()
+MDB_DEPRECATED(void,
+mdb_init())
{
-#if !MDB_NO_BACKENDS
- mdb_init_backends();
-#endif
+ fprintf(stderr, "mdb_init() is DEPRECATED and does nothing. Stop calling it.\n");
}
-/**
- * mdb_exit:
- *
- * Cleans up the LibMDB library. This function should be called exactly once
- * by the calling program prior to exiting (or prior to final use of LibMDB
- * functions).
- *
- **/
-/* METHOD */ void mdb_exit()
+MDB_DEPRECATED(void,
+mdb_exit())
{
-#if !MDB_NO_BACKENDS
- mdb_remove_backends();
-#endif
+ fprintf(stderr, "mdb_exit() is DEPRECATED and does nothing. Stop calling it.\n");
}
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/money.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/money.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/money.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/money.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include
@@ -24,10 +23,10 @@
#include "dmalloc.h"
#endif
-#define MAXPRECISION 19
+#define MAX_NUMERIC_PRECISION 28
/*
** these routines are copied from the freetds project which does something
-** very similar
+** very similiar
*/
static int multiply_byte(unsigned char *product, int num, unsigned char *multiplier);
@@ -43,41 +42,70 @@
*/
char *mdb_money_to_string(MdbHandle *mdb, int start)
{
- #define num_bytes 8
+ int num_bytes=8, scale=4;
int i;
int neg=0;
- unsigned char multiplier[MAXPRECISION], temp[MAXPRECISION];
- unsigned char product[MAXPRECISION];
- unsigned char money[num_bytes];
+ unsigned char multiplier[MAX_NUMERIC_PRECISION], temp[MAX_NUMERIC_PRECISION];
+ unsigned char product[MAX_NUMERIC_PRECISION];
+ unsigned char bytes[num_bytes];
- memset(multiplier,0,MAXPRECISION);
- memset(product,0,MAXPRECISION);
+ memset(multiplier,0,MAX_NUMERIC_PRECISION);
+ memset(product,0,MAX_NUMERIC_PRECISION);
multiplier[0]=1;
- memcpy(money, mdb->pg_buf + start, num_bytes);
+ memcpy(bytes, mdb->pg_buf + start, num_bytes);
/* Perform two's complement for negative numbers */
- if (money[7] & 0x80) {
+ if (bytes[num_bytes-1] & 0x80) {
neg = 1;
for (i=0;ipg_buf + start + 1, num_bytes);
+
+ /* Perform two's complement for negative numbers */
+ if (mdb->pg_buf[start] & 0x80) neg = 1;
+ for (i=0;i9) {
product[j+1]+=product[j]/10;
product[j]=product[j]%10;
@@ -117,9 +145,10 @@
char *s;
unsigned int top, i, j=0;
- for (top=MAXPRECISION;(top>0) && (top-1>scale) && !array[top-1];top--);
+ for (top=MAX_NUMERIC_PRECISION;(top>0) && (top-1>scale) && !array[top-1];top--);
- s = (char *) g_malloc(22);
+ /* allocate enough space for all digits + minus sign + decimal point + trailing NULL byte */
+ s = (char *) g_malloc(MAX_NUMERIC_PRECISION+3);
if (neg)
s[j++] = '-';
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/options.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/options.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/options.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/options.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,17 +12,15 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include
#include
#include
#include
-
-#include
+#include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
@@ -36,17 +34,17 @@
static void load_options();
void
-mdb_debug(int klass, char *fmt, ...)
+mdb_debug(int klass, const char *fmt, ...)
{
#ifdef DEBUG
va_list ap;
if (!optset) load_options();
- if (klass & opts) {
- va_start(ap, fmt);
- vfprintf (stdout,fmt, ap);
- va_end(ap);
- fprintf(stdout,"\n");
+ if (klass & opts) {
+ va_start(ap, fmt);
+ vfprintf (stderr,fmt, ap);
+ va_end(ap);
+ fprintf(stderr,"\n");
}
#endif
}
@@ -57,26 +55,28 @@
char *opt;
char *s;
- if (!optset && (s=getenv("MDBOPTS"))) {
+ if (!optset && (s=getenv("MDBOPTS"))) {
opt = strtok(s, ":");
- do {
- if (!strcmp(opt, "use_index")) opts |= MDB_USE_INDEX;
- if (!strcmp(opt, "no_memo")) opts |= MDB_NO_MEMO;
- if (!strcmp(opt, "debug_like")) opts |= MDB_DEBUG_LIKE;
- if (!strcmp(opt, "debug_write")) opts |= MDB_DEBUG_WRITE;
- if (!strcmp(opt, "debug_usage")) opts |= MDB_DEBUG_USAGE;
- if (!strcmp(opt, "debug_ole")) opts |= MDB_DEBUG_OLE;
- if (!strcmp(opt, "debug_row")) opts |= MDB_DEBUG_ROW;
- if (!strcmp(opt, "debug_all")) {
+ while (opt) {
+ if (!strcmp(opt, "use_index")) opts |= MDB_USE_INDEX;
+ if (!strcmp(opt, "no_memo")) opts |= MDB_NO_MEMO;
+ if (!strcmp(opt, "debug_like")) opts |= MDB_DEBUG_LIKE;
+ if (!strcmp(opt, "debug_write")) opts |= MDB_DEBUG_WRITE;
+ if (!strcmp(opt, "debug_usage")) opts |= MDB_DEBUG_USAGE;
+ if (!strcmp(opt, "debug_ole")) opts |= MDB_DEBUG_OLE;
+ if (!strcmp(opt, "debug_row")) opts |= MDB_DEBUG_ROW;
+ if (!strcmp(opt, "debug_props")) opts |= MDB_DEBUG_PROPS;
+ if (!strcmp(opt, "debug_all")) {
opts |= MDB_DEBUG_LIKE;
opts |= MDB_DEBUG_WRITE;
opts |= MDB_DEBUG_USAGE;
opts |= MDB_DEBUG_OLE;
opts |= MDB_DEBUG_ROW;
+ opts |= MDB_DEBUG_PROPS;
}
opt = strtok(NULL,":");
- } while (opt);
- }
+ }
+ }
optset = 1;
}
int
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/props.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/props.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/props.c 1970-01-01 00:00:00.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/props.c 2016-02-02 19:53:13.000000000 +0000
@@ -0,0 +1,215 @@
+/* MDB Tools - A library for reading MS Access database file
+ * Copyright (C) 2000-2011 Brian Bruns and others
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "mdbtools.h"
+
+static GPtrArray *
+mdb_read_props_list(MdbHandle *mdb, gchar *kkd, int len)
+{
+ guint32 record_len;
+ int pos = 0;
+ gchar *name;
+ GPtrArray *names = NULL;
+ int i=0;
+
+ names = g_ptr_array_new();
+#if MDB_DEBUG
+ mdb_buffer_dump(kkd, 0, len);
+#endif
+ pos = 0;
+ while (pos < len) {
+ record_len = mdb_get_int16(kkd, pos);
+ pos += 2;
+ if (mdb_get_option(MDB_DEBUG_PROPS)) {
+ fprintf(stderr, "%02d ",i++);
+ mdb_buffer_dump(kkd, pos - 2, record_len + 2);
+ }
+ name = g_malloc(3*record_len + 1); /* worst case scenario is 3 bytes out per byte in */
+ mdb_unicode2ascii(mdb, &kkd[pos], record_len, name, 3*record_len);
+
+ pos += record_len;
+ g_ptr_array_add(names, name);
+#if MDB_DEBUG
+ printf("new len = %d\n", names->len);
+#endif
+ }
+ return names;
+}
+static gboolean
+free_hash_entry(gpointer key, gpointer value, gpointer user_data)
+{
+ g_free(key);
+ g_free(value);
+ return TRUE;
+}
+void
+mdb_free_props(MdbProperties *props)
+{
+ if (!props) return;
+
+ if (props->name) g_free(props->name);
+ if (props->hash) {
+ g_hash_table_foreach(props->hash, (GHFunc)free_hash_entry, 0);
+ g_hash_table_destroy(props->hash);
+ }
+ g_free(props);
+}
+
+static void
+free_names(GPtrArray *names) {
+ g_ptr_array_foreach(names, (GFunc)g_free, NULL);
+ g_ptr_array_free(names, TRUE);
+}
+MdbProperties *
+mdb_alloc_props()
+{
+ MdbProperties *props;
+
+ props = g_malloc0(sizeof(MdbProperties));
+
+ return props;
+}
+static MdbProperties *
+mdb_read_props(MdbHandle *mdb, GPtrArray *names, gchar *kkd, int len)
+{
+ guint32 record_len, name_len;
+ int pos = 0;
+ int elem, dtype, dsize;
+ gchar *name, *value;
+ MdbProperties *props;
+ int i=0;
+
+#if MDB_DEBUG
+ mdb_buffer_dump(kkd, 0, len);
+#endif
+ pos = 0;
+
+ record_len = mdb_get_int16(kkd, pos);
+ pos += 4;
+ name_len = mdb_get_int16(kkd, pos);
+ pos += 2;
+ props = mdb_alloc_props();
+ if (name_len) {
+ props->name = g_malloc(3*name_len + 1);
+ mdb_unicode2ascii(mdb, kkd+pos, name_len, props->name, 3*name_len);
+ mdb_debug(MDB_DEBUG_PROPS,"prop block named: %s", props->name);
+ }
+ pos += name_len;
+
+ props->hash = g_hash_table_new(g_str_hash, g_str_equal);
+
+ while (pos < len) {
+ record_len = mdb_get_int16(kkd, pos);
+ dtype = kkd[pos + 3];
+ elem = mdb_get_int16(kkd, pos + 4);
+ dsize = mdb_get_int16(kkd, pos + 6);
+ value = g_malloc(dsize + 1);
+ strncpy(value, &kkd[pos + 8], dsize);
+ value[dsize] = '\0';
+ name = g_ptr_array_index(names,elem);
+ if (mdb_get_option(MDB_DEBUG_PROPS)) {
+ fprintf(stderr, "%02d ",i++);
+ mdb_debug(MDB_DEBUG_PROPS,"elem %d (%s) dsize %d dtype %d", elem, name, dsize, dtype);
+ mdb_buffer_dump(value, 0, dsize);
+ }
+ if (dtype == MDB_MEMO) dtype = MDB_TEXT;
+ if (dtype == MDB_BOOL) {
+ g_hash_table_insert(props->hash, g_strdup(name),
+ g_strdup(kkd[pos + 8] ? "yes" : "no"));
+ } else {
+ g_hash_table_insert(props->hash, g_strdup(name),
+ mdb_col_to_string(mdb, kkd, pos + 8, dtype, dsize));
+ }
+ g_free(value);
+ pos += record_len;
+ }
+ return props;
+
+}
+
+static void
+print_keyvalue(gpointer key, gpointer value, gpointer outfile)
+{
+ fprintf((FILE*)outfile,"\t%s: %s\n", (gchar *)key, (gchar *)value);
+}
+void
+mdb_dump_props(MdbProperties *props, FILE *outfile, int show_name) {
+ if (show_name)
+ fprintf(outfile,"name: %s\n", props->name ? props->name : "(none)");
+ g_hash_table_foreach(props->hash, print_keyvalue, outfile);
+ if (show_name)
+ fputc('\n', outfile);
+}
+
+/*
+ * That function takes a raw KKD/MR2 binary buffer,
+ * typically read from LvProp in table MSysbjects
+ * and returns a GArray of MdbProps*
+ */
+GArray*
+mdb_kkd_to_props(MdbHandle *mdb, void *buffer, size_t len) {
+ guint32 record_len;
+ guint16 record_type;
+ size_t pos;
+ GPtrArray *names = NULL;
+ MdbProperties *props;
+ GArray *result;
+
+#if MDB_DEBUG
+ mdb_buffer_dump(buffer, 0, len);
+#endif
+ mdb_debug(MDB_DEBUG_PROPS,"starting prop parsing of type %s", buffer);
+
+ if (strcmp("KKD", buffer) && strcmp("MR2", buffer)) {
+ fprintf(stderr, "Unrecognized format.\n");
+ mdb_buffer_dump(buffer, 0, len);
+ return NULL;
+ }
+
+ result = g_array_new(0, 0, sizeof(MdbProperties*));
+
+ pos = 4;
+ while (pos < len) {
+ record_len = mdb_get_int32(buffer, pos);
+ record_type = mdb_get_int16(buffer, pos + 4);
+ mdb_debug(MDB_DEBUG_PROPS,"prop chunk type:0x%04x len:%d", record_type, record_len);
+ //mdb_buffer_dump(buffer, pos+4, record_len);
+ switch (record_type) {
+ case 0x80:
+ if (names) free_names(names);
+ names = mdb_read_props_list(mdb, buffer+pos+6, record_len - 6);
+ break;
+ case 0x00:
+ case 0x01:
+ if (!names) {
+ fprintf(stderr,"sequence error!\n");
+ break;
+ }
+ props = mdb_read_props(mdb, names, buffer+pos+6, record_len - 6);
+ g_array_append_val(result, props);
+ //mdb_dump_props(props, stderr, 1);
+ break;
+ default:
+ fprintf(stderr,"Unknown record type %d\n", record_type);
+ break;
+ }
+ pos += record_len;
+ }
+ if (names) free_names(names);
+ return result;
+}
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/sargs.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/sargs.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/sargs.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/sargs.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/*
@@ -27,8 +26,9 @@
* datatype support is a bit weak at this point. To add more types create
* a mdb_test_[type]() function and invoke it from mdb_test_sarg()
*/
-#include "mdbtools.h"
+#include
+#include "mdbtools.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
@@ -76,7 +76,7 @@
{
switch (node->op) {
case MDB_EQUAL:
-
+ //fprintf(stderr, "comparing %ld and %ld\n", i, node->value.i);
if (node->value.i == i) return 1;
break;
case MDB_GT:
@@ -97,8 +97,51 @@
}
return 0;
}
-#if 0
-#endif
+
+int
+mdb_test_date(MdbSargNode *node, double td)
+{
+ struct tm found;
+ /* TODO: you should figure out a way to pull mdb_date_to_string in here
+ * char date_tmp[MDB_BIND_SIZE];
+ */
+
+ time_t found_t;
+ time_t asked_t;
+
+ double diff;
+
+ mdb_date_to_tm(td, &found);
+
+ asked_t = node->value.i;
+ found_t = mktime(&found);
+
+ diff = difftime(asked_t, found_t);
+
+ switch (node->op) {
+ case MDB_EQUAL:
+ if (diff==0) return 1;
+ break;
+ case MDB_GT:
+ if (diff<0) return 1;
+ break;
+ case MDB_LT:
+ if (diff>0) return 1;
+ break;
+ case MDB_GTEQ:
+ if (diff<=0) return 1;
+ break;
+ case MDB_LTEQ:
+ if (diff>=0) return 1;
+ break;
+ default:
+ fprintf(stderr, "Calling mdb_test_sarg on unknown operator. Add code to mdb_test_date() for operator %d\n", node->op);
+ break;
+ }
+ return 0;
+}
+
+
int
mdb_find_indexable_sargs(MdbSargNode *node, gpointer data)
{
@@ -120,7 +163,7 @@
* probably better off table scanning.
*/
if (mdb_is_relational_op(node->op) && node->col) {
-
+ //printf("op = %d value = %s\n", node->op, node->value.s);
sarg.op = node->op;
sarg.value = node->value;
mdb_add_sarg(node->col, &sarg);
@@ -155,6 +198,8 @@
case MDB_TEXT:
mdb_unicode2ascii(mdb, field->value, field->siz, tmpbuf, 256);
return mdb_test_string(node, tmpbuf);
+ case MDB_DATETIME:
+ return mdb_test_date(node, mdb_get_double(field->value, 0));
default:
fprintf(stderr, "Calling mdb_test_sarg on unknown type. Add code to mdb_test_sarg() for type %d\n",col->col_type);
break;
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/stats.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/stats.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/stats.c 1970-01-01 00:00:00.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/stats.c 2016-02-02 19:53:13.000000000 +0000
@@ -0,0 +1,77 @@
+/* MDB Tools - A library for reading MS Access database files
+ * Copyright (C) 2000 Brian Bruns
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "mdbtools.h"
+
+#if !MDB_NO_STATS
+
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
+/**
+ * mdb_stats_on:
+ * @mdb: Handle to the (open) MDB file to collect stats on.
+ *
+ * Begins collection of statistics on an MDBHandle.
+ *
+ * Statistics in LibMDB will track the number of reads from the MDB file. The
+ * collection of statistics is started and stopped with the mdb_stats_on and
+ * mdb_stats_off functions. Collected statistics are accessed by reading the
+ * MdbStatistics structure or calling mdb_dump_stats.
+ *
+ */
+void
+mdb_stats_on(MdbHandle *mdb)
+{
+ if (!mdb->stats)
+ mdb->stats = g_malloc0(sizeof(MdbStatistics));
+
+ mdb->stats->collect = TRUE;
+}
+/**
+ * mdb_stats_off:
+ * @mdb: pointer to handle of MDB file with active stats collection.
+ *
+ * Turns off statistics collection.
+ *
+ * If mdb_stats_off is not called, statistics will be turned off when handle
+ * is freed using mdb_close.
+ **/
+void
+mdb_stats_off(MdbHandle *mdb)
+{
+ if (!mdb->stats) return;
+
+ mdb->stats->collect = FALSE;
+}
+/**
+ * mdb_dump_stats:
+ * @mdb: pointer to handle of MDB file with active stats collection.
+ *
+ * Dumps current statistics to stdout.
+ **/
+void
+mdb_dump_stats(MdbHandle *mdb)
+{
+ if (!mdb->stats) return;
+
+ fprintf(stdout, "Physical Page Reads: %lu\n", mdb->stats->pg_reads);
+}
+
+#endif /* !MDB_NO_STATS */
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/table.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/table.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/table.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/table.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mdbtools.h"
@@ -76,15 +75,16 @@
MdbTableDef *table;
MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
- int len, row_start, pg_row;
+ int row_start, pg_row;
void *buf, *pg_buf = mdb->pg_buf;
+ guint i;
mdb_read_pg(mdb, entry->table_pg);
if (mdb_get_byte(pg_buf, 0) != 0x02) /* not a valid table def page */
return NULL;
table = mdb_alloc_tabledef(entry);
- len = mdb_get_int16(pg_buf, 8);
+ mdb_get_int16(pg_buf, 8); /* len */
table->num_rows = mdb_get_int32(pg_buf, fmt->tab_num_rows_offset);
table->num_var_cols = mdb_get_int16(pg_buf, fmt->tab_num_cols_offset-2);
@@ -97,7 +97,7 @@
mdb_find_pg_row(mdb, pg_row, &buf, &row_start, &(table->map_sz));
table->usage_map = g_memdup((char*)buf + row_start, table->map_sz);
if (mdb_get_option(MDB_DEBUG_USAGE))
- buffer_dump(buf, row_start, table->map_sz);
+ mdb_buffer_dump(buf, row_start, table->map_sz);
mdb_debug(MDB_DEBUG_USAGE,"usage map found on page %ld row %d start %d len %d",
pg_row >> 8, pg_row & 0xff, row_start, table->map_sz);
@@ -110,6 +110,13 @@
table->first_data_pg = mdb_get_int16(pg_buf, fmt->tab_first_dpg_offset);
+ if (entry->props)
+ for (i=0; iprops->len; ++i) {
+ MdbProperties *props = g_array_index(entry->props, MdbProperties*, i);
+ if (!props->name)
+ table->props = props;
+ }
+
return table;
}
MdbTableDef *mdb_read_table_by_name(MdbHandle *mdb, gchar *table_name, int obj_type)
@@ -161,7 +168,6 @@
void *
read_pg_if_n(MdbHandle *mdb, void *buf, int *cur_pos, size_t len)
{
- char *buf_char = (char *)buf;
/* Advance to page which contains the first byte */
while (*cur_pos >= mdb->fmt->pg_size) {
mdb_read_pg(mdb, mdb_get_int32(mdb->pg_buf,4));
@@ -170,20 +176,20 @@
/* Copy pages into buffer */
while (*cur_pos + len >= mdb->fmt->pg_size) {
int piece_len = mdb->fmt->pg_size - *cur_pos;
- if (buf_char) {
- memcpy(buf_char, mdb->pg_buf + *cur_pos, piece_len);
- buf_char += piece_len;
+ if (buf) {
+ memcpy(buf, mdb->pg_buf + *cur_pos, piece_len);
+ buf += piece_len;
}
len -= piece_len;
mdb_read_pg(mdb, mdb_get_int32(mdb->pg_buf,4));
*cur_pos = 8;
}
/* Copy into buffer from final page */
- if (len && buf_char) {
- memcpy(buf_char, mdb->pg_buf + *cur_pos, len);
+ if (len && buf) {
+ memcpy(buf, mdb->pg_buf + *cur_pos, len);
}
*cur_pos += len;
- return buf_char;
+ return buf;
}
@@ -193,11 +199,20 @@
}
void mdb_free_columns(GPtrArray *columns)
{
- unsigned int i;
+ unsigned int i, j;
+ MdbColumn *col;
if (!columns) return;
- for (i=0; ilen; i++)
- g_free (g_ptr_array_index(columns, i));
+ for (i=0; ilen; i++) {
+ col = (MdbColumn *) g_ptr_array_index(columns, i);
+ if (col->sargs) {
+ for (j=0; jsargs->len; j++) {
+ g_free( g_ptr_array_index(col->sargs, j));
+ }
+ g_ptr_array_free(col->sargs, TRUE);
+ }
+ g_free(col);
+ }
g_ptr_array_free(columns, TRUE);
}
GPtrArray *mdb_read_columns(MdbTableDef *table)
@@ -206,9 +221,10 @@
MdbFormatConstants *fmt = mdb->fmt;
MdbColumn *pcol;
unsigned char *col;
- unsigned int i;
+ unsigned int i, j;
int cur_pos;
size_t name_sz;
+ GArray *allprops;
table->columns = g_ptr_array_new();
@@ -225,24 +241,26 @@
for (i=0;inum_cols;i++) {
#ifdef MDB_DEBUG
/* printf("column %d\n", i);
- buffer_dump(mdb->pg_buf, cur_pos, fmt->tab_col_entry_size); */
+ mdb_buffer_dump(mdb->pg_buf, cur_pos, fmt->tab_col_entry_size); */
#endif
read_pg_if_n(mdb, col, &cur_pos, fmt->tab_col_entry_size);
pcol = (MdbColumn *) g_malloc0(sizeof(MdbColumn));
+ pcol->table = table;
+
pcol->col_type = col[0];
-
+ // col_num_offset == 1 or 5
pcol->col_num = col[fmt->col_num_offset];
-
-
+ //fprintf(stdout,"----- column %d -----\n",pcol->col_num);
+ // col_var == 3 or 7
pcol->var_col_num = mdb_get_int16(col, fmt->tab_col_offset_var);
-
+ //fprintf(stdout,"var column pos %d\n",pcol->var_col_num);
-
+ // col_var == 5 or 9
pcol->row_col_num = mdb_get_int16(col, fmt->tab_row_col_num_offset);
-
+ //fprintf(stdout,"row column num %d\n",pcol->row_col_num);
/* FIXME: can this be right in Jet3 and Jet4? */
if (pcol->col_type == MDB_NUMERIC) {
@@ -250,16 +268,18 @@
pcol->col_scale = col[12];
}
-
- pcol->is_fixed = col[fmt->col_fixed_offset] & 0x01 ? 1 : 0;
+ // col_flags_offset == 13 or 15
+ pcol->is_fixed = col[fmt->col_flags_offset] & 0x01 ? 1 : 0;
+ pcol->is_long_auto = col[fmt->col_flags_offset] & 0x04 ? 1 : 0;
+ pcol->is_uuid_auto = col[fmt->col_flags_offset] & 0x40 ? 1 : 0;
-
+ // tab_col_offset_fixed == 14 or 21
pcol->fixed_offset = mdb_get_int16(col, fmt->tab_col_offset_fixed);
-
-
+ //fprintf(stdout,"fixed column offset %d\n",pcol->fixed_offset);
+ //fprintf(stdout,"col type %s\n",pcol->is_fixed ? "fixed" : "variable");
if (pcol->col_type != MDB_BOOL) {
-
+ // col_size_offset == 16 or 23
pcol->col_size = mdb_get_int16(col, fmt->col_size_offset);
} else {
pcol->col_size=0;
@@ -277,24 +297,34 @@
char *tmp_buf;
pcol = g_ptr_array_index(table->columns, i);
- if (IS_JET4(mdb)) {
- name_sz = read_pg_if_16(mdb, &cur_pos);
- } else if (IS_JET3(mdb)) {
+ if (IS_JET3(mdb))
name_sz = read_pg_if_8(mdb, &cur_pos);
- } else {
- fprintf(stderr,"Unknown MDB version\n");
- continue;
- }
+ else
+ name_sz = read_pg_if_16(mdb, &cur_pos);
tmp_buf = (char *) g_malloc(name_sz);
read_pg_if_n(mdb, tmp_buf, &cur_pos, name_sz);
mdb_unicode2ascii(mdb, tmp_buf, name_sz, pcol->name, MDB_MAX_OBJ_NAME);
g_free(tmp_buf);
+
}
/* Sort the columns by col_num */
g_ptr_array_sort(table->columns, (GCompareFunc)mdb_col_comparer);
+ allprops = table->entry->props;
+ if (allprops)
+ for (i=0;inum_cols;i++) {
+ pcol = g_ptr_array_index(table->columns, i);
+ for (j=0; jlen; ++j) {
+ MdbProperties *props = g_array_index(allprops, MdbProperties*, j);
+ if (props->name && pcol->name && !strcmp(props->name, pcol->name)) {
+ pcol->props = props;
+ break;
+ }
+
+ }
+ }
table->index_start = cur_pos;
return table->columns;
}
@@ -306,7 +336,6 @@
MdbColumn *col;
int coln;
MdbIndex *idx;
-MdbHandle *mdb = entry->mdb;
unsigned int i, bitn;
guint32 pgnum;
@@ -316,6 +345,8 @@
fprintf(stdout,"number of columns = %d\n",table->num_cols);
fprintf(stdout,"number of indices = %d\n",table->num_real_idxs);
+ if (table->props)
+ mdb_dump_props(table->props, stdout, 0);
mdb_read_columns(table);
mdb_read_indices(table);
@@ -324,8 +355,10 @@
fprintf(stdout,"column %d Name: %-20s Type: %s(%d)\n",
i, col->name,
- mdb_get_coltype_string(mdb->default_backend, col->col_type),
+ mdb_get_colbacktype_string(col),
col->col_size);
+ if (col->props)
+ mdb_dump_props(col->props, stdout, 0);
}
for (i=0;inum_idxs;i++) {
@@ -371,3 +404,17 @@
return ((entry->object_type == MDB_TABLE)
&& (entry->flags & 0x80000002)) ? 1 : 0;
}
+
+const char *
+mdb_table_get_prop(const MdbTableDef *table, const gchar *key) {
+ if (!table->props)
+ return NULL;
+ return g_hash_table_lookup(table->props->hash, key);
+}
+
+const char *
+mdb_col_get_prop(const MdbColumn *col, const gchar *key) {
+ if (!col->props)
+ return NULL;
+ return g_hash_table_lookup(col->props->hash, key);
+}
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/worktable.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/worktable.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/worktable.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/worktable.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,9 +12,8 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mdbtools.h"
@@ -74,6 +73,7 @@
void
mdb_temp_table_add_col(MdbTableDef *table, MdbColumn *col)
{
+ col->table = table,
col->col_num = table->num_cols;
if (!col->is_fixed)
col->var_col_num = table->num_var_cols++;
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/write.c calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/write.c
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/libmdb/write.c 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/libmdb/write.c 2016-02-02 19:53:13.000000000 +0000
@@ -12,41 +12,65 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include
+#include
+#include
#include "mdbtools.h"
-#include "time.h"
-#include "math.h"
#ifdef DMALLOC
#include "dmalloc.h"
#endif
-
+//static int mdb_copy_index_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg);
static int mdb_add_row_to_leaf_pg(MdbTableDef *table, MdbIndex *idx, MdbIndexPage *ipg, MdbField *idx_fields, guint32 pgnum, guint16 rownum);
void
-_mdb_put_int16(void *buf, guint32 offset, guint32 value)
+mdb_put_int16(void *buf, guint32 offset, guint32 value)
{
value = GINT32_TO_LE(value);
memcpy((char*)buf + offset, &value, 2);
}
void
-_mdb_put_int32(void *buf, guint32 offset, guint32 value)
+_mdb_put_int16(void *buf, guint32 offset, guint32 value)
+#ifdef HAVE_ATTRIBUTE_ALIAS
+__attribute__((alias("mdb_put_int16")));
+#else
+{ mdb_put_int16((char*)buf, offset, value); }
+#endif
+
+void
+mdb_put_int32(void *buf, guint32 offset, guint32 value)
{
value = GINT32_TO_LE(value);
memcpy((char*)buf + offset, &value, 4);
}
void
-_mdb_put_int32_msb(void *buf, guint32 offset, guint32 value)
+_mdb_put_int32(void *buf, guint32 offset, guint32 value)
+#ifdef HAVE_ATTRIBUTE_ALIAS
+__attribute__((alias("mdb_put_int32")));
+#else
+{ mdb_put_int32((char*)buf, offset, value); }
+#endif
+
+void
+mdb_put_int32_msb(void *buf, guint32 offset, guint32 value)
{
value = GINT32_TO_BE(value);
memcpy((char*)buf + offset, &value, 4);
}
+void
+_mdb_put_int32_mdb(void *buf, guint32 offset, guint32 value)
+#ifdef HAVE_ATTRIBUTE_ALIAS
+__attribute__((alias("mdb_put_int32_msb")));
+#else
+{ mdb_put_int32_msb((char*)buf, offset, value); }
+#endif
+
ssize_t
mdb_write_pg(MdbHandle *mdb, unsigned long pg)
{
@@ -57,7 +81,7 @@
fstat(mdb->f->fd, &status);
/* is page beyond current size + 1 ? */
if ((size_t)status.st_size < (offset + mdb->fmt->pg_size)) {
- fprintf(stderr,"offset %lu is beyond EOF\n",offset);
+ fprintf(stderr,"offset %jd is beyond EOF\n",(intmax_t)offset);
return 0;
}
lseek(mdb->f->fd, offset, SEEK_SET);
@@ -158,31 +182,31 @@
unsigned int i;
if (mdb_get_option(MDB_DEBUG_ROW)) {
- buffer_dump(pg_buf, row_start, row_end - row_start + 1);
+ mdb_buffer_dump(pg_buf, row_start, row_end - row_start + 1);
}
- if (IS_JET4(mdb)) {
- row_cols = mdb_get_int16(pg_buf, row_start);
- col_count_size = 2;
- } else {
+ if (IS_JET3(mdb)) {
row_cols = mdb_get_byte(pg_buf, row_start);
col_count_size = 1;
+ } else {
+ row_cols = mdb_get_int16(pg_buf, row_start);
+ col_count_size = 2;
}
bitmask_sz = (row_cols + 7) / 8;
- nullmask = (unsigned char*)pg_buf + row_end - bitmask_sz + 1;
+ nullmask = (unsigned char *)pg_buf + row_end - bitmask_sz + 1;
/* read table of variable column locations */
- row_var_cols = IS_JET4(mdb) ?
- mdb_get_int16(pg_buf, row_end - bitmask_sz - 1) :
- mdb_get_byte(pg_buf, row_end - bitmask_sz);
- var_col_offsets = (unsigned int *)g_malloc((row_var_cols+1)*sizeof(int));
if (table->num_var_cols > 0) {
- if (IS_JET4(mdb)) {
- mdb_crack_row4(mdb, row_start, row_end, bitmask_sz,
+ row_var_cols = IS_JET3(mdb) ?
+ mdb_get_byte(pg_buf, row_end - bitmask_sz) :
+ mdb_get_int16(pg_buf, row_end - bitmask_sz - 1);
+ var_col_offsets = (unsigned int *)g_malloc((row_var_cols+1)*sizeof(int));
+ if (IS_JET3(mdb)) {
+ mdb_crack_row3(mdb, row_start, row_end, bitmask_sz,
row_var_cols, var_col_offsets);
} else {
- mdb_crack_row3(mdb, row_start, row_end, bitmask_sz,
+ mdb_crack_row4(mdb, row_start, row_end, bitmask_sz,
row_var_cols, var_col_offsets);
}
}
@@ -246,7 +270,7 @@
/* column is null if bit is clear (0) */
if (!fields[i].is_null) {
byte |= 1 << bit;
-
+ //printf("%d %d %d %d\n", i, bit, 1 << bit, byte);
}
bit++;
if (bit==8) {
@@ -404,10 +428,10 @@
}
}
}
- if (IS_JET4(table->entry->mdb)) {
- return mdb_pack_row4(table, row_buffer, num_fields, fields);
- } else {
+ if (IS_JET3(table->entry->mdb)) {
return mdb_pack_row3(table, row_buffer, num_fields, fields);
+ } else {
+ return mdb_pack_row4(table, row_buffer, num_fields, fields);
}
}
int
@@ -428,8 +452,8 @@
MdbHandle *mdb = entry->mdb;
void *new_pg = g_malloc0(mdb->fmt->pg_size);
- _mdb_put_int16(new_pg, 2, 0x0104);
- _mdb_put_int32(new_pg, 4, entry->table_pg);
+ mdb_put_int16(new_pg, 0, 0x0104);
+ mdb_put_int32(new_pg, 4, entry->table_pg);
return new_pg;
}
@@ -439,13 +463,14 @@
MdbFormatConstants *fmt = entry->mdb->fmt;
void *new_pg = g_malloc0(fmt->pg_size);
- _mdb_put_int16(new_pg, 2, 0x0101);
- _mdb_put_int16(new_pg, 2, fmt->pg_size - fmt->row_count_offset - 2);
- _mdb_put_int32(new_pg, 4, entry->table_pg);
+ mdb_put_int16(new_pg, 0, 0x0101);
+ mdb_put_int16(new_pg, 2, fmt->pg_size - fmt->row_count_offset - 2);
+ mdb_put_int32(new_pg, 4, entry->table_pg);
return new_pg;
}
+/* could be static */
int
mdb_update_indexes(MdbTableDef *table, int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum)
{
@@ -476,25 +501,22 @@
return 1;
}
+/* could be static */
int
mdb_update_index(MdbTableDef *table, MdbIndex *idx, unsigned int num_fields, MdbField *fields, guint32 pgnum, guint16 rownum)
{
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
- /*
- int idx_xref[16];
- */
+ /*int idx_xref[16];*/
unsigned int i, j;
MdbIndexChain *chain;
MdbField idx_fields[10];
for (i = 0; i < idx->num_keys; i++) {
for (j = 0; j < num_fields; j++) {
- /* key_col_num is 1 based, can't remember why though */
+ // key_col_num is 1 based, can't remember why though
if (fields[j].colnum == idx->key_col_num[i]-1) {
- /*
- idx_xref[i] = j;
- */
+ /* idx_xref[i] = j; */
idx_fields[i] = fields[j];
}
}
@@ -515,10 +537,10 @@
chain = g_malloc0(sizeof(MdbIndexChain));
mdb_index_find_row(mdb, idx, chain, pgnum, rownum);
-
-
-
-
+ //printf("chain depth = %d\n", chain->cur_depth);
+ //printf("pg = %" G_GUINT32_FORMAT "\n",
+ //chain->pages[chain->cur_depth-1].pg);
+ //mdb_copy_index_pg(table, idx, &chain->pages[chain->cur_depth-1]);
mdb_add_row_to_leaf_pg(table, idx, &chain->pages[chain->cur_depth-1], idx_fields, pgnum, rownum);
return 1;
@@ -541,7 +563,7 @@
}
new_row_size = mdb_pack_row(table, row_buffer, num_fields, fields);
if (mdb_get_option(MDB_DEBUG_WRITE)) {
- buffer_dump(row_buffer, 0, new_row_size);
+ mdb_buffer_dump(row_buffer, 0, new_row_size);
}
pgnum = mdb_map_find_next_freepage(table, new_row_size);
if (!pgnum) {
@@ -552,13 +574,13 @@
rownum = mdb_add_row_to_pg(table, row_buffer, new_row_size);
if (mdb_get_option(MDB_DEBUG_WRITE)) {
- buffer_dump(mdb->pg_buf, 0, 40);
- buffer_dump(mdb->pg_buf, fmt->pg_size - 160, 160);
+ mdb_buffer_dump(mdb->pg_buf, 0, 40);
+ mdb_buffer_dump(mdb->pg_buf, fmt->pg_size - 160, 160);
}
mdb_debug(MDB_DEBUG_WRITE, "writing page %d", pgnum);
if (!mdb_write_pg(mdb, pgnum)) {
- fprintf(stderr, "write failed! exiting...\n");
- exit(1);
+ fprintf(stderr, "write failed!\n");
+ return 0;
}
mdb_update_indexes(table, num_fields, fields, pgnum, rownum);
@@ -606,7 +628,7 @@
mdb_find_row(mdb, i, &row_start, &row_size);
pos -= row_size;
memcpy((char*)new_pg + pos, mdb->pg_buf + row_start, row_size);
- _mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (i*2), pos);
+ mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (i*2), pos);
}
}
@@ -614,14 +636,14 @@
pos -= new_row_size;
memcpy((char*)new_pg + pos, row_buffer, new_row_size);
/* add row to the row offset table */
- _mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (num_rows*2), pos);
+ mdb_put_int16(new_pg, (fmt->row_count_offset + 2) + (num_rows*2), pos);
/* update number rows on this page */
num_rows++;
- _mdb_put_int16(new_pg, fmt->row_count_offset, num_rows);
+ mdb_put_int16(new_pg, fmt->row_count_offset, num_rows);
/* update the freespace */
- _mdb_put_int16(new_pg,2,pos - fmt->row_count_offset - 2 - (num_rows*2));
+ mdb_put_int16(new_pg,2,pos - fmt->row_count_offset - 2 - (num_rows*2));
/* copy new page over old */
if (!table->is_temp_table) {
@@ -655,7 +677,7 @@
mdb_debug(MDB_DEBUG_WRITE,"page %lu row %d start %d end %d", (unsigned long) table->cur_phys_pg, table->cur_row-1, row_start, row_end);
if (mdb_get_option(MDB_DEBUG_LIKE))
- buffer_dump(mdb->pg_buf, row_start, old_row_size);
+ mdb_buffer_dump(mdb->pg_buf, row_start, old_row_size);
for (i=0;inum_cols;i++) {
col = g_ptr_array_index(table->columns,i);
@@ -668,7 +690,7 @@
if (mdb_get_option(MDB_DEBUG_WRITE)) {
for (i=0;inum_cols;i++) {
@@ -681,15 +703,21 @@
new_row_size = mdb_pack_row(table, row_buffer, num_fields, fields);
if (mdb_get_option(MDB_DEBUG_WRITE))
- buffer_dump(row_buffer, 0, new_row_size);
+ mdb_buffer_dump(row_buffer, 0, new_row_size);
if (new_row_size > (old_row_size + mdb_pg_get_freespace(mdb))) {
fprintf(stderr, "No space left on this page, update will not occur\n");
return 0;
}
/* do it! */
mdb_replace_row(table, table->cur_row-1, row_buffer, new_row_size);
- return 0;
+ return 0; /* FIXME */
}
+
+/* WARNING the return code is opposite to convention used elsewhere:
+ * returns 0 on success
+ * returns 1 on failure
+ * This might change on next ABI break.
+ */
int
mdb_replace_row(MdbTableDef *table, int row, void *new_row, int new_row_size)
{
@@ -704,14 +732,14 @@
int i, pos;
if (mdb_get_option(MDB_DEBUG_WRITE)) {
- buffer_dump(mdb->pg_buf, 0, 40);
- buffer_dump(mdb->pg_buf, pg_size - 160, 160);
+ mdb_buffer_dump(mdb->pg_buf, 0, 40);
+ mdb_buffer_dump(mdb->pg_buf, pg_size - 160, 160);
}
mdb_debug(MDB_DEBUG_WRITE,"updating row %d on page %lu", row, (unsigned long) table->cur_phys_pg);
new_pg = mdb_new_data_pg(entry);
num_rows = mdb_get_int16(mdb->pg_buf, rco);
- _mdb_put_int16(new_pg, rco, num_rows);
+ mdb_put_int16(new_pg, rco, num_rows);
pos = pg_size;
@@ -720,20 +748,20 @@
mdb_find_row(mdb, i, &row_start, &row_size);
pos -= row_size;
memcpy((char*)new_pg + pos, mdb->pg_buf + row_start, row_size);
- _mdb_put_int16(new_pg, rco + 2 + i*2, pos);
+ mdb_put_int16(new_pg, rco + 2 + i*2, pos);
}
/* our row */
pos -= new_row_size;
memcpy((char*)new_pg + pos, new_row, new_row_size);
- _mdb_put_int16(new_pg, rco + 2 + row*2, pos);
+ mdb_put_int16(new_pg, rco + 2 + row*2, pos);
/* rows after */
for (i=row+1;ipg_buf + row_start, row_size);
- _mdb_put_int16(new_pg, rco + 2 + i*2, pos);
+ mdb_put_int16(new_pg, rco + 2 + i*2, pos);
}
/* almost done, copy page over current */
@@ -741,15 +769,15 @@
g_free(new_pg);
- _mdb_put_int16(mdb->pg_buf, 2, mdb_pg_get_freespace(mdb));
+ mdb_put_int16(mdb->pg_buf, 2, mdb_pg_get_freespace(mdb));
if (mdb_get_option(MDB_DEBUG_WRITE)) {
- buffer_dump(mdb->pg_buf, 0, 40);
- buffer_dump(mdb->pg_buf, pg_size - 160, 160);
+ mdb_buffer_dump(mdb->pg_buf, 0, 40);
+ mdb_buffer_dump(mdb->pg_buf, pg_size - 160, 160);
}
/* drum roll, please */
if (!mdb_write_pg(mdb, table->cur_phys_pg)) {
- fprintf(stderr, "write failed! exiting...\n");
- exit(1);
+ fprintf(stderr, "write failed!\n");
+ return 1;
}
return 0;
}
@@ -796,16 +824,18 @@
}
pg_row = mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 4);
+ /* guint32 pg = pg_row >> 8; */
row = pg_row & 0xff;
+ /* unsigned char iflag = mdb->pg_buf[ipg->offset]; */
/* turn the key hash back into a value */
mdb_index_swap_n(&mdb->pg_buf[ipg->offset + 1], col->col_size, key_hash);
key_hash[col->col_size - 1] &= 0x7f;
if (mdb_get_option(MDB_DEBUG_WRITE)) {
- buffer_dump(mdb->pg_buf, ipg->offset, ipg->len);
- buffer_dump(mdb->pg_buf, ipg->offset + 1, col->col_size);
- buffer_dump(key_hash, 0, col->col_size);
+ mdb_buffer_dump(mdb->pg_buf, ipg->offset, ipg->len);
+ mdb_buffer_dump(mdb->pg_buf, ipg->offset + 1, col->col_size);
+ mdb_buffer_dump(key_hash, 0, col->col_size);
}
memcpy((char*)new_pg + ipg->offset, mdb->pg_buf + ipg->offset, ipg->len);
@@ -814,32 +844,37 @@
row++;
}
-
+
+ if (!row) {
+ fprintf(stderr,"missing indexes not yet supported, aborting\n");
+ return 0;
+ }
+ //mdb_put_int16(new_pg, mdb->fmt->row_count_offset, row);
/* free space left */
- _mdb_put_int16(new_pg, 2, mdb->fmt->pg_size - ipg->offset);
-
+ mdb_put_int16(new_pg, 2, mdb->fmt->pg_size - ipg->offset);
+ //printf("offset = %d\n", ipg->offset);
mdb_index_swap_n(idx_fields[0].value, col->col_size, key_hash);
key_hash[0] |= 0x080;
if (mdb_get_option(MDB_DEBUG_WRITE)) {
printf("key_hash\n");
- buffer_dump(idx_fields[0].value, 0, col->col_size);
- buffer_dump(key_hash, 0, col->col_size);
+ mdb_buffer_dump(idx_fields[0].value, 0, col->col_size);
+ mdb_buffer_dump(key_hash, 0, col->col_size);
printf("--------\n");
}
((char *)new_pg)[ipg->offset] = 0x7f;
memcpy((char*)new_pg + ipg->offset + 1, key_hash, col->col_size);
pg_row = (pgnum << 8) | ((rownum-1) & 0xff);
- _mdb_put_int32_msb(new_pg, ipg->offset + 5, pg_row);
+ mdb_put_int32_msb(new_pg, ipg->offset + 5, pg_row);
ipg->idx_starts[row++] = ipg->offset + ipg->len;
-
+ //ipg->idx_starts[row] = ipg->offset + ipg->len;
if (mdb_get_option(MDB_DEBUG_WRITE)) {
- buffer_dump(mdb->pg_buf, 0, mdb->fmt->pg_size);
+ mdb_buffer_dump(mdb->pg_buf, 0, mdb->fmt->pg_size);
}
memcpy(mdb->pg_buf, new_pg, mdb->fmt->pg_size);
mdb_index_pack_bitmap(mdb, ipg);
if (mdb_get_option(MDB_DEBUG_WRITE)) {
- buffer_dump(mdb->pg_buf, 0, mdb->fmt->pg_size);
+ mdb_buffer_dump(mdb->pg_buf, 0, mdb->fmt->pg_size);
}
g_free(new_pg);
diff -Nru calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/update_diffs.sh calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/update_diffs.sh
--- calligra-2.9.7/kexi/migration/mdb/3rdparty/mdbtools/update_diffs.sh 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/3rdparty/mdbtools/update_diffs.sh 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cd libmdb
-for i in `ls -1 *.c` ; do cd ..; diff -u ./libmdb.cvs/$i ./libmdb/$i > ../diffs/`echo $i | sed -e 's/\.c/\.diff/g'` ; cd libmdb; done
-
-cd ..
-diff -u ./include.cvs/mdbtools.h ./include/mdbtools.h > ../diffs/mdbtools.diff
diff -Nru calligra-2.9.7/kexi/migration/mdb/ChangeLog calligra-2.9.11/kexi/migration/mdb/ChangeLog
--- calligra-2.9.7/kexi/migration/mdb/ChangeLog 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/ChangeLog 2016-02-02 19:53:13.000000000 +0000
@@ -1,3 +1,7 @@
+Mon Jun 24 21:04:51 CEST 2014
+ Update to mdbtools from June. This also fixes primary keys import.
+-- Jarosław Staniek
+
Mon Jun 4 14:49:44 CEST 2007
Ported to Qt4, imported into calligra/kexi/migration/ for Kexi 2.0.
-- Jarosław Staniek
diff -Nru calligra-2.9.7/kexi/migration/mdb/src/CMakeLists.txt calligra-2.9.11/kexi/migration/mdb/src/CMakeLists.txt
--- calligra-2.9.7/kexi/migration/mdb/src/CMakeLists.txt 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/src/CMakeLists.txt 2016-02-02 19:53:13.000000000 +0000
@@ -3,7 +3,10 @@
add_definitions(-Wno-missing-format-attribute)
add_definitions(-Wno-sign-compare)
add_definitions(-Wno-unused-parameter)
-endif ()
+ add_definitions(-Wno-pointer-arith)
+ add_definitions(-std=c99)
+ add_definitions(-Wno-cast-qual)
+endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC)
set(MDBTOOLS_SOURCE_DIR "${CMAKE_SOURCE_DIR}/kexi/migration/mdb/3rdparty/mdbtools")
@@ -31,7 +34,9 @@
${MDBTOOLS_SOURCE_DIR}/libmdb/mem.c
${MDBTOOLS_SOURCE_DIR}/libmdb/money.c
${MDBTOOLS_SOURCE_DIR}/libmdb/options.c
+${MDBTOOLS_SOURCE_DIR}/libmdb/props.c
${MDBTOOLS_SOURCE_DIR}/libmdb/sargs.c
+${MDBTOOLS_SOURCE_DIR}/libmdb/stats.c
${MDBTOOLS_SOURCE_DIR}/libmdb/table.c
${MDBTOOLS_SOURCE_DIR}/libmdb/worktable.c
${MDBTOOLS_SOURCE_DIR}/libmdb/write.c
diff -Nru calligra-2.9.7/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp calligra-2.9.11/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp
--- calligra-2.9.7/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/src/keximdb/mdbmigrate.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2005,2006 Martin Ellis
- Copyright (C) 2005 Jarosław Staniek
+ Copyright (C) 2005-2014 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -51,18 +51,6 @@
setPropertyValue(nonUnicodePropId, QString());
setPropertyCaption(nonUnicodePropId, i18n("Source Database Non-Unicode Character Encoding"));
- initBackend();
-}
-
-MDBMigrate::~MDBMigrate()
-{
- releaseBackend();
-}
-
-void MDBMigrate::initBackend()
-{
- mdb_init();
-
// Date format associated with Qt::ISODate: YYYY-MM-DDTHH:MM:SS
// (where T is a literal). The following is equivalent to %FT%T, but
// backards compatible with old/Windows C libraries.
@@ -70,9 +58,8 @@
mdb_set_date_fmt("%Y-%m-%dT%H:%M:%S");
}
-void MDBMigrate::releaseBackend()
+MDBMigrate::~MDBMigrate()
{
- mdb_exit();
}
QVariant MDBMigrate::propertyValue(const QByteArray& propName)
@@ -224,7 +211,7 @@
case MDB_BOOL: //! @todo use &bool!
case MDB_BYTE:
return QString::fromUtf8(data, len).toShort();
- case MDB_SDATETIME:
+ case MDB_DATETIME:
return QDateTime::fromString(data, Qt::ISODate);
case MDB_INT:
case MDB_LONGINT:
@@ -347,7 +334,7 @@
case MDB_DOUBLE:
kexiType = KexiDB::Field::Double;
break;
- case MDB_SDATETIME:
+ case MDB_DATETIME:
kexiType = KexiDB::Field::DateTime;
break;
case MDB_TEXT:
@@ -446,6 +433,3 @@
mdb_free_tabledef(tableDef);
return true;
}
-
-
-#include "mdbmigrate.moc"
diff -Nru calligra-2.9.7/kexi/migration/mdb/src/keximdb/mdbmigrate.h calligra-2.9.11/kexi/migration/mdb/src/keximdb/mdbmigrate.h
--- calligra-2.9.7/kexi/migration/mdb/src/keximdb/mdbmigrate.h 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mdb/src/keximdb/mdbmigrate.h 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2005,2006 Martin Ellis
- Copyright (C) 2005 Jarosław Staniek
+ Copyright (C) 2005-2014 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -33,7 +33,6 @@
class MDBMigrate : public KexiMigrate
{
- Q_OBJECT
KEXIMIGRATION_DRIVER
public:
@@ -84,8 +83,6 @@
virtual bool drv_getTableSize(const QString& table, qulonglong& size);
private:
- void initBackend();
- void releaseBackend();
MdbHandle *m_mdb;
};
}
diff -Nru calligra-2.9.7/kexi/migration/mysql/keximigrate_mysql.desktop calligra-2.9.11/kexi/migration/mysql/keximigrate_mysql.desktop
--- calligra-2.9.7/kexi/migration/mysql/keximigrate_mysql.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/migration/mysql/keximigrate_mysql.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -47,7 +47,7 @@
Name[ro]=MySQL
Name[ru]=MySQL
Name[se]=MySQL
-Name[sk]=mySQL
+Name[sk]=MySQL
Name[sl]=MySQL
Name[sv]=MySQL
Name[tg]=MySQL
diff -Nru calligra-2.9.7/kexi/migration/pqxx/pqxxmigrate.cpp calligra-2.9.11/kexi/migration/pqxx/pqxxmigrate.cpp
--- calligra-2.9.7/kexi/migration/pqxx/pqxxmigrate.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/migration/pqxx/pqxxmigrate.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -432,14 +432,16 @@
std::vector::const_iterator i, end(R.end());
int index = 0;
for (i = R.begin(); i != end; ++i, index++) {
- if (fieldsExpanded.at(index)->field->type() == KexiDB::Field::BLOB
- || fieldsExpanded.at(index)->field->type() == KexiDB::Field::LongText) {
+ KexiDB::Field *field = fieldsExpanded.at(index)->field;
+ const KexiDB::Field::Type type = field->type(); // cache: evaluating type of expressions can be expensive
+ if (type == KexiDB::Field::BLOB || type == KexiDB::Field::LongText) {
vals.append(KexiDB::pgsqlByteaToByteArray((*i).c_str(), (*i).size()));
- } else if (fieldsExpanded.at(index)->field->type() == KexiDB::Field::Boolean) {
+ } else if (type == KexiDB::Field::Boolean) {
vals.append(QString((*i).c_str()).toLower() == "t" ? QVariant(true) : QVariant(false));
- } else
+ } else {
vals.append(KexiDB::cstringToVariant((*i).c_str(),
- fieldsExpanded.at(index)->field, (*i).size()));
+ field, (*i).size()));
+ }
}
if (!destConn->insertRecord(*dstTable, vals))
return false;
diff -Nru calligra-2.9.7/kexi/migration/txt/keximigrate_txt.desktop calligra-2.9.11/kexi/migration/txt/keximigrate_txt.desktop
--- calligra-2.9.7/kexi/migration/txt/keximigrate_txt.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/migration/txt/keximigrate_txt.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -2,6 +2,7 @@
Name=TSV
Name[bs]=TSV
Name[ca]=TSV
+Name[ca@valencia]=TSV
Name[da]=TSV
Name[de]=TSV
Name[en_GB]=TSV
@@ -9,6 +10,7 @@
Name[et]=TSV
Name[fi]=TSV
Name[fr]=TSV
+Name[gl]=TSV
Name[ia]=TSV
Name[it]=TSV
Name[ja]=TSV
@@ -25,6 +27,7 @@
Comment="Tab Separated Values" Document Import Plugin for Kexi
Comment[bs]="Tabulatorom razdvojene vrijednosti" uvozni dodatak dokumenta za Kexi
Comment[ca]=Connector d'importació de documents «Valors separats per tabulacions» (TSV) pel Kexi
+Comment[ca@valencia]=Connector d'importació de documents «Valors separats per tabulacions» (TSV) pel Kexi
Comment[da]=Importplugin til "tabulatorseparerede værdier"-dokumenter (TSV) til Kexi
Comment[de]=„Durch Tabulator getrennte Werte“-Dokument-Importmodul für Kexi
Comment[en_GB]="Tab Separated Values" Document Import Plugin for Kexi
@@ -32,6 +35,7 @@
Comment[et]=Kexi "tabeldusmärgiga erandatud väärtuste" dokumendi impordiplugin
Comment[fi]=”Sarkaimin eroteltujen arvojen” (TSV) tiedostojen tuontiliitännäinen Kexille
Comment[fr]=Module d'importation de document «séparations par tabulation» pour Kexi
+Comment[gl]=Complemento para Kexi de importación de documentos TSV (valores separados por tabulacións).
Comment[it]=Estensione di importazione dei documenti con valori separati da tabulazioni di Kexi
Comment[ja]=Kexi のための TSV ドキュメント インポートプラグイン
Comment[nb]=Kexi programtillegg for import av dokument med TAB-atskilte verdier
diff -Nru calligra-2.9.7/kexi/plugins/forms/kexiformhandler.desktop calligra-2.9.11/kexi/plugins/forms/kexiformhandler.desktop
--- calligra-2.9.7/kexi/plugins/forms/kexiformhandler.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/kexiformhandler.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -7,7 +7,6 @@
GenericName[bs]=Formulari
GenericName[ca]=Formularis
GenericName[ca@valencia]=Formularis
-GenericName[cs]=Formuláře
GenericName[cy]=Ffurflenni
GenericName[da]=Formularer
GenericName[de]=Formulare
@@ -19,7 +18,6 @@
GenericName[eu]=Inprimakiak
GenericName[fa]=برگهها
GenericName[fi]=Lomakkeet
-GenericName[fr]=Formulaires
GenericName[fy]=Forms
GenericName[ga]=Foirmeacha
GenericName[gl]=Formularios
diff -Nru calligra-2.9.7/kexi/plugins/forms/kexiformscrollview.cpp calligra-2.9.11/kexi/plugins/forms/kexiformscrollview.cpp
--- calligra-2.9.7/kexi/plugins/forms/kexiformscrollview.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/kexiformscrollview.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2004 Cedric Pasteur
- Copyright (C) 2004-2015 Jarosław Staniek
+ Copyright (C) 2004-2016 Jarosław Staniek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -131,8 +131,6 @@
}
m_contextMenu = new KMenu(this);
m_contextMenu->setObjectName("m_contextMenu");
-//! @todo sorting temporarily disabled because not it's not implemented in forms (bug 150372)
- setSortingEnabled(false);
}
KexiFormScrollView::~KexiFormScrollView()
@@ -229,7 +227,6 @@
Qt::SortOrder KexiFormScrollView::currentLocalSortOrder() const
{
- //! @todo
return d->localSortOrder;
}
@@ -240,22 +237,18 @@
void KexiFormScrollView::setLocalSortOrder(int column, Qt::SortOrder order)
{
- //! @todo
d->currentLocalSortColumn = column;
d->localSortOrder = order;
}
void KexiFormScrollView::sortColumnInternal(int col, int order)
{
- Q_UNUSED(col);
- Q_UNUSED(order);
- //! @todo
+ KexiDataAwareObjectInterface::sortColumnInternal(col, order);
}
void KexiFormScrollView::updateGUIAfterSorting(int previousRow)
{
Q_UNUSED(previousRow);
- //! @todo
}
void KexiFormScrollView::createEditor(int row, int col, const QString& addText,
diff -Nru calligra-2.9.7/kexi/plugins/forms/kexiformscrollview.h calligra-2.9.11/kexi/plugins/forms/kexiformscrollview.h
--- calligra-2.9.7/kexi/plugins/forms/kexiformscrollview.h 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/kexiformscrollview.h 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2004 Cedric Pasteur
- Copyright (C) 2004-2015 Jarosław Staniek
+ Copyright (C) 2004-2016 Jarosław Staniek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -177,8 +177,8 @@
/*! Handles verticalScrollBar()'s valueChanged(int) signal.
Called when vscrollbar's value has been changed. */
//! @todo unused for now, will be used for continuous forms
- virtual void vScrollBarValueChanged(int v) {
- KexiDataAwareObjectInterface::vScrollBarValueChanged(v);
+ virtual void verticalScrollBarValueChanged(int v) {
+ KexiDataAwareObjectInterface::verticalScrollBarValueChanged(v);
}
Q_SIGNALS:
@@ -251,13 +251,16 @@
//! Implementation for KexiDataAwareObjectInterface
virtual int currentLocalSortColumn() const;
- //! Implementation for KexiDataAwareObjectInterface
+ //! Implementation for KexiDataAwareObjectInterface. Visually does nothing
+ //! but remembers index of the currently sorted column and order.
virtual void setLocalSortOrder(int column, Qt::SortOrder order);
- //! Implementation for KexiDataAwareObjectInterface
+ //! Implementation for KexiDataAwareObjectInterface.
+ //! Just calls KexiDataAwareObjectInterface's implementation.
void sortColumnInternal(int col, int order = 0);
- //! Implementation for KexiDataAwareObjectInterface
+ //! Implementation for KexiDataAwareObjectInterface.
+ //! Nothing to do here. Record navigator is already updated.
virtual void updateGUIAfterSorting(int previousRow);
//! Implementation for KexiDataAwareObjectInterface
diff -Nru calligra-2.9.7/kexi/plugins/forms/kexiformview.cpp calligra-2.9.11/kexi/plugins/forms/kexiformview.cpp
--- calligra-2.9.7/kexi/plugins/forms/kexiformview.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/kexiformview.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -540,7 +540,9 @@
if (viewMode() == Kexi::DataViewMode) {
//TMP!!
- initDataSource();
+ if (!initDataSource()) {
+ return false;
+ }
//handle events for this form
d->scrollView->setMainWidgetForEventHandling(d->dbform);
@@ -596,16 +598,20 @@
return dynamic_cast(part());
}
-void KexiFormView::initDataSource()
+bool KexiFormView::initDataSource()
{
deleteQuery();
+ const QString dataSourceString(d->dbform->dataSource());
+ if (dataSourceString.isEmpty()) {
+ return true; // nothing to do
+ }
+
//! @todo also handle anonymous (not stored) queries provided as statements here
KexiDB::TableSchema *tableSchema = 0;
KexiDB::Connection *conn = 0;
QStringList sources;
bool forceReadOnlyDataSource = false;
- QString dataSourceString(d->dbform->dataSource());
- bool ok = !dataSourceString.isEmpty();
+ bool ok = true;
if (ok) {
//collect all data-aware widgets and create query schema
d->scrollView->setMainDataSourceWidget(d->dbform);
@@ -700,11 +706,15 @@
KexiUtils::WaitCursorRemover remover;
params = KexiQueryParameters::getParameters(this, *conn->driver(), *d->query, ok);
}
- if (ok) //input cancelled
- d->cursor = conn->executeQuery(*d->query, params);
+ if (ok) { //input cancelled
+ d->cursor = conn->prepareQuery(*d->query, params);
+ }
}
d->scrollView->invalidateDataSources(invalidSources, d->query);
ok = d->cursor != 0;
+ if (ok) {
+ ok = setData(d->cursor);
+ }
}
if (!invalidSources.isEmpty())
@@ -716,7 +726,7 @@
KexiDB::TableViewData* data = new KexiDB::TableViewData(d->cursor);
if (forceReadOnlyDataSource)
data->setReadOnly(true);
- data->preloadAllRows();
+ ok = data->preloadAllRows();
///*! @todo few backends return result count for free! - no need to reopen() */
// int resultCount = -1;
@@ -727,11 +737,16 @@
// if (ok)
// ok = ! (!d->cursor->moveFirst() && d->cursor->error());
- d->scrollView->setData(data, true /*owner*/);
+ if (ok) {
+ d->scrollView->setData(data, true /*owner*/);
+ } else {
+ delete data;
+ }
}
else {
d->scrollView->setData(0, false);
}
+ return ok;
}
void KexiFormView::setFormModified()
diff -Nru calligra-2.9.7/kexi/plugins/forms/kexiformview.h calligra-2.9.11/kexi/plugins/forms/kexiformview.h
--- calligra-2.9.7/kexi/plugins/forms/kexiformview.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/kexiformview.h 2016-02-02 19:53:13.000000000 +0000
@@ -151,7 +151,7 @@
//! Redirects to Container::eventFilter().
virtual void contextMenuEvent(QContextMenuEvent *e);
- void initDataSource();
+ bool initDataSource();
virtual void setFocusInternal();
/*! Called after loading the form contents (before showing it). */
diff -Nru calligra-2.9.7/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop calligra-2.9.11/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop
--- calligra-2.9.7/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -13,7 +13,6 @@
Name[es]=Complemento de elementos gráficos para los formularios de Kexi
Name[et]=Kexi vormide vidinate plugin
Name[eu]=Kexi-ren inprimakietarako trepeta-plugina
-Name[fr]=Module externe pour Kexi de composants graphiques pour les formulaires
Name[gl]=Complemento de trebellos para os formularios de Kexi
Name[hu]=Felületi elemek bővítmény a Kexi űrlapokhoz
Name[it]=Estensione degli oggetti dei moduli di Kexi
diff -Nru calligra-2.9.7/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop calligra-2.9.11/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop
--- calligra-2.9.7/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -13,7 +13,6 @@
Name[es]=Complemento de navegador de mapas para los formularos de Kexi
Name[et]=Kexi vormide kaardibrauseri plugin
Name[eu]=Kexi-ren inprimakietarako mapa-arakatzailearen plugina
-Name[fr]=Module externe pour Kexi d'explorateur de carte pour les formulaire
Name[gl]=Complemento de exploración de mapas para os formularios de Kexi
Name[hu]=Térképböngésző bővítmény a Kexi űrlapokhoz
Name[it]=Estensione di navigazione mappe per i moduli di Kexi
diff -Nru calligra-2.9.7/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop calligra-2.9.11/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop
--- calligra-2.9.7/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -15,7 +15,6 @@
Name[es]=Complemento de navegador web para los formularios de Kexi
Name[et]=Kexi vormide veebibrauseri plugin
Name[eu]=Kexi-ren inprimakietarako web-arakatzailearen plugina
-Name[fr]=Module externe pour Kexi de navigateur internet pour les formulaire
Name[gl]=Complemento de navegación web para os formularios de Kexi
Name[hu]=Webböngésző bővítmény a Kexi űrlapokhoz
Name[it]=Estensione del browser web per i moduli di Kexi
diff -Nru calligra-2.9.7/kexi/plugins/importexport/csv/kexicsvexport.cpp calligra-2.9.11/kexi/plugins/importexport/csv/kexicsvexport.cpp
--- calligra-2.9.7/kexi/plugins/importexport/csv/kexicsvexport.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/importexport/csv/kexicsvexport.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -184,13 +184,14 @@
visibleFieldIndex[i] = i;
}
- isText[i] = ci->field->isTextType();
- isDateTime[i] = ci->field->type() == KexiDB::Field::DateTime;
- isTime[i] = ci->field->type() == KexiDB::Field::Time;
- isBLOB[i] = ci->field->type() == KexiDB::Field::BLOB;
-// isInteger[i] = fields[i]->field->isIntegerType()
-// || fields[i]->field->type()==KexiDB::Field::Boolean;
-// isFloatingPoint[i] = fields[i]->field->isFPNumericType();
+ const KexiDB::Field::Type t = ci->field->type(); // cache: evaluating type of expressions can be expensive
+ isText[i] = KexiDB::Field::isTextType(t);
+ isDateTime[i] = t == KexiDB::Field::DateTime;
+ isTime[i] = t == KexiDB::Field::Time;
+ isBLOB[i] = t == KexiDB::Field::BLOB;
+// isInteger[i] = KexiDB::Field::isIntegerType(t)
+// || t == KexiDB::Field::Boolean;
+// isFloatingPoint[i] = KexiDB::Field::isFPNumericType(t);
}
kDebug() << 1;
diff -Nru calligra-2.9.7/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop calligra-2.9.11/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop
--- calligra-2.9.7/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop 2016-02-02 19:53:13.000000000 +0000
@@ -4,9 +4,8 @@
Name=Kexi CSV Data Import/Export Plugin
Name[bs]=Kexi CSV plugin za uvoz/izvoz podataka
-Name[ca]=Connector d'importació/Exportació de dades CSV per al Kexi
-Name[ca@valencia]=Connector d'importació/Exportació de dades CSV per al Kexi
-Name[cs]=Modul Kexi pro import a export dat CSV
+Name[ca]=Connector d'importació/exportació de dades CSV per al Kexi
+Name[ca@valencia]=Connector d'importació/exportació de dades CSV per al Kexi
Name[da]=Kexi CSV data-import/eksport plugin
Name[de]=Kexi-CSV-Daten-Import/Export-Modul
Name[el]=Πρόσθετο εισαγωγής/εξαγωγής CSV δεδομένων του Kexi
@@ -17,7 +16,6 @@
Name[eu]=Kexi-ren CSV datuak inportatzeko/esportatzeko plugina
Name[fa]=وصله واردات/صادرات داده Kexi CSV
Name[fi]=Kexin CSV-tuonti-/vientisuodatin
-Name[fr]=Module d'importation / exportation de données CSV de Kexi
Name[fy]=Kexi ymport/eksport Plugin foar CSV-gegevens
Name[ga]=Breiseán Iompórtála/Easpórtála Sonraí CSV le haghaidh Kexi
Name[gl]=Complemento de Kexi para a importación e exportación de datos CSV
@@ -26,7 +24,7 @@
Name[hne]=केएक्जाई सीएसवी डाटा आयात/निर्यात प्लगइन
Name[hu]=Kexi CSV adatimportáló és -exportáló modul
Name[is]=Kexi CSV gagna inn/útflutnings íforrit
-Name[it]=Importazione ed esportazione di dati CSV di Kexi
+Name[it]=Estensione di importazione ed esportazione di dati CSV di Kexi
Name[ja]=Kexi CSV データ インポート/エクスポートプラグイン
Name[kk]=Kexi-нің CSV деректерді импорт/экспорт ету плагині
Name[ko]=Kexi용 CSV 데이터 가져오기/내보내기 플러그인
diff -Nru calligra-2.9.7/kexi/plugins/queries/kexiquerydesignerguieditor.cpp calligra-2.9.11/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
--- calligra-2.9.7/kexi/plugins/queries/kexiquerydesignerguieditor.cpp 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/queries/kexiquerydesignerguieditor.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2004 Lucijan Busch
- Copyright (C) 2004-2015 Jarosław Staniek
+ Copyright (C) 2004-2016 Jarosław Staniek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -504,7 +504,8 @@
kDebug() << "invisible field with sorting: do not add it to the fields list";
continue;
}
- temp->query()->addField(currentField, fieldVisible);
+ const int tablePosition = temp->query()->tablePosition(t->name());
+ temp->query()->addField(currentField, tablePosition, fieldVisible);
if (fieldVisible)
fieldsFound = true;
if (!alias.isEmpty())
@@ -601,7 +602,7 @@
if (!d->dataTable->dataAwareObject()->acceptRowEdit())
return cancelled;
- kDebug() << "queryChangedInPreviousView:" << tempData()->queryChangedInPreviousView();
+ kDebug() << "queryChangedInView:" << tempData()->queryChangedInView();
if (mode == Kexi::DesignViewMode) {
return true;
@@ -611,7 +612,7 @@
KMessageBox::information(this, msgCannotSwitch_EmptyDesign());
return cancelled;
}
- if (tempData()->queryChangedInPreviousView() || !tempData()->query()) {
+ if (tempData()->queryChangedInView() != Kexi::NoViewMode || !tempData()->query()) {
//remember current design in a temporary structure
QString errMsg;
//build schema; problems are not allowed
@@ -625,7 +626,7 @@
return true;
} else if (mode == Kexi::TextViewMode) {
dontStore = true;
- if (tempData()->queryChangedInPreviousView() || !tempData()->query()) {
+ if (tempData()->queryChangedInView() != Kexi::NoViewMode || !tempData()->query()) {
//remember current design in a temporary structure
//build schema; ignore problems
buildSchema();
@@ -675,8 +676,8 @@
} else if (mode == Kexi::TextViewMode || mode == Kexi::DataViewMode) {
// Switch from text or data view. In the second case, the design could be changed as well
// because there could be changes made in the text view before switching to the data view.
- if (tempData()->queryChangedInPreviousView()) {
- //previous view changed query data
+ if (tempData()->queryChangedInView() == Kexi::TextViewMode) {
+ //SQL view changed the query design
//-clear and regenerate GUI items
initTableRows();
//! @todo
@@ -710,7 +711,7 @@
d->dataTable->tableView()->adjustColumnWidthToContents(COLUMN_ID_COLUMN);
d->dataTable->tableView()->adjustColumnWidthToContents(COLUMN_ID_TABLE);
}
- tempData()->setQueryChangedInPreviousView(false);
+ tempData()->setQueryChangedInView(false);
setFocus(); //to allow shared actions proper update
return true;
}
@@ -728,7 +729,7 @@
}
QString errMsg;
KexiQueryPart::TempData * temp = tempData();
- if (!temp->query() || !(viewMode() == Kexi::DesignViewMode && !temp->queryChangedInPreviousView())) {
+ if (!temp->query() || !(viewMode() == Kexi::DesignViewMode && temp->queryChangedInView() == Kexi::NoViewMode)) {
//only rebuild schema if it has not been rebuilt previously
if (!buildSchema(&errMsg)) {
KMessageBox::sorry(this, errMsg);
@@ -1253,7 +1254,7 @@
propertySetSwitched();
d->droppedNewRecord = 0;
}
- tempData()->setQueryChangedInPreviousView(true);
+ tempData()->setQueryChangedInView(true);
}
void KexiQueryDesignerGuiEditor::slotTableAdded(KexiDB::TableSchema & /*t*/)
@@ -1262,7 +1263,7 @@
return;
updateColumnsData();
setDirty();
- tempData()->setQueryChangedInPreviousView(true);
+ tempData()->setQueryChangedInView(true);
d->dataTable->setFocus();
}
@@ -1270,7 +1271,7 @@
{
updateColumnsData();
setDirty();
- tempData()->setQueryChangedInPreviousView(true);
+ tempData()->setQueryChangedInView(true);
}
QByteArray KexiQueryDesignerGuiEditor::generateUniqueAlias() const
@@ -1623,7 +1624,7 @@
#else
//! @todo unused yet
setDirty(true);
- tempData()->setQueryChangedInPreviousView(true);
+ tempData()->setQueryChangedInView(true);
#endif
}
@@ -1702,7 +1703,7 @@
(*set)["criteria"] = QVariant(); //clear it
}
setDirty(true);
- tempData()->setQueryChangedInPreviousView(true);
+ tempData()->setQueryChangedInView(true);
}
else {
result->success = false;
@@ -1715,13 +1716,13 @@
void KexiQueryDesignerGuiEditor::slotTablePositionChanged(KexiRelationsTableContainer*)
{
setDirty(true);
- // this is not needed here because only position has changed: tempData()->setQueryChangedInPreviousView(true);
+ // this is not needed here because only position has changed: tempData()->setQueryChangedInView(true);
}
void KexiQueryDesignerGuiEditor::slotAboutConnectionRemove(KexiRelationsConnection*)
{
setDirty(true);
- tempData()->setQueryChangedInPreviousView(true);
+ tempData()->setQueryChangedInView(true);
}
void KexiQueryDesignerGuiEditor::slotAppendFields(
@@ -1852,7 +1853,7 @@
}
}
}
- tempData()->setQueryChangedInPreviousView(true);
+ tempData()->setQueryChangedInView(true);
}
void KexiQueryDesignerGuiEditor::slotNewItemStored(KexiPart::Item& item)
diff -Nru calligra-2.9.7/kexi/plugins/queries/kexiquerydesignerguieditor.h calligra-2.9.11/kexi/plugins/queries/kexiquerydesignerguieditor.h
--- calligra-2.9.7/kexi/plugins/queries/kexiquerydesignerguieditor.h 2015-08-29 14:39:29.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/queries/kexiquerydesignerguieditor.h 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2004 Lucijan Busch
- Copyright (C) 2004-2015 Jarosław Staniek
+ Copyright (C) 2004-2016 Jarosław Staniek
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff -Nru calligra-2.9.7/kexi/plugins/queries/kexiquerydesignersql.cpp calligra-2.9.11/kexi/plugins/queries/kexiquerydesignersql.cpp
--- calligra-2.9.7/kexi/plugins/queries/kexiquerydesignersql.cpp 2015-08-29 14:38:24.000000000 +0000
+++ calligra-2.9.11/kexi/plugins/queries/kexiquerydesignersql.cpp 2016-02-02 19:53:13.000000000 +0000
@@ -1,6 +1,6 @@
/* This file is part of the KDE project
Copyright (C) 2003 Lucijan Busch
- Copyright (C) 2004-2014 Jarosław Staniek
+ Copyright (C) 2004-2016 Jarosław Staniek
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -18,6 +18,11 @@
* Boston, MA 02110-1301, USA.
*/
+#include "kexiquerydesignersql.h"
+#include "kexiquerydesignersqleditor.h"
+#include "kexiquerypart.h"
+#include "kexisectionheader.h"
+
#include