diff -Nru calligra-2.4.0/active/calligraactive.desktop calligra-2.4.3/active/calligraactive.desktop --- calligra-2.4.0/active/calligraactive.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/active/calligraactive.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Type=Application Name=Calligra Active Name[ca]=Calligra Actiu +Name[ca@valencia]=Calligra Actiu Name[cs]=Calligra Active Name[da]=Calligra Active Name[el]=Calligra Active @@ -10,6 +11,7 @@ Name[et]=Calligra Active Name[fi]=Calligra Active Name[hu]=Calligra Active +Name[is]=Calligra Virkni Name[it]=Calligra Active Name[kk]=Calligra Active Name[nb]=Calligra Active @@ -18,6 +20,7 @@ Name[pt]=Calligra Active Name[pt_BR]=Calligra Active Name[ru]=Calligra Active +Name[sk]=Calligra Active Name[sv]=Calligra Active Name[uk]=Портативна Calligra Name[x-test]=xxCalligra Activexx diff -Nru calligra-2.4.0/braindump/data/braindump.desktop calligra-2.4.3/braindump/data/braindump.desktop --- calligra-2.4.0/braindump/data/braindump.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/braindump/data/braindump.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ GenericName=Notes and idea gathering. GenericName[bs]=Napomene i sakupljanje ideja. GenericName[ca]=Notes i recull d'idees. +GenericName[ca@valencia]=Notes i recull d'idees. GenericName[cs]=Poznámky a shromažďování nápadů. GenericName[da]=Noter og idesamling GenericName[de]=Notizen und Ideen sammeln. @@ -12,8 +13,10 @@ GenericName[en_GB]=Notes and idea gathering. GenericName[es]=Notas y recolección de ideas. GenericName[et]=Märkmed ja ajurünnakud +GenericName[fi]=Muistiinpanot ja ideoiden keräys GenericName[fr]=Notes et ensemble d'idées GenericName[hu]=Jegyzetek és ötletgyűjtés. +GenericName[is]=Glósur og hugmyndasöfnun. GenericName[it]=Note e raccolta di idee GenericName[kk]=Ойларды түртіп қою құралы GenericName[nb]=Samling av notater og idéer. @@ -22,8 +25,9 @@ GenericName[pt]=Notas e recolha de ideias. GenericName[pt_BR]=Notas e coleção de ideias. GenericName[ru]=Программа для хранения заметок и идей. +GenericName[sk]=Poznámky a zbieranie nápadov. GenericName[sv]=Anteckningar och insamling av idéer. -GenericName[uk]=Програма для впорядкування нотаток та ідей. +GenericName[uk]=Програма для впорядковування нотаток та ідей GenericName[x-test]=xxNotes and idea gathering.xx GenericName[zh_CN]=笔记和备忘 GenericName[zh_TW]=備忘與點子收集。 @@ -31,6 +35,7 @@ MimeType=application/x-braindump; Name=Braindump Name[ca]=Memoràndum +Name[ca@valencia]=Memoràndum Name[cs]=Braindump Name[da]=Braindump Name[de]=Braindump @@ -39,7 +44,9 @@ Name[es]=Braindump Name[et]=Braindump Name[fi]=Braindump +Name[gl]=Braindump Name[hu]=Braindump +Name[is]=Heilabrot (Braindump) Name[it]=Braindump Name[kk]=Braindump Name[nb]=Braindump diff -Nru calligra-2.4.0/braindump/data/braindump_extensions.desktop calligra-2.4.3/braindump/data/braindump_extensions.desktop --- calligra-2.4.0/braindump/data/braindump_extensions.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/braindump/data/braindump_extensions.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ X-KDE-ServiceType=Braindump/Extensions Comment=Extensions for Braindump Comment[ca]=Extensions per a Braindump +Comment[ca@valencia]=Extensions per a Braindump Comment[cs]=Rozšíření pro Braindump Comment[da]=Udvidelser til Braindump Comment[de]=Erweiterungen für Braindump @@ -10,7 +11,9 @@ Comment[en_GB]=Extensions for Braindump Comment[es]=Extensión para Braindump Comment[et]=Braindumpi laiendused +Comment[fi]=Laajennuksia Braindumpiin Comment[hu]=Braindump kiterjesztések +Comment[is]=Viðbætur fyrir Heilabrot Comment[it]=Estensioni per Braindump Comment[kk]=Braindump кеңейтулері Comment[nb]=Utvidelser for Braindump @@ -19,6 +22,7 @@ Comment[pt]=Extensões para o Braindump Comment[pt_BR]=Extensões para o Braindump Comment[ru]=Расширения для Braindump +Comment[sk]=Rozšírenia pre Braindump Comment[sv]=Utökningar för Braindump Comment[uk]=Розширення для Braindump Comment[x-test]=xxExtensions for Braindumpxx diff -Nru calligra-2.4.0/braindump/plugins/quickstates/braindumpquickstates.desktop calligra-2.4.3/braindump/plugins/quickstates/braindumpquickstates.desktop --- calligra-2.4.0/braindump/plugins/quickstates/braindumpquickstates.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/braindump/plugins/quickstates/braindumpquickstates.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Quickstates Plugin Name[ca]=Connector Quickstates +Name[ca@valencia]=Connector Quickstates Name[da]=Quickstates-plugin Name[el]=Πρόσθετο Quickstates Name[en_GB]=Quickstates Plugin Name[es]=Complemento de estados rápidos Name[et]=Olekuplugin +Name[gl]=Engadido Quickstates Name[hu]=Quickstates bővítmény Name[it]=Estensione per stati veloci Name[kk]=Quickstates плагині @@ -15,6 +17,7 @@ Name[pt]='Plugin' de Estados Rápidos Name[pt_BR]=Plugin de estados rápidos Name[ru]=Модуль Quickstates +Name[sk]=Quickstates Plugin Name[sv]=Insticksprogram med snabbtillstånd Name[uk]=Додаток станів Name[x-test]=xxQuickstates Pluginxx diff -Nru calligra-2.4.0/braindump/plugins/stateshape/stateshape.desktop calligra-2.4.3/braindump/plugins/stateshape/stateshape.desktop --- calligra-2.4.0/braindump/plugins/stateshape/stateshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/braindump/plugins/stateshape/stateshape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=State Shape Name[bg]=Форма за състояние Name[ca]=Forma d'estat +Name[ca@valencia]=Forma d'estat Name[cs]=Stavový tvar Name[da]=Tilstand-form Name[de]=Status-Objekt @@ -10,7 +11,9 @@ Name[es]=Forma de estado Name[et]=Olekukujund Name[fi]=Tilamuoto +Name[gl]=Forma do estado Name[hu]=Állapotalakzat +Name[is]=Stöðuform Name[it]=Forma di stato Name[kk]=Күй-жай қалыпы Name[nb]=Statisk form @@ -19,6 +22,7 @@ Name[pt]=Forma do Estado Name[pt_BR]=Forma de estados Name[ru]=Объект состояния +Name[sk]=Tvar stavu Name[sv]=Tillståndsform Name[ug]=ھالەت شەكىللىرى Name[uk]=Форма стану diff -Nru calligra-2.4.0/braindump/plugins/webshape/webshape.desktop calligra-2.4.3/braindump/plugins/webshape/webshape.desktop --- calligra-2.4.0/braindump/plugins/webshape/webshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/braindump/plugins/webshape/webshape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Web Shape Name[bg]=Форма за уеб Name[ca]=Forma de web +Name[ca@valencia]=Forma de web Name[cs]=Tvar webu Name[da]=Web-form Name[de]=Web-Objekt @@ -10,7 +11,9 @@ Name[es]=Forma web Name[et]=Veebikujund Name[fi]=Webmuoto +Name[gl]=Forma de web Name[hu]=Webes alakzat +Name[is]=Vefform Name[it]=Forma Web Name[kk]=Веб қалыпы Name[nb]=Web-form diff -Nru calligra-2.4.0/braindump/src/AboutData.h~ calligra-2.4.3/braindump/src/AboutData.h~ --- calligra-2.4.0/braindump/src/AboutData.h~ 2012-04-06 15:45:58.000000000 +0000 +++ calligra-2.4.3/braindump/src/AboutData.h~ 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2009 Cyrille Berger - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * either version 2, or (at your option) any later version of the License. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef BRAINDUMPABOUTDATA_H -#define BRAINDUMPABOUTDATA_H - -#include -#include -#include - -static const char* BRAINDUMP_DESCRIPTION = I18N_NOOP("Braindump: directly from your brain to the computer."); -static const char* BRAINDUMP_VERSION = "0.10.9"; - -inline KAboutData* newBrainDumpAboutData() -{ - KAboutData* aboutData = new KAboutData("braindump", 0, ki18n("Braindump"), - BRAINDUMP_VERSION, ki18n(BRAINDUMP_DESCRIPTION), KAboutData::License_LGPL, - ki18n("(c) 2009, 2010, 2011, 2012 Cyrille Berger"), KLocalizedString(), - ""); - aboutData->addAuthor(ki18n("Cyrille Berger"), ki18n("Maintainer"), "cberger@cberger.net"); - - return aboutData; -} - -#endif diff -Nru calligra-2.4.0/debian/calligrasheets.install calligra-2.4.3/debian/calligrasheets.install --- calligra-2.4.0/debian/calligrasheets.install 2012-04-09 17:01:00.000000000 +0000 +++ calligra-2.4.3/debian/calligrasheets.install 2012-07-10 13:09:02.000000000 +0000 @@ -80,25 +80,25 @@ usr/share/kde4/services/spreadsheetshape.desktop usr/share/kde4/services/sheetspart.desktop usr/share/kde4/servicetypes/sheets_plugin.desktop -usr/share/kde4/apps/tables/scripts/scripts.rc -usr/share/kde4/apps/tables/scripts/functions/pyregexp.py -usr/share/kde4/apps/tables/scripts/functions/rpyfunctions.py -usr/share/kde4/apps/tables/scripts/functions/pytime.py -usr/share/kde4/apps/tables/scripts/functions/yfinance.py -usr/share/kde4/apps/tables/scripts/functions/functions.py -usr/share/kde4/apps/tables/scripts/functions/yweather.py -usr/share/kde4/apps/tables/scripts/docker/consoledocker.py -usr/share/kde4/apps/tables/scripts/docker/snippetsdocker.rb -usr/share/kde4/apps/tables/scripts/extensions/kexidbimport.py -usr/share/kde4/apps/tables/scripts/extensions/csvoptions.ui -usr/share/kde4/apps/tables/scripts/extensions/kexidbexport.py -usr/share/kde4/apps/tables/scripts/extensions/csvimport.py -usr/share/kde4/apps/tables/scripts/extensions/xmlviewer.py -usr/share/kde4/apps/tables/scripts/extensions/htmlexport.py -usr/share/kde4/apps/tables/scripts/extensions/csvexport.py -usr/share/kde4/apps/tables/scripts/extensions/odfpyexport.py -usr/share/kde4/apps/tables/scripts/extensions/myorca.py -usr/share/kde4/apps/tables/scripts/extensions/logger.py -usr/share/kde4/apps/tables/scripts/extensions/htmlexportinfos.ui -usr/share/kde4/apps/tables/scripts/extensions/vcardimport.py +usr/share/kde4/apps/sheets/scripts/scripts.rc +usr/share/kde4/apps/sheets/scripts/functions/pyregexp.py +usr/share/kde4/apps/sheets/scripts/functions/rpyfunctions.py +usr/share/kde4/apps/sheets/scripts/functions/pytime.py +usr/share/kde4/apps/sheets/scripts/functions/yfinance.py +usr/share/kde4/apps/sheets/scripts/functions/functions.py +usr/share/kde4/apps/sheets/scripts/functions/yweather.py +usr/share/kde4/apps/sheets/scripts/docker/consoledocker.py +usr/share/kde4/apps/sheets/scripts/docker/snippetsdocker.rb +usr/share/kde4/apps/sheets/scripts/extensions/kexidbimport.py +usr/share/kde4/apps/sheets/scripts/extensions/csvoptions.ui +usr/share/kde4/apps/sheets/scripts/extensions/kexidbexport.py +usr/share/kde4/apps/sheets/scripts/extensions/csvimport.py +usr/share/kde4/apps/sheets/scripts/extensions/xmlviewer.py +usr/share/kde4/apps/sheets/scripts/extensions/htmlexport.py +usr/share/kde4/apps/sheets/scripts/extensions/csvexport.py +usr/share/kde4/apps/sheets/scripts/extensions/odfpyexport.py +usr/share/kde4/apps/sheets/scripts/extensions/myorca.py +usr/share/kde4/apps/sheets/scripts/extensions/logger.py +usr/share/kde4/apps/sheets/scripts/extensions/htmlexportinfos.ui +usr/share/kde4/apps/sheets/scripts/extensions/vcardimport.py usr/share/doc/kde/HTML/en/sheets/ diff -Nru calligra-2.4.0/debian/changelog calligra-2.4.3/debian/changelog --- calligra-2.4.0/debian/changelog 2012-04-11 17:32:13.000000000 +0000 +++ calligra-2.4.3/debian/changelog 2012-07-09 14:49:20.000000000 +0000 @@ -1,3 +1,9 @@ +calligra (1:2.4.3-0ubuntu1~precise1~ppa1) precise; urgency=low + + * New upstream release + + -- Jonathan Riddell Mon, 09 Jul 2012 14:48:54 +0000 + calligra (1:2.4.0-0ubuntu2) precise; urgency=low * Keep calligra-map-shape package with no files, precent crashes for people diff -Nru calligra-2.4.0/debian/krita-data.install calligra-2.4.3/debian/krita-data.install --- calligra-2.4.0/debian/krita-data.install 2012-04-09 13:05:32.000000000 +0000 +++ calligra-2.4.3/debian/krita-data.install 2012-07-10 13:10:44.000000000 +0000 @@ -37,3 +37,4 @@ usr/share/kde4/apps/pigmentcms/ctlprofiles/ycbcr_16.ctlp usr/share/kde4/apps/pigmentcms/ctlprofiles/xyzaf32.ctlp usr/share/kde4/apps/pigmentcms/ctlprofiles/scrgbaf.ctlp +usr/share/kde4/apps/pigmentcms/ctlcompositeops/erase.ctlt diff -Nru calligra-2.4.0/debian/krita.install calligra-2.4.3/debian/krita.install --- calligra-2.4.0/debian/krita.install 2012-04-09 13:05:32.000000000 +0000 +++ calligra-2.4.3/debian/krita.install 2012-07-10 13:07:18.000000000 +0000 @@ -1,6 +1,5 @@ usr/bin/krita usr/lib/kde4/kritaartisticcolorselector.so -usr/lib/kde4/kritabackgrounds.so usr/lib/kde4/kritabigbrother.so usr/lib/kde4/kritablurfilter.so usr/lib/kde4/kritabmpexport.so @@ -115,7 +114,6 @@ usr/share/applications/kde4/krita_tiff.desktop usr/share/applications/kde4/krita_xcf.desktop usr/share/kde4/services/krita_artisticcolorselector.desktop -usr/share/kde4/services/kritabackgrounds.desktop usr/share/kde4/services/kritabigbrother.desktop usr/share/kde4/services/kritablurfilter.desktop usr/share/kde4/services/krita_bmp_export.desktop Binary files /tmp/X4LFAVLGfb/calligra-2.4.0/doc/calligra/index.cache.bz2 and /tmp/NJDgunogOO/calligra-2.4.3/doc/calligra/index.cache.bz2 differ diff -Nru calligra-2.4.0/doc/calligra.desktop calligra-2.4.3/doc/calligra.desktop --- calligra-2.4.0/doc/calligra.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/doc/calligra.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Calligra Name[bg]=Calligra Name[ca]=Calligra +Name[ca@valencia]=Calligra Name[cs]=Calligra Name[da]=Calligra Name[de]=Calligra @@ -12,7 +13,9 @@ Name[fi]=Calligra Name[fr]=Calligra Name[hu]=Calligra +Name[is]=Calligra Name[it]=Calligra +Name[ja]=Calligra Name[kk]=Calligra Name[nb]=Calligra Name[nds]=Calligra Binary files /tmp/X4LFAVLGfb/calligra-2.4.0/doc/kexi/index.cache.bz2 and /tmp/NJDgunogOO/calligra-2.4.3/doc/kexi/index.cache.bz2 differ Binary files /tmp/X4LFAVLGfb/calligra-2.4.0/doc/sheets/index.cache.bz2 and /tmp/NJDgunogOO/calligra-2.4.3/doc/sheets/index.cache.bz2 differ Binary files /tmp/X4LFAVLGfb/calligra-2.4.0/doc/stage/index.cache.bz2 and /tmp/NJDgunogOO/calligra-2.4.3/doc/stage/index.cache.bz2 differ Binary files /tmp/X4LFAVLGfb/calligra-2.4.0/doc/thesaurus/index.cache.bz2 and /tmp/NJDgunogOO/calligra-2.4.3/doc/thesaurus/index.cache.bz2 differ diff -Nru calligra-2.4.0/filters/flow/imageexport/flow_image_export.desktop calligra-2.4.3/filters/flow/imageexport/flow_image_export.desktop --- calligra-2.4.0/filters/flow/imageexport/flow_image_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/flow/imageexport/flow_image_export.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=Flow Image Export Filter Name[bg]=Филтър за изнасяне на изображения от Flow Name[ca]=Filtre d'exportació d'imatges del Flow +Name[ca@valencia]=Filtre d'exportació d'imatges del Flow Name[cs]=Exportní filtr do formátu obrázků Proud Name[da]=Billedeksportfilter til Flow Name[de]=Flow-Bild-Exportfilter @@ -12,8 +13,10 @@ Name[et]=Flow pildi ekspordifilter Name[fi]=Kuvavientisuodin Flow’hun Name[fr]=Filtre d'exportation d'images +Name[gl]=Filtro de exportación de imaxes para Flow Name[hu]=Flow képexportáló szűrő Name[it]=Filtro di esportazione delle immagini per Flow +Name[ja]=Flow 画像 エクスポートフィルタ Name[kk]=Flow кескінге экспорт сүзгісі Name[nb]=Flow bilde-eksportfilter Name[nds]=Bild-Exportfilter för Flow @@ -22,6 +25,7 @@ Name[pt]=Filtro de Exportação de Imagem para o Flow Name[pt_BR]=Filtro de exportação de imagens para o Flow Name[ru]=Фильтр экспорта изображений для Flow +Name[sk]=Exportný filter obrázkov Flow Name[sv]=Flow bildexportfilter Name[uk]=Фільтр експорту зображення для Flow Name[x-test]=xxFlow Image Export Filterxx diff -Nru calligra-2.4.0/filters/generic_wrapper/generic_filter.desktop calligra-2.4.3/filters/generic_wrapper/generic_filter.desktop --- calligra-2.4.0/filters/generic_wrapper/generic_filter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/generic_wrapper/generic_filter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Generic Calligra Filter Name[bg]=Общ филтър за Calligra Name[ca]=Filtre genèric del Calligra +Name[ca@valencia]=Filtre genèric del Calligra Name[cs]=Obecný filtr Calligra Name[da]=Generisk Calligra-filter Name[de]=Generischer Calligra-Filter @@ -10,7 +11,9 @@ Name[et]=Calligra üldine filter Name[fi]=Yleinen Calligra-suodin Name[fr]=Filtre générique de Calligra +Name[gl]=Filtro xenérico de Calligra Name[hu]=Általános Calligra szűrő +Name[is]=Almenn Calligra sía Name[it]=Filtro generico di Calligra Name[kk]=Жалпы Calligra сүзгісі Name[nb]=Alment Calligra-filter @@ -20,6 +23,7 @@ Name[pt]=Filtro Genérico do Calligra Name[pt_BR]=Filtro genérico do Calligra Name[ru]=Основной фильтр Calligra +Name[sk]=Všeobecný filter Calligra Name[sv]=Generellt Calligra-filter Name[uk]=Загальний фільтр Calligra Name[x-test]=xxGeneric Calligra Filterxx diff -Nru calligra-2.4.0/filters/karbon/ai/karbon_ai_import.desktop calligra-2.4.3/filters/karbon/ai/karbon_ai_import.desktop --- calligra-2.4.0/filters/karbon/ai/karbon_ai_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/ai/karbon_ai_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,18 @@ Name[de]=Karbon Illustrator-Importfilter Name[el]=Φίλτρο εισαγωγής Karbon Illustrator Name[es]=Filtro de Karbon de importación de Illustrator +Name[et]=Karboni Illustratori impordifilter Name[fi]=Illustrator-tuontisuodin Karboniin Name[hu]=Karbon Illustrator importszűrő +Name[is]=Karbon Illustrator innflutningssía Name[it]=Filtro di importazione Illustrator per Karbon +Name[ja]=Karbon Illustrator インポートフィルタ Name[kk]=Illustrator -> Karbon импорт сүзгісі Name[nl]=Illustrator-importfilter voor Karbon Name[pl]=Filtr importu Illustrator do Karbon Name[pt]=Filtro de Importação de Illustrator para o Karbon Name[pt_BR]=Filtro de importação de Illustrator para o Karbon +Name[sk]=Illustrator filter pre import do Karbon Name[sv]=Karbon Illustrator-importfilter Name[uk]=Фільтр імпорту Illustrator для Karbon Name[x-test]=xxKarbon Illustrator Import Filterxx diff -Nru calligra-2.4.0/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop calligra-2.4.3/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop --- calligra-2.4.0/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/applixgraphics/kontour_applixgraphic_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Филтър за внасяне от Applixgraphics в Kontour Name[br]=Sil enporzh Applixgraphics evit Kontour Name[ca]=Filtre d'importació Applixgraphics per al Kontour +Name[ca@valencia]=Filtre d'importació Applixgraphics per al Kontour Name[cs]=Importní filtr Applixgraphics pro Kontour Name[cy]=Hidlen Fewnforio Applixgraphics Kontour Name[da]=Kontour Applixgraphics-importfilter diff -Nru calligra-2.4.0/filters/karbon/eps/karbon_eps_export.desktop calligra-2.4.3/filters/karbon/eps/karbon_eps_export.desktop --- calligra-2.4.0/filters/karbon/eps/karbon_eps_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/eps/karbon_eps_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon EPS-Exportfilter Name[el]=Φίλτρο εξαγωγής του Karbon EPS Name[es]=Filtro de Karbon de exportación a EPS +Name[et]=Karboni EPS-i ekspordifilter Name[fi]=EPS-vientisuodin Karboniin +Name[gl]=Filtro de exportación de EPS para Karbon Name[hu]=Karbon EPS exportszűrő +Name[is]=Karbon EPS útflutningssía Name[it]=Filtro di esportazione EPS per Karbon +Name[ja]=Karbon EPS エクスポートフィルタ Name[kk]=Karbon -> EPS экспорт сүзгісі Name[nl]=EPS-exportfilter voor Karbon Name[pl]=Filtr eksportu EPS z Karbon Name[pt]=Filtro de Exportação de EPS para o Karbon Name[pt_BR]=Filtro de exportação de EPS para o Karbon +Name[sk]=EPS filter pre export z Karbon Name[sv]=Karbon EPS-exportfilter Name[uk]=Фільтр експорту EPS для Karbon Name[x-test]=xxKarbon EPS Export Filterxx diff -Nru calligra-2.4.0/filters/karbon/eps/karbon_eps_import.desktop calligra-2.4.3/filters/karbon/eps/karbon_eps_import.desktop --- calligra-2.4.0/filters/karbon/eps/karbon_eps_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/eps/karbon_eps_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon EPS-Importfilter Name[el]=Φίλτρο εισαγωγής του Karbon EPS Name[es]=Filtro de Karbon de importación de EPS +Name[et]=Karboni EPS-i impordifilter Name[fi]=EPS-tuontisuodin Karboniin +Name[gl]=Filtro de importación de EPS para Karbon Name[hu]=Karbon EPS importszűrő +Name[is]=Karbon EPS innflutningssía Name[it]=Filtro di importazione EPS per Karbon +Name[ja]=Karbon EPS インポートフィルタ Name[kk]=EPS -> Karbon импорт сүзгісі Name[nl]=EPS-importfilter voor Karbon Name[pl]=Filtr importu EPS do Karbon Name[pt]=Filtro de Importação de EPS para o Karbon Name[pt_BR]=Filtro de importação de EPS para o Karbon +Name[sk]=EPS filter pre import do Karbon Name[sv]=Karbon EPS-importfilter Name[uk]=Фільтр експорту EPS для Karbon Name[x-test]=xxKarbon EPS Import Filterxx diff -Nru calligra-2.4.0/filters/karbon/eps/karbon_ps_import.desktop calligra-2.4.3/filters/karbon/eps/karbon_ps_import.desktop --- calligra-2.4.0/filters/karbon/eps/karbon_ps_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/eps/karbon_ps_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon EPS-Importfilter Name[el]=Φίλτρο εισαγωγής του Karbon EPS Name[es]=Filtro de Karbon de importación de EPS +Name[et]=Karboni EPS-i impordifilter Name[fi]=EPS-tuontisuodin Karboniin +Name[gl]=Filtro de importación de EPS para Karbon Name[hu]=Karbon EPS importszűrő +Name[is]=Karbon EPS innflutningssía Name[it]=Filtro di importazione EPS per Karbon +Name[ja]=Karbon EPS インポートフィルタ Name[kk]=EPS -> Karbon импорт сүзгісі Name[nl]=EPS-importfilter voor Karbon Name[pl]=Filtr importu EPS do Karbon Name[pt]=Filtro de Importação de EPS para o Karbon Name[pt_BR]=Filtro de importação de EPS para o Karbon +Name[sk]=EPS filter pre import do Karbon Name[sv]=Karbon EPS-importfilter Name[uk]=Фільтр експорту EPS для Karbon Name[x-test]=xxKarbon EPS Import Filterxx diff -Nru calligra-2.4.0/filters/karbon/image/karbon_jpg_export.desktop calligra-2.4.3/filters/karbon/image/karbon_jpg_export.desktop --- calligra-2.4.0/filters/karbon/image/karbon_jpg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/image/karbon_jpg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon JPEG-Exportfilter Name[el]=Φίλτρο εξαγωγής του Karbon JPEG Name[es]=Filtro de Karbon de exportación a JPEG +Name[et]=Karboni JPEG ekspordifilter Name[fi]=JPEG-vientisuodin Karboniin +Name[gl]=Filtro de exportación de JPEG para Karbon Name[hu]=Karbon PNG exportszűrő +Name[is]=Karbon JPEG útflutningssía Name[it]=Filtro di esportazione PNG per Karbon +Name[ja]=Karbon JPEG エクスポートフィルタ Name[kk]=Karbon -> JPEG экспорт сүзгісі Name[nl]=JPEG-exportfilter voor Karbon Name[pl]=Filtr eksportu JPEG z Karbon Name[pt]=Filtro de Exportação de JPEG para o Karbon Name[pt_BR]=Filtro de exportação de JPEG para o Karbon +Name[sk]=Exportný filter Karbon JPEG Name[sv]=Karbon JPEG-exportfilter Name[uk]=Фільтр експорту JPEG для Karbon Name[x-test]=xxKarbon JPEG Export Filterxx diff -Nru calligra-2.4.0/filters/karbon/image/karbon_png_export.desktop calligra-2.4.3/filters/karbon/image/karbon_png_export.desktop --- calligra-2.4.0/filters/karbon/image/karbon_png_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/image/karbon_png_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon PNG-Exportfilter Name[el]=Φίλτρο εξαγωγής Karbon PNG Name[es]=Filtro de Karbon de exportación a PNG +Name[et]=Karboni PNG ekspordifilter Name[fi]=PNG-vientisuodin Karboniin +Name[gl]=Filtro de exportación de PNG para Karbon Name[hu]=Karbon PNG exportszűrő +Name[is]=Karbon PNG útflutningssía Name[it]=Filtro di esportazione PNG per Karbon +Name[ja]=Karbon PNG エクスポートフィルタ Name[kk]=Karbon -> PNG экспорт сүзгісі Name[nl]=PNG-exportfilter voor Karbon Name[pl]=Filtr eksportu PNG z Karbon Name[pt]=Filtro de Exportação de PNG para o Karbon Name[pt_BR]=Filtro de exportação de PNG para o Karbon +Name[sk]=PNG filter pre export z Karbon Name[sv]=Karbon PNG-exportfilter Name[uk]=Фільтр експорту SVG для Karbon Name[x-test]=xxKarbon PNG Export Filterxx diff -Nru calligra-2.4.0/filters/karbon/karbon1.x/karbon_1x_import.desktop calligra-2.4.3/filters/karbon/karbon1.x/karbon_1x_import.desktop --- calligra-2.4.0/filters/karbon/karbon1.x/karbon_1x_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/karbon1.x/karbon_1x_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Karbon 1.x Import Filter Name[bg]=Филтър за внасяне от Karbon 1.x Name[ca]=Filtre d'importació Karbon 1.x +Name[ca@valencia]=Filtre d'importació Karbon 1.x Name[cs]=Importní filtr Karbon 1.x Name[da]=Karbon 1.x-importfilter Name[de]=Karbon 1.x Importfilter @@ -20,6 +21,7 @@ Name[hi]=कार्बन १.x आयात फ़िल्टर Name[hne]=कार्बन १.x आयात फिल्टर Name[hu]=Karbon 1.x importszűrő +Name[is]=Karbon 1.x innflutningssía Name[it]=Filtro di importazione per Karbon 1.x Name[ja]=Karbon 1.x インポートフィルタ Name[kk]=Karbon 1.x импорт сүзгісі diff -Nru calligra-2.4.0/filters/karbon/kontour/karbon_kontour_import.desktop calligra-2.4.3/filters/karbon/kontour/karbon_kontour_import.desktop --- calligra-2.4.0/filters/karbon/kontour/karbon_kontour_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/kontour/karbon_kontour_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Филтър за внасяне от Kontour в Karbon Name[br]=Sil enporzh Kontour evit Karbon Name[ca]=Filtre d'importació Kontour per al Karbon +Name[ca@valencia]=Filtre d'importació Kontour per al Karbon Name[cs]=Importní filtr Kontour pro Karbon14 Name[cy]=Hidlen Fewnforio Kontour Karbon Name[da]=Karbon Kontour-importfilter diff -Nru calligra-2.4.0/filters/karbon/msod/karbon_msod_import.desktop calligra-2.4.3/filters/karbon/msod/karbon_msod_import.desktop --- calligra-2.4.0/filters/karbon/msod/karbon_msod_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/msod/karbon_msod_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от MS Office Drawing в Karbon Name[br]=Sil enporzh MS Office Drawing evit Karbon's Name[ca]=Filtre d'importació MS Office Drawing per al Karbon +Name[ca@valencia]=Filtre d'importació MS Office Drawing per al Karbon Name[cs]=Importní filtr Kreslení MS Office pro Karbon Name[cy]=Hidlen Fewnforio Lluniad MS Office Karbon Name[da]=Karbons MS Office-tegning-importfilter diff -Nru calligra-2.4.0/filters/karbon/oodraw/karbon_oodraw_import.desktop calligra-2.4.3/filters/karbon/oodraw/karbon_oodraw_import.desktop --- calligra-2.4.0/filters/karbon/oodraw/karbon_oodraw_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/oodraw/karbon_oodraw_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,18 @@ Name[de]=Karbon OpenOffice.org-Draw-Importfilter Name[el]=Φίλτρο εισαγωγής OpenOffice.org Draw για το Karbon Name[es]=Filtro de Karbon de importación de OpenOffice.org Draw +Name[et]=Karboni OpenOffice.org Draw' impordifilter Name[fi]=OpenOffice.org-piirrostuontisuodin Karboniin Name[hu]=OpenOffice.org Draw importszűrő a Karbonhoz +Name[is]=OpenOffice.org Draw innflutningssía fyrir Karbon Name[it]=Filtro di importazione OpenOffice.org Draw per Karbon +Name[ja]=Karbon のための OpenOffice.org Draw インポートフィルタ Name[kk]=OpenOffice.org Draw -> Karbon импорт сүзгісі Name[nl]=OpenOffice.org Draw-importfilter voor Karbon Name[pl]=Filtr importu OpenOffice.org Draw do Karbon Name[pt]=Filtro de Importação de OpenOffice.org Draw para o Karbon Name[pt_BR]=Filtro de importação de OpenOffice.org Draw para o Karbon +Name[sk]=Filter pre import OpenOffice.org Draw pre Karbon Name[sv]=OpenOffice.org Draw-importfilter för Karbon Name[uk]=Фільтр імпорту малюнків OpenOffice.org у Karbon Name[x-test]=xxOpenOffice.org Draw Import Filter for Karbonxx diff -Nru calligra-2.4.0/filters/karbon/pdf/karbon_pdf_import.desktop calligra-2.4.3/filters/karbon/pdf/karbon_pdf_import.desktop --- calligra-2.4.0/filters/karbon/pdf/karbon_pdf_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/pdf/karbon_pdf_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Karbon PDF Import Filter Name[bg]=Филтър за внасяне от PDF в Karbon Name[ca]=Filtre d'importació PDF per al Karbon +Name[ca@valencia]=Filtre d'importació PDF per al Karbon Name[cs]=Importní filtr PDF pro Karbon Name[da]=PDF-importfilter til Karbon Name[de]=Karbon PDF-Importfilter @@ -12,10 +13,11 @@ Name[fi]=PDF-tuontisuodin Karboniin Name[fr]=Filtre d'importation PDF de Karbon Name[ga]=Scagaire Iompórtála Karbon PDF -Name[gl]=Filtro de Importación de PDF para Karbon14 +Name[gl]=Filtro de importación de PDF para Karbon Name[he]=מסנן ייבוא מ־PDF ל־Karbon Name[hne]=कार्बन पीडीएफ आयात फिल्टर Name[hu]=Karbon PDF importszűrő +Name[is]=Karbon PDF innflutningssía Name[it]=Filtro di importazione PDF per Karbon Name[ja]=Karbon PDF インポートフィルタ Name[kk]=PDF -> Karbon импорт сүзгісі diff -Nru calligra-2.4.0/filters/karbon/svg/karbon_svg_export.desktop calligra-2.4.3/filters/karbon/svg/karbon_svg_export.desktop --- calligra-2.4.0/filters/karbon/svg/karbon_svg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/svg/karbon_svg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon SVG-Exportfilter Name[el]=Φίλτρο εξαγωγής SVG του Karbon Name[es]=Filtro de Karbon de exportación a SVG +Name[et]=Karboni SVG ekspordifilter Name[fi]=SVG-vientisuodin Karboniin +Name[gl]=Filtro de exportación de SVG para Karbon Name[hu]=Karbon SVG exportszűrő +Name[is]=Karbon SVG útflutningssía Name[it]=Filtro di esportazione SVG per Karbon +Name[ja]=Karbon SVG エクスポートフィルタ Name[kk]=Karbon -> SVG экспорт сүзгісі Name[nl]=SVG-exportfilter voor Karbon Name[pl]=Filtr eksportu SVG z Karbon Name[pt]=Filtro de Exportação de SVG para o Karbon Name[pt_BR]=Filtro de exportação de SVG para o Karbon +Name[sk]=SVG filter pre export z Karbon Name[sv]=Karbon SVG-exportfilter Name[uk]=Фільтр експорту SVG для Karbon Name[x-test]=xxKarbon SVG Export Filterxx diff -Nru calligra-2.4.0/filters/karbon/svg/karbon_svg_import.desktop calligra-2.4.3/filters/karbon/svg/karbon_svg_import.desktop --- calligra-2.4.0/filters/karbon/svg/karbon_svg_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/svg/karbon_svg_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от SVG в Karbon Name[br]=Sil enporzh SVG evit Karbon Name[ca]=Filtre d'importació SVG per al Karbon +Name[ca@valencia]=Filtre d'importació SVG per al Karbon Name[cs]=Exportní filtr do formátu SVG pro Karbon Name[cy]=Hidlen Fewnforio SVG Karbon Name[da]=Karbon SVG-importfilter diff -Nru calligra-2.4.0/filters/karbon/svg/karbon_svgz_import.desktop calligra-2.4.3/filters/karbon/svg/karbon_svgz_import.desktop --- calligra-2.4.0/filters/karbon/svg/karbon_svgz_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/svg/karbon_svgz_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Karbon SVGZ Import Filter Name[bg]=Филтър за внасяне от SVGZ в Karbon Name[ca]=Filtre d'importació SVGZ per al Karbon +Name[ca@valencia]=Filtre d'importació SVGZ per al Karbon Name[cs]=Importní filtr formátu SVGZ pro Karbon Name[da]=SVGZ-importfilter til Karbon Name[de]=Karbon SVGZ-Importfilter @@ -19,6 +20,7 @@ Name[hi]=कार्बन एसवीजीज़ेड आयात फ़िल्टर Name[hne]=कार्बन एसवीजीजेड आयात फिल्टर Name[hu]=Karbon SVGZ importszűrő +Name[is]=Karbon SVGZ innflutningssía Name[it]=Filtro di importazione SVGZ per Karbon Name[ja]=Karbon SVGZ インポートフィルタ Name[kk]=SVGZ -> Karbon импорт сүзгісі diff -Nru calligra-2.4.0/filters/karbon/wmf/karbon_wmf_export.desktop calligra-2.4.3/filters/karbon/wmf/karbon_wmf_export.desktop --- calligra-2.4.0/filters/karbon/wmf/karbon_wmf_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/wmf/karbon_wmf_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon WMF-Exportfilter Name[el]=Φίλτρο εξαγωγής WMF του Karbon Name[es]=Filtro de Karbon de exportación a WMF +Name[et]=Karboni WMF-i ekspordifilter Name[fi]=WMF-vientisuodin Karboniin +Name[gl]=Filtro de exportación de WMF para Karbon Name[hu]=Karbon WMF exportszűrő +Name[is]=Karbon WMF útflutningssía Name[it]=Filtro di esportazione WMF per Karbon +Name[ja]=Karbon WMF エクスポートフィルタ Name[kk]=Karbon -> WMF экспорт сүзгісі Name[nl]=WMF-exportfilter voor Karbon Name[pl]=Filtr eksportu WMF z Karbon Name[pt]=Filtro de Exportação de WMF para o Karbon Name[pt_BR]=Filtro de exportação de WMF para o Karbon +Name[sk]=WFM filter pre export z Karbon Name[sv]=Karbon WMF-exportfilter Name[uk]=Фільтр експорту WMF у Karbon Name[x-test]=xxKarbon WMF Export Filterxx diff -Nru calligra-2.4.0/filters/karbon/wmf/karbon_wmf_import.desktop calligra-2.4.3/filters/karbon/wmf/karbon_wmf_import.desktop --- calligra-2.4.0/filters/karbon/wmf/karbon_wmf_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/wmf/karbon_wmf_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от WMF в Karbon Name[br]=Sil enporzh WMF evit Karbon Name[ca]=Filtre d'importació WMF per al Karbon +Name[ca@valencia]=Filtre d'importació WMF per al Karbon Name[cs]=Importní filtr WMF pro Karbon14 Name[cy]=Hidlen Fewnforio WMF Karbon Name[da]=Karbon WMF-importfilter @@ -20,7 +21,7 @@ Name[fr]=Filtre d'importation WMF de Karbon 14 Name[fy]=WMF-Ymportfilter foar Karbon Name[ga]=Scagaire Iompórtála Karbon WMF -Name[gl]=Filtro de Importación de WMF para Karbon14 +Name[gl]=Filtro de Importación de WMF para Karbon Name[he]=מסנן ייבוא מ־WMF ל־Karbon Name[hi]=कार्बन डबल्यूएमएफ़ आयात फ़िल्टर Name[hne]=कार्बन डबल्यूएमएफ आयात फिल्टर diff -Nru calligra-2.4.0/filters/karbon/wpg/karbon_wpg_import.desktop calligra-2.4.3/filters/karbon/wpg/karbon_wpg_import.desktop --- calligra-2.4.0/filters/karbon/wpg/karbon_wpg_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/wpg/karbon_wpg_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Karbon WPG Import Filter Name[bg]=Филтър за внасяне от WPG в Karbon Name[ca]=Filtre d'importació WPG per al Karbon +Name[ca@valencia]=Filtre d'importació WPG per al Karbon Name[cs]=Importní filtr formátu WPG pro Karbon Name[da]=WPG-importfilter til Karbon Name[de]=Karbon WPG-Importfilter @@ -21,6 +22,7 @@ Name[hi]=कार्बन डबल्यूपीजी आयात फ़िल्टर Name[hne]=कार्बन डबल्यूपीजी आयात फिल्टर Name[hu]=Karbon WPG importszűrő +Name[is]=Karbon WPG innflutningssía Name[it]=Filtro di importazione WPG per Karbon Name[ja]=Karbon WPG インポートフィルタ Name[kk]=WPG -> Karbon импорт сүзгісі diff -Nru calligra-2.4.0/filters/karbon/xaml/karbon_xaml_export.desktop calligra-2.4.3/filters/karbon/xaml/karbon_xaml_export.desktop --- calligra-2.4.0/filters/karbon/xaml/karbon_xaml_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/xaml/karbon_xaml_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,19 @@ Name[de]=Karbon WVG-Exportfilter Name[el]=Φίλτρο εξαγωγής WVG του Karbon Name[es]=Filtro de Karbon de exportación a WVG +Name[et]=Karboni WVG ekspordifilter Name[fi]=WVG-vientisuodin Karboniin +Name[gl]=Filtro de exportación de WVG para Karbon Name[hu]=Karbon WVG exportszűrő +Name[is]=Karbon WVG útflutningssía Name[it]=Filtro di esportazione WVG per Karbon +Name[ja]=Karbon WVG エクスポートフィルタ Name[kk]=Karbon -> WVG экспорт сүзгісі Name[nl]= WVG-exportfilter voor Karbon Name[pl]=Filtr eksportu WVG z Karbon Name[pt]=Filtro de Exportação de WVG para o Karbon Name[pt_BR]=Filtro de exportação de WVG para o Karbon +Name[sk]=WVG filter pre export z Karbon Name[sv]=Karbon WVG-exportfilter Name[uk]=Фільтр експорту WVG для Karbon Name[x-test]=xxKarbon WVG Export Filterxx diff -Nru calligra-2.4.0/filters/karbon/xaml/karbon_xaml_import.desktop calligra-2.4.3/filters/karbon/xaml/karbon_xaml_import.desktop --- calligra-2.4.0/filters/karbon/xaml/karbon_xaml_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/xaml/karbon_xaml_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от XAML в Karbon Name[br]=Sil enporzh XAML evit Karbon Name[ca]=Filtre d'importació XAML per al Karbon +Name[ca@valencia]=Filtre d'importació XAML per al Karbon Name[cs]=Importní filtr XAML pro Karbon Name[cy]=Hidlen Fewnforio XAML Karbon Name[da]=Karbon XAML-importfilter diff -Nru calligra-2.4.0/filters/karbon/xcf/karbon_xcf_export.desktop calligra-2.4.3/filters/karbon/xcf/karbon_xcf_export.desktop --- calligra-2.4.0/filters/karbon/xcf/karbon_xcf_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/xcf/karbon_xcf_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,14 +7,18 @@ Name[de]=Karbon Gimp-Exportfilter Name[el]=Φίλτρο εξαγωγής Gimp του Karbon Name[es]=Filtro de Karbon de exportación a Gimp +Name[et]=Karboni Gimpi ekspordifilter Name[fi]=Gimp-vientisuodin Karboniin Name[hu]=Karbon Gimp exportszűrő +Name[is]=Karbon Gimp útflutningssía Name[it]=Filtro di esportazione Gimp per Karbon +Name[ja]=Karbon GIMP エクスポートフィルタ Name[kk]=Karbon -> Gimp экспорт сүзгісі Name[nl]=Gimp-exportfilter voor Karbon Name[pl]=Filtr eksportu Gimp z Karbon Name[pt]=Filtro de Exportação de Gimp para o Karbon Name[pt_BR]=Filtro de exportação de Gimp para o Karbon +Name[sk]=GIMP filter pre export z Karbon Name[sv]=Karbon Gimp-exportfilter Name[uk]=Фільтр експорту Gimp для Karbon Name[x-test]=xxKarbon Gimp Export Filterxx diff -Nru calligra-2.4.0/filters/karbon/xfig/karbon_xfig_import.desktop calligra-2.4.3/filters/karbon/xfig/karbon_xfig_import.desktop --- calligra-2.4.0/filters/karbon/xfig/karbon_xfig_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/karbon/xfig/karbon_xfig_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от XFig в Karbon Name[br]=Sil enporzh XFig evit Karbon Name[ca]=Filtre d'importació XFig per al Karbon +Name[ca@valencia]=Filtre d'importació XFig per al Karbon Name[cs]=Importní filtr Xfig pro Karbon Name[cy]=Hidlen Fewnforio XFig Karbon Name[da]=Karbon XFig-importfilter diff -Nru calligra-2.4.0/filters/kchart/genericimageexport/kchart_bmp_export.desktop calligra-2.4.3/filters/kchart/genericimageexport/kchart_bmp_export.desktop --- calligra-2.4.0/filters/kchart/genericimageexport/kchart_bmp_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kchart/genericimageexport/kchart_bmp_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KChart в BMP Name[br]=Sil ezporzh BMP evit KChart Name[ca]=Filtre d'exportació BMP per al KChart +Name[ca@valencia]=Filtre d'exportació BMP per al KChart Name[cs]=Exportní filtr do formátu BMP pro KChart Name[da]=KChart BMP-eksportfilter Name[de]=KChart BMP-Exportfilter diff -Nru calligra-2.4.0/filters/kchart/genericimageexport/kchart_jpeg_export.desktop calligra-2.4.3/filters/kchart/genericimageexport/kchart_jpeg_export.desktop --- calligra-2.4.0/filters/kchart/genericimageexport/kchart_jpeg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kchart/genericimageexport/kchart_jpeg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KChart в JPEG Name[br]=Sil ezporzh JPEG evit KChart Name[ca]=Filtre d'exportació JPEG per al KChart +Name[ca@valencia]=Filtre d'exportació JPEG per al KChart Name[cs]=Exportní filtr do formátu JPEG pro KChart Name[da]=KChart JPEG-eksportfilter Name[de]=KChart-JPEG-Exportfilter diff -Nru calligra-2.4.0/filters/kchart/genericimageexport/kchart_mng_export.desktop calligra-2.4.3/filters/kchart/genericimageexport/kchart_mng_export.desktop --- calligra-2.4.0/filters/kchart/genericimageexport/kchart_mng_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kchart/genericimageexport/kchart_mng_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name=KChart MNG Export Filter Name[bg]=Филтър за изнасяне от KChart в MNG Name[ca]=Filtre d'exportació MNG per al KChart +Name[ca@valencia]=Filtre d'exportació MNG per al KChart Name[cs]=Exportní filtr do formátu MNG pro KChart Name[da]=KChart MNG-eksportfilter Name[de]=KChart MNG-Exportfilter @@ -27,6 +28,7 @@ Name[hne]=केचार्ट एमएनजी निर्यात फिल्टर Name[hr]=KChart MNG filtar izvoza Name[hu]=KChart MNG exportszűrő +Name[is]=KChart MNG útflutningssía Name[it]=Filtro di esportazione MNG per KChart Name[ja]=KChart MNG エクスポートフィルタ Name[kk]=KChart -> MNG экспорт сүзгісі diff -Nru calligra-2.4.0/filters/kchart/genericimageexport/kchart_png_export.desktop calligra-2.4.3/filters/kchart/genericimageexport/kchart_png_export.desktop --- calligra-2.4.0/filters/kchart/genericimageexport/kchart_png_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kchart/genericimageexport/kchart_png_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KChart в PNG Name[br]=Sil ezporzh PNG evit KChart Name[ca]=Filtre d'exportació PNG per al KChart +Name[ca@valencia]=Filtre d'exportació PNG per al KChart Name[cs]=Exportní filtr do formátu PNG pro KChart Name[cy]=Hidlen Allforio PNG KChart Name[da]=KChart PNG-eksportfilter diff -Nru calligra-2.4.0/filters/kchart/genericimageexport/kchart_xbm_export.desktop calligra-2.4.3/filters/kchart/genericimageexport/kchart_xbm_export.desktop --- calligra-2.4.0/filters/kchart/genericimageexport/kchart_xbm_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kchart/genericimageexport/kchart_xbm_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KChart в XBM Name[br]=Sil ezporzh XBM evit KChart Name[ca]=Filtre d'exportació XBM per al KChart +Name[ca@valencia]=Filtre d'exportació XBM per al KChart Name[cs]=Exportní filtr do formátu XBM pro KChart Name[da]=KChart XBM-eksportfilter Name[de]=KChart XBM-Exportfilter diff -Nru calligra-2.4.0/filters/kchart/genericimageexport/kchart_xpm_export.desktop calligra-2.4.3/filters/kchart/genericimageexport/kchart_xpm_export.desktop --- calligra-2.4.0/filters/kchart/genericimageexport/kchart_xpm_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kchart/genericimageexport/kchart_xpm_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KChart в XPM Name[br]=Sil ezporzh XPM evit KChart Name[ca]=Filtre d'exportació XPM per al KChart +Name[ca@valencia]=Filtre d'exportació XPM per al KChart Name[cs]=Exportní filtr do formátu XPM pro KChart Name[da]=KChart XPM-eksportfilter Name[de]=KChart XPM-Exportfilter diff -Nru calligra-2.4.0/filters/kchart/svg/kchart_svg_export.desktop calligra-2.4.3/filters/kchart/svg/kchart_svg_export.desktop --- calligra-2.4.0/filters/kchart/svg/kchart_svg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kchart/svg/kchart_svg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KChart в SVG Name[br]=Sil ezporzh SVG evit KChart Name[ca]=Filtre d'exportació SVG per al KChart +Name[ca@valencia]=Filtre d'exportació SVG per al KChart Name[cs]=Exportní filtr do formátu SVG pro KChart Name[cy]=Hidlen Allforio SVG KChart Name[da]=KChart SVG-eksportfilter diff -Nru calligra-2.4.0/filters/kformula/latex/kformula_latex_export.desktop calligra-2.4.3/filters/kformula/latex/kformula_latex_export.desktop --- calligra-2.4.0/filters/kformula/latex/kformula_latex_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kformula/latex/kformula_latex_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -10,6 +10,7 @@ Name[bg]=Филтър за изнасяне от KFormula в LaTeX Name[br]=Sil ezporzh LaTeX evit KFormula Name[ca]=Filtre d'exportació LaTeX per al KFormula +Name[ca@valencia]=Filtre d'exportació LaTeX per al KFormula Name[cs]=Exportní filtr formátu LaTeX pro KFormula Name[cy]=Hidlen Allforio LaTeX KFormula Name[da]=KFormula LaTex-eksportfilter diff -Nru calligra-2.4.0/filters/kformula/png/kformula_png_export.desktop calligra-2.4.3/filters/kformula/png/kformula_png_export.desktop --- calligra-2.4.0/filters/kformula/png/kformula_png_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kformula/png/kformula_png_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -10,6 +10,7 @@ Name[bg]=Филтър за изнасяне от KFormula в PNG Name[br]=Sil ezporzh PNG evit KFormula Name[ca]=Filtre d'exportació PNG per al KFormula +Name[ca@valencia]=Filtre d'exportació PNG per al KFormula Name[cs]=Exportní filtr formátu PNG pro KFormula Name[cy]=Hidlen Allforio PNG KFormula Name[da]=KFormula PNG-eksportfilter diff -Nru calligra-2.4.0/filters/kformula/svg/kformula_svg_export.desktop calligra-2.4.3/filters/kformula/svg/kformula_svg_export.desktop --- calligra-2.4.0/filters/kformula/svg/kformula_svg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/kformula/svg/kformula_svg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Филтър за изнасяне от KFormula в SVG Name[br]=Sil ezporzh SVG evit KFormula Name[ca]=Filtre d'exportació SVG per al KFormula +Name[ca@valencia]=Filtre d'exportació SVG per al KFormula Name[cs]=Exportní filtr formátu SVG pro KFormula Name[cy]=Hidlen Allforio SVG KFormula Name[da]=KFormula SVG-eksportfilter diff -Nru calligra-2.4.0/filters/sheets/applixspread/kspread_applixspread_import.desktop calligra-2.4.3/filters/sheets/applixspread/kspread_applixspread_import.desktop --- calligra-2.4.0/filters/sheets/applixspread/kspread_applixspread_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/applixspread/kspread_applixspread_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от Applix Spreadsheet в KSpread Name[br]=Sil enporzh al loger Applix evit KSpread Name[ca]=Filtre d'importació per a fulls de càlcul Applix per al KSpread +Name[ca@valencia]=Filtre d'importació per a fulls de càlcul Applix per al KSpread Name[cs]=KSpread Applix Spreadsheet importní filtr Name[cy]=Hidlen Fewnforio Taenlen Applix KSpread Name[da]=KSpread Applix regnearks-importfilter diff -Nru calligra-2.4.0/filters/sheets/csv/kspread_csv_export.desktop calligra-2.4.3/filters/sheets/csv/kspread_csv_export.desktop --- calligra-2.4.0/filters/sheets/csv/kspread_csv_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/csv/kspread_csv_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за изнасяне от KSpread в CSV Name[br]=Sil ezporzh CSV evit 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 diff -Nru calligra-2.4.0/filters/sheets/csv/kspread_csv_import.desktop calligra-2.4.3/filters/sheets/csv/kspread_csv_import.desktop --- calligra-2.4.0/filters/sheets/csv/kspread_csv_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/csv/kspread_csv_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от CSV в KSpread Name[br]=Sil enporzh CSV evit 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[cy]=Hidlen Fewnforio CSV i Kontour Name[da]=CSV-importfilter for KSpread diff -Nru calligra-2.4.0/filters/sheets/dbase/kspread_dbase_import.desktop calligra-2.4.3/filters/sheets/dbase/kspread_dbase_import.desktop --- calligra-2.4.0/filters/sheets/dbase/kspread_dbase_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/dbase/kspread_dbase_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от dBASE в KSpread Name[br]=Sil enporzh dBASE evit KSpread Name[ca]=Filtre d'importació dBASE per al KSpread +Name[ca@valencia]=Filtre d'importació dBASE per al KSpread Name[cs]=Importní filtr dBASE pro KSpread Name[cy]=Hidlen Fewnforio dBASE Kspread Name[da]=KSpread dBASE-importfilter diff -Nru calligra-2.4.0/filters/sheets/excel/export/kspread_excel_export.desktop calligra-2.4.3/filters/sheets/excel/export/kspread_excel_export.desktop --- calligra-2.4.0/filters/sheets/excel/export/kspread_excel_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/excel/export/kspread_excel_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=KSpread Microsoft Excel Export Filter Name[bg]=Филтър за изнасяне от KSpread в Microsoft Excel Name[ca]=Filtre d'importació Microsoft Excel per al KSpread +Name[ca@valencia]=Filtre d'importació Microsoft Excel per al KSpread Name[cs]=Exportní filtr Microsoft Excel pro KSpread Name[da]=KSpread Microsoft Excel eksportfilter Name[de]=KSpread MS-Excel-Exportfilter @@ -13,7 +14,9 @@ Name[fi]=Microsoft Excel -vientisuodin KSpreadiin Name[fr]=Filtre d'exportation de Tables vers Microsoft Excel Name[ga]=Scagaire Easpórtála Microsoft Excel le haghaidh KSpread +Name[gl]=Filtro de exportación a Microsoft Excel de KSpread Name[hu]=KSpread Microsoft Excel importszűrő +Name[is]=KSpread Microsoft Excel útflutningssía Name[it]=Filtro di esportazione Microsoft Excel per KSpread Name[ja]=KSpread Microsoft Excel エクスポートフィルタ Name[kk]=KSpread -> Microsoft Excel экспорт сүзгісі diff -Nru calligra-2.4.0/filters/sheets/excel/import/kspread_excel_import.desktop calligra-2.4.3/filters/sheets/excel/import/kspread_excel_import.desktop --- calligra-2.4.0/filters/sheets/excel/import/kspread_excel_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/excel/import/kspread_excel_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от Microsoft Excel в KSpread Name[br]=Sil enporzh Microsoft Excel evit KSpread Name[ca]=Filtre d'importació Microsoft Excel per al KSpread +Name[ca@valencia]=Filtre d'importació Microsoft Excel per al KSpread Name[cs]=Importní filtr Microsoft Excel pro KSpread Name[cy]=Hidlen Fewnforio Microsoft Excel KSpread Name[da]=KSpread Microsoft Excel importfilter diff -Nru calligra-2.4.0/filters/sheets/gnumeric/kspread_gnumeric_export.desktop calligra-2.4.3/filters/sheets/gnumeric/kspread_gnumeric_export.desktop --- calligra-2.4.0/filters/sheets/gnumeric/kspread_gnumeric_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/gnumeric/kspread_gnumeric_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за изнасяне от KSpread в GNUmeric Name[br]=Sil ezporzh GNUMERIC evit KSpread Name[ca]=Filtre d'exportació GNUmeric per al KSpread +Name[ca@valencia]=Filtre d'exportació GNUmeric per al KSpread Name[cs]=Gnumeric exportní filtr pro KSpread Name[cy]=Hidlen Allforio GNUmeric i KSpread Name[da]=GNUmeric-eksportfilter for KSpread diff -Nru calligra-2.4.0/filters/sheets/gnumeric/kspread_gnumeric_import.desktop calligra-2.4.3/filters/sheets/gnumeric/kspread_gnumeric_import.desktop --- calligra-2.4.0/filters/sheets/gnumeric/kspread_gnumeric_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/gnumeric/kspread_gnumeric_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от GNUmeric в KSpread Name[br]=Sil enporzh GNUMERIC evit KSpread Name[ca]=Filtre d'importació GNUMERIC per al KSpread +Name[ca@valencia]=Filtre d'importació GNUMERIC per al KSpread Name[cs]=Gnumeric importní filtr pro KSpread Name[cy]=Hidlen Fewnforio GNUmeric i Kspread Name[da]=GNUmeric-importfilter for KSpread diff -Nru calligra-2.4.0/filters/sheets/html/kspread_html_export.desktop calligra-2.4.3/filters/sheets/html/kspread_html_export.desktop --- calligra-2.4.0/filters/sheets/html/kspread_html_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/html/kspread_html_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за изнасяне от KSpread в HTML Name[br]=Sil ezporzh HTML evit KSpread Name[ca]=Filtre d'exportació HTML per al KSpread +Name[ca@valencia]=Filtre d'exportació HTML per al KSpread Name[cs]=HTML exportní filtr pro KSpread Name[cy]=Hidlen Allforio HTML i KSpread Name[da]=HTML-eksportfilter for KSpread diff -Nru calligra-2.4.0/filters/sheets/html/kspread_html_import.desktop calligra-2.4.3/filters/sheets/html/kspread_html_import.desktop --- calligra-2.4.0/filters/sheets/html/kspread_html_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/html/kspread_html_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=HTML Import Filter for KSpread Name[bg]=Филтър за внасяне от HTML в KSpread Name[ca]=Filtre d'importació HTML per al KSpread +Name[ca@valencia]=Filtre d'importació HTML per al KSpread Name[cs]=HTML importní filtr pro KSpread Name[da]=HTML-importfilter til KSpread Name[de]=KSpread HTML-Importfilter @@ -13,7 +14,9 @@ Name[fi]=HTML-tuontisuodin KSpreadiin Name[fr]=Filtre d'importation HTML pour KSpread Name[ga]=Scagaire Iompórtála HTML le haghaidh KSpread +Name[gl]=Filtro de importación de HTML para KSpread Name[hu]=HTML importszűrő a KSpreadhez +Name[is]=HTML innflutningssía fyrir KSpread Name[it]=Filtro di importazione HTML per KSpread Name[ja]=KSpread HTML インポートフィルタ Name[kk]=HTML -> KSpread импорт сүзгісі diff -Nru calligra-2.4.0/filters/sheets/latex/export/kspread_latex_export.desktop calligra-2.4.3/filters/sheets/latex/export/kspread_latex_export.desktop --- calligra-2.4.0/filters/sheets/latex/export/kspread_latex_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/latex/export/kspread_latex_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Филтър за изнасяне от KSpread в LATEX Name[br]=Sil ezporzh LATEX evit KSpread Name[ca]=Filtre d'exportació LATEX per al KSpread +Name[ca@valencia]=Filtre d'exportació LATEX per al KSpread Name[cs]=KSpread LaTeX exportní filtr Name[cy]=Hidlen Allforio LATEX KSpread Name[da]=KSpread LaTeX-eksportfilter diff -Nru calligra-2.4.0/filters/sheets/opencalc/kspread_opencalc_export.desktop calligra-2.4.3/filters/sheets/opencalc/kspread_opencalc_export.desktop --- calligra-2.4.0/filters/sheets/opencalc/kspread_opencalc_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/opencalc/kspread_opencalc_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KSpread в OpenOffice.org Calc Name[br]=Sil ezporzh OpenOffice.org Calc evit KSpread Name[ca]=Filtre d'exportació OpenOffice.org Calc per al KSpread +Name[ca@valencia]=Filtre d'exportació OpenOffice.org Calc per al KSpread Name[cs]=OpenOffice.org Calc exportní filtr pro KSpread Name[cy]=Hidlen Allforio OpenOffice.org Calc ar gyfer KSpread Name[da]=OpenOffice.rog-Calc eksportfilter for KSpread diff -Nru calligra-2.4.0/filters/sheets/opencalc/kspread_opencalc_import.desktop calligra-2.4.3/filters/sheets/opencalc/kspread_opencalc_import.desktop --- calligra-2.4.0/filters/sheets/opencalc/kspread_opencalc_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/opencalc/kspread_opencalc_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от OpenOffice.org Calc в KSpread Name[br]=Sil enporzh OpenOffice.org Calc evit KSpread Name[ca]=Filtre d'importació OpenOffice.org Calc per al KSpread +Name[ca@valencia]=Filtre d'importació OpenOffice.org Calc per al KSpread Name[cs]=OpenOffice.org Calc importní filtr pro KSpread Name[cy]=Hidl Mewnforio OpenOffice.org Calc ar gyfer KSpread Name[da]=OpenOffice.org-Calc importfilter for KSpread diff -Nru calligra-2.4.0/filters/sheets/qpro/kspread_qpro_import.desktop calligra-2.4.3/filters/sheets/qpro/kspread_qpro_import.desktop --- calligra-2.4.0/filters/sheets/qpro/kspread_qpro_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/qpro/kspread_qpro_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от Quattro Pro в KSpread Name[br]=Sil enporzh Quattro Pro evit KSpread Name[ca]=Filtre d'importació Quattro Pro per al KSpread +Name[ca@valencia]=Filtre d'importació Quattro Pro per al KSpread Name[cs]=Quattro Pro importní filtr pro KSpread Name[cy]=Hidlen Fewnforio Quattro Pro i KSpread Name[da]=Quattro Pro-importfilter for KSpread diff -Nru calligra-2.4.0/filters/sheets/xlsx/kspread_xlsx_import.desktop calligra-2.4.3/filters/sheets/xlsx/kspread_xlsx_import.desktop --- calligra-2.4.0/filters/sheets/xlsx/kspread_xlsx_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/sheets/xlsx/kspread_xlsx_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=MS Excel 2007 Import Filter for KSpread Name[bg]=Филтър за внасяне от MS Excel 2007 в KSpread Name[ca]=Filtre d'importació MS Excel 2007 per al KSpread +Name[ca@valencia]=Filtre d'importació MS Excel 2007 per al KSpread Name[cs]=Importní filtr MS Excel 2007 pro KSpread Name[da]=MS Excel 2007 importfilter til KSpread Name[de]=KSpread MS-Excel-2007-Exportfilter @@ -13,7 +14,9 @@ Name[fi]=MS Excel 2007 -tuontisuodin KSpreadille Name[fr]=Filtre d'importation MS Excel 2007 de KSpread Name[ga]=Scagaire Iompórtála Microsoft Excel 2007 le haghaidh KSpread +Name[gl]=Filtro de importación de MS Excel 2007 para KSpread Name[hu]=Microsoft Excel 2007 importszűrő a KSpreadhez +Name[is]=MS Excel 2007 innflutningssía fyrir KSpread Name[it]=Filtro di importazione MS Excel 2007 per KSpread Name[ja]=KSpread MS Excel 2007 インポートフィルタ Name[kk]=MS Excel 2007 -> KSpread импорт сүзгісі diff -Nru calligra-2.4.0/filters/stage/genericimageexport/kpresenter_bmp_export.desktop calligra-2.4.3/filters/stage/genericimageexport/kpresenter_bmp_export.desktop --- calligra-2.4.0/filters/stage/genericimageexport/kpresenter_bmp_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/genericimageexport/kpresenter_bmp_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в BMP Name[br]=Sil ezporzh BMB evit KPresenter Name[ca]=Filtre d'exportació BMP per al KPresenter +Name[ca@valencia]=Filtre d'exportació BMP per al KPresenter Name[cs]=Exportní filtr do formátu BMP pro KPresenter Name[cy]=Hidlen Allforio BMP KPresenter Name[da]=KPresenter BMP-eksportfilter diff -Nru calligra-2.4.0/filters/stage/genericimageexport/kpresenter_jpeg_export.desktop calligra-2.4.3/filters/stage/genericimageexport/kpresenter_jpeg_export.desktop --- calligra-2.4.0/filters/stage/genericimageexport/kpresenter_jpeg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/genericimageexport/kpresenter_jpeg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в JPEG Name[br]=Sil ezporzh JPEG evit KPresenter Name[ca]=Filtre d'exportació JPEG per al KPresenter +Name[ca@valencia]=Filtre d'exportació JPEG per al KPresenter Name[cs]=Exportní filtr do formátu JPEG pro KPresenter Name[da]=KPresenter JPEG-eksportfilter Name[de]=KPresenter JPEG-Exportfilter diff -Nru calligra-2.4.0/filters/stage/genericimageexport/kpresenter_mng_export.desktop calligra-2.4.3/filters/stage/genericimageexport/kpresenter_mng_export.desktop --- calligra-2.4.0/filters/stage/genericimageexport/kpresenter_mng_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/genericimageexport/kpresenter_mng_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в MNG Name[br]=Sil ezporzh MNG evit KPresenter Name[ca]=Filtre d'exportació MNG per al KPresenter +Name[ca@valencia]=Filtre d'exportació MNG per al KPresenter Name[cs]=Exportní filtr do formátu MNG pro KPresenter Name[da]=KPresenter MNG-eksportfilter Name[de]=KPresenter MNG-Exportfilter diff -Nru calligra-2.4.0/filters/stage/genericimageexport/kpresenter_png_export.desktop calligra-2.4.3/filters/stage/genericimageexport/kpresenter_png_export.desktop --- calligra-2.4.0/filters/stage/genericimageexport/kpresenter_png_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/genericimageexport/kpresenter_png_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в PNG Name[br]=Sil ezporzh PNG evit KPresenter Name[ca]=Filtre d'exportació PNG per al KPresenter +Name[ca@valencia]=Filtre d'exportació PNG per al KPresenter Name[cs]=Exportní filtr do formátu PNG pro KPresenter Name[cy]=Hidlen Allforio PNG KPresenter Name[da]=KPresenter PNG-eksportfilter diff -Nru calligra-2.4.0/filters/stage/genericimageexport/kpresenter_xbm_export.desktop calligra-2.4.3/filters/stage/genericimageexport/kpresenter_xbm_export.desktop --- calligra-2.4.0/filters/stage/genericimageexport/kpresenter_xbm_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/genericimageexport/kpresenter_xbm_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в XBM Name[br]=Sil ezporzh XBM evit KPresenter Name[ca]=Filtre d'exportació XBM per al KPresenter +Name[ca@valencia]=Filtre d'exportació XBM per al KPresenter Name[cs]=Exportní filtr do formátu XBM pro KPresenter Name[da]=KPresenter XBM-eksportfilter Name[de]=KPresenter XBM-Exportfilter diff -Nru calligra-2.4.0/filters/stage/genericimageexport/kpresenter_xpm_export.desktop calligra-2.4.3/filters/stage/genericimageexport/kpresenter_xpm_export.desktop --- calligra-2.4.0/filters/stage/genericimageexport/kpresenter_xpm_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/genericimageexport/kpresenter_xpm_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в XPM Name[br]=Sil ezporzh XPM evit KPresenter Name[ca]=Filtre d'exportació XPM per al KPresenter +Name[ca@valencia]=Filtre d'exportació XPM per al KPresenter Name[cs]=Exportní filtr do formátu XPM pro KPresenter Name[da]=KPresenter XPM-eksportfilter Name[de]=KPresenter XPM-Exportfilter diff -Nru calligra-2.4.0/filters/stage/kpr/export/odp2kpr.desktop calligra-2.4.3/filters/stage/kpr/export/odp2kpr.desktop --- calligra-2.4.0/filters/stage/kpr/export/odp2kpr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/kpr/export/odp2kpr.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=KPresenter Old File Format Filter Name[bg]=Филтър за стария файлов формат на KPresenter Name[ca]=Filtre de format de fitxer antic del KPresenter +Name[ca@valencia]=Filtre de format de fitxer antic del KPresenter Name[cs]=Filtr starého formátu pro KPresenter Name[da]=Filter til KPresenters gamle filformat Name[de]=KPresenter Filter für altes Dateiformat diff -Nru calligra-2.4.0/filters/stage/kpr/import/kpr2odp.desktop calligra-2.4.3/filters/stage/kpr/import/kpr2odp.desktop --- calligra-2.4.0/filters/stage/kpr/import/kpr2odp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/kpr/import/kpr2odp.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=KPresenter Old File Format Filter Name[bg]=Филтър за стария файлов формат на KPresenter Name[ca]=Filtre de format de fitxer antic del KPresenter +Name[ca@valencia]=Filtre de format de fitxer antic del KPresenter Name[cs]=Filtr starého formátu pro KPresenter Name[da]=Filter til KPresenters gamle filformat Name[de]=KPresenter Filter für altes Dateiformat diff -Nru calligra-2.4.0/filters/stage/kpr2odf/Filterkpr2odf.cpp calligra-2.4.3/filters/stage/kpr2odf/Filterkpr2odf.cpp --- calligra-2.4.0/filters/stage/kpr2odf/Filterkpr2odf.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/filters/stage/kpr2odf/Filterkpr2odf.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -60,6 +60,8 @@ Filterkpr2odf::Filterkpr2odf(QObject *parent, const QVariantList&) : KoFilter(parent) + , m_mainDoc(true) + , m_documentInfo(true) , m_currentPage(1) , m_objectIndex(1) , m_sticky(false) @@ -274,7 +276,8 @@ KoXmlNode backgrounds = m_mainDoc.namedItem("DOC").namedItem("BACKGROUND"); KoXmlNode objects = m_mainDoc.namedItem("DOC").namedItem("OBJECTS"); KoXmlNode paper = m_mainDoc.namedItem("DOC").namedItem("PAPER"); - m_pageHeight = paper.toElement().attribute("ptHeight").toFloat(); + //m_pageHeight = paper.toElement().attribute("ptHeight").toFloat(); + m_pageHeight = paper.toElement().attribute("ptHeight").toDouble(); //Go to the first background, there might be missing backgrounds KoXmlElement pageBackground = backgrounds.firstChild().toElement(); diff -Nru calligra-2.4.0/filters/stage/kpr2odf/Filterkpr2odf.desktop calligra-2.4.3/filters/stage/kpr2odf/Filterkpr2odf.desktop --- calligra-2.4.0/filters/stage/kpr2odf/Filterkpr2odf.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/kpr2odf/Filterkpr2odf.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=Filter to export KPR files to ODP Name[bg]=Филтър за изнасяне на файлове от KPR в ODP Name[ca]=Filtre per exportar fitxers KPR a ODP +Name[ca@valencia]=Filtre per exportar fitxers KPR a ODP Name[cs]=Filtr pro export souborů KPR do ODP Name[da]=Filter til eksport af KPR-filer til ODP Name[de]=Filter zum Export von KPR-Dateien nach ODP diff -Nru calligra-2.4.0/filters/stage/kpr2odf/Filterkpr2odf.h calligra-2.4.3/filters/stage/kpr2odf/Filterkpr2odf.h --- calligra-2.4.0/filters/stage/kpr2odf/Filterkpr2odf.h 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/filters/stage/kpr2odf/Filterkpr2odf.h 2012-06-26 04:18:00.000000000 +0000 @@ -105,7 +105,7 @@ QHash< int, QList > m_pageAnimations;//stores the animations, needed a hash to be able to sort them - int m_pageHeight;//needed to find out where's every object + double m_pageHeight;//needed to find out where's every object int m_currentPage; int m_objectIndex;//the number of the next object QHash m_pictures;//store the pair of the keys diff -Nru calligra-2.4.0/filters/stage/kpr2odf/StylesFilterkpr2odf.cpp calligra-2.4.3/filters/stage/kpr2odf/StylesFilterkpr2odf.cpp --- calligra-2.4.0/filters/stage/kpr2odf/StylesFilterkpr2odf.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/filters/stage/kpr2odf/StylesFilterkpr2odf.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -25,7 +25,7 @@ #include const QString Filterkpr2odf::createPageStyle(const KoXmlElement& page) { - KoGenStyle style(KoGenStyle::DrawingPageStyle, "drawing-page"); + KoGenStyle style(KoGenStyle::DrawingPageAutoStyle, "drawing-page"); bool useMasterBackground = false; if (page.nodeName() == "PAGE") { @@ -33,7 +33,7 @@ if (!backMaster.isNull()) { style.addProperty("presentation:background-visible", backMaster.attribute("displayBackground", "1") == "1"); style.addProperty("presentation:background-objects-visible", backMaster.attribute("displayMasterPageObject", "1") == "1"); - useMasterBackground = backMaster.attribute("useMasterBackground", "0") == "1"; + useMasterBackground = backMaster.attribute("useMasterBackground", "1") == "1"; // not set was the default and it means use the background from master } else { //if BACKMASTER is not found we assume it's true style.addProperty("presentation:background-visible", true); @@ -263,6 +263,7 @@ style.addChildElement("presentationSound", elementContents); } }//if pageEfect is null + return m_styles.insert(style, "dp"); } diff -Nru calligra-2.4.0/filters/stage/magicpoint/kpresenter_magicpoint_import.desktop calligra-2.4.3/filters/stage/magicpoint/kpresenter_magicpoint_import.desktop --- calligra-2.4.0/filters/stage/magicpoint/kpresenter_magicpoint_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/magicpoint/kpresenter_magicpoint_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Филтър за внасяне от Magicpoint в KPresenter Name[br]=Sil enporzh Magicpoint evit KPresenter Name[ca]=Filtre d'importació Magicpoint per al KPresenter +Name[ca@valencia]=Filtre d'importació Magicpoint per al KPresenter Name[cs]=Importní filtr Magicpoint pro KPresenter Name[cy]=Hidlen Fewnforio Magicpoint i KPresenter Name[da]=Magicpoint importfilter til KPresenter diff -Nru calligra-2.4.0/filters/stage/ooimpress/kpresenter_ooimpress_export.desktop calligra-2.4.3/filters/stage/ooimpress/kpresenter_ooimpress_export.desktop --- calligra-2.4.0/filters/stage/ooimpress/kpresenter_ooimpress_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/ooimpress/kpresenter_ooimpress_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в OpenOffice.org Impress Name[br]=Sil ezporzh OpenOffice.org Impress evit KPresenter Name[ca]=Filtre d'exportació OpenOffice.org Impress per al KPresenter +Name[ca@valencia]=Filtre d'exportació OpenOffice.org Impress per al KPresenter Name[cs]=OpenOffice.org Impress exportní filtr pro KPresenter Name[cy]=Hidlen Allforio Impress OpenOffice.org ar gyfer KPresenter Name[da]=OpenOffice.org Impress eksportfilter til KPresenter diff -Nru calligra-2.4.0/filters/stage/ooimpress/kpresenter_ooimpress_import.desktop calligra-2.4.3/filters/stage/ooimpress/kpresenter_ooimpress_import.desktop --- calligra-2.4.0/filters/stage/ooimpress/kpresenter_ooimpress_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/ooimpress/kpresenter_ooimpress_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от OpenOffice.org Impress в KPresenter Name[br]=Sil enporzh OpenOffice.org Impress evit KPresenter Name[ca]=Filtre d'importació OpenOffice.org Impress per al KPresenter +Name[ca@valencia]=Filtre d'importació OpenOffice.org Impress per al KPresenter Name[cs]=OpenOffice.org Impress importní filtr pro KPresenter Name[cy]=Hidlen Fewnforio OpenOffice.org Impress i KPresenter Name[da]=OpenOffice.org Impress importfilter til KPresenter diff -Nru calligra-2.4.0/filters/stage/ooppt/kpresenter_ooppt_import.desktop calligra-2.4.3/filters/stage/ooppt/kpresenter_ooppt_import.desktop --- calligra-2.4.0/filters/stage/ooppt/kpresenter_ooppt_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/ooppt/kpresenter_ooppt_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=PPT Import Filter for KPresenter Name[bg]=Филтър за внасяне от PPT в KPresenter Name[ca]=Filtre d'importació PPT per al KPresenter +Name[ca@valencia]=Filtre d'importació PPT per al KPresenter Name[cs]=Importní filtr PPT pro KPresenter Name[da]=PPT-importfilter til KPresenter Name[de]=PPT-Importfilter für KPresenter diff -Nru calligra-2.4.0/filters/stage/powerpoint/kpresenter_powerpoint_import.desktop calligra-2.4.3/filters/stage/powerpoint/kpresenter_powerpoint_import.desktop --- calligra-2.4.0/filters/stage/powerpoint/kpresenter_powerpoint_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/powerpoint/kpresenter_powerpoint_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от Microsoft PowerPoint в KPresenter Name[br]=Sil enporzh Microsoft PowerPoint evit 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 diff -Nru calligra-2.4.0/filters/stage/pptx/kpresenter_pptx_import.desktop calligra-2.4.3/filters/stage/pptx/kpresenter_pptx_import.desktop --- calligra-2.4.0/filters/stage/pptx/kpresenter_pptx_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/pptx/kpresenter_pptx_import.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=MS PowerPoint 2007 Import Filter for KPresenter Name[bg]=Филтър за внасяне от MS PowerPoint 2007 в 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 @@ -13,6 +14,7 @@ Name[fi]=Microsoft PowerPoint 2007 -tuontisuodin KPresenteriin 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 de importación de Microsoft PowerPoint 2007 para KPresenter Name[hu]=Microsoft PowerPoint 2007 importszűrő a KPresenterhez Name[it]=Filtro di importazione MS PowerPoint 2007 per KPresenter Name[ja]=KPresenter Microsoft PowerPoint 2007 インポートフィルタ diff -Nru calligra-2.4.0/filters/stage/svg/kpresenter_svg_export.desktop calligra-2.4.3/filters/stage/svg/kpresenter_svg_export.desktop --- calligra-2.4.0/filters/stage/svg/kpresenter_svg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/svg/kpresenter_svg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от KPresenter в SVG Name[br]=Sil ezporzh SVG evit KPresenter Name[ca]=Filtre d'exportació SVG per al KPresenter +Name[ca@valencia]=Filtre d'exportació SVG per al KPresenter Name[cs]=Exportní filtr do formátu SVG pro KPresenter Name[cy]=Hidlen Allforio SVG KPresenter Name[da]=KPresenter SVG-eksportfilter diff -Nru calligra-2.4.0/filters/stage/words/kodp2odt.desktop calligra-2.4.3/filters/stage/words/kodp2odt.desktop --- calligra-2.4.0/filters/stage/words/kodp2odt.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/words/kodp2odt.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=KPresenter Words Filter Name[bg]=Филтър за KPresenter за файлове на Words Name[ca]=Filtre del Words per al KPresenter +Name[ca@valencia]=Filtre del Words per al KPresenter Name[cs]=Filtr pro převod KPresenter->Words Name[da]=Words-filter til KPresenter Name[de]=KPresenter Words-Filter @@ -12,6 +13,7 @@ Name[fi]=Words-suodin KPresenteriin Name[hu]=KPresenter Words szűrő Name[it]=Filtro da KPresenter a Words +Name[ja]=KPresenter Words フィルタ Name[kk]=Words -> KPresenter сүзгісі Name[nb]=KPresenter Words-filter Name[nds]=Words-Filter för KPresenter @@ -20,6 +22,7 @@ Name[pt]=Filtro do Words para o KPresenter Name[pt_BR]=Filtro do Words para o KPresenter Name[ru]=Фильтр экспорта документов Words в KPresenter +Name[sk]=Filter pre prevod KPresenter - Words Name[sv]=Kpresenter Words-filter Name[uk]=Фільтр Words для KPresenter Name[x-test]=xxKPresenter Words Filterxx diff -Nru calligra-2.4.0/filters/stage/words/kprwords.desktop calligra-2.4.3/filters/stage/words/kprwords.desktop --- calligra-2.4.0/filters/stage/words/kprwords.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/stage/words/kprwords.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=KPresenter Words Filter Name[bg]=Филтър за KPresenter за файлове на Words Name[ca]=Filtre del Words per al KPresenter +Name[ca@valencia]=Filtre del Words per al KPresenter Name[cs]=Filtr pro převod KPresenter->Words Name[da]=Words-filter til KPresenter Name[de]=KPresenter Words-Filter @@ -12,6 +13,7 @@ Name[fi]=Words-suodin KPresenteriin Name[hu]=KPresenter Words szűrő Name[it]=Filtro da KPresenter a Words +Name[ja]=KPresenter Words フィルタ Name[kk]=Words -> KPresenter сүзгісі Name[nb]=KPresenter Words-filter Name[nds]=Words-Filter för KPresenter @@ -20,6 +22,7 @@ Name[pt]=Filtro do Words para o KPresenter Name[pt_BR]=Filtro do Words para o KPresenter Name[ru]=Фильтр экспорта документов Words в KPresenter +Name[sk]=Filter pre prevod KPresenter - Words Name[sv]=Kpresenter Words-filter Name[uk]=Фільтр Words для KPresenter Name[x-test]=xxKPresenter Words Filterxx diff -Nru calligra-2.4.0/filters/words/abiword/words_abiword_export.desktop calligra-2.4.3/filters/words/abiword/words_abiword_export.desktop --- calligra-2.4.0/filters/words/abiword/words_abiword_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/abiword/words_abiword_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words AbiWord Export Filter Name[bg]=Филтър за изнасяне от Words в AbiWord Name[ca]=Filtre d'exportació AbiWord per al Words +Name[ca@valencia]=Filtre d'exportació AbiWord per al Words Name[cs]=Exportní filtr AbiWord pro Words Name[da]=AbiWord-eksportfilter til Words Name[de]=Words AbiWord-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation AbiWord de Words Name[hu]=Words AbiWord exportszűrő Name[it]=Filtro di esportazione AbiWord per Words +Name[ja]=Words AbiWord エクスポートフィルタ Name[kk]=Words -> AbiWord экспорт сүзгісі Name[nb]=AbiWord-eksportfilter for Words Name[nds]=AbiWord-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de exportação para AbiWord do Words Name[pt_BR]=Filtro de exportação de AbiWord para o Words Name[ru]=Фильтр экспорта документов Words в AbiWord +Name[sk]=AbiWord filter pre export z Words Name[sv]=Words-exportfilter för Abiword Name[uk]=Фільтр експорту AbiWord для Words Name[x-test]=xxWords AbiWord Export Filterxx diff -Nru calligra-2.4.0/filters/words/abiword/words_abiword_import.desktop calligra-2.4.3/filters/words/abiword/words_abiword_import.desktop --- calligra-2.4.0/filters/words/abiword/words_abiword_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/abiword/words_abiword_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words AbiWord Import Filter Name[bg]=Филтър за внасяне от AbiWord в Words Name[ca]=Filtre d'importació AbiWord per al Words +Name[ca@valencia]=Filtre d'importació AbiWord per al Words Name[cs]=Importní filtr AbiWord pro Words Name[da]=Applixword-importfilter til Words Name[de]=Words AbiWord-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation AbiWord de Words Name[hu]=Words AbiWord importszűrő Name[it]=Filtro di importazione AbiWord per Words +Name[ja]=Words AbiWord インポートフィルタ Name[kk]=AbiWord -> Words импорт сүзгісі Name[nb]=AbiWord-importfilter for Words Name[nds]=AbiWord-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de importação do AbiWord para o Words Name[pt_BR]=Filtro de importação de AbiWord para o Words Name[ru]=Фильтр импорта документов AbiWord в Words +Name[sk]=AbiWord filter pre import do Words Name[sv]=Words-importfilter för Abiword Name[uk]=Фільтр імпорту AbiWord для Words Name[x-test]=xxWords AbiWord Import Filterxx diff -Nru calligra-2.4.0/filters/words/amipro/words_amipro_export.desktop calligra-2.4.3/filters/words/amipro/words_amipro_export.desktop --- calligra-2.4.0/filters/words/amipro/words_amipro_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/amipro/words_amipro_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words AmiPro Export Filter Name[bg]=Филтър за изнасяне от Words в AmiPro Name[ca]=Filtre d'exportació AmiPro per al Words +Name[ca@valencia]=Filtre d'exportació AmiPro per al Words Name[cs]=Exportní filtr AmiPro pro Words Name[da]=AmiPro-eksportfilter til Words Name[de]=Words AmiPro-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation AmiPro de Words Name[hu]=Words AmiPro exportszűrő Name[it]=Filtro di esportazione AmiPro per Words +Name[ja]=Words AmiPro エクスポートフィルタ Name[kk]=Words -> AmiPro экспорт сүзгісі Name[nb]=AmiPro-eksportfilter for Words Name[nds]=AmiPro-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Exportação para AmiPro do Words Name[pt_BR]=Filtro de exportação de AmiPro para o Words Name[ru]=Фильтр экспорта документов AmiPro в Words +Name[sk]=AmiPro filter pre export z Words Name[sv]=Words-exportfilter för AmiPro Name[uk]=Фільтр експорту AmiPro для Words Name[x-test]=xxWords AmiPro Export Filterxx diff -Nru calligra-2.4.0/filters/words/amipro/words_amipro_import.desktop calligra-2.4.3/filters/words/amipro/words_amipro_import.desktop --- calligra-2.4.0/filters/words/amipro/words_amipro_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/amipro/words_amipro_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words AmiPro Import Filter Name[bg]=Филтър за внасяне от AmiPro в Words Name[ca]=Filtre d'importació AmiPro per al Words +Name[ca@valencia]=Filtre d'importació AmiPro per al Words Name[cs]=Importní filtr AmiPro pro Words Name[da]=AmiPro-importfilter til Words Name[de]=Words AmiPro-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation AmiPro de Words Name[hu]=Words AmiPro importszűrő Name[it]=Filtro di importazione AmiPro per Words +Name[ja]=Words AmiPro インポートフィルタ Name[kk]=AmiPro -> Words импорт сүзгісі Name[nb]=AmiPro-importfilter for Words Name[nds]=AmiPro-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação do AmiPro para o Words Name[pt_BR]=Filtro de importação de AmiPro para o Words Name[ru]=Фильтр импорта документов AmiPro в Words +Name[sk]=AmiPro filter pre import do Words Name[sv]=Words-importfilter för AmiPro Name[uk]=Фільтр імпорту AmiPro для Words Name[x-test]=xxWords AmiPro Import Filterxx diff -Nru calligra-2.4.0/filters/words/applixword/words_applixword_import.desktop calligra-2.4.3/filters/words/applixword/words_applixword_import.desktop --- calligra-2.4.0/filters/words/applixword/words_applixword_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/applixword/words_applixword_import.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words Applixword Import Filter Name[bg]=Филтър за внасяне от Applixword в Words Name[ca]=Filtre d'importació Applixword per al Words +Name[ca@valencia]=Filtre d'importació Applixword per al Words Name[cs]=Importní filtr Applixword pro Words Name[da]=Applixword-importfilter til Words Name[de]=Words Applixword-Importfilter @@ -11,8 +12,10 @@ Name[et]=Wordsi Applixwordi impordifilter Name[fi]=Applixword-tuontisuodin Wordsiin Name[fr]=Filtre d'importation Applix Word de Words +Name[gl]=Filtro de importación de Applixword para Words Name[hu]=Words Applix Words importszűrő Name[it]=Filtro di importazione Applixword per Words +Name[ja]=Words Applixword インポートフィルタ Name[kk]=Applixword -> Words импорт сүзгісі Name[nb]=Applixword-importfilter for Words Name[nds]=Applixword-Importfilter för Words @@ -21,6 +24,7 @@ Name[pt]=Filtro de Importação do Applixword para o Words Name[pt_BR]=Filtro de importação de Applixword para o Words Name[ru]=Фильтр импорта документов Applixword в Words +Name[sk]=Applixword filter pre import do Words Name[sv]=Words-importfilter för Applixword Name[uk]=Фільтр імпорту Applixword для Words Name[x-test]=xxWords Applixword Import Filterxx diff -Nru calligra-2.4.0/filters/words/ascii/words_ascii_export.desktop calligra-2.4.3/filters/words/ascii/words_ascii_export.desktop --- calligra-2.4.0/filters/words/ascii/words_ascii_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/ascii/words_ascii_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words Ascii Export Filter Name[bg]=Филтър за изнасяне от Words в ASCII Name[ca]=Filtre d'exportació ASCII per al Words +Name[ca@valencia]=Filtre d'exportació ASCII per al Words Name[cs]=Exportní filtr formátu Ascii pro Words Name[da]=ASCII-eksportfilter til Words Name[de]=Words ASCII-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation ASCII de Words Name[hu]=Words ASCII exportszűrő Name[it]=Filtro di esportazione ASCII per Words +Name[ja]=Words ASCII エクスポートフィルタ Name[kk]=Words -> ASCII экспорт сүзгісі Name[nb]=Ascii-eksportfilter for Words Name[nds]=ASCII-Exportfilter för Words diff -Nru calligra-2.4.0/filters/words/ascii/words_ascii_import.desktop calligra-2.4.3/filters/words/ascii/words_ascii_import.desktop --- calligra-2.4.0/filters/words/ascii/words_ascii_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/ascii/words_ascii_import.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words ASCII Import Filter Name[bg]=Филтър за внасяне от ASCII в Words Name[ca]=Filtre d'importació ASCII per al Words +Name[ca@valencia]=Filtre d'importació ASCII per al Words Name[cs]=Importní filtr ASCII pro Words Name[da]=ASCII-importfilter til Words Name[de]=Words ASCII-Importfilter @@ -11,8 +12,10 @@ Name[et]=Wordsi ASCII impordifilter Name[fi]=ASCII-tuontisuodin Wordsiin Name[fr]=Filtre d'importation ASCII de Words +Name[gl]=Filtro de importación de ASCII para Words Name[hu]=Words ASCII importszűrő Name[it]=Filtro di importazione ASCII per Words +Name[ja]=Words ASCII インポートフィルタ Name[kk]=ASCII -> Words импорт сүзгісі Name[nb]=Ascii-importfilter for Words Name[nds]=ASCII-Importfilter för Words diff -Nru calligra-2.4.0/filters/words/docbook/words_docbook_export.desktop calligra-2.4.3/filters/words/docbook/words_docbook_export.desktop --- calligra-2.4.0/filters/words/docbook/words_docbook_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/docbook/words_docbook_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words SGML DocBook Export Filter Name[bg]=Филтър за изнасяне от Words в SGML DocBook Name[ca]=Filtre d'exportació SGML DocBook per al Words +Name[ca@valencia]=Filtre d'exportació SGML DocBook per al Words Name[cs]=Exportní filtr SGML Docbook pro Words Name[da]=SGML DocBook-eksportfilter til Words Name[de]=Words SGML-DocBook-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation SGML DocBook de Words Name[hu]=Words SGML DocBook exportszűrő Name[it]=Filtro di esportazione SGML DocBook per Words +Name[ja]=Words SGML DocBook エクスポートフィルタ Name[kk]=Words -> SGML DocBook экспорт сүзгісі Name[nb]=SGML DocBook eksportfilter for Words Name[nds]="SGML DocBook"-Exportfilter för Words diff -Nru calligra-2.4.0/filters/words/docx/words_docx_import.desktop calligra-2.4.3/filters/words/docx/words_docx_import.desktop --- calligra-2.4.0/filters/words/docx/words_docx_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/docx/words_docx_import.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=MS Word 2007 Import Filter for Words Name[bg]=Филтър за внасяне от MS Word 2007 в Words Name[ca]=Filtre d'importació MS Word 2007 per al Words +Name[ca@valencia]=Filtre d'importació MS Word 2007 per al Words Name[cs]=Importní filtr MS Word 2007 pro Words Name[da]=MS Word 2007 importfilter til Words Name[de]=Words MS-Word-2007-Importfilter @@ -11,8 +12,10 @@ Name[et]=Wordsi MS Word 2007 impordifilter Name[fi]=MS Word 2007 -tuontisuodin Wordsiin Name[fr]=Filtre d'importation MS Word 2007 de Words +Name[gl]=Filtro de importación de MS Word 2007 para Words Name[hu]=Microsoft Word 2007 importszűrő a Wordshöz Name[it]=Filtro di importazione MS Word 2007 per Words +Name[ja]=Words のための MS Word 2007 インポートフィルタ Name[kk]=MS Word 2007 -> Words импорт сүзгісі Name[nb]=MS Word 2007 importfilter for Words Name[nds]="MS Word 2007"-Importfilter för Words diff -Nru calligra-2.4.0/filters/words/hancomword/pole.cpp calligra-2.4.3/filters/words/hancomword/pole.cpp --- calligra-2.4.0/filters/words/hancomword/pole.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/hancomword/pole.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -867,8 +867,8 @@ unsigned k = 109; unsigned mblock = header->mbat_start; for (unsigned r = 0; r < header->num_mbat; r++) { - unsigned long r = loadBigBlock(mblock, buffer2, bbat->blockSize); - if (r != bbat->blockSize) { + unsigned long sizeRead = loadBigBlock(mblock, buffer2, bbat->blockSize); + if (sizeRead != bbat->blockSize) { delete[] buffer2; return; } diff -Nru calligra-2.4.0/filters/words/hancomword/words_hancomword_import.desktop calligra-2.4.3/filters/words/hancomword/words_hancomword_import.desktop --- calligra-2.4.0/filters/words/hancomword/words_hancomword_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/hancomword/words_hancomword_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words HancomWord Import Filter Name[bg]=Филтър за внасяне от HancomWord в Words Name[ca]=Filtre d'importació HancomWord per al Words +Name[ca@valencia]=Filtre d'importació HancomWord per al Words Name[cs]=Importní filtr HancomWord pro Words Name[da]=HancomWord-importfilter til Words Name[de]=Words HancomWord-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation HancomWord de Words Name[hu]=Words HancomWord importszűrő Name[it]=Filtro di importazione HancomWord per Words +Name[ja]=Words HancomWord インポートフィルタ Name[kk]=HancomWord -> Words импорт сүзгісі Name[nb]=HancomWord-importfilter for Words Name[nds]=HancomWord-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação de HancomWord para o Words Name[pt_BR]=Filtro de importação de HancomWord para o Words Name[ru]=Фильтр импорта документов HancomWord в Words +Name[sk]=HancomWord filter pre import do Words Name[sv]=Words-importfilter för HancomWord Name[uk]=Фільтр імпорту HancomWord для Words Name[x-test]=xxWords HancomWord Import Filterxx diff -Nru calligra-2.4.0/filters/words/html/export/words_html_export.desktop calligra-2.4.3/filters/words/html/export/words_html_export.desktop --- calligra-2.4.0/filters/words/html/export/words_html_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/html/export/words_html_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words HTML Export Filter Name[bg]=Филтър за изнасяне от Words в HTML Name[ca]=Filtre d'exportació HTML per al Words +Name[ca@valencia]=Filtre d'exportació HTML per al Words Name[cs]=Exportní filtr HTML pro Words Name[da]=HTML-eksportfilter til Words Name[de]=Words HTML-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation HTML de Words Name[hu]=Words HTML exportszűrő Name[it]=Filtro di esportazione HTML per Words +Name[ja]=Words HTML エクスポートフィルタ Name[kk]=Words -> HTML экспорт сүзгісі Name[nb]=HTML-eksportfilter for Words Name[nds]=HTML-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Exportação de HTML para o Words Name[pt_BR]=Filtro de exportação de HTML para o Words Name[ru]=Фильтр экспорта документов Words в HTML +Name[sk]=HTML filter pre export z Words Name[sv]=Words HTML-exportfilter Name[uk]=Фільтр експорту HTML для Words Name[x-test]=xxWords HTML Export Filterxx diff -Nru calligra-2.4.0/filters/words/html/import/words_html_import.desktop calligra-2.4.3/filters/words/html/import/words_html_import.desktop --- calligra-2.4.0/filters/words/html/import/words_html_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/html/import/words_html_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words HTML Import Filter Name[bg]=Филтър за внасяне от HTML в Words Name[ca]=Filtre d'importació HTML per al Words +Name[ca@valencia]=Filtre d'importació HTML per al Words Name[cs]=Importní filtr HTML pro Words Name[da]=HTML-importfilter til Words Name[de]=Words HTML-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation HTML de Words Name[hu]=Words HTML importszűrő Name[it]=Filtro di importazione HTML per Words +Name[ja]=Words HTML インポートフィルタ Name[kk]=HTML -> Words импорт сүзгісі Name[nb]=HTML-importfilter for Words Name[nds]=HTML-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação de HTML para o Words Name[pt_BR]=Filtro de importação de HTML para o Words Name[ru]=Фильтр импорта файлов HTML в Words +Name[sk]=HTML filter pre import do Words Name[sv]=Words HTML-importfilter Name[uk]=Фільтр імпорту HTML для Words Name[x-test]=xxWords HTML Import Filterxx diff -Nru calligra-2.4.0/filters/words/html-odf/html-odf_export.desktop calligra-2.4.3/filters/words/html-odf/html-odf_export.desktop --- calligra-2.4.0/filters/words/html-odf/html-odf_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/html-odf/html-odf_export.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words HTML-ODF Export Filter Name[bg]=Филтър за изнасяне от Words в HTML-ODF Name[ca]=Filtre d'exportació HTML-ODF per al Words +Name[ca@valencia]=Filtre d'exportació HTML-ODF per al Words Name[cs]=Exportní filtr HTML-ODF pro Words Name[da]=HTML-ODF eksportfilter til Words Name[de]=Words HTML-ODF-Exportfilter @@ -11,8 +12,10 @@ Name[et]=Wordsi HTML-ODF-i ekspordifilter Name[fi]=HTML-ODF-vientisuodin Wordsiin Name[fr]=Filtre d'exportation HTML-ODF de Words +Name[gl]=Filtro de exportación de HTML-ODF para Words Name[hu]=Words HTML-ODF exportszűrő Name[it]=Filtro di esportazione HTML-ODF per Words +Name[ja]=Words HTML-ODF エクスポートフィルタ Name[kk]=Words -> HTML экспорт сүзгісі Name[nb]=HTML-ODF-eksportfilter for Words Name[nds]=HTML-ODF-Exportfilter för Words @@ -21,6 +24,7 @@ Name[pt]=Filtro de Exportação de HTML-ODF para o Words Name[pt_BR]=Filtro de exportação de HTML-ODF para o Words Name[ru]=Фильтр экспорта документов Words в HTML-ODF +Name[sk]=Exportný filter Words HTML-ODF Name[sv]=Words HTML-ODF-exportfilter Name[uk]=Фільтр експорту HTML-ODF для Words Name[x-test]=xxWords HTML-ODF Export Filterxx diff -Nru calligra-2.4.0/filters/words/kword1.3/import/kword_kword1dot3_import.desktop calligra-2.4.3/filters/words/kword1.3/import/kword_kword1dot3_import.desktop --- calligra-2.4.0/filters/words/kword1.3/import/kword_kword1dot3_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/kword1.3/import/kword_kword1dot3_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words's KWord 1.3 Import Filter Name[bg]=Филтър за внасяне от KWord 1.3 в Words Name[ca]=Filtre d'importació KWord 1.3 per al Words +Name[ca@valencia]=Filtre d'importació KWord 1.3 per al Words Name[cs]=Importní filtr formátu KWord 1.3 pro Words Name[da]=KWord 1.3 importfilter til Words Name[de]=Words „KWord 1.3“-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation Words1.3 de Words Name[hu]=Words KWord 1.3 importszűrő Name[it]=Filtro di importazione KWord 1.3 per Words +Name[ja]=Words KWord 1.3 インポートフィルタ Name[kk]=KWord 1.3 -> Words импорт сүзгісі Name[nb]=KWord 1.3-importfilter for Words Name[nds]="KWord 1.3"-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de importação do KWord 1.3 para o Words Name[pt_BR]=Filtro de importação de KWord 1.3 para o Words Name[ru]=Фильтр импорта документов KWord 1.3 в Words +Name[sk]=AbiWord filter pre import do Words 1.3 Name[sv]=Words importfilter för KWord 1.3 Name[uk]=Фільтр імпорту KWord 1.3 для Words Name[x-test]=xxWords's KWord 1.3 Import Filterxx diff -Nru calligra-2.4.0/filters/words/latex/export/words_latex_export.desktop calligra-2.4.3/filters/words/latex/export/words_latex_export.desktop --- calligra-2.4.0/filters/words/latex/export/words_latex_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/latex/export/words_latex_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name=Words LATEX Export Filter Name[bg]=Филтър за изнасяне от Words в LATEX Name[ca]=Filtre d'exportació LATEX per al Words +Name[ca@valencia]=Filtre d'exportació LATEX per al Words Name[cs]=Exportní filtr LaTeX pro Words Name[da]=LaTeX-eksportfilter til Words Name[de]=Words LaTeX-Exportfilter @@ -18,6 +19,7 @@ Name[fr]=Filtre d'exportation LaTeX de Words Name[hu]=Words LaTeX exportszűrő Name[it]=Filtro di esportazione LaTeX per Words +Name[ja]=Words LATEX エクスポートフィルタ Name[kk]=Words -> LATEX экспорт сүзгісі Name[nb]=LaTeX-eksportfilter for Words Name[nds]=LaTeX-Exportfilter för Words @@ -26,6 +28,7 @@ Name[pt]=Filtro de Exportação de LATEX para o Words Name[pt_BR]=Filtro de exportação de LaTeX para o Words Name[ru]=Фильтр экспорта документов Words в LaTeX +Name[sk]=LaTeX filter pre export z Words Name[sv]=Words Latex-exportfilter Name[uk]=Фільтр експорту LATEX для Words Name[x-test]=xxWords LATEX Export Filterxx diff -Nru calligra-2.4.0/filters/words/latex/import/words_latex_import.desktop calligra-2.4.3/filters/words/latex/import/words_latex_import.desktop --- calligra-2.4.0/filters/words/latex/import/words_latex_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/latex/import/words_latex_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name=Words Latex Import Filter Name[bg]=Филтър за внасяне от Latex в Words Name[ca]=Filtre d'importació Latex per al Words +Name[ca@valencia]=Filtre d'importació Latex per al Words Name[cs]=Importní filtr formátu LaTeX pro Words Name[da]=LaTeX-importfilter til Words Name[de]=Words LaTeX-Importfilter @@ -18,6 +19,7 @@ Name[fr]=Filtre d'importation LaTeX deWords Name[hu]=Words LaTeX importszűrő Name[it]=Filtro di importazione LaTeX per Words +Name[ja]=Words LaTeX インポートフィルタ Name[kk]=Latex -> Words импорт сүзгісі Name[nb]=LaTeX-importfilter for Words Name[nds]=LaTeX-Importfilter för Words @@ -26,6 +28,7 @@ Name[pt]=Filtro de Importação de LATEX para o Words Name[pt_BR]=Filtro de importação de LaTeX para o Words Name[ru]=Фильтр импорта документов LaTeX в Words +Name[sk]=Latex filter pre import do Words Name[sv]=Words Latex-importfilter Name[uk]=Фільтр імпорту LaTeX для Words Name[x-test]=xxWords Latex Import Filterxx diff -Nru calligra-2.4.0/filters/words/msword-odf/words_msword-odf_import.desktop calligra-2.4.3/filters/words/msword-odf/words_msword-odf_import.desktop --- calligra-2.4.0/filters/words/msword-odf/words_msword-odf_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/msword-odf/words_msword-odf_import.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words MS Word-ODF Import Filter Name[bg]=Филтър за внасяне от MS Word-ODF в Words Name[ca]=Filtre d'importació MS Word-ODF per al Words +Name[ca@valencia]=Filtre d'importació MS Word-ODF per al Words Name[cs]=Importní filtr formátu MS Word-ODF pro Words Name[da]=MS Word-ODF-importfilter til Words Name[de]=Words MS-Word-ODF-Importfilter @@ -12,8 +13,10 @@ Name[et]=Wordsi MS Word-ODF impordifilter Name[fi]=MS Word-ODF -tuontisuodin Wordsiin Name[fr]=Filtre d'importation MS Word-ODF de Words +Name[gl]=Filtro de Importación de MS Word-ODF para Words Name[hu]=Words MS Word-ODF importszűrő Name[it]=Filtro di importazione MS Word-ODF per Words +Name[ja]=Words MS Word-ODF インポートフィルタ Name[kk]=MS Word-ODF -> Words импорт сүзгісі Name[nb]=MS Word ODF-importfilter for Words Name[nds]="Microsoft Word-ODF"-Importfilter för Words @@ -22,6 +25,7 @@ Name[pt]=Filtro de Importação de MS Word-ODF para o Words Name[pt_BR]=Filtro de importação de MS Word-ODF para o Words Name[ru]=Фильтр импорта документов MS Word-ODF в Words +Name[sk]=Importný filter Words MS Word-ODF Name[sv]=Words-importfilter för MS Word-ODF Name[uk]=Фільтр імпорту MS Word-ODF для Words Name[x-test]=xxWords MS Word-ODF Import Filterxx diff -Nru calligra-2.4.0/filters/words/mswrite/words_mswrite_export.desktop calligra-2.4.3/filters/words/mswrite/words_mswrite_export.desktop --- calligra-2.4.0/filters/words/mswrite/words_mswrite_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/mswrite/words_mswrite_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words Microsoft Write Export Filter Name[bg]=Филтър за изнасяне от Words в Microsoft Write Name[ca]=Filtre d'exportació Microsoft Write per al Words +Name[ca@valencia]=Filtre d'exportació Microsoft Write per al Words Name[cs]=Exportní filtr formátu MS Write pro Words Name[da]=Microsoft Write-eksportfilter til Words Name[de]=Words MS-Write-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation MS-Write de Words Name[hu]=Words Microsoft Write exportszűrő Name[it]=Filtro di esportazione Microsoft Write per Words +Name[ja]=Words Microsoft Write エクスポートフィルタ Name[kk]=Words -> Microsoft Write экспорт сүзгісі Name[nb]=Microsoft Write-eksportfilter for Words Name[nds]="Microsoft Write"-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Exportação de Microsoft Write para o Words Name[pt_BR]=Filtro de exportação de Microsoft Write para o Words Name[ru]=Фильтр экспорта документов Words в Microsoft Write +Name[sk]=Microsoft Write filter pre export z Words Name[sv]=Words-exportfilter för Microsoft Write Name[uk]=Фільтр експорту MS Word Write для Words Name[x-test]=xxWords Microsoft Write Export Filterxx diff -Nru calligra-2.4.0/filters/words/mswrite/words_mswrite_import.desktop calligra-2.4.3/filters/words/mswrite/words_mswrite_import.desktop --- calligra-2.4.0/filters/words/mswrite/words_mswrite_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/mswrite/words_mswrite_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words Microsoft Write Import Filter Name[bg]=Филтър за внасяне от Microsoft Write в Words Name[ca]=Filtre d'importació Microsoft Write per al Words +Name[ca@valencia]=Filtre d'importació Microsoft Write per al Words Name[cs]=Importní filtr Microsoft Write pro Words Name[da]=Microsoft Write-importfilter til Words Name[de]=Words MS-Write-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation MS-Write deWords Name[hu]=Words Microsoft Write importszűrő Name[it]=Filtro di importazione Microsoft Write per Words +Name[ja]=Words Microsoft Write インポートフィルタ Name[kk]=Microsoft Write -> Words импорт сүзгісі Name[nb]=Microsoft Write-importfilter for Words Name[nds]="Microsoft Write"-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação de Microsoft Write para o Words Name[pt_BR]=Filtro de importação de Microsoft Write para o Words Name[ru]=Фильтр импорта документов Microsoft Write в Words +Name[sk]=Microsoft Write filter pre import do Words Name[sv]=Words-importfilter för Microsoft Write Name[uk]=Фільтр імпорту Microsoft Write для Words Name[x-test]=xxWords Microsoft Write Import Filterxx diff -Nru calligra-2.4.0/filters/words/oowriter/words_oowriter_export.desktop calligra-2.4.3/filters/words/oowriter/words_oowriter_export.desktop --- calligra-2.4.0/filters/words/oowriter/words_oowriter_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/oowriter/words_oowriter_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=OpenOffice.org Writer Export Filter for Words Name[bg]=Филтър за изнасяне от Words в OpenOffice.org Writer Name[ca]=Filtre d'exportació OpenOffice.org Writer per al Words +Name[ca@valencia]=Filtre d'exportació OpenOffice.org Writer per al Words Name[cs]=Exportní filtr formátu OpenOffice.org Writer pro Words Name[da]=OpenOffice.org Writer eksportfilter til Words Name[de]=Words OpenOffice.org Writer-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation OpenOffice.org Writer pourWords Name[hu]=OpenOffice.org Writer exportszűrő a Wordshöz Name[it]=Filtro di esportazione OpenOffice.org Writer per Words +Name[ja]=Words のための OpenOffice.org Writer エクスポートフィルタ Name[kk]=Words -> OpenOffice.org Writer экспорт сүзгісі Name[nb]=OpenOffice.org Writer-eksportfilter for Words Name[nds]="OpenOffice.org Writer"-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação do OpenOffice.org Writer para o Words Name[pt_BR]=Filtro de importação de OpenOffice.org Writer para o Words Name[ru]=Фильтр экспорта документов Words в OpenOffice.org Writer +Name[sk]=OpenOffice.org exportný filter pre Words Name[sv]=OpenOffice.org Writer-importfilter för Words Name[uk]=Фільтр експорту OpenOffice.org Writer для Words Name[x-test]=xxOpenOffice.org Writer Export Filter for Wordsxx diff -Nru calligra-2.4.0/filters/words/oowriter/words_oowriter_import.desktop calligra-2.4.3/filters/words/oowriter/words_oowriter_import.desktop --- calligra-2.4.0/filters/words/oowriter/words_oowriter_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/oowriter/words_oowriter_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=OpenOffice.org Writer Import Filter for Words Name[bg]=Филтър за внасяне от OpenOffice.org Writer в Words Name[ca]=Filtre d'importació OpenOffice.org Writer per al Words +Name[ca@valencia]=Filtre d'importació OpenOffice.org Writer per al Words Name[cs]=Importní filtr formátu OpenOffice.org Writer pro Words Name[da]=OpenOffice.org Writer importfilter til Words Name[de]=Words OpenOffice.org Writer-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation OpenOffice.org pour Words Name[hu]=OpenOffice.org Writer importszűrő a Wordshöz Name[it]=Filtro di importazione OpenOffice.org Writer per Words +Name[ja]=Words のための OpenOffice.org Writer インポートフィルタ Name[kk]=OpenOffice.org Writer -> Words импорт сүзгісі Name[nb]=OpenOffice.org Writer-importfilter for Words Name[nds]="OpenOffice.org Writer"-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação do OpenOffice.org Writer para o Words Name[pt_BR]=Filtro de importação de OpenOffice.org Writer para o Words Name[ru]=Фильтр импорта документов OpenOffice.org Writer в Words +Name[sk]=OpenOffice.org Writer filter pre import z Words Name[sv]=OpenOffice.org Writer-importfilter för Words Name[uk]=Фільтр імпорту OpenOffice.org Writer для Words Name[x-test]=xxOpenOffice.org Writer Import Filter for Wordsxx diff -Nru calligra-2.4.0/filters/words/palmdoc/words_palmdoc_export.desktop calligra-2.4.3/filters/words/palmdoc/words_palmdoc_export.desktop --- calligra-2.4.0/filters/words/palmdoc/words_palmdoc_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/palmdoc/words_palmdoc_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words Palm Doc Export Filter Name[bg]=Филтър за изнасяне от Words в Palm Doc Name[ca]=Filtre d'exportació Palm Doc per al Words +Name[ca@valencia]=Filtre d'exportació Palm Doc per al Words Name[cs]=Exportní filtr Palm Doc pro Words Name[da]=Palm Doc-eksportfilter til Words Name[de]=Words Palm-Doc-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation Palm Doc de Words Name[hu]=Words Palm Doc exportszűrő Name[it]=Filtro di esportazione Palm Doc per Words +Name[ja]=Words Palm Doc エクスポートフィルタ Name[kk]=Words -> Palm Doc экспорт сүзгісі Name[nb]=Palm Doc-eksportfilter for Words Name[nds]="Palm Doc"-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Exportação de PalmDoc para o Words Name[pt_BR]=Filtro de exportação de PalmDoc para o Words Name[ru]=Фильтр экспорта документов Words в Palm Doc +Name[sk]=Palm Doc filter pre export z Words Name[sv]=Words-exportfilter för Palm-dokument Name[uk]=Фільтр експорту Palm Doc для Words Name[x-test]=xxWords Palm Doc Export Filterxx diff -Nru calligra-2.4.0/filters/words/palmdoc/words_palmdoc_import.desktop calligra-2.4.3/filters/words/palmdoc/words_palmdoc_import.desktop --- calligra-2.4.0/filters/words/palmdoc/words_palmdoc_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/palmdoc/words_palmdoc_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words Palm Doc Import Filter Name[bg]=Филтър за внасяне от Palm Doc в Words Name[ca]=Filtre d'importació Palm Doc per al Words +Name[ca@valencia]=Filtre d'importació Palm Doc per al Words Name[cs]=Importní filtr Palm Doc pro Words Name[da]=Palm Doc-importfilter til Words Name[de]=Words Palm-Doc-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation Palm Doc de Words Name[hu]=Words Palm Doc importszűrő Name[it]=Filtro di importazione Palm Doc per Word +Name[ja]=Words Palm Doc インポートフィルタ Name[kk]=Palm Doc -> Words импорт сүзгісі Name[nb]=Palm Doc importfilter for Words Name[nds]="Palm Doc"-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação de PalmDoc para o Words Name[pt_BR]=Filtro de importação de PalmDoc para o Words Name[ru]=Фильтр импорта документов Palm Doc в Words +Name[sk]=Palm Doc filter pre import do Words Name[sv]=Words-importfilter för Palm-dokument Name[uk]=Фільтр імпорту Palm Doc для Words Name[x-test]=xxWords Palm Doc Import Filterxx diff -Nru calligra-2.4.0/filters/words/rtf/export/words_rtf_export.desktop calligra-2.4.3/filters/words/rtf/export/words_rtf_export.desktop --- calligra-2.4.0/filters/words/rtf/export/words_rtf_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/rtf/export/words_rtf_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words RTF Export Filter Name[bg]=Филтър за изнасяне от Words в RTF Name[ca]=Filtre d'exportació RTF per al Words +Name[ca@valencia]=Filtre d'exportació RTF per al Words Name[cs]=Exportní filtr formátu RTF pro Words Name[da]=RTF-eksportfilter til Words Name[de]=Words RTF-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation RTF de Words Name[hu]=Words RTF exportszűrő Name[it]=Filtro di esportazione RTF per Words +Name[ja]=Words RTF エクスポートフィルタ Name[kk]=Words -> RTF экспорт сүзгісі Name[nb]=RTF-eksportfilter for Words Name[nds]=RTF-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Exportação de RTF para o Words Name[pt_BR]=Filtro de exportação de RTF para o Words Name[ru]=Фильтр экспорта документов Words в RTF +Name[sk]=RTF filter pre export z Words Name[sv]=Words RTF-exportfilter Name[uk]=Фільтр експорту RTF для Words Name[x-test]=xxWords RTF Export Filterxx diff -Nru calligra-2.4.0/filters/words/rtf/import/words_rtf_import.desktop calligra-2.4.3/filters/words/rtf/import/words_rtf_import.desktop --- calligra-2.4.0/filters/words/rtf/import/words_rtf_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/rtf/import/words_rtf_import.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words RTF Import Filter Name[bg]=Филтър за внасяне от RTF в Words Name[ca]=Filtre d'exportació RTF per al Words +Name[ca@valencia]=Filtre d'exportació RTF per al Words Name[cs]=Dialog exportního filtru RTF pro Words Name[da]=RTF-importfilter til Words Name[de]=Words RTF-Importfilter @@ -11,8 +12,10 @@ Name[et]=Wordsi RTF-i impordifilter Name[fi]=RTF-tuontisuodin Wordsiin Name[fr]=Filtre d'importation RTF de Words +Name[gl]=Filtro de importación de RTF para Words Name[hu]=Words RTF importszűrő Name[it]=Filtro di importazione RTF per Words +Name[ja]=Words RTF インポートフィルタ Name[kk]=RTF -> Words импорт сүзгісі Name[nb]=RTF-importfilter for Words Name[nds]=RTF-Importfilter för Words @@ -21,6 +24,7 @@ Name[pt]=Filtro de Importação de RTF para o Words Name[pt_BR]=Filtro de importação de RTF para o Words Name[ru]=Фильтр импорта документов RTF в Words +Name[sk]=RTF filter pre import do Words Name[sv]=Words RTF-importfilter Name[uk]=Фільтр експорту RTF для Words Name[x-test]=xxWords RTF Import Filterxx diff -Nru calligra-2.4.0/filters/words/starwriter/pole.cpp calligra-2.4.3/filters/words/starwriter/pole.cpp --- calligra-2.4.0/filters/words/starwriter/pole.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/filters/words/starwriter/pole.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -869,8 +869,8 @@ unsigned k = 109; unsigned mblock = header->mbat_start; for (unsigned r = 0; r < header->num_mbat; r++) { - unsigned long r = loadBigBlock(mblock, buffer2, bbat->blockSize); - if (r != bbat->blockSize) { + unsigned long sizeRead = loadBigBlock(mblock, buffer2, bbat->blockSize); + if (sizeRead != bbat->blockSize) { delete[] buffer2; return; } diff -Nru calligra-2.4.0/filters/words/starwriter/words_starwriter_import.desktop calligra-2.4.3/filters/words/starwriter/words_starwriter_import.desktop --- calligra-2.4.0/filters/words/starwriter/words_starwriter_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/starwriter/words_starwriter_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words StarWriter 5.x Import Filter Name[bg]=Филтър за внасяне от StarWriter 5.x в Words Name[ca]=Filtre d'importació StarWriter 5.x per al Words +Name[ca@valencia]=Filtre d'importació StarWriter 5.x per al Words Name[cs]=Importní filtr StarWriter 5.x pro Words Name[da]=StarWriter 5.x importfilter til Words Name[de]=Words StarWriter 5.x Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation StarWriter 5.x de Words Name[hu]=Words StarWriter 5.x importszűrő Name[it]=Filtro di importazione StarWriter 5.x per Words +Name[ja]=Words StarWriter 5.x インポートフィルタ Name[kk]=StarWriter 5.x -> Words импорт сүзгісі Name[nb]=StarWriter 5.x-importfilter for Words Name[nds]=StarWriter 5.x Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação do StarWriter 5.x para o Words Name[pt_BR]=Filtro de importação de StarWriter 5.x para o Words Name[ru]=Фильтр импорта документов StarWriter 5.x в Words +Name[sk]=StarWriter 5.x filter pre import do Words Name[sv]=Words-importfilter för StarWriter 5.x Name[uk]=Фільтр імпорту StarWriter 5.x для Words Name[x-test]=xxWords StarWriter 5.x Import Filterxx diff -Nru calligra-2.4.0/filters/words/wml/words_wml_export.desktop calligra-2.4.3/filters/words/wml/words_wml_export.desktop --- calligra-2.4.0/filters/words/wml/words_wml_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/wml/words_wml_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words WML Export Filter Name[bg]=Филтър за изнасяне от Words в WML Name[ca]=Filtre d'exportació WML per al Words +Name[ca@valencia]=Filtre d'exportació WML per al Words Name[cs]=Exportní filtr formátu WML pro Words Name[da]=WML-eksportfilter til Words Name[de]=Words WML-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation WML de Words Name[hu]=Words WML exportszűrő Name[it]=Filtro di esportazione WML per Words +Name[ja]=Words WML エクスポートフィルタ Name[kk]=Words -> WML экспорт сүзгісі Name[nb]=WML-eksportfilter for Words Name[nds]=WML-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Exportação de WML para o Words Name[pt_BR]=Filtro de exportação de WML para o Words Name[ru]=Фильтр экспорта документов Words в WML +Name[sk]=WML filter pre export z Words Name[sv]=Words WML-exportfilter Name[uk]=Фільтр експорту WML для Words Name[x-test]=xxWords WML Export Filterxx diff -Nru calligra-2.4.0/filters/words/wml/words_wml_import.desktop calligra-2.4.3/filters/words/wml/words_wml_import.desktop --- calligra-2.4.0/filters/words/wml/words_wml_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/wml/words_wml_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words WML Import Filter Name[bg]=Филтър за внасяне от WML в Words Name[ca]=Filtre d'importació WML per al Words +Name[ca@valencia]=Filtre d'importació WML per al Words Name[cs]=Importní filtr formátu WML pro Words Name[da]=WML-importfilter til Words Name[de]=Words WML-Importfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'importation WML de Words Name[hu]=Words WML importszűrő Name[it]=Filtro di importazione WML per Words +Name[ja]=Words WML インポートフィルタ Name[kk]=WML -> Words импорт сүзгісі Name[nb]=WML-importfilter for Words Name[nds]=WML-Importfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Importação de WML para o Words Name[pt_BR]=Filtro de importação de WML para o Words Name[ru]=Фильтр импорта файлов WML в Words +Name[sk]=WML filter pre import do Words Name[sv]=Words WML-importfilter Name[uk]=Фільтр імпорту WML для Words Name[x-test]=xxWords WML Import Filterxx diff -Nru calligra-2.4.0/filters/words/wordperfect/export/words_wp_export.desktop calligra-2.4.3/filters/words/wordperfect/export/words_wp_export.desktop --- calligra-2.4.0/filters/words/wordperfect/export/words_wp_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/wordperfect/export/words_wp_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words WordPerfect Export Filter Name[bg]=Филтър за изнасяне от Words в WordPerfect Name[ca]=Filtre d'exportació WordPerfect per al Words +Name[ca@valencia]=Filtre d'exportació WordPerfect per al Words Name[cs]=Exportní filtr WordPerfect pro Words Name[da]=WordPerfect-eksportfilter til Words Name[de]=Words WordPerfect-Exportfilter @@ -13,6 +14,7 @@ Name[fr]=Filtre d'exportation WordPerfect de Words Name[hu]=Words WordPerfect exportszűrő Name[it]=Filtro di esportazione WordPerfect per Words +Name[ja]=Words WordPerfect エクスポートフィルタ Name[kk]=Words -> WordPerfect экспорт сүзгісі Name[nb]=WordPerfect-eksportfilter for Words Name[nds]=WordPerfect-Exportfilter för Words @@ -21,6 +23,7 @@ Name[pt]=Filtro de Exportação de WordPerfect do Words Name[pt_BR]=Filtro de exportação de WordPerfect para o Words Name[ru]=Фильтр экспорта документов Words в WordPerfect +Name[sk]=AbiWord filter pre export z Words Name[sv]=Words-exportfilter för WordPerfect Name[uk]=Фільтр експорту WordPerfect для Words Name[x-test]=xxWords WordPerfect Export Filterxx diff -Nru calligra-2.4.0/filters/words/wordperfect/import/words_wp_import.desktop calligra-2.4.3/filters/words/wordperfect/import/words_wp_import.desktop --- calligra-2.4.0/filters/words/wordperfect/import/words_wp_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/words/wordperfect/import/words_wp_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Words WordPerfect Import Filter Name[bg]=Филтър за внасяне от WordPerfect в Words Name[ca]=Filtre d'importació WordPerfect per al Words +Name[ca@valencia]=Filtre d'importació WordPerfect per al Words Name[cs]=Importní filtr WordPerfect pro Words Name[da]=WordPerfect-importfilter til Words Name[de]=Words WordPerfect-Importfilter @@ -11,8 +12,10 @@ Name[et]=Wordsi WordPerfecti impordifilter Name[fi]=WordPerfect-tuontisuodin Wordsiin Name[fr]=Filtre d'importation WordPerfect de Words +Name[gl]=Filtro de Importación de WordPerfect para Words Name[hu]=Words WordPerfect importszűrő Name[it]=Filtro di importazione WordPerfect per Words +Name[ja]=Words WordPerfect インポートフィルタ Name[kk]=WordPerfect -> Words импорт сүзгісі Name[nb]=WordPerfect-importfilter for Words Name[nds]=WordPerfect-Importfilter för Words @@ -21,6 +24,7 @@ Name[pt]=Filtro de Importação de WordPerfect para o Words Name[pt_BR]=Filtro de importação de WordPerfect para o Words Name[ru]=Фильтр импорта документов WordPerfect в Words +Name[sk]=AbiWord filter pre import do Words Name[sv]=Words-importfilter för WordPerfect Name[uk]=Фільтр імпорту WordPerfect для Words Name[x-test]=xxWords WordPerfect Import Filterxx diff -Nru calligra-2.4.0/filters/xsltfilter/export/xslt_export.desktop calligra-2.4.3/filters/xsltfilter/export/xslt_export.desktop --- calligra-2.4.0/filters/xsltfilter/export/xslt_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/xsltfilter/export/xslt_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name=Calligra XSLT Export Filter Name[bg]=Филтър за изнасяне от Calligra в XSLT Name[ca]=Filtre d'exportació XSLT per al Calligra +Name[ca@valencia]=Filtre d'exportació XSLT per al Calligra Name[cs]=Exportní filtr typu XSLT pro Calligra Name[da]=XSLT-eksportfilter til Calligra Name[de]=Calligra XSLT-Exportfilter @@ -17,8 +18,10 @@ Name[et]=Calligra XSLT ekspordifilter Name[fi]=XSLT-vientisuodin Calligraan Name[fr]=Filtre d'exportation XSLT de Calligra +Name[gl]=Filtro de exportación de XSLT para Calligra Name[hu]=Calligra XSLT exportszűrő Name[it]=Filtro di esportazione XSLT per Calligra +Name[ja]=Calligra XSLT エクスポートフィルタ Name[kk]=Calligra -> XSLT экспорт сүзгісі Name[nb]=XSLT-eksportfilter for Calligra Name[nds]=XSLT-Exportfilter för Calligra @@ -27,6 +30,7 @@ Name[pt]=Filtro de Exportação de XSLT para o Calligra Name[pt_BR]=Filtro de exportação de XSLT para o Calligra Name[ru]=Фильтр экспорта документов Calligra посредством XSLT +Name[sk]=XSLT filter pre export z Words Name[sv]=Calligra XSLT-exportfilter Name[uk]=Фільтр експорту XSLT для Calligra Name[x-test]=xxCalligra XSLT Export Filterxx diff -Nru calligra-2.4.0/filters/xsltfilter/import/xslt_import.desktop calligra-2.4.3/filters/xsltfilter/import/xslt_import.desktop --- calligra-2.4.0/filters/xsltfilter/import/xslt_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/filters/xsltfilter/import/xslt_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name=Calligra XSLT Import Filter Name[bg]=Филтър за внасяне от XSLT в Calligra Name[ca]=Filtre d'importació XSLT per al Calligra +Name[ca@valencia]=Filtre d'importació XSLT per al Calligra Name[cs]=Importní filtr typu XSLT pro Calligra Name[da]=XSLT-importfilter til Calligra Name[de]=Calligra XSLT-Importfilter @@ -16,8 +17,10 @@ Name[et]=Calligra XSLT impordifilter Name[fi]=XSLT-tuontisuodin Calligraan Name[fr]=Filtre d'importation XSLT de Calligra +Name[gl]=Filtro de importación de XSLT para Words Name[hu]=Calligra XSLT importszűrő Name[it]=Filtro di importazione XSLT per Calligra +Name[ja]=Calligra XSLT インポートフィルタ Name[kk]=XSLT -> Calligra импорт сүзгісі Name[nb]=XSLT-importfilter for Calligra Name[nds]=XSLT-Importfilter för Calligra @@ -26,6 +29,7 @@ Name[pt]=Filtro de Importação de XSLT para o Calligra Name[pt_BR]=Filtro de importação de XSLT para o Calligra Name[ru]=Фильтр импорта документов Calligra посредством XSLT +Name[sk]=XSLT filter pre import do Words Name[sv]=Calligra XSLT-importfilter Name[uk]=Фільтр експорту XSLT для Calligra Name[x-test]=xxCalligra XSLT Import Filterxx diff -Nru calligra-2.4.0/flow/flow_dock.desktop calligra-2.4.3/flow/flow_dock.desktop --- calligra-2.4.0/flow/flow_dock.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/flow_dock.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ X-KDE-ServiceType=Flow/Dock Comment=Docker for Flow Comment[ca]=Amarrador per al Flow +Comment[ca@valencia]=Amarrador per al Flow Comment[cs]=Dok pro Proud Comment[da]=Dokker til Flow Comment[de]=Docker für Flow @@ -11,8 +12,10 @@ Comment[et]=Flow dokk Comment[fi]=Flow-telakoija Comment[fr]=Panneau pour Flow +Comment[gl]=Docker para Flow Comment[hu]=Dokkoló a Flowhoz Comment[it]=Gancio per Flow +Comment[ja]=Flow のドッキングパネル Comment[kk]=Flow-дың докері Comment[nb]=Dokker for Flow Comment[nds]=Andockmoduul för Flow @@ -21,6 +24,7 @@ Comment[pt]=Acoplador para o Flow Comment[pt_BR]=Acoplador para o Flow Comment[ru]=Панель для Flow +Comment[sk]=Docker pre Flow Comment[sv]=Dockningsfönster för Flow Comment[uk]=Бічна панель Flow Comment[x-test]=xxDocker for Flowxx diff -Nru calligra-2.4.0/flow/part/flow.desktop calligra-2.4.3/flow/part/flow.desktop --- calligra-2.4.0/flow/part/flow.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/part/flow.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Type=Application Name=Calligra Flow Name[ca]=Flux del Calligra +Name[ca@valencia]=Flux del Calligra Name[cs]=Calligra Flow Name[da]=Calligra Flow Name[de]=Calligra Flow @@ -10,8 +11,10 @@ Name[et]=Calligra Flow Name[fi]=Calligra Flow Name[fr]=Calligra Flow +Name[gl]=Calligra Flow Name[hu]=Calligra Flow Name[it]=Calligra Flow +Name[ja]=Calligra Flow Name[kk]=Calligra Flow Name[nb]=Calligra Flow Name[nds]=Calligra-Flow @@ -20,6 +23,7 @@ Name[pt]=Calligra Flow Name[pt_BR]=Calligra Flow Name[ru]=Calligra Flow +Name[sk]=Calligra Flow Name[sv]=Calligra Flow Name[uk]=Calligra Flow Name[x-test]=xxCalligra Flowxx @@ -29,6 +33,7 @@ GenericName=Flowchart & Diagram Editing GenericName[bg]=Редактиране на блоксхеми и диаграми GenericName[ca]=Editor de diagrames de fluxos +GenericName[ca@valencia]=Editor de diagrames de fluxos GenericName[cs]=Editor nákresů a diagramů GenericName[cy]=Golygu Siartiau Llif & Diagram GenericName[da]=Flydediagrammer & diagramredigering @@ -40,11 +45,11 @@ GenericName[et]=Skeemide redigeerimine GenericName[eu]=Fluxu-diagramen eta diagramen edizioa GenericName[fa]=روندنما و ویرایش نمودار -GenericName[fi]=Vuokaavioiden ja kaavioiden piirtäminen +GenericName[fi]=Kaavioiden piirtäminen GenericName[fr]=Conception de diagrammes et de tableaux GenericName[fy]=Bewurkje fan (stroom)diagrammen GenericName[ga]=Eagarthóireacht Sreabhchairteacha agus Léaráidí -GenericName[gl]=Criación e Edición de Diagramas de Fluxo +GenericName[gl]=Creación e Edición de Diagramas de Fluxo GenericName[he]=עריכת תרשימי זרימה ודיאגרמות GenericName[hi]=फ्लोचार्ट व डायग्राम संपादन GenericName[hne]=फ्लोचार्ट अउ डायग्राम संपादन diff -Nru calligra-2.4.0/flow/part/flowpart.desktop calligra-2.4.3/flow/part/flowpart.desktop --- calligra-2.4.0/flow/part/flowpart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/part/flowpart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Calligra Flowchart & Diagram Editing Component Name[bg]=Компонент за блоксхеми и диаграми в Calligra Name[ca]=Component d'edició de diagrames de fluxos i diagrames del Calligra +Name[ca@valencia]=Component d'edició de diagrames de fluxos i diagrames del Calligra Name[cs]=Komponenta editoru nákresů a diagramů Calligra Name[da]=Calligra-komponent til redigering af diagrammer Name[de]=Calligra-Komponente für Flussdiagramme & Diagrammbearbeitung @@ -10,8 +11,10 @@ Name[et]=Calligra skeemide redigeerimise komponent Name[fi]=Calligran kaavionpiirtämisosa Name[fr]=Composant conception de diagrammes et de tableaux de Calligra +Name[gl]=Compoñente de diagramas e diagramas de fluxo de Calligra Name[hu]=Calligra folyamatábra- és diagramkészítő komponens Name[it]=Componente per la modifica di diagrammi di flusso di Calligra +Name[ja]=Calligra フローチャート & ダイアグラム編集コンポーネント Name[kk]=Calligra-ның сұлба және диаграмма өңдеу бағдарламасы Name[nb]=Calligra-komponent for flytskjema- og diagramredigering Name[nds]=Calligra-Komponent för Afloopdiagrammen un Diagrammbewerken @@ -20,6 +23,7 @@ Name[pt]=Componente de Fluxogramas e Edição de Diagramas do Calligra Name[pt_BR]=Componente de edição de fluxogramas e diagramas do Calligra Name[ru]=Компонент редактирования диаграмм и блок-схем в Calligra +Name[sk]=Komponent na editovanie vývojových diagramov Calligra Name[sv]=Calligra flödesschema- och diagramredigeringskomponent Name[uk]=Компонент редагування діаграм та блок-схем Calligra Name[x-test]=xxCalligra Flowchart & Diagram Editing Componentxx @@ -36,6 +40,7 @@ GenericName=Flowchart & Diagram GenericName[bg]=Блоксхеми и диаграми GenericName[ca]=Editor de diagrames de fluxos i diagrames +GenericName[ca@valencia]=Editor de diagrames de fluxos i diagrames GenericName[cs]=Nákresy a diagramy GenericName[cy]=Siart Llif & Diagram GenericName[da]=Flydediagrammer & diagrammer diff -Nru calligra-2.4.0/flow/plugins/dockers/flowdockersplugin.desktop calligra-2.4.3/flow/plugins/dockers/flowdockersplugin.desktop --- calligra-2.4.0/flow/plugins/dockers/flowdockersplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/plugins/dockers/flowdockersplugin.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,15 +1,19 @@ [Desktop Entry] Name=Flow Dockers plugin Name[ca]=Connector de Dockers per al Flow +Name[ca@valencia]=Connector de Dockers per al Flow Name[da]=Dokker-plugin til Flow Name[de]=Flow-Docker-Modul Name[el]=Πρόσθετο προσάρτησης του Flow Name[en_GB]=Flow Dockers plugin Name[es]=Complemento de ventanas acoplables de Flow Name[et]=Flow dokkide plugin +Name[fi]=Flow’n telakointiliitännäinen Name[fr]=Module externe de panneaux +Name[gl]=Engadido Flow Dockers Name[hu]=Flow dokkoló bővítmény Name[it]=Estensione per i ganci di Flow +Name[ja]=Flow ドッキングパネル・プラグイン Name[kk]=Flow докерлер плагині Name[nb]=Flow Dockers programtillegg Name[nds]=Andockmoduul för Flow @@ -18,6 +22,7 @@ Name[pt]='Plugin' de Módulos Acopláveis do Flow Name[pt_BR]=Plugin de módulos acopláveis do Flow Name[ru]=Модуль панелей Flow +Name[sk]=Plugin dockerov Flow Name[sv]=Flow dockningsinsticksprogram Name[uk]=Додаток панелей Flow Name[x-test]=xxFlow Dockers pluginxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-chevron.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-chevron.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-chevron.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-chevron.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Chevron Name[bg]=Нашивка Name[ca]=Galó +Name[ca@valencia]=Galó Name[cs]=Krokev Name[da]=Chevron Name[de]=Chevron diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-down.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-down.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-down.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-down.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Down Arrow Name[bg]=Стрелка надолу Name[ca]=Fletxa avall +Name[ca@valencia]=Fletxa avall Name[cs]=Šipka dolů Name[da]=Pil ned Name[de]=Pfeil nach unten @@ -20,6 +21,7 @@ Name[pt]=Seta-Baixo Name[pt_BR]=Seta para baixo Name[ru]=Стрелка вниз +Name[sk]=Šípka dole Name[sv]=Neråtpil Name[ug]=ئاستى يا ئوق Name[uk]=Стрілка вниз diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-left.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-left.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-left.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-left.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Left Arrow Name[bg]=Стрелка наляво Name[ca]=Fletxa esquerra +Name[ca@valencia]=Fletxa esquerra Name[cs]=Šipka doleva Name[da]=Pil til venstre Name[de]=Pfeil nach links @@ -10,6 +11,7 @@ Name[et]=Nool vasakule Name[fi]=Nuoli vasemmalle Name[fr]=Flèche gauche +Name[gl]=Frecha esquerda Name[hu]=Balra nyíl Name[it]=Freccia a sinistra Name[kk]=Сол жақ жебесі @@ -20,6 +22,7 @@ Name[pt]=Seta-Esquerda Name[pt_BR]=Seta à esquerda Name[ru]=Стрелка влево +Name[sk]=Šípka doľava Name[sv]=Vänsterpil Name[ug]=سول يا ئوق Name[uk]=Стрілка ліворуч diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-left-notched.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-left-notched.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-left-notched.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-left-notched.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Notched Left Arrow Name[bg]=Назъбена стрелка наляво Name[ca]=Fletxa esquerra dentada +Name[ca@valencia]=Fletxa esquerra dentada Name[da]=Hakket pil til venstre Name[de]=Eingekerbter Pfeil nach links Name[el]=Χαραγμένο αριστερό βέλος @@ -17,6 +18,7 @@ Name[pt]=Seta Esquerda Dobrada Name[pt_BR]=Seta entalhada para a esquerda Name[ru]=Стрелка влево с вырезом +Name[sk]=Zrezaná šípka vľavo Name[sv]=Vänsterpil med skåra Name[uk]=Стрілка ліворуч з вирізом Name[x-test]=xxNotched Left Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-left-right.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-left-right.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-left-right.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-left-right.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Left-Right Arrow Name[bg]=Стрелка наляво-надясно Name[ca]=Fletxa de esquerra-dreta +Name[ca@valencia]=Fletxa d'esquerra-dreta Name[da]=Pil til venstre-højre Name[de]=Pfeil nach links und rechts Name[el]=Αριστερό-δεξί βέλος @@ -18,6 +19,7 @@ Name[pt]=Seta Esquerda-Direita Name[pt_BR]=Seta Esquerda-Direita Name[ru]=Стрелки влево и вправо +Name[sk]=Šípka vľavo-vpravo Name[sv]=Vänster-högerpil Name[uk]=Стрілки ліворуч і праворуч Name[x-test]=xxLeft-Right Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-left-right-up.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-left-right-up.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-left-right-up.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-left-right-up.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Left-Right-Up Arrow Name[bg]=Стрелка наляво-надясно-нагоре Name[ca]=Fletxa esquerra-dreta-dalt +Name[ca@valencia]=Fletxa esquerra-dreta-dalt Name[da]=Pil til venstre-højre-op Name[de]=Pfeil nach links, rechts und oben Name[el]=Αριστερό-δεξί-πάνω βέλος @@ -18,6 +19,7 @@ Name[pt]=Seta Esquerda-Direita-Cima Name[pt_BR]=Seta Esquerda-Direita-Cima Name[ru]=Стрелка влево, вправо и вверх +Name[sk]=Šípka vpravo-hore Name[sv]=Vänster-höger-uppåtpil Name[uk]=Стрілки ліворуч, праворуч і вгору Name[x-test]=xxLeft-Right-Up Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-left-up.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-left-up.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-left-up.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-left-up.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Left-Up Arrow Name[bg]=Стрелка наляво-нагоре Name[ca]=Fletxa esquerra-dalt +Name[ca@valencia]=Fletxa esquerra-dalt Name[da]=Pil til venstre-op Name[de]=Pfeil nach links und oben Name[el]=Αριστερό-πάνω βέλος @@ -19,6 +20,7 @@ Name[pt]=Seta Esquerda-Cima Name[pt_BR]=Seta Esquerda-Cima Name[ru]=Стрелка влево и вверх +Name[sk]=Šípka vľavo-hore Name[sv]=Vänster-uppåtpil Name[uk]=Стрілки ліворуч і вгору Name[x-test]=xxLeft-Up Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-pentagon.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-pentagon.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-pentagon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-pentagon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,15 @@ Name=Pentagon Name[bg]=Петоъгълник Name[ca]=Pentàgon +Name[ca@valencia]=Pentàgon Name[cs]=Pětiúhelník Name[da]=Femkant Name[de]=Fünfeck Name[el]=Πεντάγωνο Name[es]=Pentágono Name[et]=Viisnurk +Name[fi]=Viisikulmio +Name[gl]=Pentágono Name[hu]=Ötszög Name[it]=Pentagono Name[kk]=Бесбұрыш @@ -18,6 +21,7 @@ Name[pt]=Pentágono Name[pt_BR]=Pentágono Name[ru]=Пятиугольник +Name[sk]=Päťuholník Name[sv]=Femhörning Name[ug]=بەش تەرەپلىك Name[uk]=П’ятикутник diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-quad.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-quad.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-quad.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-quad.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Quad Arrow Name[bg]=Четворна стрелка Name[ca]=Fletxa quad +Name[ca@valencia]=Fletxa quad Name[da]=Pil i fire retninger Name[de]=Pfeil in alle vier Richtungen Name[el]=Τετραπλό βέλος @@ -17,6 +18,7 @@ Name[pt]=Seta Quádrupla Name[pt_BR]=Seta Quádrupla Name[ru]=Стрелки в четыре стороны +Name[sk]=Štvoritá šípka Name[sv]=Fyrdubbel pil Name[uk]=Стрілки у чотири боки Name[x-test]=xxQuad Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-right.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-right.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-right.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-right.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Right Arrow Name[bg]=Стрелка надясно Name[ca]=Fletxa dreta +Name[ca@valencia]=Fletxa dreta Name[cs]=Šipka doprava Name[da]=Pil til højre Name[de]=Pfeil nach rechts @@ -9,6 +10,7 @@ Name[es]=Flecha derecha Name[et]=Nool paremale Name[fr]=Flèche droit +Name[gl]=Frecha dereita Name[hu]=Jobbra nyíl Name[it]=Freccia a destra Name[kk]=Оң жақ жебесі @@ -19,6 +21,7 @@ Name[pt]=Seta Direita Name[pt_BR]=Seta à direita Name[ru]=Стрелка вправо +Name[sk]=Šípka doprava Name[sv]=Högerpil Name[ug]=ئوڭ يا ئوق Name[uk]=Стрілка праворуч diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-right-notched.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-right-notched.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-right-notched.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-right-notched.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Notched Right Arrow Name[bg]=Назъбена стрелка надясно Name[ca]=Fletxa dreta dentada +Name[ca@valencia]=Fletxa dreta dentada Name[da]=Hakket pil til højre Name[de]=Eingekerbter Pfeil nach rechts Name[el]=Χαραγμένο δεξί βέλος @@ -17,6 +18,7 @@ Name[pt]=Seta Direita Dobrada Name[pt_BR]=Seta entalhada para a direita Name[ru]=Стрелка вправо с вырезом +Name[sk]=Zrezaná šípka vpravo Name[sv]=Högerpil med skåra Name[ug]=ھەرە چىشى ئوڭ ئىسترېلكا Name[uk]=Стрілка праворуч з вирізом diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-turn-up.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-turn-up.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-turn-up.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-turn-up.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Turn-Up Arrow Name[ca]=Fletxa cap amunt +Name[ca@valencia]=Fletxa cap amunt Name[da]=Pil der drejer op Name[el]=Στραμμένο άνω βέλος Name[es]=Flecha doblada hacia arriba @@ -15,6 +16,7 @@ Name[pt]=Seta para Cima Name[pt_BR]=Seta virar para cima Name[ru]=Стрелка, поворачивающая вверх +Name[sk]=Šípka otočiť hore Name[sv]=Uppåtsvängd pil Name[uk]=Стрілка «поворот вгору» Name[x-test]=xxTurn-Up Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-up.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-up.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-up.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-up.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,15 @@ Name=Up Arrow Name[bg]=Стрелка нагоре Name[ca]=Fletxa amunt +Name[ca@valencia]=Fletxa amunt Name[cs]=Šipka nahoru Name[da]=Pil op Name[de]=Pfeil nach oben Name[el]=Πάνω βέλος Name[es]=Flecha arriba Name[et]=Nool üles +Name[fi]=Nuoli ylös +Name[gl]=Frecha cara a arriba Name[hu]=Felfelé nyíl Name[it]=Freccia in su Name[kk]=Жоғары жебесі @@ -18,6 +21,7 @@ Name[pt]=Seta Cima Name[pt_BR]=Seta para cima Name[ru]=Стрелка вверх +Name[sk]=Šípka hore Name[sv]=Uppåtpil Name[ug]=ئۈستى يا ئوق Name[uk]=Стрілка вгору diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-up-down.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-up-down.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-up-down.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-up-down.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Up-Down Arrow Name[bg]=Стрелка нагоре-надолу Name[ca]=Fletxa dalt-baix +Name[ca@valencia]=Fletxa dalt-baix Name[da]=Pil op-ned Name[de]=Pfeil nach oben und unten Name[el]=Πάνω-κάτω βέλος Name[es]=Flecha arriba-abajo Name[et]=Nool üles-alla +Name[fi]=Nuoli ylös ja alas Name[hu]=Lefelé kanyarodó nyíl Name[it]=Freccia in su e in giù Name[kk]=Жоғары-Төмен жақты жебесі @@ -17,6 +19,7 @@ Name[pt]=Seta Cima-Baixo Name[pt_BR]=Seta cima-baixo Name[ru]=Стрелка вверх и вниз +Name[sk]=Šípka hore-dolu Name[sv]=Uppåt-neråtpil Name[uk]=Стрілки вгору і вниз Name[x-test]=xxUp-Down Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/arrow-up-down-left.desktop calligra-2.4.3/flow/stencils/Assorted/arrow-up-down-left.desktop --- calligra-2.4.0/flow/stencils/Assorted/arrow-up-down-left.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/arrow-up-down-left.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Up-Down-Left Arrow Name[bg]=Стрелка нагоре-надолу-наляво Name[ca]=Fletxa dalt-baix-esquerra +Name[ca@valencia]=Fletxa dalt-baix-esquerra Name[da]=Pil til op-ned-venstre Name[de]=Pfeil nach oben, unten und links Name[el]=Πάνω-κάτω-αριστερά βέλος Name[es]=Flecha arriba-abajo-izquierda Name[et]=Nool üles-alla-vasakule +Name[fi]=Nuoli ylös, alas ja vasemmalle Name[hu]=Fel-le-balra nyíl Name[it]=Freccia in su, in giù e a sinistra Name[kk]=Жоғары-Төмен-Сол жақты жебесі @@ -17,6 +19,7 @@ Name[pt]=Seta Cima-Baixo-Esquerda Name[pt_BR]=Seta cima-baixo-esquerda Name[ru]=Стрелка вверх, вниз и влево +Name[sk]=Šípka hore-dolu-vľavo Name[sv]=Uppåt-neråt-vänsterpil Name[uk]=Стрілки вгору, вниз і ліворуч Name[x-test]=xxUp-Down-Left Arrowxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/circle.desktop calligra-2.4.3/flow/stencils/Assorted/circle.desktop --- calligra-2.4.0/flow/stencils/Assorted/circle.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/circle.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Perfect Circle Name[bg]=Окръжност Name[ca]=Cercle perfecte +Name[ca@valencia]=Cercle perfecte Name[cs]=Dokonalý kruh Name[da]=Perfekt cirkel Name[de]=Perfekter Kreis @@ -9,6 +10,7 @@ Name[es]=Círculo perfecto Name[et]=Ring Name[fi]=Täydellinen ympyrä +Name[gl]=Círculo perfecto Name[hu]=Teljes kör Name[it]=Cerchio perfetto Name[kk]=Толық шеңбер @@ -19,6 +21,7 @@ Name[pt]=Círculo Perfeito Name[pt_BR]=Círculo perfeito Name[ru]=Идеальная окружность +Name[sk]=Dokonalý kruh Name[sv]=Perfekt cirkel Name[uk]=Ідеальне коло Name[x-test]=xxPerfect Circlexx diff -Nru calligra-2.4.0/flow/stencils/Assorted/circle-quarter.desktop calligra-2.4.3/flow/stencils/Assorted/circle-quarter.desktop --- calligra-2.4.0/flow/stencils/Assorted/circle-quarter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/circle-quarter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Quarter Circle Name[bg]=Четвърт окръжност Name[ca]=Quart de cercle +Name[ca@valencia]=Quart de cercle Name[cs]=Čtvrtinový kruh Name[da]=Kvartcirkel Name[de]=Viertelkreis @@ -10,6 +11,7 @@ Name[et]=Veerandring Name[fi]=Neljännesympyrä Name[fr]=Quart de cercle +Name[gl]=Cuarto de círculo Name[hu]=Negyedkör Name[it]=Quarto di cerchio Name[kk]=Ширек секторы @@ -20,6 +22,7 @@ Name[pt]=Quarto de Círculo Name[pt_BR]=Quarto de círculo Name[ru]=Четверть окружности +Name[sk]=Štvrťkruh Name[sv]=Kvartscirkel Name[uk]=Чвертьколо Name[x-test]=xxQuarter Circlexx diff -Nru calligra-2.4.0/flow/stencils/Assorted/collection.desktop calligra-2.4.3/flow/stencils/Assorted/collection.desktop --- calligra-2.4.0/flow/stencils/Assorted/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/collection.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,14 @@ Name=Assorted Name[bg]=Разнородни Name[ca]=Assortit +Name[ca@valencia]=Assortit Name[da]=Diverse Name[de]=Diverses Name[el]=Διάφορα Name[es]=Variado Name[et]=Valikkogu +Name[fi]=Sekalaista 1 +Name[gl]=Variados Name[hu]=Vegyes Name[it]=Varie Name[kk]=Түрлі басқа @@ -17,6 +20,7 @@ Name[pt]=Seleccionada Name[pt_BR]=Variados Name[ru]=Разное +Name[sk]=Zmiešané Name[sv]=Diverse Name[uk]=Різне Name[x-test]=xxAssortedxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/cross-maltese.desktop calligra-2.4.3/flow/stencils/Assorted/cross-maltese.desktop --- calligra-2.4.0/flow/stencils/Assorted/cross-maltese.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/cross-maltese.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Maltese Cross Name[bg]=Малтийски кръст Name[ca]=Creu maltesa +Name[ca@valencia]=Creu maltesa Name[cs]=Maltézský kříž Name[da]=Malteserkors Name[de]=Malteserkreuz @@ -19,6 +20,7 @@ Name[pt]=Cruz de Malta Name[pt_BR]=Cruz de Malta Name[ru]=Мальтийский крест +Name[sk]=Maltézsky kríž Name[sv]=Malteserkors Name[ug]=مالتا كىروسى Name[uk]=Мальтійський хрест diff -Nru calligra-2.4.0/flow/stencils/Assorted/cross-swiss.desktop calligra-2.4.3/flow/stencils/Assorted/cross-swiss.desktop --- calligra-2.4.0/flow/stencils/Assorted/cross-swiss.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/cross-swiss.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Swiss Cross Name[bg]=Швейцарски кръст Name[ca]=Creu suïssa +Name[ca@valencia]=Creu suïssa Name[cs]=Švýcarský kříž Name[da]=Schweizerkors Name[de]=Schweizer Kreuz @@ -19,6 +20,7 @@ Name[pt]=Cruz Suíça Name[pt_BR]=Cruz Suíça Name[ru]=Швейцарский крест +Name[sk]=Švajčiarsky kríž Name[sv]=Schweizerkors Name[ug]=شىۋېتسىيە كىروسى Name[uk]=Швейцарський хрест diff -Nru calligra-2.4.0/flow/stencils/Assorted/diamond.desktop calligra-2.4.3/flow/stencils/Assorted/diamond.desktop --- calligra-2.4.0/flow/stencils/Assorted/diamond.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/diamond.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Diamond Name[bg]=Диамант Name[ca]=Diamant +Name[ca@valencia]=Diamant Name[cs]=Diamant Name[da]=Diamant Name[de]=Diamant @@ -9,6 +10,7 @@ Name[es]=Diamante Name[et]=Romb Name[fi]=Timantti +Name[gl]=Diamante Name[hu]=Gyémánt Name[it]=Diamante Name[kk]=Ромб @@ -19,6 +21,7 @@ Name[pt]=Diamante Name[pt_BR]=Diamante Name[ru]=Ромб +Name[sk]=Diamant Name[sv]=Ruter Name[ug]=رومبا Name[uk]=Бубни diff -Nru calligra-2.4.0/flow/stencils/Assorted/heart.desktop calligra-2.4.3/flow/stencils/Assorted/heart.desktop --- calligra-2.4.0/flow/stencils/Assorted/heart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/heart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Heart Name[bg]=Сърце Name[ca]=Cor +Name[ca@valencia]=Cor Name[cs]=Srdce Name[da]=Hjerte Name[de]=Herz @@ -10,6 +11,7 @@ Name[et]=Süda Name[fi]=Sydän Name[fr]=Coeur +Name[gl]=Corazón Name[hu]=Szív Name[it]=Cuore Name[kk]=Жүрек @@ -20,6 +22,7 @@ Name[pt]=Coração Name[pt_BR]=Coração Name[ru]=Сердце +Name[sk]=Srdce Name[sv]=Hjärter Name[ug]=يۈرەك Name[uk]=Черви diff -Nru calligra-2.4.0/flow/stencils/Assorted/heptagon.desktop calligra-2.4.3/flow/stencils/Assorted/heptagon.desktop --- calligra-2.4.0/flow/stencils/Assorted/heptagon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/heptagon.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Heptagon Name[bg]=Седмоъгълник Name[ca]=Heptàgon +Name[ca@valencia]=Heptàgon Name[cs]=Pětistěn Name[da]=Syvkant Name[de]=Siebeneck Name[el]=Επτάγωνο Name[es]=Heptágono Name[et]=Seitsenurk +Name[fi]=Seitsenkulmio Name[hu]=Hétszög Name[it]=Ettagono Name[kk]=Жетібұрыш @@ -18,6 +20,7 @@ Name[pt]=Heptágono Name[pt_BR]=Heptágono Name[ru]=Семиугольник +Name[sk]=Sedemuholník Name[sv]=Sjuhörning Name[uk]=Семикутник Name[x-test]=xxHeptagonxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/hexagon.desktop calligra-2.4.3/flow/stencils/Assorted/hexagon.desktop --- calligra-2.4.0/flow/stencils/Assorted/hexagon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/hexagon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,13 +2,16 @@ Name=Hexagon Name[bg]=Шестоъгълник Name[ca]=Hexàgon +Name[ca@valencia]=Hexàgon Name[cs]=Šestiúhelník Name[da]=Sekskant Name[de]=Sechseck Name[el]=Εξάγωνο Name[es]=Hexágono Name[et]=Kuusnurk +Name[fi]=Kuusikulmio Name[fr]=Hexagone +Name[gl]=Hexágono Name[hu]=Hatszög Name[it]=Esagono Name[kk]=Алтыбұрыш @@ -19,6 +22,7 @@ Name[pt]=Hexágono Name[pt_BR]=Hexágono Name[ru]=Шестиугольник +Name[sk]=Šesťuholník Name[sv]=Sexhörning Name[ug]=ئالتە تەرەپلىك Name[uk]=Шестикутник diff -Nru calligra-2.4.0/flow/stencils/Assorted/moon-quarter.desktop calligra-2.4.3/flow/stencils/Assorted/moon-quarter.desktop --- calligra-2.4.0/flow/stencils/Assorted/moon-quarter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/moon-quarter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Quarter Moon Name[bg]=Четвърт Луна Name[ca]=Quart de Lluna +Name[ca@valencia]=Quart de Lluna Name[da]=Kvartmåne Name[de]=Viertelmond Name[el]=Μισοφέγγαρο @@ -18,6 +19,7 @@ Name[pt]=Quarto de Lua Name[pt_BR]=Lua minguante Name[ru]=Четверть Луны +Name[sk]=Štvrťmesiac Name[sv]=Kvartsmåne Name[uk]=Чверть місяця Name[x-test]=xxQuarter Moonxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/octagon.desktop calligra-2.4.3/flow/stencils/Assorted/octagon.desktop --- calligra-2.4.0/flow/stencils/Assorted/octagon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/octagon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=Octogon Name[bg]=Осмоъгълник Name[ca]=Octògon +Name[ca@valencia]=Octògon Name[cs]=Osmiúhelník Name[da]=Oktogon Name[de]=Achteck Name[el]=Οκτάγωνο Name[es]=Octógono Name[et]=Kaheksanurk +Name[fi]=öKahdeksankulmio Name[fr]=Octogon Name[hu]=Nyolcszög Name[it]=Ottagono diff -Nru calligra-2.4.0/flow/stencils/Assorted/parallelogram-horizontal.desktop calligra-2.4.3/flow/stencils/Assorted/parallelogram-horizontal.desktop --- calligra-2.4.0/flow/stencils/Assorted/parallelogram-horizontal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/parallelogram-horizontal.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Parallelogram Name[bg]=Хоризонтален успоредник Name[ca]=Paral·lelogram horitzontal +Name[ca@valencia]=Paral·lelogram horitzontal Name[da]=Vandret parallelogram Name[de]=Waagerechtes Parallelogramm Name[el]=Οριζόντιο παραλληλόγραμμο @@ -18,6 +19,7 @@ Name[pt]=Paralelograma Horizontal Name[pt_BR]=Paralelogramo Horizontal Name[ru]=Горизонтальный параллелограмм +Name[sk]=Vodorovný rovnobežník Name[sv]=Horisontellt parallellogram Name[uk]=Горизонтальний паралелограм Name[x-test]=xxHorizontal Parallelogramxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/parallelogram-vertical.desktop calligra-2.4.3/flow/stencils/Assorted/parallelogram-vertical.desktop --- calligra-2.4.0/flow/stencils/Assorted/parallelogram-vertical.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/parallelogram-vertical.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Parallelogram Name[bg]=Вертикален успоредник Name[ca]=Paral·lelogram vertical +Name[ca@valencia]=Paral·lelogram vertical Name[da]=Lodret parallelogram Name[de]=Senkrechtes Parallelogramm Name[el]=Κάθετο παραλληλόγραμμο @@ -18,6 +19,7 @@ Name[pt]=Paralelograma Vertical Name[pt_BR]=Paralelogramo Vertical Name[ru]=Вертикальный параллелограмм +Name[sk]=Zvislý rovnobežník Name[sv]=Vertikalt parallellogram Name[uk]=Вертикальний паралелограм Name[x-test]=xxVertical Parallelogramxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/pentagon.desktop calligra-2.4.3/flow/stencils/Assorted/pentagon.desktop --- calligra-2.4.0/flow/stencils/Assorted/pentagon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/pentagon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,15 @@ Name=Pentagon Name[bg]=Петоъгълник Name[ca]=Pentàgon +Name[ca@valencia]=Pentàgon Name[cs]=Pětiúhelník Name[da]=Femkant Name[de]=Fünfeck Name[el]=Πεντάγωνο Name[es]=Pentágono Name[et]=Viisnurk +Name[fi]=Viisikulmio +Name[gl]=Pentágono Name[hu]=Ötszög Name[it]=Pentagono Name[kk]=Бесбұрыш @@ -18,6 +21,7 @@ Name[pt]=Pentágono Name[pt_BR]=Pentágono Name[ru]=Пятиугольник +Name[sk]=Päťuholník Name[sv]=Femhörning Name[ug]=بەش تەرەپلىك Name[uk]=П’ятикутник diff -Nru calligra-2.4.0/flow/stencils/Assorted/square.desktop calligra-2.4.3/flow/stencils/Assorted/square.desktop --- calligra-2.4.0/flow/stencils/Assorted/square.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/square.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Perfect Square Name[bg]=Квадрат Name[ca]=Quadrat perfecte +Name[ca@valencia]=Quadrat perfecte Name[cs]=Dokonalý čtverec Name[da]=Perfekt kvadrat Name[de]=Perfektes Quadrat @@ -20,6 +21,7 @@ Name[pt]=Quadrado Perfeito Name[pt_BR]=Quadrado perfeito Name[ru]=Идеальный квадрат +Name[sk]=Dokonalý štvorec Name[sv]=Perfekt fyrkant Name[uk]=Ідеальний квадрат Name[x-test]=xxPerfect Squarexx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star4curved.desktop calligra-2.4.3/flow/stencils/Assorted/star4curved.desktop --- calligra-2.4.0/flow/stencils/Assorted/star4curved.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star4curved.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Curved Four Point Star Name[bg]=Извита четирилъчна звезда Name[ca]=Estrella corbada de quatre puntes +Name[ca@valencia]=Estrella corbada de quatre puntes Name[da]=Kurvet firespidset stjerne Name[de]=Gekurvter Stern mit vier Zacken Name[el]=Καμπύλο τετράκτινο αστέρι @@ -17,6 +18,7 @@ Name[pt]=Estrela de Quatro Pontas Curvada Name[pt_BR]=Estrela Curvada de Quatro Pontas Name[ru]=Изогнутая звезда с четырьмя лучами +Name[sk]=Krivková štvorcípa hviezda Name[sv]=Rundad fyruddig stjärna Name[uk]=Викривлена чотирикутна зірка Name[x-test]=xxCurved Four Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star4.desktop calligra-2.4.3/flow/stencils/Assorted/star4.desktop --- calligra-2.4.0/flow/stencils/Assorted/star4.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star4.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Four Point Star Name[bg]=Четирилъчна звезда Name[ca]=Estrella de quatre puntes +Name[ca@valencia]=Estrella de quatre puntes Name[da]=Firspidset stjerne Name[de]=Stern mit vier Zacken Name[el]=Τετράκτινο αστέρι @@ -9,6 +10,7 @@ Name[et]=Neljaharuline täht Name[fi]=Nelisakarainen tähti Name[fr]=Étoile à quatre branches +Name[gl]=Estrela de catro puntas Name[hu]=Négypontos csillag Name[it]=Stella a quattro punte Name[kk]=Төртұшты жұлдыз @@ -19,6 +21,7 @@ Name[pt]=Estrela de Quatro Pontas Name[pt_BR]=Estrela de Quatro Pontas Name[ru]=Звезда с четырьмя лучами +Name[sk]=Štvorcípa hviezda Name[sv]=Fyruddig stjärna Name[uk]=Зірка з чотирма променями Name[x-test]=xxFour Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star5.desktop calligra-2.4.3/flow/stencils/Assorted/star5.desktop --- calligra-2.4.0/flow/stencils/Assorted/star5.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star5.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Five Point Star Name[bg]=Петолъчка Name[ca]=Estrella de cinc puntes +Name[ca@valencia]=Estrella de cinc puntes Name[cs]=Pěticípá hvězda Name[da]=Femspidset stjerne Name[de]=Stern mit fünf Zacken @@ -10,6 +11,7 @@ Name[et]=Viieharuline täht Name[fi]=Viisisakarainen tähti Name[fr]=Étoile à cinq branches +Name[gl]=Estrela de cinco puntas Name[hu]=Ötpontos csillag Name[it]=Stella a cinque punte Name[kk]=Бесұшты жұлдыз @@ -20,6 +22,7 @@ Name[pt]=Estrela de Cinco Pontas Name[pt_BR]=Estrela de Cinco Pontas Name[ru]=Звезда с пятью лучами +Name[sk]=Pätcípa hviezda Name[sv]=Femuddig stjärna Name[uk]=Зірка з п’ятьма променями Name[x-test]=xxFive Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star6.desktop calligra-2.4.3/flow/stencils/Assorted/star6.desktop --- calligra-2.4.0/flow/stencils/Assorted/star6.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star6.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Six Point Star Name[bg]=Шестлъчна звезда Name[ca]=Estrella de sis puntes +Name[ca@valencia]=Estrella de sis puntes Name[cs]=Šesticípá hvězda Name[da]=Sekspidset stjerne Name[de]=Stern mit sechs Zacken @@ -10,6 +11,7 @@ Name[et]=Kuueharuline täht Name[fi]=Kuusisakarainen tähti Name[fr]=Étoile à six branches +Name[gl]=Estrela de seis puntas Name[hu]=Hatpontos csillag Name[it]=Stella a sei punte Name[kk]=Алтыұшты жұлдыз @@ -20,6 +22,7 @@ Name[pt]=Estrela de Seis Pontas Name[pt_BR]=Estrela de Seis Pontas Name[ru]=Звезда с шестью лучами +Name[sk]=Šesťcípa hviezda Name[sv]=Sexuddig stjärna Name[uk]=Зірка з шістьма променями Name[x-test]=xxSix Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star7.desktop calligra-2.4.3/flow/stencils/Assorted/star7.desktop --- calligra-2.4.0/flow/stencils/Assorted/star7.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star7.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Seven Point Star Name[bg]=Седемлъчна звезда Name[ca]=Estrella de set puntes +Name[ca@valencia]=Estrella de set puntes Name[cs]=Sedmicípá hvězda Name[da]=Syvspidset stjerne Name[de]=Stern mit sieben Zacken @@ -20,6 +21,7 @@ Name[pt]=Estrela de Sete Pontas Name[pt_BR]=Estrela de Sete Pontas Name[ru]=Звезда с семью лучами +Name[sk]=Sedemcípa hviezda Name[sv]=Sjuuddig stjärna Name[uk]=Зірка з сімома променями Name[x-test]=xxSeven Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star8curved.desktop calligra-2.4.3/flow/stencils/Assorted/star8curved.desktop --- calligra-2.4.0/flow/stencils/Assorted/star8curved.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star8curved.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Curved Eight Point Star Name[bg]=Извита осемлъчна звезда Name[ca]=Estrella corbada de vuit puntes +Name[ca@valencia]=Estrella corbada de vuit puntes Name[da]=Kurvet ottespidset stjerne Name[de]=Gekurvter Stern mit acht Zacken Name[el]=Καμπύλο οκτάκτινο αστέρι @@ -17,6 +18,7 @@ Name[pt]=Estrela de Oito Pontas Curvada Name[pt_BR]=Estrela Curvada de Oito Pontas Name[ru]=Изогнутая звезда с восемью лучами +Name[sk]=Krivková osemcípa hviezda Name[sv]=Rundad åttauddig stjärna Name[uk]=Викривлена восьмикутна зірка Name[x-test]=xxCurved Eight Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star8.desktop calligra-2.4.3/flow/stencils/Assorted/star8.desktop --- calligra-2.4.0/flow/stencils/Assorted/star8.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star8.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Eight Point Star Name[bg]=Осемлъчна звезда Name[ca]=Estrella de vuit puntes +Name[ca@valencia]=Estrella de vuit puntes Name[cs]=Osmicípá hvězda Name[da]=Ottespidset stjerne Name[de]=Stern mit acht Zacken @@ -20,6 +21,7 @@ Name[pt]=Estrela de Oito Pontas Name[pt_BR]=Estrela de Oito Pontas Name[ru]=Звезда с восемью лучами +Name[sk]=Osemcípa hviezda Name[sv]=Åttauddig stjärna Name[uk]=Восьмикутна зірка Name[x-test]=xxEight Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/star8sharp.desktop calligra-2.4.3/flow/stencils/Assorted/star8sharp.desktop --- calligra-2.4.0/flow/stencils/Assorted/star8sharp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/star8sharp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sharp Eight Point Star Name[bg]=Остра осемлъчна звезда Name[ca]=Estrella afilada de vuit puntes +Name[ca@valencia]=Estrella afilada de vuit puntes Name[da]=Skarp ottespidset stjerne Name[de]=Scharfer Stern mit acht Zacken Name[el]=Αιχμηρό οκτάκτινο αστέρι @@ -17,6 +18,7 @@ Name[pt]=Estrela de Oito Pontas Direita Name[pt_BR]=Estrela Afiada de Oito Pontas Name[ru]=Острая звезда с восемью лучами +Name[sk]=Ostrá osemcípa hviezda Name[sv]=Spetsig åttauddig stjärna Name[uk]=Зірка з вісьмома гострими променями Name[x-test]=xxSharp Eight Point Starxx diff -Nru calligra-2.4.0/flow/stencils/Assorted/sun.desktop calligra-2.4.3/flow/stencils/Assorted/sun.desktop --- calligra-2.4.0/flow/stencils/Assorted/sun.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/sun.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sun Name[bg]=Слънце Name[ca]=Sol +Name[ca@valencia]=Sol Name[cs]=Slunce Name[da]=Sol Name[de]=Sonne @@ -10,6 +11,7 @@ Name[et]=Päike Name[fi]=Aurinko Name[fr]=Soleil +Name[gl]=Dom Name[hu]=Nap Name[it]=Sole Name[kk]=Күннің көзі @@ -20,6 +22,7 @@ Name[pt]=Sol Name[pt_BR]=Sol Name[ru]=Солнце +Name[sk]=Slnko Name[sv]=Sol Name[ug]=ي Name[uk]=Сонце diff -Nru calligra-2.4.0/flow/stencils/Assorted/trapezoid.desktop calligra-2.4.3/flow/stencils/Assorted/trapezoid.desktop --- calligra-2.4.0/flow/stencils/Assorted/trapezoid.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/trapezoid.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Trapezoid Name[bg]=Трапец Name[ca]=Trapezoide +Name[ca@valencia]=Trapezoide Name[da]=Trapezer Name[de]=Trapezoid Name[el]=Τραπεζοειδές Name[es]=Trapezoide Name[et]=Trapets +Name[fi]=Puolisuunnikas Name[hu]=Trapéz Name[it]=Trapezoide Name[kk]=Трапеция diff -Nru calligra-2.4.0/flow/stencils/Assorted/triangle-isoceles.desktop calligra-2.4.3/flow/stencils/Assorted/triangle-isoceles.desktop --- calligra-2.4.0/flow/stencils/Assorted/triangle-isoceles.desktop 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/triangle-isoceles.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -5,7 +5,9 @@ Name[el]=Ισοσκελές τρίγωνο Name[es]=Triángulo isósceles Name[et]=Võrdhaarne kolmnurk +Name[fi]=Tasakylkinen kolmio Name[fr]=Triangle isocèle +Name[gl]=Triángulo isósceles Name[hu]=Egyenlő szárú háromszög Name[it]=Triangolo isoscele Name[kk]=Тең бүйірлі үшбұрыш @@ -14,6 +16,7 @@ Name[pt]=Triângulo Isósceles Name[pt_BR]=Triângulo isósceles Name[ru]=Равнобедренный треугольник +Name[sk]=Rovnoramenný trojuholník Name[sv]=Likbent triangel Name[uk]=Рівнобедрений трикутник Name[x-test]=xxIsosceles Trianglexx diff -Nru calligra-2.4.0/flow/stencils/Assorted/triangle-rightangle.desktop calligra-2.4.3/flow/stencils/Assorted/triangle-rightangle.desktop --- calligra-2.4.0/flow/stencils/Assorted/triangle-rightangle.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Assorted/triangle-rightangle.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Right Angle Triangle Name[bg]=Правоъгълен триъгълник Name[ca]=Triangle rectangle +Name[ca@valencia]=Triangle rectangle Name[da]=Højrevinklet trekant Name[de]=Rechtwinkliges Dreieck Name[el]=Ορθογώνιο τρίγωνο @@ -18,6 +19,7 @@ Name[pt]=Triângulo Rectângulo Name[pt_BR]=Triângulo com ângulo reto Name[ru]=Прямоугольный треугольник +Name[sk]=Pravouhlý trojuholník Name[sv]=Triangel med högervinkel Name[uk]=Прямокутний трикутник Name[x-test]=xxRight Angle Trianglexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Activity-Looping.desktop calligra-2.4.3/flow/stencils/BPMN/Activity-Looping.desktop --- calligra-2.4.0/flow/stencils/BPMN/Activity-Looping.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Activity-Looping.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Activity-Looping Name[ca]=Activitat-enllaçada +Name[ca@valencia]=Activitat-enllaçada Name[da]=Aktivitetsløkke Name[el]=Βρόχος-δραστηριότητας Name[es]=Actividad en bucle @@ -13,6 +14,7 @@ Name[pt]=Ciclo de Actividades Name[pt_BR]=Ciclo de atividades Name[ru]=Циклическое действие +Name[sk]=Slučkovanie aktivít Name[sv]=Upprepad-aktivitet Name[uk]=Циклічна дія Name[x-test]=xxActivity-Loopingxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop calligra-2.4.3/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop --- calligra-2.4.0/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Ad-Hoc-Collapsed-Sub-Process.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Ad-Hoc-Collapsed-Sub-Process Name[ca]=Sub-procés col·lapsat ad-hoc +Name[ca@valencia]=Sub-procés col·lapsat ad-hoc Name[el]=Ειδική-περίπτωση-κατάρρευσης-υπο-διεργασίας Name[es]=Subproceso específico colapsado Name[et]=Ad hoc suletud alamprotsess @@ -12,6 +13,7 @@ Name[pt]=Sub-Processo-Ad-Hoc-Recolhido Name[pt_BR]=Sub-processo-Ad-Hoc-recolhido Name[ru]=Свёрнутый Ad-hoc подпроцесс +Name[sk]=Ad-Hoc-Collapsed-Sub-Process Name[sv]=Ad-hoc-sammanslagen-delprocess Name[uk]=Спеціально згорнутий підпроцес Name[x-test]=xxAd-Hoc-Collapsed-Sub-Processxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Collapsed-Sub-Process.desktop calligra-2.4.3/flow/stencils/BPMN/Collapsed-Sub-Process.desktop --- calligra-2.4.0/flow/stencils/BPMN/Collapsed-Sub-Process.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Collapsed-Sub-Process.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Collapsed-Sub-Process Name[ca]=Sub-procés col·lapsat +Name[ca@valencia]=Sub-procés col·lapsat Name[el]=Κατάρρευση-υπο-διεργασίας Name[es]=Subproceso colapsado Name[et]=Suletud alamprotsess @@ -12,6 +13,7 @@ Name[pt]=Sub-Processo-Recolhido Name[pt_BR]=Sub-processo-recolhido Name[ru]=Свёрнутый подпроцесс +Name[sk]=Zbalený podproces Name[sv]=Sammanslagen-delprocess Name[uk]=Згорнутий підпроцес Name[x-test]=xxCollapsed-Sub-Processxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/collection.desktop calligra-2.4.3/flow/stencils/BPMN/collection.desktop --- calligra-2.4.0/flow/stencils/BPMN/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=BPMN Name[bg]=BPMN Name[ca]=BPMN +Name[ca@valencia]=BPMN Name[de]=BPMN Name[el]=BPMN Name[es]=BPMN diff -Nru calligra-2.4.0/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop calligra-2.4.3/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop --- calligra-2.4.0/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Compensation-Collapsed-Sub-Process.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Compensation-Collapsed-Sub-Process Name[ca]=Sub-procés col·lapsat de compensació +Name[ca@valencia]=Sub-procés col·lapsat de compensació Name[el]=Αντιστάθμιση-σε-κατάρρευση-υπο-διεργασίας Name[es]=Compensación de subproceso colapsado Name[et]=Kompenseeriv suletud alamprotsess @@ -12,6 +13,7 @@ Name[pt]=Sub-Processo-Compensação-Recolhido Name[pt_BR]=Sub-processo-compensação-recolhido Name[ru]=Компенсационно свёрнутый подпроцесс +Name[sk]=Compensation-Collapsed-Sub-Process Name[sv]=Kompensation-sammanslagen-delprocess Name[uk]=Компенсаційно згорнутий підпроцес Name[x-test]=xxCompensation-Collapsed-Sub-Processxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Compensation.desktop calligra-2.4.3/flow/stencils/BPMN/Compensation.desktop --- calligra-2.4.0/flow/stencils/BPMN/Compensation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Compensation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Compensation Name[ca]=Compensació +Name[ca@valencia]=Compensació Name[el]=Αντιστάθμιση Name[es]=Compensación Name[et]=Kompenseerimine @@ -14,6 +15,7 @@ Name[pt]=Compensação Name[pt_BR]=Compensação Name[ru]=Компенсация +Name[sk]=Kompenzácia Name[sv]=Kompensation Name[uk]=Компенсація Name[x-test]=xxCompensationxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Data-Object.desktop calligra-2.4.3/flow/stencils/BPMN/Data-Object.desktop --- calligra-2.4.0/flow/stencils/BPMN/Data-Object.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Data-Object.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,12 +1,15 @@ [Desktop Entry] Name=Data-Object Name[ca]=Objecte-dada +Name[ca@valencia]=Objecte-dada Name[de]=Datenobjekt Name[el]=Data-Object Name[es]=Objeto de datos Name[et]=Andmeobjekt +Name[gl]=Obxecto de datos Name[hu]=Adatobjektum Name[it]=Oggetto-Dati +Name[ja]=データオブジェクト Name[kk]=Дерек нысаны Name[nb]=Data-objekt Name[nds]=Datenobjekt @@ -15,6 +18,7 @@ Name[pt]=Objecto-Dados Name[pt_BR]=Objeto de dados Name[ru]=Объект данных +Name[sk]=Dátový objekt Name[sv]=Dataobjekt Name[uk]=Об’єкт даних Name[x-test]=xxData-Objectxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event-Cancel.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event-Cancel.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event-Cancel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event-Cancel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event-Cancel Name[ca]=Final-Esdeveniment-Cancel·la +Name[ca@valencia]=Final-Esdeveniment-Cancel·la Name[el]=Ακύρωση-γεγονότος-τέλους Name[es]=Cancelación del evento final Name[et]=Lõpusündmuse katkestamine @@ -12,6 +13,7 @@ Name[pt]=Evento-Final-Cancelar Name[pt_BR]=Cancelar evento final Name[ru]=Отмена завершения события +Name[sk]=End-Event-Cancel Name[sv]=Sluthändelse-avbryt Name[uk]=Скасування кінцевої події Name[x-test]=xxEnd-Event-Cancelxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event-Compensation.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event-Compensation.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event-Compensation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event-Compensation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event-Compensation Name[ca]=Final-Esdeveniment-Compensació +Name[ca@valencia]=Final-Esdeveniment-Compensació Name[el]=Αντιστάθμιση-γεγονότος-τέλους Name[es]=Compensación del evento final Name[et]=Lõpusündmuse kompenseerimine @@ -12,6 +13,7 @@ Name[pt]=Evento-Final-Compensação Name[pt_BR]=Compensação do evento final Name[ru]=Компенсация завершения события +Name[sk]=End-Event-Compensation Name[sv]=Sluthändelse-kompensation Name[uk]=Компенсація кінцевої події Name[x-test]=xxEnd-Event-Compensationxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event Name[ca]=Esdeveniment-Final +Name[ca@valencia]=Esdeveniment-Final Name[el]=Γεγονός-τέλους Name[es]=Evento final Name[et]=Lõpusündmus @@ -12,6 +13,7 @@ Name[pt]=Evento-Final Name[pt_BR]=Evento final Name[ru]=Завершение события +Name[sk]=End-Event Name[sv]=Sluthändelse Name[uk]=Кінцева подія Name[x-test]=xxEnd-Eventxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event-Error.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event-Error.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event-Error.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event-Error.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event-Error Name[ca]=Final-Esdeveniment-Error +Name[ca@valencia]=Final-Esdeveniment-Error Name[el]=Σφάλμα-γεγονότος-τέλους Name[es]=Error en el evento final Name[et]=Lõpusündmuse tõrge @@ -12,6 +13,7 @@ Name[pt]=Evento-Final-Erro Name[pt_BR]=Erro no evento final Name[ru]=Ошибка завершения события +Name[sk]=End-Event-Error Name[sv]=Sluthändelse-fel Name[uk]=Помилка кінцевої події Name[x-test]=xxEnd-Event-Errorxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event-Link.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event-Link.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event-Link.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event-Link.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event-Link Name[ca]=Final-Esdeveniment-Enllaç +Name[ca@valencia]=Final-Esdeveniment-Enllaç Name[el]=Σύνδεσμος-γεγονότος-τέλους Name[es]=Enlace al evento final Name[et]=Lõpusündmuse link @@ -12,6 +13,7 @@ Name[pt]=Evento-Final-Ligação Name[pt_BR]=Link do evento final Name[ru]=Ссылка на завершение события +Name[sk]=End-Event-Link Name[sv]=Sluthändelse-länk Name[uk]=Посилання на кінцеву подію Name[x-test]=xxEnd-Event-Linkxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event-Message.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event-Message.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event-Message.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event-Message.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event-Message Name[ca]=Final-Esdeveniment-Missatge +Name[ca@valencia]=Final-Esdeveniment-Missatge Name[el]=Μήνυμα-γεγονότος-τέλους Name[es]=Mensaje del evento final Name[et]=Lõpusündmuse sõnum @@ -12,6 +13,7 @@ Name[pt]=Evento-Final-Mensagem Name[pt_BR]=Mensagem do evento final Name[ru]=Сообщение завершения события +Name[sk]=End-Event-Message Name[sv]=Sluthändelse-brev Name[uk]=Повідомлення кінцевої події Name[x-test]=xxEnd-Event-Messagexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event-Multiple.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event-Multiple.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event-Multiple.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event-Multiple.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event-Multiple Name[ca]=Final-Esdeveniment-Múltiple +Name[ca@valencia]=Final-Esdeveniment-Múltiple Name[el]=Πολλαπλότητα-γεγονότος-τέλους Name[es]=Evento final múltiple Name[et]=Mitmiklõpusündmus @@ -12,6 +13,7 @@ Name[pt]=Evento-Final-Múltiplo Name[pt_BR]=Evento final múltiplo Name[ru]=Составное завершение события +Name[sk]=End-Event-Multiple Name[sv]=Sluthändelse-flera Name[uk]=Розгалуження кінцевої події Name[x-test]=xxEnd-Event-Multiplexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/End-Event-Terminate.desktop calligra-2.4.3/flow/stencils/BPMN/End-Event-Terminate.desktop --- calligra-2.4.0/flow/stencils/BPMN/End-Event-Terminate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/End-Event-Terminate.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=End-Event-Terminate Name[ca]=Final-Esdeveniment-Finalitza +Name[ca@valencia]=Final-Esdeveniment-Finalitza Name[el]=Τερματισμός-γεγονότος-τέλους Name[es]=Terminación del evento final Name[et]=Lõpusündmuse lõpetamine @@ -12,6 +13,7 @@ Name[pt]=Evento-Final-Terminar Name[pt_BR]=Terminar evento final Name[ru]=Прерывание завершения события +Name[sk]=End-Event-Terminate Name[sv]=Sluthändelse-avsluta Name[uk]=Припинення кінцевої події Name[x-test]=xxEnd-Event-Terminatexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Gateway-Complex.desktop calligra-2.4.3/flow/stencils/BPMN/Gateway-Complex.desktop --- calligra-2.4.0/flow/stencils/BPMN/Gateway-Complex.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Gateway-Complex.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Gateway-Complex Name[ca]=Passarel·la-Complex +Name[ca@valencia]=Passarel·la-Complex Name[el]=Σύμπλεγμα-πύλης Name[es]=Puerta de enlace compleja Name[et]=Keeruline värav @@ -12,6 +13,7 @@ Name[pt]='Gateway'-Complexa Name[pt_BR]=Gateway complexo Name[ru]=Сложный оператор +Name[sk]=Brána-komplexná Name[sv]=Port-komplex Name[uk]=Шлюзовий комплекс Name[x-test]=xxGateway-Complexxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Gateway.desktop calligra-2.4.3/flow/stencils/BPMN/Gateway.desktop --- calligra-2.4.0/flow/stencils/BPMN/Gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Gateway.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Gateway Name[ca]=Passarel·la +Name[ca@valencia]=Passarel·la Name[cs]=Brána Name[de]=Gateway Name[el]=Πύλη Name[es]=Puerta de enlace Name[et]=Värav +Name[gl]=Pasarela Name[hu]=Átjáró Name[it]=Gateway Name[kk]=Шлюз @@ -16,6 +18,7 @@ Name[pt]='Gateway' Name[pt_BR]=Gateway Name[ru]=Оператор +Name[sk]=Brána Name[sv]=Port Name[ug]=تور ئۆتكىلى Name[uk]=Шлюз diff -Nru calligra-2.4.0/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop calligra-2.4.3/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop --- calligra-2.4.0/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Gateway-Exclusive-XOR-Data-Based.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Gateway-Exclusive-XOR-Data-Based Name[ca]=Passarel·la-Exclusiu-XOR-Basat-Dades +Name[ca@valencia]=Passarel·la-Exclusiu-XOR-Basat-Dades Name[el]=Πύλη-Exclusive-XOR-με-βάση-δεδομένα Name[es]=Puerta de enlace XOR exclusiva basada en datos Name[et]=Eksklusiivne (XOR) andmepõhine värav @@ -12,6 +13,7 @@ Name[pt]='Gateway'-XOR-Exclusivo-Baseado-Dados Name[pt_BR]=Gateway XOR exclusivo baseado em dados Name[ru]=Оператор исключающего ИЛИ, управляемый данными +Name[sk]=Gateway-Exclusive-XOR-Data-Based Name[sv]=Port-exklusiv-eller-databaserad Name[uk]=Шлюз виключного АБО на основі даних Name[x-test]=xxGateway-Exclusive-XOR-Data-Basedxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop calligra-2.4.3/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop --- calligra-2.4.0/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Gateway-Exclusive-XOR-Event-Based.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Gateway-Exclusive-XOR-Event-Based Name[ca]=Passarel·la-Exclusiu-XOR-Basat-Esdeveniment +Name[ca@valencia]=Passarel·la-Exclusiu-XOR-Basat-Esdeveniment Name[el]=Πύλη-Exclusive-XOR-με-βάση-γεγονότα Name[es]=Puerta de enlace XOR exclusiva basada en eventos Name[et]=Eksklusiivne (XOR) sündmusepõhine värav @@ -12,6 +13,7 @@ Name[pt]='Gateway'-XOR-Exclusivo-Baseado-Eventos Name[pt_BR]=Gateway XOR exclusivo baseado em eventos Name[ru]=Оператор исключающего ИЛИ, управляемый событиями +Name[sk]=Gateway-Exclusive-XOR-Event-Based Name[sv]=Port-exklusiv-eller-händelsebaserad Name[uk]=Шлюз виключного АБО на основі подій Name[x-test]=xxGateway-Exclusive-XOR-Event-Basedxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop calligra-2.4.3/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop --- calligra-2.4.0/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Gateway-Inclusive-OR.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Gateway-Inclusive-OR Name[ca]=Passarel·la-Inclusiu-OR +Name[ca@valencia]=Passarel·la-Inclusiu-OR Name[el]=Πύλη-Inclusive-OR Name[es]=Puerta de enlace O inclusiva Name[et]=Inklusiivne (OR) värav @@ -12,6 +13,7 @@ Name[pt]='Gateway'-OU-Inclusivo Name[pt_BR]=Gateway OR inclusivo Name[ru]=Оператор включающего ИЛИ +Name[sk]=Gateway-Inclusive-OR Name[sv]=Port-inklusiv-eller Name[uk]=Шлюз включного АБО Name[x-test]=xxGateway-Inclusive-ORxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Gateway-Parallel-AND.desktop calligra-2.4.3/flow/stencils/BPMN/Gateway-Parallel-AND.desktop --- calligra-2.4.0/flow/stencils/BPMN/Gateway-Parallel-AND.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Gateway-Parallel-AND.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Gateway-Parallel-AND Name[ca]=Passarel·la-Paral·lel-AND +Name[ca@valencia]=Passarel·la-Paral·lel-AND Name[el]=Πύλη-Parallel-AND Name[es]=Puerta de enlace Y paralela Name[et]=Paralleelne (AND) värav @@ -12,6 +13,7 @@ Name[pt]='Gateway'-E-Paralelo Name[pt_BR]=Gateway AND paralelo Name[ru]=Оператор И +Name[sk]=Gateway-Parallel-AND Name[sv]=Port-parallell-och Name[uk]=Шлюз паралельного ТА Name[x-test]=xxGateway-Parallel-ANDxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Group.desktop calligra-2.4.3/flow/stencils/BPMN/Group.desktop --- calligra-2.4.0/flow/stencils/BPMN/Group.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Group.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Group Name[bg]=Група Name[ca]=Grup +Name[ca@valencia]=Grup Name[cs]=Skupina Name[de]=Gruppe Name[el]=Ομάδα @@ -9,6 +10,7 @@ Name[et]=Grupp Name[fi]=Ryhmä Name[ga]=Grúpa +Name[gl]=Grupo Name[hu]=Csoport Name[it]=Gruppo Name[kk]=Тобы @@ -19,6 +21,7 @@ Name[pt]=Grupo Name[pt_BR]=Grupo Name[ru]=Группа +Name[sk]=Skupina Name[sv]=Grupp Name[ug]=گۇرۇپپا Name[uk]=Група diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Cancel.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Cancel.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Cancel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Cancel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Cancel Name[ca]=Intermedi-Esdeveniment-Cancel·la +Name[ca@valencia]=Intermedi-Esdeveniment-Cancel·la Name[el]=Ακύρωση-ενδιάμεσου-γεγονότος Name[es]=Cancelación de evento intermedio Name[et]=Vahesündmuse katkestamine @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Cancelar Name[pt_BR]=Cancelar evento intermediário Name[ru]=Промежуточное событие - отмена +Name[sk]=Intermediate-Event-Cancel Name[sv]=Mellanliggande-händelse-avbryt Name[uk]=Скасування проміжної події Name[x-test]=xxIntermediate-Event-Cancelxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Compensation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Compensation Name[ca]=Intermedi-Esdeveniment-Compensació +Name[ca@valencia]=Intermedi-Esdeveniment-Compensació Name[el]=Αντιστάθμιση-ενδιάμεσου-γεγονότος Name[es]=Compensación del evento intermedio Name[et]=Vahesündmuse kompenseerimine @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Compensação Name[pt_BR]=Compensação do evento intermediário Name[ru]=Промежуточное событие - компенсация +Name[sk]=Intermediate-Event-Compensation Name[sv]=Mellanliggande-händelse-kompensation Name[uk]=Компенсація проміжної події Name[x-test]=xxIntermediate-Event-Compensationxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event Name[ca]=Intermedi-Esdeveniment +Name[ca@valencia]=Intermedi-Esdeveniment Name[el]=Ενδιάμεσο-γεγονός Name[es]=Evento intermedio Name[et]=Vahesündmus @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio Name[pt_BR]=Evento intermediário Name[ru]=Промежуточное событие +Name[sk]=Intermediate-Event Name[sv]=Mellanliggande-händelse Name[uk]=Проміжна подія Name[x-test]=xxIntermediate-Eventxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Error.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Error.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Error.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Error.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Error Name[ca]=Intermedi-Esdeveniment-Error +Name[ca@valencia]=Intermedi-Esdeveniment-Error Name[el]=Σφάλμα-ενδιάμεσου-γεγονότος Name[es]=Error en el evento intermedio Name[et]=Vahesündmuse tõrge @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Erro Name[pt_BR]=Erro no evento intermediário Name[ru]=Промежуточное событие - ошибка +Name[sk]=Intermediate-Event-Error Name[sv]=Mellanliggande-händelse-fel Name[uk]=Помилка проміжної події Name[x-test]=xxIntermediate-Event-Errorxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Link.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Link.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Link.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Link.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Link Name[ca]=Intermedi-Esdeveniment-Enllaç +Name[ca@valencia]=Intermedi-Esdeveniment-Enllaç Name[el]=Σύνδεσμος-ενδιάμεσου-γεγονότος Name[es]=Enlace al evento intermedio Name[et]=Vahesündmuse link @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Ligação Name[pt_BR]=Link do evento intermediário Name[ru]=Промежуточное событие - связь +Name[sk]=Intermediate-Event-Link Name[sv]=Mellanliggande-händelse-länk Name[uk]=Посилання на проміжну подію Name[x-test]=xxIntermediate-Event-Linkxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Message.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Message.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Message.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Message.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Message Name[ca]=Intermedi-Esdeveniment-Missatge +Name[ca@valencia]=Intermedi-Esdeveniment-Missatge Name[el]=Μήνυμα-ενδιάμεσου-γεγονότος Name[es]=Mensaje del evento intermedio Name[et]=Vahesündmuse sõnum @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Mensagem Name[pt_BR]=Mensagem do evento intermediário Name[ru]=Промежуточное событие - сообщение +Name[sk]=Intermediate-Event-Message Name[sv]=Mellanliggande-händelse-brev Name[uk]=Повідомлення проміжної події Name[x-test]=xxIntermediate-Event-Messagexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Multiple.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Multiple.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Multiple.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Multiple.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Multiple Name[ca]=Intermedi-Esdeveniment-Múltiple +Name[ca@valencia]=Intermedi-Esdeveniment-Múltiple Name[el]=Πολλαπλότητα-ενδιάμεσου-γεγονότος Name[es]=Evento intermedio múltiple Name[et]=Mitmikvahesündmus @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Múltiplo Name[pt_BR]=Evento intermediário múltiplo Name[ru]=Промежуточное событие - составное +Name[sk]=Intermediate-Event-Multiple Name[sv]=Mellanliggande-händelse-flera Name[uk]=Розгалуження проміжної події Name[x-test]=xxIntermediate-Event-Multiplexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Rule.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Rule.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Rule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Rule.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Rule Name[ca]=Intermedi-Esdeveniment-Regla +Name[ca@valencia]=Intermedi-Esdeveniment-Regla Name[el]=Κανόνας-ενδιάμεσου-γεγονότος Name[es]=Regla del evento intermedio Name[et]=Vahesündmuse reegel @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Regra Name[pt_BR]=Regra do evento intermediário Name[ru]=Промежуточное событие - правило +Name[sk]=Intermediate-Event-Rule Name[sv]=Mellanliggande-händelse-regel Name[uk]=Правило проміжної події Name[x-test]=xxIntermediate-Event-Rulexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Timer.desktop calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Timer.desktop --- calligra-2.4.0/flow/stencils/BPMN/Intermediate-Event-Timer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Intermediate-Event-Timer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Intermediate-Event-Timer Name[ca]=Intermedi-Esdeveniment-Temporitzador +Name[ca@valencia]=Intermedi-Esdeveniment-Temporitzador Name[el]=Χρονόμετρο-ενδιάμεσου-γεγονότος Name[es]=Temporizador del evento intermedio Name[et]=Vahesündmuse taimer @@ -12,6 +13,7 @@ Name[pt]=Evento-Intermédio-Temporizador Name[pt_BR]=Cronômetro do evento intermediário Name[ru]=Промежуточное событие - таймер +Name[sk]=Intermediate-Event-Timer Name[sv]=Mellanliggande-händelse-tidtagning Name[uk]=Таймер проміжної події Name[x-test]=xxIntermediate-Event-Timerxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop calligra-2.4.3/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop --- calligra-2.4.0/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Looping-Collapsed-Sub-Process.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Looping-Collapsed-Sub-Process Name[ca]=Llaçant-Sub-Procés-Col·lapsat +Name[ca@valencia]=Llaçant-Sub-Procés-Col·lapsat Name[el]=Βρόχος-υπο-διεργασίας-σε-κατάρρευση Name[es]=Ciclo de subproceso colapsado Name[et]=Korduv suletud alamprotsess @@ -12,6 +13,7 @@ Name[pt]=Sub-Processo-Recolhido-Ciclo Name[pt_BR]=Sub-processo recolhido de ciclo Name[ru]=Циклический свёрнутый подпроцесс +Name[sk]=Looping-Collapsed-Sub-Process Name[sv]=Upprepad-sammanslagen-delprocess Name[uk]=Циклічно згорнутий підпроцес Name[x-test]=xxLooping-Collapsed-Sub-Processxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop calligra-2.4.3/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop --- calligra-2.4.0/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Multiple-Instance-Collapsed-Sub-Process.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Multiple-Instance-Collapsed-Sub-Process Name[ca]=Sup-procés-Col·lapsat-Múltiples-Instàncies +Name[ca@valencia]=Sup-procés-Col·lapsat-Múltiples-Instàncies Name[el]=Πολλαπλές-περιπτώσεις-υπο-διεργασιών-σε-κατάρρευση Name[es]=Instancia múltiple de subproceso colapsado Name[et]=Suletud mitmikalamprotsess @@ -12,6 +13,7 @@ Name[pt]=Sub-Processo-Recolhido-Múltiplas-Instâncias Name[pt_BR]=Sub-processo recolhido de estância múltipla Name[ru]=Многоэкземплярный свёрнутый подпроцесс +Name[sk]=Multiple-Instance-Collapsed-Sub-Process Name[sv]=Flerinstans-sammanslagen-delprocess Name[uk]=Декілька екземплярів згорнутих підпроцесів Name[x-test]=xxMultiple-Instance-Collapsed-Sub-Processxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Multiple-Instance-Task.desktop calligra-2.4.3/flow/stencils/BPMN/Multiple-Instance-Task.desktop --- calligra-2.4.0/flow/stencils/BPMN/Multiple-Instance-Task.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Multiple-Instance-Task.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Multiple-Instance-Task Name[ca]=Tasca-Múltiples-Instàncies +Name[ca@valencia]=Tasca-Múltiples-Instàncies Name[el]=Πολλαπλές-περιπτώσεις-εργασίας Name[es]=Instancia múltiple de la tarea Name[et]=Mitmikülesanne @@ -12,6 +13,7 @@ Name[pt]=Tarefa-Múltiplas-Instâncias Name[pt_BR]=Tarefas de instância múltipla Name[ru]=Задача со множественными вхождениями +Name[sk]=Multiple-Instance-Task Name[sv]=Flerinstans-uppgift Name[uk]=Декілька екземплярів задачі Name[x-test]=xxMultiple-Instance-Taskxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Start-Event.desktop calligra-2.4.3/flow/stencils/BPMN/Start-Event.desktop --- calligra-2.4.0/flow/stencils/BPMN/Start-Event.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Start-Event.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Start-Event Name[ca]=Inicia-Esdeveniment +Name[ca@valencia]=Inicia-Esdeveniment Name[el]=Γεγονός-εκκίνησης Name[es]=Evento inicial Name[et]=Algussündmus @@ -12,6 +13,7 @@ Name[pt]=Evento-Inicial Name[pt_BR]=Evento inicial Name[ru]=Начальное событие +Name[sk]=Start-Event Name[sv]=Starthändelse Name[uk]=Початкова подія Name[x-test]=xxStart-Eventxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Start-Event-Link.desktop calligra-2.4.3/flow/stencils/BPMN/Start-Event-Link.desktop --- calligra-2.4.0/flow/stencils/BPMN/Start-Event-Link.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Start-Event-Link.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Start-Event-Link Name[ca]=Inicia-Esdeveniment-Enllaç +Name[ca@valencia]=Inicia-Esdeveniment-Enllaç Name[el]=Σύνδεσμος-γεγονότος-εκκίνησης Name[es]=Enlace al evento inicial Name[et]=Algussündmuse link @@ -12,6 +13,7 @@ Name[pt]=Evento-Inicial-Ligação Name[pt_BR]=Link do evento inicial Name[ru]=Начальное событие - связь +Name[sk]=Start-Event-Link Name[sv]=Starthändelse-länk Name[uk]=Посилання на початкову подію Name[x-test]=xxStart-Event-Linkxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Start-Event-Message.desktop calligra-2.4.3/flow/stencils/BPMN/Start-Event-Message.desktop --- calligra-2.4.0/flow/stencils/BPMN/Start-Event-Message.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Start-Event-Message.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Start-Event-Message Name[ca]=Inicia-Esdeveniment-Missatge +Name[ca@valencia]=Inicia-Esdeveniment-Missatge Name[el]=Μήνυμα-γεγονότος-εκκίνησης Name[es]=Mensaje del evento inicial Name[et]=Algussündmuse sõnum @@ -12,6 +13,7 @@ Name[pt]=Evento-Inicial-Mensagem Name[pt_BR]=Mensagem do evento inicial Name[ru]=Начальное событие - сообщение +Name[sk]=Start-Event-Message Name[sv]=Starthändelse-brev Name[uk]=Повідомлення початкової події Name[x-test]=xxStart-Event-Messagexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Start-Event-Multiple.desktop calligra-2.4.3/flow/stencils/BPMN/Start-Event-Multiple.desktop --- calligra-2.4.0/flow/stencils/BPMN/Start-Event-Multiple.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Start-Event-Multiple.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Start-Event-Multiple Name[ca]=Inicia-Esdeveniment-Múltiple +Name[ca@valencia]=Inicia-Esdeveniment-Múltiple Name[el]=Πολλπλότητα-γεγονότος-εκκίνησης Name[es]=Evento inicial múltiple Name[et]=Mitmikalgussündmus @@ -12,6 +13,7 @@ Name[pt]=Evento-Inicial-Múltiplo Name[pt_BR]=Evento inicial múltiplo Name[ru]=Начальное событие - составное +Name[sk]=Start-Event-Multiple Name[sv]=Starthändelse-flera Name[uk]=Декілька початкових подій Name[x-test]=xxStart-Event-Multiplexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Start-Event-Rule.desktop calligra-2.4.3/flow/stencils/BPMN/Start-Event-Rule.desktop --- calligra-2.4.0/flow/stencils/BPMN/Start-Event-Rule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Start-Event-Rule.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Start-Event-Rule Name[ca]=Inicia-Esdeveniment-Regla +Name[ca@valencia]=Inicia-Esdeveniment-Regla Name[el]=Κανόνας-γεγονότος-εκκίνησης Name[es]=Regla del evento incial Name[et]=Algussündmuse reegel @@ -12,6 +13,7 @@ Name[pt]=Evento-Inicial-Regra Name[pt_BR]=Regra do evento inicial Name[ru]=Начальное событие - правило +Name[sk]=Start-Event-Rule Name[sv]=Starthändelse-regel Name[uk]=Правило початкової події Name[x-test]=xxStart-Event-Rulexx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Start-Event-Timer.desktop calligra-2.4.3/flow/stencils/BPMN/Start-Event-Timer.desktop --- calligra-2.4.0/flow/stencils/BPMN/Start-Event-Timer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Start-Event-Timer.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Start-Event-Timer Name[ca]=Inicia-Esdeveniment-Temporitzador +Name[ca@valencia]=Inicia-Esdeveniment-Temporitzador Name[el]=Χρονόμετρο-γεγονότος-εκκίνησης Name[es]=Temporizador del evento inicial Name[et]=Algussündmuse taimer @@ -12,6 +13,7 @@ Name[pt]=Evento-Inicial-Temporizador Name[pt_BR]=Cronômetro do evento inicial Name[ru]=Начальное событие - таймер +Name[sk]=Start-Event-Timer Name[sv]=Starthändelse-tidtagning Name[uk]=Таймер початкової події Name[x-test]=xxStart-Event-Timerxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Task.desktop calligra-2.4.3/flow/stencils/BPMN/Task.desktop --- calligra-2.4.0/flow/stencils/BPMN/Task.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Task.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Task Name[bg]=Задача Name[ca]=Tasca +Name[ca@valencia]=Tasca Name[cs]=Úloha Name[de]=Aufgabe Name[el]=Εργασία @@ -9,6 +10,7 @@ Name[et]=Ülesanne Name[fi]=Tehtävä Name[fr]=Tâche +Name[gl]=Tarefa Name[hu]=Feladat Name[it]=Compito Name[kk]=Тапсырма @@ -19,6 +21,7 @@ Name[pt]=Tarefa Name[pt_BR]=Tarefa Name[ru]=Задача +Name[sk]=Úloha Name[sv]=Uppgift Name[ug]=ۋەزىپە Name[uk]=Задача diff -Nru calligra-2.4.0/flow/stencils/BPMN/Text-Annotation.desktop calligra-2.4.3/flow/stencils/BPMN/Text-Annotation.desktop --- calligra-2.4.0/flow/stencils/BPMN/Text-Annotation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Text-Annotation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Text-Annotation Name[bg]=Текстови функции Name[ca]=Anotació de text +Name[ca@valencia]=Anotació de text Name[cs]=Textová anotace Name[de]=Text-Anmerkung Name[el]=Κείμενο-σημειώσεις Name[es]=Comentario de texto Name[et]=Tekstiannotatsioon Name[fr]=Annotation de texte +Name[gl]=Anotación de texto Name[hu]=Megjegyzések Name[it]=Annotazione-Testo Name[kk]=Аңдатпа-мәтін @@ -18,6 +20,7 @@ Name[pt]=Anotação-Texto Name[pt_BR]=Anotação de texto Name[ru]=Аннотация +Name[sk]=Textová poznámka Name[sv]=Text-anmärkning Name[uk]=Текстова анотація Name[x-test]=xxText-Annotationxx diff -Nru calligra-2.4.0/flow/stencils/BPMN/Transaction.desktop calligra-2.4.3/flow/stencils/BPMN/Transaction.desktop --- calligra-2.4.0/flow/stencils/BPMN/Transaction.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/BPMN/Transaction.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Transaction Name[ca]=Transacció +Name[ca@valencia]=Transacció Name[cs]=Přenos Name[el]=Συναλλαγή Name[es]=Transacción Name[et]=Tehing +Name[gl]=Transacción Name[hu]=Tranzakció Name[it]=Transazione Name[kk]=Транзакция @@ -14,6 +16,7 @@ Name[pt]=Transacção Name[pt_BR]=Transação Name[ru]=Транзакция +Name[sk]=Tranzakcia Name[sv]=Transaktion Name[uk]=Операція Name[x-test]=xxTransactionxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop calligra-2.4.3/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop --- calligra-2.4.0/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/circle_diagonal_quarters_filled.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Circle Diagonal Quarters Filled Name[ca]=Quarts de cercle diagonal omplerts +Name[ca@valencia]=Quarts de cercle diagonal omplerts Name[el]=Τα διαγώνια τεταρτημόρια γέμισαν Name[es]=Cuartos diagonales de círculo llenos Name[et]=Diagonaalsete täidetud veeranditega ring @@ -12,6 +13,7 @@ Name[pt]=Quartos de Círculo Diagonais Preenchidos Name[pt_BR]=Quartos de círculos diagonais preenchidos Name[ru]=Окружность с заполненными по диагонали четвертями +Name[sk]=Kružnica diagonálne štvrtiny vyplnené Name[sv]=Cirkel diagonala fjärdedelar fyllda Name[uk]=Коло з заповненими діагональними чвертями Name[x-test]=xxCircle Diagonal Quarters Filledxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/collection.desktop calligra-2.4.3/flow/stencils/Building_Site/collection.desktop --- calligra-2.4.0/flow/stencils/Building_Site/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Building Site Name[bg]=Строеж Name[ca]=Construint el lloc +Name[ca@valencia]=Construint el lloc Name[de]=Baustelle Name[el]=Κατασκευή ιστοχώρου Name[es]=Sitio en construcción Name[et]=Ehitus +Name[fi]=Rakennustyömaa Name[it]=Cantiere Name[kk]=Құрылыс орны Name[nb]=Byggeplass @@ -14,6 +16,7 @@ Name[pt]=Local de Construção Name[pt_BR]=Local de construção Name[ru]=Строительство +Name[sk]=Vytváranie siete Name[sv]=Byggplats Name[uk]=Планування будівництва Name[x-test]=xxBuilding Sitexx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/concrete_mixer.desktop calligra-2.4.3/flow/stencils/Building_Site/concrete_mixer.desktop --- calligra-2.4.0/flow/stencils/Building_Site/concrete_mixer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/concrete_mixer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,14 @@ Name=Concrete Mixer Name[bg]=Бетонобъркачка Name[ca]=Mesclador concret +Name[ca@valencia]=Mesclador concret Name[de]=Betonmischer Name[el]=Συμπαγής μείκτης Name[es]=Hormigonera Name[et]=Betoonisegisti +Name[fi]=Betonimylly +Name[gl]=Mesturador concreto +Name[hu]=Betonkeverő Name[it]=Betoniera Name[kk]=Бетон араластырғышы Name[nb]=Betongblander @@ -14,6 +18,7 @@ Name[pt]=Mistura Cimento Name[pt_BR]=Misturador de concreto Name[ru]=Бетономешалка +Name[sk]=Betónový domiešavač Name[sv]=Betongblandare Name[uk]=Бетонозмішувач Name[x-test]=xxConcrete Mixerxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/fence_horizontal.desktop calligra-2.4.3/flow/stencils/Building_Site/fence_horizontal.desktop --- calligra-2.4.0/flow/stencils/Building_Site/fence_horizontal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/fence_horizontal.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,13 @@ Name=Horizontal Fence Name[bg]=Хоризонтална ограда Name[ca]=Tanca horitzontal +Name[ca@valencia]=Tanca horitzontal Name[de]=Waagerechter Zaun Name[el]=Οριζόντιος φράκτης Name[es]=Valla horizontal Name[et]=Horisontaalne piire +Name[fi]=Vaakasuora aita +Name[hu]=Vízszintes kerítés Name[it]=Recinzione orizzontale Name[kk]=Жатық қоршау Name[nb]=Vannrett gjerde @@ -14,6 +17,7 @@ Name[pt]=Muro Horizontal Name[pt_BR]=Muro horizontal Name[ru]=Горизонтальное ограждение +Name[sk]=Vodorovný plot Name[sv]=Horisontellt staket Name[uk]=Горизонтальна огорожа Name[x-test]=xxHorizontal Fencexx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/fence_vertical.desktop calligra-2.4.3/flow/stencils/Building_Site/fence_vertical.desktop --- calligra-2.4.0/flow/stencils/Building_Site/fence_vertical.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/fence_vertical.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,13 @@ Name=Vertical Fence Name[bg]=Вертикална ограда Name[ca]=Tanca vertical +Name[ca@valencia]=Tanca vertical Name[de]=Senkrechter Zaun Name[el]=Κάθετος φράκτης Name[es]=Valla vertical Name[et]=Vertikaalne piire +Name[fi]=Pystysuora aita +Name[hu]=Függőleges kerítés Name[it]=Recinzione verticale Name[kk]=Тік қоршау Name[nb]=Loddrett gjerde @@ -14,6 +17,7 @@ Name[pt]=Muro Vertical Name[pt_BR]=Muro vertical Name[ru]=Вертикальное ограждение +Name[sk]=Zvislý plot Name[sv]=Vertikalt staket Name[uk]=Вертикальна огорожа Name[x-test]=xxVertical Fencexx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/pre_silo.desktop calligra-2.4.3/flow/stencils/Building_Site/pre_silo.desktop --- calligra-2.4.0/flow/stencils/Building_Site/pre_silo.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/pre_silo.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Pre-Silo Name[ca]=Pre-Silo +Name[ca@valencia]=Pre-Silo Name[el]=Pre-Silo Name[es]=Pre-silo Name[et]=Eelhoidla @@ -12,6 +13,7 @@ Name[pt]=Pré-Silo Name[pt_BR]=Pré-Silo Name[ru]=Предварительная ёмкость +Name[sk]=Pre-Silo Name[sv]=Försilo Name[uk]=Бункер для цементу Name[x-test]=xxPre-Siloxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/proportioning_batcher.desktop calligra-2.4.3/flow/stencils/Building_Site/proportioning_batcher.desktop --- calligra-2.4.0/flow/stencils/Building_Site/proportioning_batcher.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/proportioning_batcher.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Proportioning Batcher Name[ca]=Proporcionat Batcher +Name[ca@valencia]=Proporcionat Batcher Name[el]=Συσκευή δοσολογίας Name[es]=Dosificador proporcional Name[et]=Dosaator +Name[gl]=Porporcionado Batcher Name[it]=Dosatore proporzionale Name[kk]=Мөлшерлеуіш Name[nb]=Proporsjonerende blandeverk @@ -12,6 +14,7 @@ Name[pt]=Empilhador Proporcional Name[pt_BR]=Empilhador proporcional Name[ru]=Дозатор компонентов +Name[sk]=Proporčný dávkovač Name[sv]=Proportionerande doseringsapparat Name[uk]=Дозатор компонентів Name[x-test]=xxProportioning Batcherxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/road_crossroads.desktop calligra-2.4.3/flow/stencils/Building_Site/road_crossroads.desktop --- calligra-2.4.0/flow/stencils/Building_Site/road_crossroads.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/road_crossroads.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Road Crossroads Name[ca]=Encreuament de carreteres +Name[ca@valencia]=Encreuament de carreteres Name[el]=Διασταυρώσεις Name[es]=Cruce de carreteras Name[et]=Risttee +Name[fi]=Tienristeys Name[it]=Incroci stradali Name[kk]=Жол қиылысы Name[nb]=Veikryss @@ -12,6 +14,7 @@ Name[pt]=Cruzamento de Estrada Name[pt_BR]=Cruzamento da estrada Name[ru]=Перекрёсток +Name[sk]=Cestné križovatky Name[sv]=Vägkorsning Name[uk]=Перехрестя Name[x-test]=xxRoad Crossroadsxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/road_horizontal.desktop calligra-2.4.3/flow/stencils/Building_Site/road_horizontal.desktop --- calligra-2.4.0/flow/stencils/Building_Site/road_horizontal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/road_horizontal.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=Horizontal Road Name[ca]=Carretera horitzontal +Name[ca@valencia]=Carretera horitzontal Name[de]=Waagerechte Straße Name[el]=Οριζόντιος δρόμος Name[es]=Carretera horizontal Name[et]=Horisontaalne tee +Name[fi]=Vaakasuora tie +Name[hu]=Vízszintes út Name[it]=Strada orizzontale Name[kk]=Қөлдеңен жол Name[nb]=Vannrett vei @@ -14,6 +17,7 @@ Name[pt]=Estrada Horizontal Name[pt_BR]=Estrada horizontal Name[ru]=Горизонтальная дорога +Name[sk]=Vodorovná cesta Name[sv]=Horisontell väg Name[uk]=Горизонтальний шлях Name[x-test]=xxHorizontal Roadxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/road_rotated_tee.desktop calligra-2.4.3/flow/stencils/Building_Site/road_rotated_tee.desktop --- calligra-2.4.0/flow/stencils/Building_Site/road_rotated_tee.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/road_rotated_tee.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Road Rotated Tee Name[ca]=Carretera T girada +Name[ca@valencia]=Carretera T girada Name[el]=Περιστρεφόμενο υποστήριγμα δρόμου Name[es]=Unión en forma de T rotada de carreteras Name[et]=Pööratud T-kujuline ristmik +Name[fi]=Pyöritetty T-risteys Name[it]=Strada a T ruotata Name[kk]=Төңкерген "Т" секілді қиылыс Name[nb]=Rotert veimøte @@ -12,6 +14,7 @@ Name[pt]=Entroncamento Rodado Name[pt_BR]=Entroncamento rodado Name[ru]=Перевёрнутая Т-образная дорога +Name[sk]=Cestný otočený prierez Name[sv]=Roterad t-vägkorsning Name[uk]=Перехрестя у формі повернутої «Т» Name[x-test]=xxRoad Rotated Teexx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/road_tee.desktop calligra-2.4.3/flow/stencils/Building_Site/road_tee.desktop --- calligra-2.4.0/flow/stencils/Building_Site/road_tee.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/road_tee.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Road Tee Name[ca]=Carretera T +Name[ca@valencia]=Carretera T Name[el]=Υποστήριγμα δρόμου Name[es]=Unión en forma de T de carreteras Name[et]=T-kujuline ristmik +Name[fi]=T-risteys Name[it]=Strada a T Name[kk]="Т" секілді қиылыс Name[nb]=Veimøte @@ -12,6 +14,7 @@ Name[pt]=Entroncamento Name[pt_BR]=Entroncamento Name[ru]=Т-образная дорога +Name[sk]=Cestný prierez Name[sv]=T-vägkorsning Name[uk]=Перехрестя у формі «Т» Name[x-test]=xxRoad Teexx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/road_turn.desktop calligra-2.4.3/flow/stencils/Building_Site/road_turn.desktop --- calligra-2.4.0/flow/stencils/Building_Site/road_turn.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/road_turn.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Road Turn Name[ca]=Gir de carretera +Name[ca@valencia]=Gir de carretera Name[el]=Στροφή δρόμου Name[es]=Giro de carretera Name[et]=Teekäänak +Name[fi]=Tien mutka Name[it]=Curva stradale Name[kk]=Жол бұрылысы Name[nb]=Veisving @@ -12,6 +14,7 @@ Name[pt]=Curva de Estrada Name[pt_BR]=Curva de estrada Name[ru]=Поворачивающая дорога +Name[sk]=Cestná odbočka Name[sv]=Vägsväng Name[uk]=Поворот шляху Name[x-test]=xxRoad Turnxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/road_vertical.desktop calligra-2.4.3/flow/stencils/Building_Site/road_vertical.desktop --- calligra-2.4.0/flow/stencils/Building_Site/road_vertical.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/road_vertical.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,9 +1,12 @@ [Desktop Entry] Name=Vertical Road Name[ca]=Carretera vertical +Name[ca@valencia]=Carretera vertical Name[el]=Κάθετος δρόμος Name[es]=Carretera vertical Name[et]=Vertikaalne tee +Name[fi]=Pystysuora tie +Name[hu]=Függőleges út Name[it]=Strada verticale Name[kk]=Тік жол Name[nb]=Loddrett vei @@ -13,6 +16,7 @@ Name[pt]=Estrada Vertical Name[pt_BR]=Estrada vertical Name[ru]=Вертикальная дорога +Name[sk]=Zvislá cesta Name[sv]=Vertikal väg Name[uk]=Вертикальний шлях Name[x-test]=xxVertical Roadxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/slope_horizontal.desktop calligra-2.4.3/flow/stencils/Building_Site/slope_horizontal.desktop --- calligra-2.4.0/flow/stencils/Building_Site/slope_horizontal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/slope_horizontal.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,12 @@ [Desktop Entry] Name=Horizontal Slope Name[ca]=Desnivell horitzontal +Name[ca@valencia]=Desnivell horitzontal Name[el]=Οριζόντια κλίση Name[es]=Rampa horizontal Name[et]=Horisontaalne kallak +Name[fi]=Vaakasuora luiska +Name[hu]=Vízszintes lejtő Name[it]=Pendio orizzontale Name[kk]=Жатық еңіс Name[nb]=Vannrett skråning @@ -12,6 +15,7 @@ Name[pt]=Rampa Horizontal Name[pt_BR]=Rampa horizontal Name[ru]=Горизонтальный склон +Name[sk]=Vodorovný svah Name[sv]=Horisontell backe Name[uk]=Горизонтальний ухил Name[x-test]=xxHorizontal Slopexx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/slope_vertical.desktop calligra-2.4.3/flow/stencils/Building_Site/slope_vertical.desktop --- calligra-2.4.0/flow/stencils/Building_Site/slope_vertical.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/slope_vertical.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,12 @@ [Desktop Entry] Name=Vertical Slope Name[ca]=Desnivell vertical +Name[ca@valencia]=Desnivell vertical Name[el]=Κάθετη κλίση Name[es]=Rampa vertical Name[et]=Vertikaalne kallak +Name[fi]=Pystysuora luiska +Name[hu]=Függőleges lejtő Name[it]=Pendio verticale Name[kk]=Тік еңіс Name[nb]=Loddrett skråning @@ -12,6 +15,7 @@ Name[pt]=Rampa Vertical Name[pt_BR]=Rampa vertical Name[ru]=Вертикальный склон +Name[sk]=Zvislý svah Name[sv]=Vertikal backe Name[uk]=Вертикальний ухил Name[x-test]=xxVertical Slopexx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/wall_horizontal.desktop calligra-2.4.3/flow/stencils/Building_Site/wall_horizontal.desktop --- calligra-2.4.0/flow/stencils/Building_Site/wall_horizontal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/wall_horizontal.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=Horizontal Wall Name[ca]=Paret horitzontal +Name[ca@valencia]=Paret horitzontal Name[de]=Waagerechte Mauer Name[el]=Οριζόντιο τείχος Name[es]=Pared horizontal Name[et]=Horisontaalne sein +Name[fi]=Vaakasuora muuri +Name[hu]=Vízszintes fal Name[it]=Muro orizzontale Name[kk]=Жатық қабырға Name[nb]=Vannrett vegg @@ -14,6 +17,7 @@ Name[pt]=Parede Horizontal Name[pt_BR]=Parede horizontal Name[ru]=Горизонтальная стена +Name[sk]=Vodorovná stena Name[sv]=Horisontell mur Name[uk]=Горизонтальна стіна Name[x-test]=xxHorizontal Wallxx diff -Nru calligra-2.4.0/flow/stencils/Building_Site/wall_vertical.desktop calligra-2.4.3/flow/stencils/Building_Site/wall_vertical.desktop --- calligra-2.4.0/flow/stencils/Building_Site/wall_vertical.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Building_Site/wall_vertical.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=Vertical Wall Name[ca]=Paret vertical +Name[ca@valencia]=Paret vertical Name[de]=Senkrechte Mauer Name[el]=Κάθετο τείχος Name[es]=Pared vertical Name[et]=Vertikaalne sein +Name[fi]=Pystysuora muuri +Name[hu]=Függőleges fal Name[it]=Muro verticale Name[kk]=Тік қабырға Name[nb]=Loddrett vegg @@ -14,6 +17,7 @@ Name[pt]=Parede Vertical Name[pt_BR]=Parede vertical Name[ru]=Вертикальная стена +Name[sk]=Zvislá stena Name[sv]=Vertikal mur Name[uk]=Вертикальна стіна Name[x-test]=xxVertical Wallxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/collection.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/collection.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Central Data Processing Name[ca]=Procés central de dades +Name[ca@valencia]=Procés central de dades Name[de]=Zentrale Datenverarbeitung Name[el]=Κεντρική επεξεργασία δεδομένων Name[es]=Central de proceso de datos Name[et]=Serveriruum +Name[hu]=Központi adatfeldolgozás Name[it]=Elaborazione dati centralizzata Name[kk]=Орталықтанған дерек өңдеуі Name[nb]=Sentral databehandling @@ -13,6 +15,7 @@ Name[pt]=Processamento de Dados Centrais Name[pt_BR]=Central de processamento de dados Name[ru]=Централизованная обработка данных +Name[sk]=Centrálne spracovanie dát Name[sv]=Central databehandling Name[uk]=Централізована обробка даних Name[x-test]=xxCentral Data Processingxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_15.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_15.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_15.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_15.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack15U Name[bg]=Шкаф 15U Name[ca]=Rack15U +Name[ca@valencia]=Rack15U Name[de]=Rack15U Name[el]=Rack15U Name[es]=Rack 15U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_32.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_32.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_32.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_32.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack32U Name[bg]=Шкаф 32U Name[ca]=Rack32U +Name[ca@valencia]=Rack32U Name[de]=Rack32U Name[el]=Rack32U Name[es]=Rack 32U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_36.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_36.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_36.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_36.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack36U Name[bg]=Шкаф 36U Name[ca]=Rack36U +Name[ca@valencia]=Rack36U Name[de]=Rack36U Name[el]=Rack36U Name[es]=Rack 36U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_42.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_42.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_42.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_42.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack42U Name[bg]=Шкаф 42U Name[ca]=Rack42U +Name[ca@valencia]=Rack42U Name[de]=Rack42U Name[el]=Rack42U Name[es]=Rack 42U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_44.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_44.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_44.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_44.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack44U Name[bg]=Шкаф 44U Name[ca]=Rack44U +Name[ca@valencia]=Rack44U Name[de]=Rack44U Name[el]=Rack44U Name[es]=Rack 44U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_5.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_5.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_5.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_5.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack5U Name[bg]=Шкаф 5U Name[ca]=Rack5U +Name[ca@valencia]=Rack5U Name[de]=Rack5U Name[el]=Rack5U Name[es]=Rack 5U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_7.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_7.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/CPD_rack_7.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/CPD_rack_7.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack7U Name[bg]=Шкаф 7U Name[ca]=Rack7U +Name[ca@valencia]=Rack7U Name[de]=Rack7U Name[el]=Rack7U Name[es]=Rack 7U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Litter.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Litter.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Litter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Litter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Litter Name[ca]=Abocament +Name[ca@valencia]=Abocament Name[de]=Abfall Name[el]=Απορρίμματα Name[es]=Basura Name[et]=Alus +Name[gl]=Litter Name[it]=Litter Name[kk]=Зембіл Name[nb]=Søppel @@ -13,6 +15,7 @@ Name[pt]=Lixo Name[pt_BR]=Lixo Name[ru]=Подставка +Name[sk]=Smeti Name[sv]=Avfall Name[uk]=Підставка Name[x-test]=xxLitterxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Modem.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Modem.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Modem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Modem.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=Modem Name[bg]=Модем Name[ca]=Mòdem +Name[ca@valencia]=Mòdem Name[cs]=Modem Name[de]=Modem Name[el]=Modem Name[es]=Módem Name[et]=Modem Name[fi]=Modeemi +Name[gl]=Módem Name[hu]=Modem Name[it]=Modem Name[kk]=Модем diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizador_Rack_1U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=OrganizadorRack1U Name[ca]=OrganizadorRack1U +Name[ca@valencia]=OrganizadorRack1U Name[de]=OrganizadorRack1U Name[el]=OrganizadorRack1U Name[es]=Rack organizador 1U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizador_Rack_2U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=OrganizadorRack2U Name[ca]=OrganizadorRack2U +Name[ca@valencia]=OrganizadorRack2U Name[de]=OrganizadorRack2U Name[el]=OrganizadorRack2U Name[es]=Rack organizador 2U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizer_Rack_1U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=OrganizerRack1U Name[ca]=OrganizerRack1U +Name[ca@valencia]=OrganizerRack1U Name[de]=OrganizerRack1U Name[el]=OrganizerRack1U Name[es]=Rack organizador 1U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Organizer_Rack_2U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=OrganizerRack2U Name[ca]=OrganizerRack2U +Name[ca@valencia]=OrganizerRack2U Name[de]=OrganizerRack2U Name[el]=OrganizerRack2U Name[es]=Rack organizador 2U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Path_Painel_24P.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Path_Painel_24P.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Path_Painel_24P.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Path_Painel_24P.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=PatchPanel24P Name[ca]=PatchPanel24P +Name[ca@valencia]=PatchPanel24P Name[de]=PatchPanel24P Name[el]=PatchPanel24P Name[es]=Panel de conexión 24P Name[et]=Ühenduspaneel 24P +Name[gl]=PatchPanel24P Name[hu]=PatchPanel24P Name[it]=PatchPanel24P Name[kk]=24 портты патч-панелі diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Router.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Router.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Router.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,12 +1,14 @@ [Desktop Entry] Name=Router Name[ca]=Encaminador +Name[ca@valencia]=Encaminador Name[cs]=Router Name[de]=Router Name[el]=Δρομολογητής Name[es]=Enrutador Name[et]=Ruuter Name[fi]=Reititin +Name[gl]=Router Name[hu]=Router Name[it]=Router Name[kk]=Маршруттауыш diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_1U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=ServerRack1U Name[bg]=Сървърен шкаф 1U Name[ca]=ServerRack1U +Name[ca@valencia]=ServerRack1U Name[de]=ServerRack1U Name[el]=ServerRack1U Name[es]=Rack servidor 1U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_2U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=ServerRack2U Name[bg]=Сървърен шкаф 2U Name[ca]=ServerRack2U +Name[ca@valencia]=ServerRack2U Name[de]=ServerRack2U Name[el]=ServerRack2U Name[es]=Rack servidor 2U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_2U_Slow.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerRack2USlow Name[ca]=ServerRack2USlow +Name[ca@valencia]=ServerRack2USlow Name[de]=ServerRack2USlow Name[el]=ServerRack2USlow Name[es]=Rack servidor 2U lento @@ -14,6 +15,7 @@ Name[pt]=BastidorServidor2ULento Name[pt_BR]=Rack de servidor 2U lento Name[ru]=Серверная стойка 2U (медленная) +Name[sk]=ServerRack2USlow Name[sv]=Serverrack 2U långsam Name[uk]=Серверна стійка 2U повільна Name[x-test]=xxServerRack2USlowxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_2U_Very_Slow.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerRack2UVerySlow Name[ca]=ServerRack2UVerySlow +Name[ca@valencia]=ServerRack2UVerySlow Name[de]=ServerRack2UVerySlow Name[el]=ServerRack2UVerySlow Name[es]=Rack servidor 2U muy lento @@ -14,6 +15,7 @@ Name[pt]=BastidorServidor2UMuitoLento Name[pt_BR]=Rack de servidor 2U muito lento Name[ru]=Серверная стойка 2U (очень медленная) +Name[sk]=ServerRack2UVerySlow Name[sv]=Serverrack 2U mycket långsam Name[uk]=Серверна стійка 2U дуже повільна Name[x-test]=xxServerRack2UVerySlowxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_3U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=ServerRack3U Name[bg]=Сървърен шкаф 3U Name[ca]=ServerRack3U +Name[ca@valencia]=ServerRack3U Name[de]=ServerRack3U Name[el]=ServerRack3U Name[es]=Rack servidor 3U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_3U_Slow_Density.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerRack3USlowDensity Name[ca]=ServerRack3USlowDensity +Name[ca@valencia]=ServerRack3USlowDensity Name[de]=ServerRack3USlowDensity Name[el]=ServerRack3USlowDensity Name[es]=Rack servidor 3U de capacidad lenta @@ -14,6 +15,7 @@ Name[pt]=BastidorServidor3UDensidadeLenta Name[pt_BR]=Rack de servidor 3U de densidade lenta Name[ru]=Серверная стойка 3USlowDensity +Name[sk]=ServerRack3USlowDensity Name[sv]=Serverrack 3U långsam täthet Name[uk]=Серверна стійка 3U повільна щільність Name[x-test]=xxServerRack3USlowDensityxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=ServerRack4U Name[bg]=Сървърен шкаф 4U Name[ca]=ServerRack4U +Name[ca@valencia]=ServerRack4U Name[de]=ServerRack4U Name[el]=ServerRack4U Name[es]=Rack servidor 4U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U_Right_Capacity.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerRack4URightCapacity Name[ca]=ServerRack4URightCapacity +Name[ca@valencia]=ServerRack4URightCapacity Name[de]=ServerRack4URightCapacity Name[el]=ServerRack4URightCapacity Name[es]=Rack servidor 4U de capacidad correcta @@ -14,6 +15,7 @@ Name[pt]=BastidorServidor4UCapacidadeCorrecta Name[pt_BR]=Rack de servidor 4U de capacidade correta Name[ru]=Серверная стойка 4URightCapacity +Name[sk]=ServerRack4URightCapacity Name[sv]=Serverrack 4U rätt kapacitet Name[uk]=Серверна стійка 4U правильна місткість Name[x-test]=xxServerRack4URightCapacityxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U_Slow_Capacity.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerRack4USlowCapacity Name[ca]=ServerRack4USlowCapacity +Name[ca@valencia]=ServerRack4USlowCapacity Name[de]=ServerRack4USlowCapacity Name[el]=ServerRack4USlowCapacity Name[es]=Rack servidor 4U de capacidad lenta @@ -14,6 +15,7 @@ Name[pt]=BastidorServidor4UCapacidadeLenta Name[pt_BR]=Rack de servidor 4U de capacidade lenta Name[ru]=Серверная стойка 4USlowCapacity +Name[sk]=ServerRack4USlowCapacity Name[sv]=Serverrack 4U långsam kapacitet Name[uk]=Серверна стійка 4U повільна місткість Name[x-test]=xxServerRack4USlowCapacityxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_4U_Very_Right_Capacity.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerRack4UVeryRightCapacity Name[ca]=ServerRack4UVeryRightCapacity +Name[ca@valencia]=ServerRack4UVeryRightCapacity Name[de]=ServerRack4UVeryRightCapacity Name[el]=ServerRack4UVeryRightCapacity Name[es]=Rack servidor 4U de capacidad muy correcta @@ -14,6 +15,7 @@ Name[pt]=BastidorServidor4UCapacidadeMuitoCorrecta Name[pt_BR]=Rack de servidor 4U de capacidade muito correta Name[ru]=Серверная стойка 4UVeryRightCapacity +Name[sk]=ServerRack4UVeryRightCapacity Name[sv]=Serverrack 4U helt rätt kapacitet Name[uk]=Серверна стійка 4U дуже правильна місткість Name[x-test]=xxServerRack4UVeryRightCapacityxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_5U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=ServerRack5U Name[bg]=Сървърен шкаф 5U Name[ca]=ServerRack5U +Name[ca@valencia]=ServerRack5U Name[de]=ServerRack5U Name[el]=ServerRack5U Name[es]=Rack servidor 5U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Server_Rack_5U_Right_Density.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ServerRack5URightDensity Name[ca]=ServerRack5URightDensity +Name[ca@valencia]=ServerRack5URightDensity Name[de]=ServerRack5URightDensity Name[el]=ServerRack5URightDensity Name[es]=Rack servidor 5U de densidad correcta @@ -14,6 +15,7 @@ Name[pt]=BastidorServidor5UDensidadeCorrecta Name[pt_BR]=Rack de servidor 5U de densidade correta Name[ru]=Серверная стойка 5URightDensity +Name[sk]=ServerRack5URightDensity Name[sv]=Serverrack 5U rätt täthet Name[uk]=Серверна стійка 5U правильна щільність Name[x-test]=xxServerRack5URightDensityxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Storage_Rack_3U.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Storage_Rack_3U.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Storage_Rack_3U.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Storage_Rack_3U.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=StorageRack3U Name[ca]=StorageRack3U +Name[ca@valencia]=StorageRack3U Name[de]=StorageRack3U Name[el]=StorageRack3U Name[es]=Rack de almacenamiento 3U diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Storage_Rack_3U_SAN.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=StorageRack3USAN Name[ca]=StorageRack3USAN +Name[ca@valencia]=StorageRack3USAN Name[de]=StorageRack3USAN Name[el]=StorageRack3USAN Name[es]=Rack de almacenamiento 3U SAN @@ -14,6 +15,7 @@ Name[pt]=BastidorArmazenamento3USAN Name[pt_BR]=Rack de armazenamento 3USAN Name[ru]=Серверная стойка 3USAN +Name[sk]=StorageRack3USAN Name[sv]=Lagringshylla 3U SAN Name[uk]=Стійка сховища 3U SAN Name[x-test]=xxStorageRack3USANxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_16P.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_16P.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_16P.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_16P.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SwitchRack16P Name[ca]=SwitchRack16P +Name[ca@valencia]=SwitchRack16P Name[de]=SwitchRack16P Name[el]=SwitchRack16P Name[es]=Rack conmutable 16P diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_24P.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_24P.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_24P.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_24P.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SwitchRack24P Name[ca]=SwitchRack24P +Name[ca@valencia]=SwitchRack24P Name[de]=SwitchRack24P Name[el]=SwitchRack24P Name[es]=Rack conmutable 24P diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_48P.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_48P.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_48P.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_48P.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SwitchRack48P Name[ca]=SwitchRack48P +Name[ca@valencia]=SwitchRack48P Name[de]=SwitchRack48P Name[el]=SwitchRack48P Name[es]=Rack conmutable 48P diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Switch_Rack_50P.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SwitchRack50P Name[ca]=SwitchRack50P +Name[ca@valencia]=SwitchRack50P Name[de]=SwitchRack50P Name[el]=SwitchRack50P Name[es]=Rack conmutable 50P diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Telephone_exchange.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=TelephoneExchange Name[ca]=TelephoneExchange +Name[ca@valencia]=TelephoneExchange Name[el]=TelephoneExchange Name[es]=Central telefónica Name[et]=Telefonijaam @@ -12,6 +13,7 @@ Name[pt]=ComutadorTelefone Name[pt_BR]=Comutador de telefone Name[ru]=Телефонная станция +Name[sk]=TelephoneExchange Name[sv]=Telefonväxel Name[uk]=Телефонна станція Name[x-test]=xxTelephoneExchangexx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Voice_Painel_20P.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=VoicePanel20P Name[ca]=VoicePanel20P +Name[ca@valencia]=VoicePanel20P Name[de]=VoicePanel20P Name[el]=VoicePanel20P Name[es]=Panel de voz 20P @@ -14,6 +15,7 @@ Name[pt]=PainelVoz20P Name[pt_BR]=Painel de voz 20P Name[ru]=Телефонная панель на 20 портов +Name[sk]=VoicePanel20P Name[sv]=Röstpanel 20P Name[uk]=Голосова панель 20P Name[x-test]=xxVoicePanel20Pxx diff -Nru calligra-2.4.0/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop calligra-2.4.3/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop --- calligra-2.4.0/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Central_Data_Processing/Voice_Painel_50P.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=VoicePanel50P Name[ca]=VoicePanel50P +Name[ca@valencia]=VoicePanel50P Name[de]=VoicePanel50P Name[el]=VoicePanel50P Name[es]=panel de voz 50P @@ -14,6 +15,7 @@ Name[pt]=PainelVoz50P Name[pt_BR]=Painel de voz 50P Name[ru]=Телефонная панель на 50 портов +Name[sk]=VoicePanel50P Name[sv]=Röstpanel 50P Name[uk]=Голосова панель 50P Name[x-test]=xxVoicePanel50Pxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/ACgen.desktop calligra-2.4.3/flow/stencils/ChemEng/ACgen.desktop --- calligra-2.4.0/flow/stencils/ChemEng/ACgen.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/ACgen.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ACgen Name[ca]=ACgen +Name[ca@valencia]=ACgen Name[el]=ACgen Name[es]=Generador de C.A. Name[et]=Vahelduvvoolu generaator @@ -12,6 +13,7 @@ Name[pt]=GeradorAC Name[pt_BR]=gerador de CA Name[ru]=Генератор переменного тока +Name[sk]=ACgen Name[sv]=växelströmsgenerator Name[uk]=Генератор змінного струму Name[x-test]=xxACgenxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/aircooler.desktop calligra-2.4.3/flow/stencils/ChemEng/aircooler.desktop --- calligra-2.4.0/flow/stencils/ChemEng/aircooler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/aircooler.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=aircooler Name[ca]=refrigerador d'aire +Name[ca@valencia]=refredador d'aire Name[de]=Kühlschlange Name[el]=aircooler Name[es]=refrigerador por aire Name[et]=Õhujahuti +Name[gl]=refrixerador Name[it]=raffreddamento-ad-aria Name[kk]=Ауа салқындатқышы Name[nb]=luftkjøler @@ -13,6 +15,7 @@ Name[pt]=arrefecimento Name[pt_BR]=arrefecimento Name[ru]=Воздушный вентилятор +Name[sk]=vzduchový chladič Name[sv]=luftkylare Name[uk]=Охолоджувач повітря Name[x-test]=xxaircoolerxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/airforced.desktop calligra-2.4.3/flow/stencils/ChemEng/airforced.desktop --- calligra-2.4.0/flow/stencils/ChemEng/airforced.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/airforced.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=airforced Name[ca]=forçat per aire +Name[ca@valencia]=forçat per aire Name[el]=airforced Name[es]=aire forzado Name[et]=Sissepuhe @@ -12,6 +13,7 @@ Name[pt]=ar-forçado Name[pt_BR]=ar forçado Name[ru]=Воздушный вентилятор с принудительным затягиванием +Name[sk]=airforced Name[sv]=fläktluft Name[uk]=Охолоджувач з примусовим виводом повітря Name[x-test]=xxairforcedxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/airinduced.desktop calligra-2.4.3/flow/stencils/ChemEng/airinduced.desktop --- calligra-2.4.0/flow/stencils/ChemEng/airinduced.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/airinduced.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=airinduced Name[ca]=induït per aire +Name[ca@valencia]=induït per aire Name[el]=airinduced Name[es]=aire inducido Name[et]=Väljatõmme @@ -12,6 +13,7 @@ Name[pt]=ar-induzido Name[pt_BR]=ar induzido Name[ru]=Воздушный вентилятор с принудительным отводом +Name[sk]=airinduced Name[sv]=självdrag Name[uk]=Охолоджувач з примусовим затягуванням повітря Name[x-test]=xxairinducedxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/autoclave.desktop calligra-2.4.3/flow/stencils/ChemEng/autoclave.desktop --- calligra-2.4.0/flow/stencils/ChemEng/autoclave.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/autoclave.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=autoclave Name[ca]=autoclau +Name[ca@valencia]=autoclau Name[de]=Autoklav Name[el]=autoclave Name[es]=clave automática @@ -13,6 +14,7 @@ Name[pt]=auto-chave Name[pt_BR]=auto-chave Name[ru]=Автоклав +Name[sk]=autoclave Name[sv]=autoklav Name[uk]=Автоклав Name[x-test]=xxautoclavexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/bigtraycol.desktop calligra-2.4.3/flow/stencils/ChemEng/bigtraycol.desktop --- calligra-2.4.0/flow/stencils/ChemEng/bigtraycol.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/bigtraycol.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=bigtraycol Name[ca]=papereragran +Name[ca@valencia]=papereragran Name[el]=bigtraycol Name[es]=Bandeja de columnas grande Name[et]=Suur destillatsioonikolonn +Name[gl]=bigtraycol Name[it]=bigtraycol Name[kk]=Үлкен ректификатор Name[nb]=storkolonne @@ -12,6 +14,7 @@ Name[pt]=bandeja-grande Name[pt_BR]=bandeja grande Name[ru]=Большой резервуар +Name[sk]=bigtraycol Name[sv]=kolonn stora bottnar Name[uk]=Тарільчата колона, детально Name[x-test]=xxbigtraycolxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/centrifuge.desktop calligra-2.4.3/flow/stencils/ChemEng/centrifuge.desktop --- calligra-2.4.0/flow/stencils/ChemEng/centrifuge.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/centrifuge.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=centrifuge Name[ca]=centrífuga +Name[ca@valencia]=centrífuga Name[de]=Zentrifuge Name[el]=κεντρόφυγο Name[es]=centrífuga @@ -14,6 +15,7 @@ Name[pt]=centrífugo Name[pt_BR]=centrifuga Name[ru]=Центрифуга +Name[sk]=centrifuge Name[sv]=centrifug Name[uk]=Центрифуга Name[x-test]=xxcentrifugexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/coil.desktop calligra-2.4.3/flow/stencils/ChemEng/coil.desktop --- calligra-2.4.0/flow/stencils/ChemEng/coil.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/coil.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=coil Name[ca]=resistència +Name[ca@valencia]=resistència Name[el]=coil Name[es]=bobina Name[et]=Spiraaltoru @@ -12,6 +13,7 @@ Name[pt]=serpentina Name[pt_BR]=serpentina Name[ru]=Спираль +Name[sk]=cievka Name[sv]=spole Name[uk]=Нагрівальний або охолоджувальний змійовик Name[x-test]=xxcoilxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/coilv.desktop calligra-2.4.3/flow/stencils/ChemEng/coilv.desktop --- calligra-2.4.0/flow/stencils/ChemEng/coilv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/coilv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=coilv Name[ca]=resistènciav +Name[ca@valencia]=resistènciav Name[el]=coilv Name[es]=bobina vertical Name[et]=Vertikaalne spiraaltoru @@ -12,6 +13,7 @@ Name[pt]=serpentina-v Name[pt_BR]=serpentina em v Name[ru]=Спираль вертикальная +Name[sk]=coilv Name[sv]=spole vertikal Name[uk]=Вертикальний нагрівальний або охолоджувальний змійовик Name[x-test]=xxcoilvxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/collection.desktop calligra-2.4.3/flow/stencils/ChemEng/collection.desktop --- calligra-2.4.0/flow/stencils/ChemEng/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ChemEng Name[ca]=Enginyeria Química +Name[ca@valencia]=Enginyeria Química Name[el]=ChemEng Name[es]=Ingeniería química Name[et]=Keemia @@ -12,6 +13,7 @@ Name[pt]=MotorQuim Name[pt_BR]=Motor químico Name[ru]=Химическая инженерия +Name[sk]=ChemEng Name[sv]=Kemiteknik Name[uk]=Хімічна промисловість Name[x-test]=xxChemEngxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/compr.desktop calligra-2.4.3/flow/stencils/ChemEng/compr.desktop --- calligra-2.4.0/flow/stencils/ChemEng/compr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/compr.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=compr Name[ca]=compr +Name[ca@valencia]=compr Name[el]=compr Name[es]=compresor Name[et]=Kompressor +Name[gl]=compr Name[it]=compr Name[kk]=Компрессор Name[nb]=kompr @@ -12,6 +14,7 @@ Name[pt]=compr Name[pt_BR]=compressor Name[ru]=Компрессор +Name[sk]=compr Name[sv]=kompressor Name[uk]=Компресор або турбіна Name[x-test]=xxcomprxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/coveredtank.desktop calligra-2.4.3/flow/stencils/ChemEng/coveredtank.desktop --- calligra-2.4.0/flow/stencils/ChemEng/coveredtank.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/coveredtank.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=coveredtank Name[ca]=tanc cobert +Name[ca@valencia]=tanc covert Name[el]=coveredtank Name[es]=Tanque cubierto Name[et]=Kaetud anum @@ -12,6 +13,7 @@ Name[pt]=tanque-coberto Name[pt_BR]=tanque coberto Name[ru]=Резервуар с крышкой +Name[sk]=coveredtank Name[sv]=täckt tank Name[uk]=Резервуар з кришкою Name[x-test]=xxcoveredtankxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/cyclone.desktop calligra-2.4.3/flow/stencils/ChemEng/cyclone.desktop --- calligra-2.4.0/flow/stencils/ChemEng/cyclone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/cyclone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=cyclone Name[ca]=cicló +Name[ca@valencia]=cicló Name[el]=cyclone Name[es]=ciclón Name[et]=Tsüklon @@ -12,6 +13,7 @@ Name[pt]=ciclone Name[pt_BR]=ciclone Name[ru]=Центробежный сепаратор +Name[sk]=cyklón Name[sv]=cyklon Name[uk]=Центробіжний вентилятор Name[x-test]=xxcyclonexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/displa.desktop calligra-2.4.3/flow/stencils/ChemEng/displa.desktop --- calligra-2.4.0/flow/stencils/ChemEng/displa.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/displa.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=displa Name[ca]=displa +Name[ca@valencia]=displa Name[el]=displa Name[es]=Bomba o compresor de desplazamiento positivo rotatorio Name[et]=Näidik @@ -12,6 +13,7 @@ Name[pt]=displa Name[pt_BR]=displa Name[ru]=Крутящий насос или компрессор с положительным смещением +Name[sk]=displa Name[sv]=fördelare Name[uk]=Обертальний насос або компресор з додатним зміщенням Name[x-test]=xxdisplaxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/doublepipe.desktop calligra-2.4.3/flow/stencils/ChemEng/doublepipe.desktop --- calligra-2.4.0/flow/stencils/ChemEng/doublepipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/doublepipe.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=doublepipe Name[ca]=doble canonada +Name[ca@valencia]=doble canonada Name[de]=Doppelrohr Name[el]=doublepipe Name[es]=intercambiador de doble tubo @@ -13,6 +14,7 @@ Name[pt]=tubo-duplo Name[pt_BR]=tubo duplo Name[ru]=Двухтрубный теплообменник +Name[sk]=doublepipe Name[sv]=dubbelrör Name[uk]=Двотрубний обмінник Name[x-test]=xxdoublepipexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/ejector.desktop calligra-2.4.3/flow/stencils/ChemEng/ejector.desktop --- calligra-2.4.0/flow/stencils/ChemEng/ejector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/ejector.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=ejector Name[ca]=ejector +Name[ca@valencia]=ejector Name[de]=Auswurf Name[el]=ejector Name[es]=eyector Name[et]=Ejektor +Name[gl]=expulsor Name[it]=ejector Name[kk]=Эжектор Name[nb]=utkaster @@ -13,6 +15,7 @@ Name[pt]=ejecção Name[pt_BR]=ejetor Name[ru]=Эжектор +Name[sk]=ejektor Name[sv]=ejektor Name[uk]=Ежектор Name[x-test]=xxejectorxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/fan.desktop calligra-2.4.3/flow/stencils/ChemEng/fan.desktop --- calligra-2.4.0/flow/stencils/ChemEng/fan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/fan.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=fan Name[bg]=вентилатор Name[ca]=ventilador +Name[ca@valencia]=ventilador Name[de]=Lüfter Name[el]=ανεμιστήρας Name[es]=ventilador Name[et]=Ventilaator +Name[gl]=fan Name[it]=ventola Name[kk]=Желдеткіш Name[nb]=vifte @@ -15,6 +17,7 @@ Name[pt]=ventoinha Name[pt_BR]=ventoinha Name[ru]=Вентилятор +Name[sk]=ventilátor Name[sv]=fläkt Name[uk]=Вентилятор або розмішувач Name[x-test]=xxfanxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/filter.desktop calligra-2.4.3/flow/stencils/ChemEng/filter.desktop --- calligra-2.4.0/flow/stencils/ChemEng/filter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/filter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,13 +2,16 @@ Name=filter Name[bg]=филтър Name[ca]=filtre +Name[ca@valencia]=filtre Name[cs]=filtr Name[de]=Filter Name[el]=φίλτρο Name[es]=filtro Name[et]=Filter Name[fr]=Filtre +Name[gl]=filtro Name[it]=filtro +Name[ja]=フィルタ Name[kk]=Сүзгі Name[nb]=filter Name[nds]=Filter @@ -17,6 +20,7 @@ Name[pt]=filtro Name[pt_BR]=filtro Name[ru]=Фильтр +Name[sk]=filter Name[sv]=filter Name[ug]=سۈزگۈچ Name[uk]=Фільтр diff -Nru calligra-2.4.0/flow/stencils/ChemEng/fixedroof.desktop calligra-2.4.3/flow/stencils/ChemEng/fixedroof.desktop --- calligra-2.4.0/flow/stencils/ChemEng/fixedroof.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/fixedroof.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=fixedroof Name[ca]=sostre fixat +Name[ca@valencia]=sostre fixat Name[el]=fixedroof Name[es]=cubierta fija Name[et]=Fikseeritud kaas @@ -12,6 +13,7 @@ Name[pt]=tecto-fixo Name[pt_BR]=teto fixo Name[ru]=Закреплённая крышка +Name[sk]=fixedroof Name[sv]=fast tak Name[uk]=Резервуар з фіксованою кришкою Name[x-test]=xxfixedroofxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/floatingroof.desktop calligra-2.4.3/flow/stencils/ChemEng/floatingroof.desktop --- calligra-2.4.0/flow/stencils/ChemEng/floatingroof.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/floatingroof.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=floatingroof Name[ca]=fals sostre +Name[ca@valencia]=fals sostre Name[el]=floatingroof Name[es]=cubierta flotante Name[et]=Ujuv kaas @@ -12,6 +13,7 @@ Name[pt]=tecto-flutuante Name[pt_BR]=teto flutuante Name[ru]=Съёмная крышка +Name[sk]=floatingroof Name[sv]=rörligt tak Name[uk]=Резервуар з рухомою кришкою Name[x-test]=xxfloatingroofxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/flowfan.desktop calligra-2.4.3/flow/stencils/ChemEng/flowfan.desktop --- calligra-2.4.0/flow/stencils/ChemEng/flowfan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/flowfan.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=flowfan Name[ca]=ventilador de flux +Name[ca@valencia]=ventilador de flux Name[el]=flowfan Name[es]=ventilador de flujo Name[et]=Puhur @@ -12,6 +13,7 @@ Name[pt]=ventoinha-fluxo Name[pt_BR]=ventoinha de fluxo Name[ru]=Вентилятор +Name[sk]=flowfan Name[sv]=flödesfläkt Name[uk]=Вентилятор, що створює осесиметричний потік Name[x-test]=xxflowfanxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/fluidcont.desktop calligra-2.4.3/flow/stencils/ChemEng/fluidcont.desktop --- calligra-2.4.0/flow/stencils/ChemEng/fluidcont.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/fluidcont.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=fluidcont Name[ca]=fluid continu +Name[ca@valencia]=fluid continu Name[el]=fluidcont Name[es]=contenedor de fluidos Name[et]=Vedelikumahuti @@ -11,6 +12,7 @@ Name[pl]=kontener na płyn Name[pt]=contentor-fluido Name[pt_BR]=contentor de fluido +Name[sk]=fluidcont Name[sv]=vätskebehållare Name[uk]=Проста посудина для рідини Name[x-test]=xxfluidcontxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/furnace.desktop calligra-2.4.3/flow/stencils/ChemEng/furnace.desktop --- calligra-2.4.0/flow/stencils/ChemEng/furnace.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/furnace.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=furnace Name[bg]=пещ Name[ca]=forn +Name[ca@valencia]=forn Name[de]=Schmelzofen Name[el]=furnace Name[es]=horno Name[et]=Põleti +Name[gl]=forno Name[it]=forno Name[kk]=Пеш Name[nb]=ovn @@ -14,6 +16,7 @@ Name[pt]=fornalha Name[pt_BR]=fornalha Name[ru]=Печь +Name[sk]=ohnisko Name[sv]=ugn Name[uk]=Піч Name[x-test]=xxfurnacexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/gasholder.desktop calligra-2.4.3/flow/stencils/ChemEng/gasholder.desktop --- calligra-2.4.0/flow/stencils/ChemEng/gasholder.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/gasholder.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=gasholder Name[ca]=sortidor +Name[ca@valencia]=eixidor Name[el]=gasholder Name[es]=mantenedor de gas Name[et]=Gasomeeter @@ -12,6 +13,7 @@ Name[pt]=cisterna Name[pt_BR]=cisterna Name[ru]=Ёмкость для газа +Name[sk]=gasholder Name[sv]=gasbehållare Name[uk]=Газосховище Name[x-test]=xxgasholderxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/hx.desktop calligra-2.4.3/flow/stencils/ChemEng/hx.desktop --- calligra-2.4.0/flow/stencils/ChemEng/hx.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/hx.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=hx Name[ca]=hx +Name[ca@valencia]=hx Name[el]=hx Name[es]=intercambiador de calor Name[et]=Soojusvaheti diff -Nru calligra-2.4.0/flow/stencils/ChemEng/hxv.desktop calligra-2.4.3/flow/stencils/ChemEng/hxv.desktop --- calligra-2.4.0/flow/stencils/ChemEng/hxv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/hxv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=hxv Name[ca]=hxv +Name[ca@valencia]=hxv Name[el]=hxv Name[es]=intercambiador de calor vertical Name[et]=Vertikaalne soojusvaheti diff -Nru calligra-2.4.0/flow/stencils/ChemEng/kettle.desktop calligra-2.4.3/flow/stencils/ChemEng/kettle.desktop --- calligra-2.4.0/flow/stencils/ChemEng/kettle.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/kettle.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=kettle Name[ca]=bullidor +Name[ca@valencia]=bullidor Name[de]=Kessel Name[el]=kettle Name[es]=tetera Name[et]=Aurusti +Name[gl]=caldeira Name[it]=kettle Name[kk]=Қазан Name[nb]=kjele @@ -13,6 +15,7 @@ Name[pt]=tigela Name[pt_BR]=tigela Name[ru]=Чайник +Name[sk]=kettle Name[sv]=panna Name[uk]=Нагрівач Kettle Name[x-test]=xxkettlexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/knockout.desktop calligra-2.4.3/flow/stencils/ChemEng/knockout.desktop --- calligra-2.4.0/flow/stencils/ChemEng/knockout.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/knockout.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=knockout Name[ca]=knockout +Name[ca@valencia]=knockout Name[el]=knockout Name[es]=tambor de separación Name[et]=Separaator @@ -12,6 +13,7 @@ Name[pt]=queda Name[pt_BR]=queda Name[ru]=Выбивка +Name[sk]=knockout Name[sv]=kracker Name[uk]=Вибивний барабан (з підставкою) Name[x-test]=xxknockoutxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/measure.desktop calligra-2.4.3/flow/stencils/ChemEng/measure.desktop --- calligra-2.4.0/flow/stencils/ChemEng/measure.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/measure.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=measure Name[ca]=mesura +Name[ca@valencia]=mesura Name[cs]=změřit Name[el]=μέτρηση Name[es]=medida Name[et]=Mõõdik +Name[gl]=medida Name[it]=measure Name[kk]=Өлшегіш Name[nb]=mål @@ -13,6 +15,7 @@ Name[pt]=medida Name[pt_BR]=medida Name[ru]=Мерка +Name[sk]=miera Name[sv]=mått Name[uk]=Вимірювання Name[x-test]=xxmeasurexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/mixer.desktop calligra-2.4.3/flow/stencils/ChemEng/mixer.desktop --- calligra-2.4.0/flow/stencils/ChemEng/mixer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/mixer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=mixer Name[ca]=mesclador +Name[ca@valencia]=mesclador Name[cs]=směšovač Name[de]=Mixer Name[el]=μείκτης Name[es]=mezclador Name[et]=Mikser +Name[gl]=mesturador Name[it]=mixer Name[kk]=Араластырғыш Name[nb]=mikser @@ -14,6 +16,7 @@ Name[pt]=misturador Name[pt_BR]=misturador Name[ru]=Смеситель +Name[sk]=mixér Name[sv]=mixer Name[uk]=Змішувач Name[x-test]=xxmixerxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/plate.desktop calligra-2.4.3/flow/stencils/ChemEng/plate.desktop --- calligra-2.4.0/flow/stencils/ChemEng/plate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/plate.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=plate Name[ca]=plat +Name[ca@valencia]=plat Name[el]=plate Name[es]=intercambiador de platos Name[et]=Plaatsoojusvaheti +Name[gl]=plato Name[it]=plate Name[kk]=Жалпақ жылу алмастырғыKPlato Name[nb]=plate @@ -12,6 +14,7 @@ Name[pt]=prato Name[pt_BR]=prato Name[ru]=Пластинчатый теплообменник +Name[sk]=doska Name[sv]=botten Name[uk]=Пластинчастий обмінник Name[x-test]=xxplatexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/pneum.desktop calligra-2.4.3/flow/stencils/ChemEng/pneum.desktop --- calligra-2.4.0/flow/stencils/ChemEng/pneum.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/pneum.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=pneum Name[ca]=pneumàtic +Name[ca@valencia]=pneumàtic Name[el]=pneum Name[es]=línea neumática Name[et]=Pneumojuhe @@ -12,6 +13,7 @@ Name[pt]=pneum Name[pt_BR]=pneum Name[ru]=Пневматический +Name[sk]=pneum Name[sv]=pneum Name[uk]=Пневматична лінія Name[x-test]=xxpneumxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/pneumv.desktop calligra-2.4.3/flow/stencils/ChemEng/pneumv.desktop --- calligra-2.4.0/flow/stencils/ChemEng/pneumv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/pneumv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=pneumv Name[ca]=pneumàticv +Name[ca@valencia]=pneumàticv Name[el]=pneumv Name[es]=línea neumática vertical Name[et]=Vertikaalne pneumojuhe @@ -11,6 +12,7 @@ Name[pl]=pneumv Name[pt]=pneum-v Name[pt_BR]=pneum-v +Name[sk]=pneumv Name[sv]=pneum vertikal Name[uk]=Пневматична вертикальна лінія Name[x-test]=xxpneumvxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/pnuemv.desktop calligra-2.4.3/flow/stencils/ChemEng/pnuemv.desktop --- calligra-2.4.0/flow/stencils/ChemEng/pnuemv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/pnuemv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=pnuemv Name[ca]=pnuemv +Name[ca@valencia]=pnuemv Name[el]=pnuemv Name[es]=línea neumática vertical Name[et]=Vertikaalne pneumojuhe @@ -11,6 +12,7 @@ Name[pl]=pnuemv Name[pt]=pnuem-v Name[pt_BR]=pnuem-v +Name[sk]=pnuemv Name[sv]=pnuem vertikal Name[uk]=Пневматична вертикальна лінія Name[x-test]=xxpnuemvxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/pump.desktop calligra-2.4.3/flow/stencils/ChemEng/pump.desktop --- calligra-2.4.0/flow/stencils/ChemEng/pump.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/pump.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=pump Name[ca]=bomba +Name[ca@valencia]=bomba Name[de]=Pumpe Name[el]=αντλία Name[es]=bomba centrífuga @@ -14,6 +15,7 @@ Name[pt]=bomba Name[pt_BR]=bomba Name[ru]=Насос +Name[sk]=pump Name[sv]=pump Name[uk]=Центробіжний насос або вентилятор Name[x-test]=xxpumpxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/reactor.desktop calligra-2.4.3/flow/stencils/ChemEng/reactor.desktop --- calligra-2.4.0/flow/stencils/ChemEng/reactor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/reactor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=reactor Name[ca]=reactor +Name[ca@valencia]=reactor Name[el]=reactor Name[es]=reactor Name[et]=Reaktsioonianum +Name[gl]=reactor Name[it]=reattore Name[kk]=Реактор Name[nb]=reaktor @@ -12,6 +14,7 @@ Name[pt]=reactor Name[pt_BR]=reator Name[ru]=Реактор +Name[sk]=reaktor Name[sv]=reaktor Name[uk]=Спрощений реактор або абсорбційна посудина Name[x-test]=xxreactorxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/recipr.desktop calligra-2.4.3/flow/stencils/ChemEng/recipr.desktop --- calligra-2.4.0/flow/stencils/ChemEng/recipr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/recipr.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=recipr Name[ca]=recipr +Name[ca@valencia]=recipr Name[el]=recipr Name[es]=recíproco Name[et]=Kolbpump +Name[gl]=recipr Name[it]=recipr Name[kk]=Мікбасты сорғыш Name[nb]=stempl @@ -12,6 +14,7 @@ Name[pt]=recipr Name[pt_BR]=recipr Name[ru]=Взаимный +Name[sk]=recipr Name[sv]=kolv Name[uk]=Поршневий компресор або насос Name[x-test]=xxreciprxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/regval.desktop calligra-2.4.3/flow/stencils/ChemEng/regval.desktop --- calligra-2.4.0/flow/stencils/ChemEng/regval.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/regval.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=regval Name[ca]=regval +Name[ca@valencia]=regval Name[el]=regval Name[es]=válvula regulable Name[et]=Reguleeritav ventiil +Name[gl]=regval Name[it]=regval Name[kk]=Реттеуіш шұра Name[nb]=regulerventil @@ -11,6 +13,7 @@ Name[pl]=regval Name[pt]=valor-reg Name[pt_BR]=valor-reg +Name[sk]=regval Name[sv]=reglerventil Name[uk]=Регульований клапан Name[x-test]=xxregvalxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/regvalv.desktop calligra-2.4.3/flow/stencils/ChemEng/regvalv.desktop --- calligra-2.4.0/flow/stencils/ChemEng/regvalv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/regvalv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=regvalv Name[ca]=regvalv +Name[ca@valencia]=regvalv Name[el]=regvalv Name[es]=válvula regulable vertical Name[et]=Vertikaalne reguleeritav ventiil +Name[gl]=regvalv Name[it]=regvalv Name[kk]=Тік реттеуіш шұра Name[nb]=regulerventil loddrett @@ -11,6 +13,7 @@ Name[pl]=regvalv Name[pt]=valor-reg-v Name[pt_BR]=valor-reg-v +Name[sk]=regvalv Name[sv]=reglerventil vertikal Name[uk]=Регульований клапан, вертикальний Name[x-test]=xxregvalvxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/SaT-fixedtube.desktop calligra-2.4.3/flow/stencils/ChemEng/SaT-fixedtube.desktop --- calligra-2.4.0/flow/stencils/ChemEng/SaT-fixedtube.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/SaT-fixedtube.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SaT-fixedtube Name[ca]=Tub fixat SaT +Name[ca@valencia]=Tub fixat SaT Name[el]=SaT-fixedtube Name[es]=Intercambiador de tubo fijo Name[et]=Fikseeritud manteltoru-soojusvaheti @@ -11,6 +12,7 @@ Name[pl]=SaT-utwierdzona rurka Name[pt]=tubo-fixo-SaT Name[pt_BR]=tubo fixo de SaT +Name[sk]=SaT-fixedtube Name[sv]=tubpanna fasttub Name[uk]=Обмінник з фіксованим зведенням Name[x-test]=xxSaT-fixedtubexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/SaT-floatinghead.desktop calligra-2.4.3/flow/stencils/ChemEng/SaT-floatinghead.desktop --- calligra-2.4.0/flow/stencils/ChemEng/SaT-floatinghead.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/SaT-floatinghead.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SaT-floatinghead Name[ca]=Cap flotant SaT +Name[ca@valencia]=Cap flotant SaT Name[el]=SaT-floatinghead Name[es]=Intercambiador de cabezal flotante Name[et]=Hõljuv manteltoru-soojusvaheti @@ -11,6 +12,7 @@ Name[pl]=SaT-pływająca głowica Name[pt]=cabeça-flutuante-SaT Name[pt_BR]=cabeça flutuante de SaT +Name[sk]=SaT-floatinghead Name[sv]=tubpanna rörlig topp Name[uk]=Обмінник з рухомою голівкою Name[x-test]=xxSaT-floatingheadxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/sealedtank.desktop calligra-2.4.3/flow/stencils/ChemEng/sealedtank.desktop --- calligra-2.4.0/flow/stencils/ChemEng/sealedtank.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/sealedtank.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=sealedtank Name[ca]=tanc segellat +Name[ca@valencia]=tanc segellat Name[el]=sealedtank Name[es]=Tanque sellado Name[et]=Kinnine paak @@ -12,6 +13,7 @@ Name[pt]=tanque-selado Name[pt_BR]=tanque selado Name[ru]=Запаянный сосуд +Name[sk]=sealedtank Name[sv]=täckt tank Name[uk]=Запечатана посудина Name[x-test]=xxsealedtankxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/settling.desktop calligra-2.4.3/flow/stencils/ChemEng/settling.desktop --- calligra-2.4.0/flow/stencils/ChemEng/settling.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/settling.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=settling Name[ca]=assentant +Name[ca@valencia]=assentant Name[el]=settling Name[es]=asentamiento Name[et]=Settepaak @@ -12,6 +13,7 @@ Name[pt]=depósito Name[pt_BR]=depósito Name[ru]=Осадок +Name[sk]=settling Name[sv]=sedimentation Name[uk]=Очищувач або відстійник Name[x-test]=xxsettlingxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/spray.desktop calligra-2.4.3/flow/stencils/ChemEng/spray.desktop --- calligra-2.4.0/flow/stencils/ChemEng/spray.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/spray.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,13 +2,16 @@ Name=spray Name[bg]=спрей Name[ca]=esprai +Name[ca@valencia]=esprai Name[cs]=sprej Name[de]=Sprühen Name[el]=spray Name[es]=dispositivo difusor Name[et]=Segisti Name[fr]=Aérographe +Name[gl]=spray Name[it]=spray +Name[ja]=スプレー Name[kk]=Бүркіш Name[nb]=dusj Name[nl]=sproeier @@ -16,6 +19,7 @@ Name[pt]=spray Name[pt_BR]=spray Name[ru]=Распылитель +Name[sk]=sprej Name[sv]=sprej Name[uk]=Розпилювач Name[x-test]=xxsprayxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/spraydrier.desktop calligra-2.4.3/flow/stencils/ChemEng/spraydrier.desktop --- calligra-2.4.0/flow/stencils/ChemEng/spraydrier.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/spraydrier.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=spraydrier Name[ca]=assecadoresprai +Name[ca@valencia]=assecadoresprai Name[de]=Sprühtrockner Name[el]=spraydrier Name[es]=secadora difusora Name[et]=Pihustuskuivati +Name[gl]=spraydrier Name[it]=spraydrier Name[kk]=Бүрку құрғатқыш Name[nb]=dusjtørker @@ -13,6 +15,7 @@ Name[pt]=secador-spray Name[pt_BR]=secador de spray Name[ru]=Распылительная сушилка +Name[sk]=spraydrier Name[sv]=sprejtorkare Name[uk]=Розпилювальна сушарка Name[x-test]=xxspraydrierxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/storagesphere.desktop calligra-2.4.3/flow/stencils/ChemEng/storagesphere.desktop --- calligra-2.4.0/flow/stencils/ChemEng/storagesphere.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/storagesphere.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=storagesphere Name[ca]=esfera d'emmagatzemament +Name[ca@valencia]=esfera d'emmagatzament Name[el]=storagesphere Name[es]=esfera de almacenamiento Name[et]=Ümarhoidla @@ -11,6 +12,7 @@ Name[pl]=magazyn sferyczny Name[pt]=esfera-armazenamento Name[pt_BR]=esfera de armazenamento +Name[sk]=storagesphere Name[sv]=lagringsklocka Name[uk]=Сферичний накопичувач Name[x-test]=xxstoragespherexx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/tank.desktop calligra-2.4.3/flow/stencils/ChemEng/tank.desktop --- calligra-2.4.0/flow/stencils/ChemEng/tank.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/tank.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=tank Name[ca]=tanc +Name[ca@valencia]=tanc Name[el]=tank Name[es]=tanque Name[et]=Paak @@ -12,6 +13,7 @@ Name[pt]=tanque Name[pt_BR]=tanque Name[ru]=Сосуд +Name[sk]=tank Name[sv]=tank Name[uk]=Відкрита посудина Name[x-test]=xxtankxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/traycol.desktop calligra-2.4.3/flow/stencils/ChemEng/traycol.desktop --- calligra-2.4.0/flow/stencils/ChemEng/traycol.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/traycol.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=traycol Name[ca]=escombraries +Name[ca@valencia]=escombraries Name[el]=traycol Name[es]=columna de bandejas Name[et]=Destillatsioonikolonn +Name[gl]=traycol Name[it]=traycol Name[kk]=Ректификатор Name[nb]=kolonne bunner @@ -12,6 +14,7 @@ Name[pt]=bandeja Name[pt_BR]=bandeja Name[ru]=Лоток +Name[sk]=traycol Name[sv]=kolonn bottnar Name[uk]=Спрощена тарільчата колона Name[x-test]=xxtraycolxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/val.desktop calligra-2.4.3/flow/stencils/ChemEng/val.desktop --- calligra-2.4.0/flow/stencils/ChemEng/val.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/val.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=val Name[ca]=val +Name[ca@valencia]=val Name[el]=val Name[es]=válvula Name[et]=Ventiil +Name[gl]=val Name[it]=val Name[kk]=Шұра Name[nb]=ventil @@ -11,6 +13,7 @@ Name[pl]=val Name[pt]=val Name[pt_BR]=val +Name[sk]=val Name[sv]=ventil Name[uk]=Клапан Name[x-test]=xxvalxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/valv.desktop calligra-2.4.3/flow/stencils/ChemEng/valv.desktop --- calligra-2.4.0/flow/stencils/ChemEng/valv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/valv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=valv Name[ca]=valv +Name[ca@valencia]=valv Name[el]=valv Name[es]=válvula vertical Name[et]=Vertikaalne ventiil +Name[gl]=valv Name[it]=valv Name[kk]=Тік шұра Name[nb]=ventil loddrett @@ -11,6 +13,7 @@ Name[pl]=valv Name[pt]=valv Name[pt_BR]=valv +Name[sk]=valv Name[sv]=ventil vertikal Name[uk]=Вертикальний клапан Name[x-test]=xxvalvxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/vessel.desktop calligra-2.4.3/flow/stencils/ChemEng/vessel.desktop --- calligra-2.4.0/flow/stencils/ChemEng/vessel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/vessel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=vessel Name[ca]=nau +Name[ca@valencia]=nau Name[de]=Gefäß Name[el]=vessel Name[es]=contenedor Name[et]=Anum +Name[gl]=depósito Name[it]=vessel Name[kk]=Сауыт Name[nb]=flaske @@ -13,6 +15,7 @@ Name[pt]=vasilhame Name[pt_BR]=vasilhame Name[ru]=Резервуар +Name[sk]=vessel Name[sv]=behållare Name[uk]=Проста посудина Name[x-test]=xxvesselxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/wcool.desktop calligra-2.4.3/flow/stencils/ChemEng/wcool.desktop --- calligra-2.4.0/flow/stencils/ChemEng/wcool.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/wcool.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=wcool Name[ca]=wcool +Name[ca@valencia]=wcool Name[el]=wcool Name[es]=refrigerador de agua Name[et]=Veejahuti @@ -11,6 +12,7 @@ Name[pl]=wcool Name[pt]=arrefecimento-água Name[pt_BR]=arrefecimento à água +Name[sk]=wcool Name[sv]=vattenkylare Name[uk]=Водяний охолоджувач Name[x-test]=xxwcoolxx diff -Nru calligra-2.4.0/flow/stencils/ChemEng/wcoolv.desktop calligra-2.4.3/flow/stencils/ChemEng/wcoolv.desktop --- calligra-2.4.0/flow/stencils/ChemEng/wcoolv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/ChemEng/wcoolv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=wcoolv Name[ca]=wcoolv +Name[ca@valencia]=wcoolv Name[el]=wcoolv Name[es]=refrigerador de agua vertical Name[et]=Vertikaalne veejahuti @@ -11,6 +12,7 @@ Name[pl]=wcoolv Name[pt]=arrefecimento-água-v Name[pt_BR]=arrefecimento à água em v +Name[sk]=wcoolv Name[sv]=vattenkylare vertikal Name[uk]=Вертикальний водяний охолоджувач Name[x-test]=xxwcoolvxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/30-degree-bend.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/30-degree-bend.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/30-degree-bend.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/30-degree-bend.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=30-degree-bend Name[ca]=corba a 30 graus +Name[ca@valencia]=corba a 30 graus Name[el]=30-degree-bend +Name[es]=curva de 30 grados Name[et]=30-kraadine nurk Name[it]=curva-30-gradi Name[kk]=30 градусты құбыр жалғауы @@ -11,6 +13,7 @@ Name[pt]=dobra-30-graus Name[pt_BR]=dobre de 30 graus Name[ru]=30-градусное натяжение +Name[sk]=30 stupňový ohyb Name[sv]=30-graders böj Name[uk]=30-градусний вигин Name[x-test]=xx30-degree-bendxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/beaker.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/beaker.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/beaker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/beaker.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=beaker Name[ca]=vasmesurat +Name[ca@valencia]=vasmesurat Name[cs]=kádinka Name[de]=Becherglas Name[el]=beaker +Name[es]=vaso Name[et]=Keeduklaas +Name[gl]=paleador Name[it]=bicchiere Name[kk]=Мензурка Name[nb]=beger @@ -13,6 +16,7 @@ Name[pt]=bico Name[pt_BR]=bico Name[ru]=Мензурка +Name[sk]=beaker Name[sv]=bägare Name[uk]=Мензурка Name[x-test]=xxbeakerxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/buechner-funnel.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/buechner-funnel.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/buechner-funnel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/buechner-funnel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=buechner-funnel Name[ca]=buechner-funnel +Name[ca@valencia]=buechner-funnel Name[de]=Büchnertrichter Name[el]=buechner-funnel +Name[es]=embudo buchner Name[et]=Büchneri jaotuslehter Name[it]=imbuto-buechner Name[kk]=Бюхнер құйғысы @@ -12,6 +14,7 @@ Name[pt]=funil-buechner Name[pt_BR]=funil buechner Name[ru]=Воронка Бюхнера +Name[sk]=buechner-funnel Name[sv]=büchnertratt Name[uk]=Лійка Бюхнера Name[x-test]=xxbuechner-funnelxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/burette.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/burette.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/burette.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/burette.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,12 @@ [Desktop Entry] Name=burette Name[ca]=bureta +Name[ca@valencia]=bureta Name[de]=Messglas Name[el]=burette +Name[es]=bureta Name[et]=Bürett +Name[gl]=bureta Name[it]=buretta Name[kk]=Бюретка Name[nb]=byrette @@ -12,6 +15,7 @@ Name[pt]=bureta Name[pt_BR]=bureta Name[ru]=Бюретка +Name[sk]=burette Name[sv]=byrett Name[uk]=Бюретка Name[x-test]=xxburettexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=clamp Name[ca]=pinça +Name[ca@valencia]=pinça Name[el]=clamp +Name[es]=abrazadera Name[et]=Näpits Name[it]=morsetto Name[kk]=Қыстырғыш @@ -11,6 +13,7 @@ Name[pt]=grampo Name[pt_BR]=grampo Name[ru]=Зажим +Name[sk]=clamp Name[sv]=klämmare Name[uk]=Затискувач Name[x-test]=xxclampxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp-extra-large.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp-extra-large.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp-extra-large.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp-extra-large.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=clamp-extra-large Name[ca]=pinça extragran +Name[ca@valencia]=pinça extragran Name[el]=clamp-extra-large +Name[es]=abrazadera extra larga Name[et]=Väga suur näpits Name[it]=morsetto-molto-grande Name[kk]=Өте үлкен қыстырғыш @@ -11,6 +13,7 @@ Name[pt]=grampo-extra-grande Name[pt_BR]=grampo extra-grande Name[ru]=Зажим (очень большой) +Name[sk]=clamp-extra-large Name[sv]=klämmare-extrastor Name[uk]=Дуже великий затискувач Name[x-test]=xxclamp-extra-largexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp-front.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp-front.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp-front.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp-front.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=clamp-front Name[ca]=pinça frontal +Name[ca@valencia]=pinça frontal Name[el]=clamp-front +Name[es]=frente de abrazadera Name[et]=Näpits eest Name[it]=morsetto-fronte Name[kk]=Бет қыстырғышы @@ -11,6 +13,7 @@ Name[pt]=grampo-frente Name[pt_BR]=grampo frontal Name[ru]=Зажим (спереди) +Name[sk]=svorka-predná Name[sv]=klämmare-frontal Name[uk]=Передній затискувач Name[x-test]=xxclamp-frontxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp-large.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp-large.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/clamp-large.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/clamp-large.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=clamp-large Name[ca]=pinça gran +Name[ca@valencia]=pinça gran Name[el]=clamp-large +Name[es]=abrazadera larga Name[et]=Suur näpits Name[it]=morsetto-grande Name[kk]=Үлкен қыстырғыш @@ -11,6 +13,7 @@ Name[pt]=grampo-grande Name[pt_BR]=grampo grande Name[ru]=Зажим (большой) +Name[sk]=svorka-veľká Name[sv]=klämmare-stor Name[uk]=Великий затискувач Name[x-test]=xxclamp-largexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/collection.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/collection.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Chemistry Lab Name[ca]=Laboratori químic +Name[ca@valencia]=Laboratori químic Name[de]=Chemielabor Name[el]=Chemistry Lab Name[es]=Laboratorio de química @@ -13,6 +14,7 @@ Name[pt]=Laboratório de Química Name[pt_BR]=Laboratório de Química Name[ru]=Химическая лаборатория +Name[sk]=Chemické laboratórium Name[sv]=Kemilabb Name[uk]=Хімічна лабораторія Name[x-test]=xxChemistry Labxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/column-reflux.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/column-reflux.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/column-reflux.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/column-reflux.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=column-reflux Name[ca]=columna reflux +Name[ca@valencia]=columna reflux Name[el]=column-reflux +Name[es]=reflujo de columna Name[et]=Tagasijooksukolonn Name[it]=colonna-riflusso Name[kk]=Рефлюкс бағаны @@ -11,6 +13,7 @@ Name[pt]=refluxo-coluna Name[pt_BR]=refluxo da coluna Name[ru]=Колонка рефлюкса +Name[sk]=column-reflux Name[sv]=återloppskolonn Name[uk]=Дистиляційна колона з рефлюксом Name[x-test]=xxcolumn-refluxxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/column-reflux-red-blue.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/column-reflux-red-blue.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/column-reflux-red-blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/column-reflux-red-blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=column-reflux-red-blue Name[ca]=columna reflux vermell-blau +Name[ca@valencia]=columna reflux roig-blau Name[el]=column-reflux-red-blue +Name[es]=reflujo de columna rojo-azul Name[et]=Puna-sinine tagasijooksukolonn Name[it]=colonna-riflusso-rosso-blu Name[kk]=Рефлюкс бағаны (қазыл-көк) @@ -11,6 +13,7 @@ Name[pt]=refluxo-coluna-vermelho-azul Name[pt_BR]=refluxo da coluna azul-vermelho Name[ru]=Колонка рефлюкса (красно-синяя) +Name[sk]=column-reflux-red-blue Name[sv]=återloppskolonn-rödblå Name[uk]=Дистиляційна колона з рефлюксом (червоним і синім) Name[x-test]=xxcolumn-reflux-red-bluexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/column-reflux-red.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/column-reflux-red.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/column-reflux-red.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/column-reflux-red.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=column-reflux-red Name[ca]=columna reflux vermell +Name[ca@valencia]=columna reflux roig Name[el]=column-reflux-red +Name[es]=reflujo de columna rojo Name[et]=Punane tagasijooksukolonn Name[it]=colonna-riflusso-rosso Name[kk]=Рефлюкс бағаны (қазыл) @@ -11,6 +13,7 @@ Name[pt]=refluxo-coluna-vermelho Name[pt_BR]=refluxo da coluna vermelho Name[ru]=Колонка рефлюкса (красная) +Name[sk]=column-reflux-red Name[sv]=återloppskolonn-röd Name[uk]=Дистиляційна колона з рефлюксом (червоним) Name[x-test]=xxcolumn-reflux-redxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-black.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-black.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-black.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-black.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=condenser-black Name[ca]=condensador-negre +Name[ca@valencia]=condensador-negre Name[el]=condenser-black Name[es]=condensador negro Name[et]=Must jahuti +Name[gl]=condensador-negro Name[it]=condensatore-nero Name[kk]=Конденсор (қара) Name[nb]=kondensator-svart @@ -12,6 +14,7 @@ Name[pt]=condensador-preto Name[pt_BR]=condensador preto Name[ru]=Конденсор (чёрный) +Name[sk]=kondenzátor-čierny Name[sv]=kylare-svart Name[uk]=Холодильник (чорний) Name[x-test]=xxcondenser-blackxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-blue.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-blue.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=condenser-blue Name[ca]=condensador-blau +Name[ca@valencia]=condensador-blau Name[el]=condenser-blue Name[es]=condensador azul Name[et]=Sinine jahuti +Name[gl]=condensador-azul Name[it]=condensatore-blu Name[kk]=Конденсор (көк) Name[nb]=kondensator-blå @@ -12,6 +14,7 @@ Name[pt]=condensador-azul Name[pt_BR]=condensador azul Name[ru]=Конденсор (синий) +Name[sk]=kondenzátor-modrý Name[sv]=kylare-blå Name[uk]=Холодильник (синій) Name[x-test]=xxcondenser-bluexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=condenser Name[ca]=condensador +Name[ca@valencia]=condensador Name[de]=Rücklaufkühler Name[el]=condenser Name[es]=condensador Name[et]=Jahuti +Name[gl]=condensador Name[it]=condensatore Name[kk]=Конденсор Name[nb]=kondensator @@ -13,6 +15,7 @@ Name[pt]=condensador Name[pt_BR]=condensador Name[ru]=Конденсор +Name[sk]=kondenzátor Name[sv]=kylare Name[uk]=Холодильник Name[x-test]=xxcondenserxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-green.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-green.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-green.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-green.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=condenser-green Name[ca]=condensador-verd +Name[ca@valencia]=condensador-verd Name[el]=condenser-green Name[es]=condensador verde Name[et]=Roheline jahuti +Name[gl]=condensador-verde Name[it]=condensatore-verde Name[kk]=Конденсор (жасыл) Name[nb]=kondensator-grønn @@ -12,6 +14,7 @@ Name[pt]=condensador-verde Name[pt_BR]=condensador verde Name[ru]=Конденсор (зелёный) +Name[sk]=kondenzátor-zelený Name[sv]=kylare-grön Name[uk]=Холодильник (зелений) Name[x-test]=xxcondenser-greenxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-liebig-vertical.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=condenser-liebig-vertical Name[ca]=condensador-liebig-vertical +Name[ca@valencia]=condensador-liebig-vertical Name[el]=condenser-liebig-vertical +Name[es]=condensador liebig vertical Name[et]=Vertikaalne Liebigi jahuti Name[it]=condensatore-liebig-verticale Name[kk]=Либиг конденсоры (тік) @@ -11,6 +13,7 @@ Name[pt]=condensador-grande-vertical Name[pt_BR]=condensador grande vertical Name[ru]=Конденсор (произвольный вертикальный) +Name[sk]=kondenzátor-liebig-zvislý Name[sv]=kylare-liebig-vertikal Name[uk]=Холодильник Лібіґа (вертикальний) Name[x-test]=xxcondenser-liebig-verticalxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-orange.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-orange.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-orange.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-orange.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=condenser-orange Name[ca]=condensador-taronja +Name[ca@valencia]=condensador-taronja Name[el]=condenser-orange Name[es]=condensador naranja Name[et]=Oranž jahuti +Name[gl]=condensador-laranxa Name[it]=condensatore-arancione Name[kk]=Конденсор (қызғылт сары) Name[nb]=kondensator-orange @@ -12,6 +14,7 @@ Name[pt]=condensador-laranja Name[pt_BR]=condensador laranja Name[ru]=Конденсор (оранжевый) +Name[sk]=kondenzátor-oranžový Name[sv]=kylare-orange Name[uk]=Холодильник (помаранчевий) Name[x-test]=xxcondenser-orangexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-pale-blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=condenser-pale-blue Name[ca]=condensador-blau-pàl·lid +Name[ca@valencia]=condensador-blau-pàlid Name[el]=condenser-pale-blue +Name[es]=condensador palio azul Name[et]=Helesinine jahuti +Name[gl]=condensador-azul-claro Name[it]=condensatore-celeste Name[kk]=Конденсор (ақшыл көк) Name[nb]=kondensator-lys-blå @@ -11,6 +14,7 @@ Name[pt]=condensador-azul-claro Name[pt_BR]=condensador azul-claro Name[ru]=Конденсор (бледно-голубой) +Name[sk]=kondenzátor-pale-modrý Name[sv]=kylare-blekblå Name[uk]=Холодильник (блідо-синій) Name[x-test]=xxcondenser-pale-bluexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-red.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-red.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/condenser-red.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/condenser-red.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=condenser-red Name[ca]=condensador-vermell +Name[ca@valencia]=condensador-roig Name[el]=condenser-red Name[es]=condensador rojo Name[et]=Punane jahuti +Name[gl]=condensador-vermello Name[it]=condensatore-rosso Name[kk]=Конденсор (қызыл) Name[nb]=kondensator-rød @@ -12,6 +14,7 @@ Name[pt]=condensador-vermelho Name[pt_BR]=condensador vermelho Name[ru]=Конденсор (красный) +Name[sk]=kondenzátor-červený Name[sv]=kylare-röd Name[uk]=Холодильник (червоний) Name[x-test]=xxcondenser-redxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/erlenmeyer.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/erlenmeyer.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/erlenmeyer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/erlenmeyer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=ryan -Erlenmeyer Flask Name[ca]=ryan -Erlenmeyer Flask +Name[ca@valencia]=ryan -Erlenmeyer Flask Name[el]=ryan -Erlenmeyer Flask +Name[es]=Frasco ryan erlenmeyer Name[et]=Erlenmeyeri kolb Name[it]=beuta Ryan-Erlenmeyer Name[kk]=Эрленмейер сауыты @@ -11,6 +13,7 @@ Name[pt]=Frasco-Ryan-ErlenMeyer Name[pt_BR]=Frasco-Ryan-ErlenMeyer Name[ru]=Колба Райана-Эрленмейера +Name[sk]=ryan -Erlenmeyer Flask Name[sv]=Erlenmeyerkolv Name[uk]=Колба Ерленмеєра Name[x-test]=xxryan -Erlenmeyer Flaskxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/funnel.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/funnel.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/funnel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/funnel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=funnel Name[ca]=funnel +Name[ca@valencia]=funnel Name[de]=Trichter Name[el]=funnel Name[es]=embudo @@ -14,6 +15,7 @@ Name[pt]=funil Name[pt_BR]=funil Name[ru]=Воронка +Name[sk]=lievik Name[sv]=tratt Name[uk]=Лійка Name[x-test]=xxfunnelxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/gooseneck.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/gooseneck.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/gooseneck.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/gooseneck.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=gooseneck Name[ca]=coll d'oca +Name[ca@valencia]=coll d'oca Name[el]=gooseneck +Name[es]=cuello de cisne Name[et]=Siugtoru Name[it]=gooseneck Name[kk]=Қазмойын түтігі @@ -11,6 +13,7 @@ Name[pt]=pescoço-ganso Name[pt_BR]=pescoço de ganso Name[ru]=Предмет S-образной формы +Name[sk]=husí krk Name[sv]=avledningsrör Name[uk]=Вигнута трубка Name[x-test]=xxgooseneckxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/lab-stand.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/lab-stand.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/lab-stand.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/lab-stand.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=lab-stand Name[ca]=laboratori stand +Name[ca@valencia]=laboratori stand Name[el]=lab-stand +Name[es]=soporte de laboratorio Name[et]=Statiiv Name[it]=lab-stand Name[kk]=Лаб. штативі @@ -11,6 +13,7 @@ Name[pt]=mesa-laboratório Name[pt_BR]=mesa de laboratório Name[ru]=Лабораторный стенд +Name[sk]=lab-stand Name[sv]=laboratoriehållare Name[uk]=Лабораторний штатив Name[x-test]=xxlab-standxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/lab-stand-front.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/lab-stand-front.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/lab-stand-front.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/lab-stand-front.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=lab-stand-front Name[ca]=laboratori stand blau +Name[ca@valencia]=laboratori stand blau Name[el]=lab-stand-front +Name[es]=frente de soporte de laboratorio Name[et]=Statiiv eestvaates Name[it]=lab-stand-front Name[kk]=Лаб. штативі (алды) @@ -11,6 +13,7 @@ Name[pt]=mesa-laboratório-frente Name[pt_BR]=mesa de laboratório (frente) Name[ru]=Лабораторный стенд (спереди) +Name[sk]=lab-stand-front Name[sv]=laboratoriehållare-framsida Name[uk]=Лабораторний штатив (спереду) Name[x-test]=xxlab-stand-frontxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/ring.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/ring.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/ring.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/ring.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,12 @@ [Desktop Entry] Name=ring Name[ca]=timbre +Name[ca@valencia]=timbre Name[cs]=prstenec Name[el]=ring +Name[es]=anillo Name[et]=Hoidik +Name[gl]=anel Name[it]=anello Name[kk]=Сақина Name[nb]=ring @@ -13,6 +16,7 @@ Name[pt]=anel Name[pt_BR]=anel Name[ru]=Ободок +Name[sk]=prstenec Name[sv]=ring Name[ug]=قوڭغۇراق Name[uk]=Злучник diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/ring-front.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/ring-front.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/ring-front.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/ring-front.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=ring-front Name[ca]=anell frontal +Name[ca@valencia]=anell frontal Name[el]=ring-front +Name[es]=frente de anillo Name[et]=Hoidik eestvaates Name[it]=anello-fronte Name[kk]=Сақина (алды) @@ -11,6 +13,7 @@ Name[pt]=anel-frente Name[pt_BR]=anel (frente) Name[ru]=Ободок (спереди) +Name[sk]=ring-front Name[sv]=ring-framsida Name[uk]=Злучник (спереду) Name[x-test]=xxring-frontxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/sep-funnel.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/sep-funnel.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/sep-funnel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/sep-funnel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=sep-funnel Name[ca]=sep-funnel +Name[ca@valencia]=sep-funnel Name[el]=sep-funnel +Name[es]=embudo separador Name[et]=Eralduslehter Name[it]=imbuto-separatore Name[kk]=Сүзгі құйғышы @@ -11,6 +13,7 @@ Name[pt]=funil-separação Name[pt_BR]=funil de separação Name[ru]=Разделительная воронка +Name[sk]=sep-funnel Name[sv]=separertratt Name[uk]=Фільтраційна лійка Name[x-test]=xxsep-funnelxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/sep-funnel-three-phases.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=sep-funnel-three-phases Name[ca]=sep-funnel-three-phases +Name[ca@valencia]=sep-funnel-three-phases Name[el]=sep-funnel-three-phases +Name[es]=embudo separador de tres fases Name[et]=Kolmefaasiline eralduslehter Name[it]=imbuto-separatore-tre-fasi Name[kk]=Үш фазалық сүзгі құйғышы @@ -11,6 +13,7 @@ Name[pt]=funil-separação-três-fases Name[pt_BR]=funil de separação de três fases Name[ru]=Разделительная воронка (трёхфазная) +Name[sk]=sep-funnel-three-phases Name[sv]=separertratt-trefas Name[uk]=Фільтраційна лійка з трьома фазами Name[x-test]=xxsep-funnel-three-phasesxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/sep-funnel-two-phases.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=sep-funnel-two-phases Name[ca]=sep-funnel-two-phases +Name[ca@valencia]=sep-funnel-two-phases Name[el]=sep-funnel-two-phases +Name[es]=embudo separador de dos fases Name[et]=Kahefaasiline eralduslehter Name[it]=imbuto-separatore-due-fasi Name[kk]=Екі фазалық сүзгі құйғышы @@ -11,6 +13,7 @@ Name[pt]=funil-separação-duas-fases Name[pt_BR]=funil de separação de duas fases Name[ru]=Разделительная воронка (двухфазная) +Name[sk]=sep-funnel-two-phases Name[sv]=separertratt-tvåfas Name[uk]=Фільтраційна лійка з двома фазами Name[x-test]=xxsep-funnel-two-phasesxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/stirbar.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/stirbar.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/stirbar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/stirbar.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=stirbar Name[ca]=agitador +Name[ca@valencia]=agitador Name[de]=Magnetrührstab Name[el]=stirbar +Name[es]=barra agitadora Name[et]=Segaja varras Name[it]=ancoretta-magnetica Name[kk]=Магнитті араластырғыш @@ -12,6 +14,7 @@ Name[pl]=mieszadełko-magnetyczne Name[pt]=barra-batedora Name[pt_BR]=barra batedora +Name[sk]=stirbar Name[sv]=magnetstav Name[uk]=Магнітний перемішувач Name[x-test]=xxstirbarxx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/stirplate.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/stirplate.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/stirplate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/stirplate.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=stirplate Name[ca]=placaremenat +Name[ca@valencia]=placaremenat Name[el]=stirplate +Name[es]=placa agitadora Name[et]=Segaja +Name[gl]=placa de axitación Name[it]=agitatore-magnetico Name[kk]=Араластырғыш Name[nb]=omrører @@ -11,6 +14,7 @@ Name[pt]=prato-batedor Name[pt_BR]=prato batedor Name[ru]=Размешиватель +Name[sk]=stirplate Name[sv]=omrörare Name[uk]=Плита для перемішування Name[x-test]=xxstirplatexx diff -Nru calligra-2.4.0/flow/stencils/Chemistry_Lab/stirplate-front.desktop calligra-2.4.3/flow/stencils/Chemistry_Lab/stirplate-front.desktop --- calligra-2.4.0/flow/stencils/Chemistry_Lab/stirplate-front.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Chemistry_Lab/stirplate-front.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=stirplate-front Name[ca]=placaremenat-front +Name[ca@valencia]=placaremenat-front Name[el]=stirplate-front +Name[es]=frente de placa agitadora Name[et]=Segaja eestvaates +Name[gl]=placa de axitanción frontal Name[it]=agitatore-magnetico-fronte Name[kk]=Араластырғыш (алды) Name[nb]=magnetstav-frontal @@ -11,6 +14,7 @@ Name[pt]=prato-batedor-frente Name[pt_BR]=prato batedor (frente) Name[ru]=Размешиватель (спереди) +Name[sk]=stirplate-front Name[sv]=omrörare-framsida Name[uk]=Плита для перемішування (спереду) Name[x-test]=xxstirplate-frontxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/collection.desktop calligra-2.4.3/flow/stencils/Circuit/collection.desktop --- calligra-2.4.0/flow/stencils/Circuit/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Circuit Name[bg]=Верига Name[ca]=Circuit +Name[ca@valencia]=Circuit Name[cs]=Obvod Name[de]=Schaltkreis Name[el]=Κύκλωμα @@ -18,6 +19,7 @@ Name[pt]=Circuito Name[pt_BR]=Circuito Name[ru]=Электрическая схема +Name[sk]=Obvod Name[sv]=Krets Name[ug]=توك يولى Name[uk]=Електричні схеми diff -Nru calligra-2.4.0/flow/stencils/Circuit/ground.desktop calligra-2.4.3/flow/stencils/Circuit/ground.desktop --- calligra-2.4.0/flow/stencils/Circuit/ground.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/ground.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Ground Name[bg]=Заземяване Name[ca]=Terra +Name[ca@valencia]=Terre Name[cs]=Zem Name[de]=Masse Name[el]=Γείωση @@ -18,6 +19,7 @@ Name[pt]=Terra Name[pt_BR]=Terreno Name[ru]=Земля +Name[sk]=Zem Name[sv]=Jord Name[uk]=Земля Name[x-test]=xxGroundxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hcapacitor.desktop calligra-2.4.3/flow/stencils/Circuit/hcapacitor.desktop --- calligra-2.4.0/flow/stencils/Circuit/hcapacitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hcapacitor.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Capacitor Name[bg]=Хоризонтален кондензатор Name[ca]=Capacitador horitzontal +Name[ca@valencia]=Capacitador horitzontal Name[de]=Waagerechter Kondensator Name[el]=Οριζόντιος πυκνωτής Name[es]=Condensador horizontal @@ -15,6 +16,7 @@ Name[pt]=Condensador Horizontal Name[pt_BR]=Capacitor horizontal Name[ru]=Горизонтальный конденсатор +Name[sk]=Vodorovný kondenzátor Name[sv]=Horisontell kondensator Name[uk]=Конденсатор (горизонтально) Name[x-test]=xxHorizontal Capacitorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hdiode.desktop calligra-2.4.3/flow/stencils/Circuit/hdiode.desktop --- calligra-2.4.0/flow/stencils/Circuit/hdiode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hdiode.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Diode Name[bg]=Хоризонтален диод Name[ca]=Diode horitzontal +Name[ca@valencia]=Diode horitzontal Name[de]=Waagerechte Diode Name[el]=Οριζόντια δίοδος Name[es]=Diodo horizontal @@ -15,6 +16,7 @@ Name[pt]=Díodo Horizontal Name[pt_BR]=Diodo Horizontal Name[ru]=Горизонтальный диод +Name[sk]=Vodorovná dióda Name[sv]=Horisontell diod Name[uk]=Діод (горизонтально) Name[x-test]=xxHorizontal Diodexx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hfuse_de.desktop calligra-2.4.3/flow/stencils/Circuit/hfuse_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/hfuse_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hfuse_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Fuse (European) Name[bg]=Хоризонтален предпазител (европейски) Name[ca]=Fusible horitzontal (europeu) +Name[ca@valencia]=Fusible horitzontal (europeu) Name[de]=Waagerechte Sicherung (europäisch) Name[el]=Οριζόντια ασφάλεια (Ευρώπη) Name[es]=Fusible horizontal (europeo) @@ -15,6 +16,7 @@ Name[pt]=Fusível Horizontal (Europeu) Name[pt_BR]=Fusível horizontal (Europeu) Name[ru]=Горизонтальный предохранитель (Европейский) +Name[sk]=Vodorovná poistka (európska) Name[sv]=Horisontell säkring (europeisk) Name[uk]=Плавкий запобіжник (горизонтально) Name[x-test]=xxHorizontal Fuse (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hinductor_de.desktop calligra-2.4.3/flow/stencils/Circuit/hinductor_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/hinductor_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hinductor_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Inductor (European) Name[bg]=Хоризонтална бобина (европейски) Name[ca]=Inductor horitzontal (europeu) +Name[ca@valencia]=Inductor horitzontal (europeu) Name[de]=Waagerechte Drosselspule (europäisch) Name[el]=Οριζόντιο πηνίο (Ευρώπη) Name[es]=Inductor horizontal (europeo) @@ -15,6 +16,7 @@ Name[pt]=Bobina Horizontal (Europeu) Name[pt_BR]=Indutor horizontal (Europeu) Name[ru]=Горизонтальная катушка индуктивности (Европейская) +Name[sk]=Vodorovná cievka (európska) Name[sv]=Horisontell induktans (europeisk) Name[uk]=Індуктивна котушка (горизонтально, Європа) Name[x-test]=xxHorizontal Inductor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hinductor.desktop calligra-2.4.3/flow/stencils/Circuit/hinductor.desktop --- calligra-2.4.0/flow/stencils/Circuit/hinductor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hinductor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Inductor Name[bg]=Хоризонтална бобина Name[ca]=Inductor horitzontal +Name[ca@valencia]=Inductor horitzontal Name[de]=Waagerechte Drosselspule Name[el]=Οριζόντιο πηνίο Name[es]=Inductor horizontal @@ -15,6 +16,7 @@ Name[pt]=Bobina Horizontal Name[pt_BR]=Indutor horizontal Name[ru]=Горизонтальная катушка индуктивности +Name[sk]=Vodorovná cievka Name[sv]=Horisontell induktans Name[uk]=Індуктивна котушка (горизонтально) Name[x-test]=xxHorizontal Inductorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hjumper.desktop calligra-2.4.3/flow/stencils/Circuit/hjumper.desktop --- calligra-2.4.0/flow/stencils/Circuit/hjumper.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hjumper.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Jumper Name[bg]=Хоризонтален джъмпер Name[ca]=Jumper horitzontal +Name[ca@valencia]=Jumper horitzontal Name[de]=Waagerechter Jumper Name[el]=Οριζόντια επαφή κυκλώματος Name[es]=Jumper horizontal @@ -15,6 +16,7 @@ Name[pt]='Jumper' Horizontal Name[pt_BR]=Jumper horizontal Name[ru]=Горизонтальный переключатель +Name[sk]=Vodorovný jumper Name[sv]=Horisontell bygel Name[uk]=Горизонтальна перемичка Name[x-test]=xxHorizontal Jumperxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hled_de.desktop calligra-2.4.3/flow/stencils/Circuit/hled_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/hled_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hled_de.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Led (European) Name[bg]=Хоризонтален светодиод (европейски) Name[ca]=Led horitzontal (europeu) +Name[ca@valencia]=Led horitzontal (europeu) Name[de]=Waagerechte LED (europäisch) Name[el]=Οριζόντιο led (Ευρώπη) Name[es]=Led horizontal (europeo) @@ -15,6 +16,7 @@ Name[pt]=LED Horizontal (Europeu) Name[pt_BR]=Led horizontal (Europeu) Name[ru]=Горизонтальный светодиод (Европейский) +Name[sk]=Vodorovná LED (európska) Name[sv]=Horisontell ljusdiod (europeisk) Name[uk]=Світлодіод (горизонтальний, Європа) Name[x-test]=xxHorizontal Led (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hpowersource_de.desktop calligra-2.4.3/flow/stencils/Circuit/hpowersource_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/hpowersource_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hpowersource_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Powersource (European) Name[bg]=Хоризонтален източник на енергия (европейски) Name[ca]=Font d'alimentació horitzontal (europea) +Name[ca@valencia]=Font d'alimentació horitzonal (europea) Name[de]=Waagerechte Stromquelle (europäisch) Name[el]=Οριζόντια πηγή ισχύος (Ευρώπη) Name[es]=Fuente de energía horizontal (europeo) @@ -15,6 +16,7 @@ Name[pt]=Fonte Alimentação Horizontal (Europeu) Name[pt_BR]=Fonte de alimentação horizontal (Europeia) Name[ru]=Горизонтальный источник питания (Европейский) +Name[sk]=Vodorovný zdroj napäria (európsky) Name[sv]=Horisontell kraftkälla (europeisk) Name[uk]=Джерело струму (горизонтально, Європа) Name[x-test]=xxHorizontal Powersource (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hresistor_de.desktop calligra-2.4.3/flow/stencils/Circuit/hresistor_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/hresistor_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hresistor_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Resistor (European) Name[bg]=Хоризонтално съпротивление (европейски) Name[ca]=Resistor horitzontal (europeu) +Name[ca@valencia]=Resistor horitzontal (europeu) Name[de]=Waagerechter Widerstand (europäisch) Name[el]=Οριζόντιος αντιστάτης (Ευρώπη) Name[es]=Resistencia horizontal (europea) @@ -15,6 +16,7 @@ Name[pt]=Resistência Horizontal (Europeu) Name[pt_BR]=Resistor horizontal (Europeu) Name[ru]=Горизонтальный резистор (Европейский) +Name[sk]=Vodorovný rezistor (európsky) Name[sv]=Horisontellt motstånd (europeiskt) Name[uk]=Резистор (горизонтально, Європа) Name[x-test]=xxHorizontal Resistor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hresistor.desktop calligra-2.4.3/flow/stencils/Circuit/hresistor.desktop --- calligra-2.4.0/flow/stencils/Circuit/hresistor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hresistor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Resistor Name[bg]=Хоризонтално съпротивление Name[ca]=Resistor horitzontal +Name[ca@valencia]=Resistor horitzontal Name[de]=Waagerechter Widerstand Name[el]=Οριζόντιος αντιστάτης Name[es]=Resistencia horizontal @@ -15,6 +16,7 @@ Name[pt]=Resistência Horizontal Name[pt_BR]=Resistor horizontal Name[ru]=Горизонтальный резистор +Name[sk]=Vodorovný rezistor Name[sv]=Horisontellt motstånd Name[uk]=Резистор (горизонтально) Name[x-test]=xxHorizontal Resistorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/hzener.desktop calligra-2.4.3/flow/stencils/Circuit/hzener.desktop --- calligra-2.4.0/flow/stencils/Circuit/hzener.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/hzener.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Horizontal Zener Diode Name[bg]=Хоризонтален ценеров диод Name[ca]=Diode Zener horitzontal +Name[ca@valencia]=Diode Zener horitzontal Name[de]=Waagerechte Zener-Diode Name[el]=Οριζόντια δίοδος Zener Name[es]=Diodo Zener horizontal @@ -15,6 +16,7 @@ Name[pt]=Díodo de Zener Horizontal Name[pt_BR]=Diodo de Zener horizontal Name[ru]=Горизонтальный зенеровский диод +Name[sk]=Vodorovná Zenerova dióda Name[sv]=Horisontell Zener-diod Name[uk]=Стабілітрон (горизонтально) Name[x-test]=xxHorizontal Zener Diodexx diff -Nru calligra-2.4.0/flow/stencils/Circuit/lamp_de.desktop calligra-2.4.3/flow/stencils/Circuit/lamp_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/lamp_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/lamp_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Lamp (European) Name[bg]=Лампа (европейски) Name[ca]=Làmpada (europea) +Name[ca@valencia]=Làmpada (europea) Name[de]=Lampe (europäisch) Name[el]=Λαμπτήρας (Ευρώπη) Name[es]=Lámpara (europea) @@ -16,6 +17,7 @@ Name[pt]=Lâmpada (Europeu) Name[pt_BR]=Lâmpada (Europeia) Name[ru]=Лампа (Европейская) +Name[sk]=Lampa (európska) Name[sv]=Lampa (europeisk) Name[uk]=Лампа (Європа) Name[x-test]=xxLamp (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/microphone_de.desktop calligra-2.4.3/flow/stencils/Circuit/microphone_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/microphone_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/microphone_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Microphone (European) Name[bg]=Микрофон (европейски) Name[ca]=Micròfon (europeu) +Name[ca@valencia]=Micròfon (europeu) Name[de]=Mikrofon (europäisch) Name[el]=Μικρόφωνο (Ευρώπη) Name[es]=Micrófono (Europeo) @@ -16,6 +17,7 @@ Name[pt]=Microfone (Europeu) Name[pt_BR]=Microfone (Europeu) Name[ru]=Микрофон (Европейский) +Name[sk]=Mikrofón (európsky) Name[sv]=Mikrofon (europeisk) Name[uk]=Мікрофон (Європа) Name[x-test]=xxMicrophone (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/nmos_de.desktop calligra-2.4.3/flow/stencils/Circuit/nmos_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/nmos_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/nmos_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=NMOS Transistor (European) Name[bg]=Транзистор NMOS (европейски) Name[ca]=Transistor NMOS (europeu) +Name[ca@valencia]=Transistor NMOS (europeu) Name[de]=NMOS-Transistor (europäisch) Name[el]=NMOS Transistor (Ευρώπη) Name[es]=Transistor NMOS (europeo) @@ -16,6 +17,7 @@ Name[pt]=Transístor NMOS (Europeu) Name[pt_BR]=Transistor NMOS (Europeu) Name[ru]=Транзистор NMOS (Европейский) +Name[sk]=NMOS tranzistor (európsky) Name[sv]=NMOS-transistor (europeisk) Name[uk]=Транзистор NMOS (Європа) Name[x-test]=xxNMOS Transistor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/npn.desktop calligra-2.4.3/flow/stencils/Circuit/npn.desktop --- calligra-2.4.0/flow/stencils/Circuit/npn.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/npn.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=NPN Transistor Name[bg]=Транзистор NPN Name[ca]=Transistor NPN +Name[ca@valencia]=Transistor NPN Name[cs]=Tranzistor NPN Name[de]=NPN-Transistor Name[el]=NPN Transistor @@ -10,6 +11,7 @@ Name[fi]=NPN-transistori Name[hu]=NPN tranzisztor Name[it]=Transistore NPN +Name[ja]=NPN トランジスタ Name[kk]=npn-транзисторы Name[nb]=NPN-transistor Name[nds]=NPN-Transistor diff -Nru calligra-2.4.0/flow/stencils/Circuit/opamp.desktop calligra-2.4.3/flow/stencils/Circuit/opamp.desktop --- calligra-2.4.0/flow/stencils/Circuit/opamp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/opamp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Op Amp Name[bg]=Операционен усилвател Name[ca]=Amplificador Op +Name[ca@valencia]=Amplificador Op Name[de]=Operationsverstärker Name[el]=Op Amp Name[es]=Amplificador operacional Name[et]=Operatsioonvõimendi Name[it]=Amplificatore operazionale +Name[ja]=オペアンプ Name[kk]=Операц. күшейткіші Name[nb]=Op. forsterker Name[nds]=Operatschoonverstarker @@ -15,6 +17,7 @@ Name[pt]=Amp-Op Name[pt_BR]=Amp-Op Name[ru]=Операционный усилитель +Name[sk]=Op Zos Name[sv]=Operationsförstärkare Name[uk]=Операційний підсилювач Name[x-test]=xxOp Ampxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/pmos_de.desktop calligra-2.4.3/flow/stencils/Circuit/pmos_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/pmos_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/pmos_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=PMOS Transistor (European) Name[bg]=Транзистор PMOS (европейски) Name[ca]=Transistor PMOS (europeu) +Name[ca@valencia]=Transistorn PMOS (europeu) Name[de]=PMOS-Transistor (europäisch) Name[el]=PMOS Transistor (Ευρώπη) Name[es]=Transistor pMOS (Europeo) @@ -16,6 +17,7 @@ Name[pt]=Transístor PMOS (Europeu) Name[pt_BR]=Transistor PMOS (Europeu) Name[ru]=Транзистор PMOS (Европейский) +Name[sk]=PMOS tranzistor (európsky) Name[sv]=PMOS-transistor (europeisk) Name[uk]=Транзистор PMOS (Європа) Name[x-test]=xxPMOS Transistor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/pnp.desktop calligra-2.4.3/flow/stencils/Circuit/pnp.desktop --- calligra-2.4.0/flow/stencils/Circuit/pnp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/pnp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=PNP Transistor Name[bg]=Транзистор PNP Name[ca]=Transistor PNP +Name[ca@valencia]=Transistor PNP Name[cs]=Tranzistor PNP Name[de]=PNP-Transistor Name[el]=PNP Transistor @@ -10,6 +11,7 @@ Name[fi]=PNP-transistori Name[hu]=PNP tranzisztor Name[it]=Transistore PNP +Name[ja]=PNP トランジスタ Name[kk]=pnp-транзисторы Name[nb]=PNP-transistor Name[nds]=PNP-Transistor diff -Nru calligra-2.4.0/flow/stencils/Circuit/speaker_de.desktop calligra-2.4.3/flow/stencils/Circuit/speaker_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/speaker_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/speaker_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Speaker (European) Name[bg]=Високоговорител (европейски) Name[ca]=Altaveu (europeu) +Name[ca@valencia]=Altaveu (europeu) Name[de]=Lautsprecher (europäisch) Name[el]=Ηχείο (Ευρώπη) Name[es]=Altavoz (europeo) @@ -15,6 +16,7 @@ Name[pt]=Altifalante (Europeu) Name[pt_BR]=Alto-falante (Europeu) Name[ru]=Громкоговоритель (Европейский) +Name[sk]=Reproduktor (európsky) Name[sv]=Högtalare (europeisk) Name[uk]=Гучномовець (Європа) Name[x-test]=xxSpeaker (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vcapacitor.desktop calligra-2.4.3/flow/stencils/Circuit/vcapacitor.desktop --- calligra-2.4.0/flow/stencils/Circuit/vcapacitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vcapacitor.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Capacitor Name[bg]=Вертикален кондензатор Name[ca]=Capacitador vertical +Name[ca@valencia]=Capacitador vertical Name[de]=Senkrechter Kondensator Name[el]=Κάθετος πυκνωτής Name[es]=Condensador vertical @@ -15,6 +16,7 @@ Name[pt]=Condensador Vertical Name[pt_BR]=Capacitor vertical Name[ru]=Вертикальный конденсатор +Name[sk]=Zvislý kondenzátor Name[sv]=Vertikal kondensator Name[uk]=Конденсатор (вертикально) Name[x-test]=xxVertical Capacitorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vdiode.desktop calligra-2.4.3/flow/stencils/Circuit/vdiode.desktop --- calligra-2.4.0/flow/stencils/Circuit/vdiode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vdiode.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Diode Name[bg]=Вертикален диод Name[ca]=Diode vertical +Name[ca@valencia]=Diode vertical Name[de]=Senkrechte Diode Name[el]=Κάθετη δίοδος Name[es]=Diodo vertical @@ -15,6 +16,7 @@ Name[pt]=Díodo Vertical Name[pt_BR]=Diodo vertical Name[ru]=Вертикальный диод +Name[sk]=Zvislá dióda Name[sv]=Vertikal diod Name[uk]=Діод (вертикально) Name[x-test]=xxVertical Diodexx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vfuse_de.desktop calligra-2.4.3/flow/stencils/Circuit/vfuse_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/vfuse_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vfuse_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Fuse (European) Name[bg]=Вертикален предпазител (европейски) Name[ca]=Fusible vertical (europeu) +Name[ca@valencia]=Fusible vertical (europeu) Name[de]=Senkrechte Sicherung (europäisch) Name[el]=Κάθετη ασφάλεια (Ευρώπη) Name[es]=Fusible vertical (europeo) @@ -15,6 +16,7 @@ Name[pt]=Fusível Vertical (Europeu) Name[pt_BR]=Fusível vertical (Europeu) Name[ru]=Вертикальный предохранитель (Европейский) +Name[sk]=Zvislá poistka (európska) Name[sv]=Vertikal säkring (europeisk) Name[uk]=Плавкий запобіжник (вертикально, Європа) Name[x-test]=xxVertical Fuse (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vinductor_de.desktop calligra-2.4.3/flow/stencils/Circuit/vinductor_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/vinductor_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vinductor_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Inductor (European) Name[bg]=Вертикална бобина (европейски) Name[ca]=Inductor vertical (europeu) +Name[ca@valencia]=Inductor vertical (europeu) Name[de]=Senkrechte Drosselspule (europäisch) Name[el]=Κάθετο πηνίο (Ευρώπη) Name[es]=Inductor vertical (europeo) @@ -15,6 +16,7 @@ Name[pt]=Bobina Vertical (Europeu) Name[pt_BR]=Indutor vertical (Europeu) Name[ru]=Вертикальная катушка индуктивности (Европейская) +Name[sk]=Zvislá cievka (európska) Name[sv]=Vertikal induktans (europeisk) Name[uk]=Індуктивна котушка (вертикально, Європа) Name[x-test]=xxVertical Inductor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vinductor.desktop calligra-2.4.3/flow/stencils/Circuit/vinductor.desktop --- calligra-2.4.0/flow/stencils/Circuit/vinductor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vinductor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Inductor Name[bg]=Вертикална бобина Name[ca]=Inductor vertical +Name[ca@valencia]=Inductor vertical Name[de]=Senkrechte Drosselspule Name[el]=Κάθετο πηνίο Name[es]=Inductor vertical @@ -15,6 +16,7 @@ Name[pt]=Bobina Vertical Name[pt_BR]=Indutor vertical Name[ru]=Вертикальная катушка индуктивности +Name[sk]=Zvislá cievka Name[sv]=Vertikal induktans Name[uk]=Індуктивна котушка (вертикально) Name[x-test]=xxVertical Inductorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vled_de.desktop calligra-2.4.3/flow/stencils/Circuit/vled_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/vled_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vled_de.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Led (European) Name[bg]=Вертикален светодиод (европейски) Name[ca]=Led vertical (europeu) +Name[ca@valencia]=Led vertical (europeu) Name[de]=Senkrechte LED (europäisch) Name[el]=Κάθετο led (Ευρώπη) Name[es]=Led vertical (europeo) @@ -15,6 +16,7 @@ Name[pt]=LED Vertical (Europeu) Name[pt_BR]=Led vertical (Europeu) Name[ru]=Вертикальный светодиод (Европейский) +Name[sk]=Zvislá LED (európska) Name[sv]=Vertikal ljusdiod (europeisk) Name[uk]=Світлодіод (вертикально, Європа) Name[x-test]=xxVertical Led (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vpowersource_de.desktop calligra-2.4.3/flow/stencils/Circuit/vpowersource_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/vpowersource_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vpowersource_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Powersource (European) Name[bg]=Вертикален източник на енергия (европейски) Name[ca]=Font d'alimentació vertical (europea) +Name[ca@valencia]=Font d'alimentació vertical (europea) Name[de]=Senkrechte Stromquelle (europäisch) Name[el]=Κάθετη πηγή ισχύος (Ευρώπη) Name[es]=Fuente de energía vertical (europeo) @@ -15,6 +16,7 @@ Name[pt]=Fonte Alimentação Vertical (Europeu) Name[pt_BR]=Fonte de alimentação vertical (Europeia) Name[ru]=Вертикальный источник питания (Европейский) +Name[sk]=Zvislý zdroj napätia (európsky) Name[sv]=Vertikal kraftkälla (europeisk) Name[uk]=Джерело струму (вертикально, Європа) Name[x-test]=xxVertical Powersource (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vresistor_de.desktop calligra-2.4.3/flow/stencils/Circuit/vresistor_de.desktop --- calligra-2.4.0/flow/stencils/Circuit/vresistor_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vresistor_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Resistor (European) Name[bg]=Вертикално съпротивление (европейски) Name[ca]=Resistor vertical (europeu) +Name[ca@valencia]=Resistor vertical (europeu) Name[de]=Senkrechter Widerstand (europäisch) Name[el]=Κάθετος αντιστάτης (Ευρώπη) Name[es]=Resistencia vertical (europea) @@ -15,6 +16,7 @@ Name[pt]=Resistência Vertical (Europeu) Name[pt_BR]=Resistor vertical (Europeu) Name[ru]=Вертикальный резистор (Европейский) +Name[sk]=Zvislý rezistor (európsky) Name[sv]=Vertikalt motstånd (europeiskt) Name[uk]=Резистор (вертикально, Європа) Name[x-test]=xxVertical Resistor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vresistor.desktop calligra-2.4.3/flow/stencils/Circuit/vresistor.desktop --- calligra-2.4.0/flow/stencils/Circuit/vresistor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vresistor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Vertical Resistor Name[bg]=Вертикално съпротивление Name[ca]=Resistor vertical +Name[ca@valencia]=Resistor vertical Name[de]=Senkrechter Widerstand Name[el]=Κάθετος αντιστάτης Name[es]=Resistencia vertical Name[et]=Vertikaalne takisti +Name[hu]=Függőleges ellenállás Name[it]=Resistore verticale Name[kk]=Тік резистор Name[nb]=Loddrett motstand @@ -15,6 +17,7 @@ Name[pt]=Resistência Vertical Name[pt_BR]=Resistor vertical Name[ru]=Вертикальный резистор +Name[sk]=Zvislý rezistor Name[sv]=Vertikalt motstånd Name[uk]=Резистор (вертикально) Name[x-test]=xxVertical Resistorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit/vzener.desktop calligra-2.4.3/flow/stencils/Circuit/vzener.desktop --- calligra-2.4.0/flow/stencils/Circuit/vzener.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit/vzener.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vertical Zener Diode Name[bg]=Вертикален ценеров диод Name[ca]=Diode Zener vertical +Name[ca@valencia]=Diode Zener vertical Name[de]=Senkrechte Zener-Diode Name[el]=Κάθετη δίοδος Zener Name[es]=Diodo Zener vertical @@ -15,6 +16,7 @@ Name[pt]=Díodo de Zener Vertical Name[pt_BR]=Diodo de Zener vertical Name[ru]=Вертикальный зенеровский диод +Name[sk]=Zvislá Zenerova dióda Name[sv]=Vertikal Zener-diod Name[uk]=Стабілітрон (вертикально) Name[x-test]=xxVertical Zener Diodexx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/collection.desktop calligra-2.4.3/flow/stencils/Circuit2/collection.desktop --- calligra-2.4.0/flow/stencils/Circuit2/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Circuit2 Name[bg]=Верига2 Name[ca]=Circuit2 +Name[ca@valencia]=Circuit2 Name[cs]=Obvod Name[de]=Schaltkreis2 Name[el]=Κύκλωμα2 Name[es]=Circuito 2 Name[et]=Vooluring2 +Name[gl]=Circuíto 2 Name[hu]=Áramkör2 Name[it]=Circuito2 Name[kk]=Электрсұлба2 diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dcapacitor.desktop calligra-2.4.3/flow/stencils/Circuit2/dcapacitor.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dcapacitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dcapacitor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Capacitor Name[ca]=Capacitador diagonal +Name[ca@valencia]=Capacitador diagonal Name[de]=Diagonaler Widerstand Name[el]=Διαγώνιος πυκνωτής Name[es]=Condensador diagonal @@ -14,6 +15,7 @@ Name[pt]=Condensador Diagonal Name[pt_BR]=Capacitor diagonal Name[ru]=Диагональный конденсатор +Name[sk]=Diagonálny kondenzátor Name[sv]=Diagonal kondensator Name[uk]=Конденсатор (діагонально) Name[x-test]=xxDiagonal Capacitorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/ddiode.desktop calligra-2.4.3/flow/stencils/Circuit2/ddiode.desktop --- calligra-2.4.0/flow/stencils/Circuit2/ddiode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/ddiode.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Diode Name[ca]=Diode diagonal +Name[ca@valencia]=Diode diagonal Name[de]=Diagonale Diode Name[el]=Διαγώνια δίοδος Name[es]=Diodo diagonal @@ -14,6 +15,7 @@ Name[pt]=Díodo Diagonal Name[pt_BR]=Diodo diagonal Name[ru]=Диагональный диод +Name[sk]=Diagonálna dióda Name[sv]=Diagonal diod Name[uk]=Діод (діагонально) Name[x-test]=xxDiagonal Diodexx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dinductor_de.desktop calligra-2.4.3/flow/stencils/Circuit2/dinductor_de.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dinductor_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dinductor_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Inductor (European) Name[ca]=Diagonal Inductor (Europeu) +Name[ca@valencia]=Diagonal Inductor (Europeu) Name[de]=Diagonale Drosselspule (europäisch) Name[el]=Διαγώνιο πηνίο (Ευρώπη) Name[es]=Inductor diagonal (Europeo) @@ -14,6 +15,7 @@ Name[pt]=Bobina Diagonal (Europeu) Name[pt_BR]=Indutor diagonal (Europeu) Name[ru]=Диагональная катушка индуктивности (Европейская) +Name[sk]=Diagonálna cievka (európska) Name[sv]=Diagonal induktans (europeisk) Name[uk]=Індуктивна котушка (діагонально, Європа) Name[x-test]=xxDiagonal Inductor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dinductor.desktop calligra-2.4.3/flow/stencils/Circuit2/dinductor.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dinductor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dinductor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Inductor Name[ca]=Diagonal Inductor +Name[ca@valencia]=Diagonal Inductor Name[de]=Diagonale Drosselspule Name[el]=Διαγώνιο πηνίο Name[es]=Inductor diagonal @@ -14,6 +15,7 @@ Name[pt]=Bobina Diagonal Name[pt_BR]=Indutor diagonal Name[ru]=Диагональная катушка индуктивности +Name[sk]=Diagonálna cievka Name[sv]=Diagonal induktans Name[uk]=Індуктивна котушка (діагонально) Name[x-test]=xxDiagonal Inductorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dled_de.desktop calligra-2.4.3/flow/stencils/Circuit2/dled_de.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dled_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dled_de.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Led (European) Name[ca]=Diagonal Led (Europeu) +Name[ca@valencia]=Diagonal Led (Europeu) Name[de]=Diagonale LED (europäisch) Name[el]=Διαγώνιο led (Ευρώπη) Name[es]=LED diagonal (Europeo) @@ -14,6 +15,7 @@ Name[pt]=LED Diagonal (Europeu) Name[pt_BR]=Led diagonal (Europeu) Name[ru]=Диагональный светодиод (Европейский) +Name[sk]=Diagonálna LED (európska) Name[sv]=Diagonal lysdiod (europeisk) Name[uk]=Світлодіод (діагонально, Європа) Name[x-test]=xxDiagonal Led (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dpcapacitor.desktop calligra-2.4.3/flow/stencils/Circuit2/dpcapacitor.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dpcapacitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dpcapacitor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Polarized Capacitor Name[ca]=Capacitador polaritzat diagonal +Name[ca@valencia]=Capacitador polaritzat diagonal Name[de]=Diagonaler gepolter Kondensator Name[el]=Διαγώνιος πολωμένος πυκνωτής Name[es]=Condensador diagonal polarizado @@ -14,6 +15,7 @@ Name[pt]=Condensador Diagonal Polarizado Name[pt_BR]=Capacitor diagonal polarizado Name[ru]=Диагональный полярный конденсатор +Name[sk]=Diagonálny polarizovaný kondenzátor Name[sv]=Diagonal polär kondensator Name[uk]=Поляризований конденсатор (діагонально) Name[x-test]=xxDiagonal Polarized Capacitorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dresistor_de.desktop calligra-2.4.3/flow/stencils/Circuit2/dresistor_de.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dresistor_de.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dresistor_de.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Resistor (European) Name[ca]=Resistor diagonal (europeu) +Name[ca@valencia]=Resistor diagonal (europeu) Name[de]=Diagonaler Widerstand (europäisch) Name[el]=Διαγώνιος αντιστάτης (Ευρώπη) Name[es]=Resistor diagonal (Europeo) @@ -14,6 +15,7 @@ Name[pt]=Resistência Diagonal (Europeu) Name[pt_BR]=Resistor diagonal (Europeu) Name[ru]=Диагональный резистор (Европейский) +Name[sk]=Diagonálny rezistor (európsky) Name[sv]=Diagonalt motstånd (europeiskt) Name[uk]=Резистор (діагонально, Європа) Name[x-test]=xxDiagonal Resistor (European)xx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dresistor.desktop calligra-2.4.3/flow/stencils/Circuit2/dresistor.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dresistor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dresistor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Resistor Name[ca]=Resistor diagonal +Name[ca@valencia]=Resistor diagonal Name[de]=Diagonaler Widerstand Name[el]=Διαγώνιος αντιστάτης Name[es]=Resistor diagonal @@ -14,6 +15,7 @@ Name[pt]=Resistência Diagonal Name[pt_BR]=Resistor diagonal Name[ru]=Диагональный резистор +Name[sk]=Diagonálny rezistor Name[sv]=Diagonalt motstånd Name[uk]=Резистор (діагонально) Name[x-test]=xxDiagonal Resistorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/dzener.desktop calligra-2.4.3/flow/stencils/Circuit2/dzener.desktop --- calligra-2.4.0/flow/stencils/Circuit2/dzener.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/dzener.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Diagonal Zener Diode Name[ca]=Diode Zener diagonal +Name[ca@valencia]=Dione Zener diagonal Name[de]=Diagonale Zener-Diode Name[el]=Διαγώνια δίοδος Zener Name[es]=Diodo Zener diagonal @@ -14,6 +15,7 @@ Name[pt]=Díodo de Zener Diagonal Name[pt_BR]=Diodo de Zener diagonal Name[ru]=Диагональный зенеровский диод +Name[sk]=Diagonálne Zenerova dióda Name[sv]=Diagonal Zener-diod Name[uk]=Стабілітрон (діагонально) Name[x-test]=xxDiagonal Zener Diodexx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/hammeter.desktop calligra-2.4.3/flow/stencils/Circuit2/hammeter.desktop --- calligra-2.4.0/flow/stencils/Circuit2/hammeter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/hammeter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Horizontal Ammeter Name[ca]=Amperímetre horitzontal +Name[ca@valencia]=Amperímetre horitzontal Name[de]=Waagerechtes Amperemeter Name[el]=Οριζόντιο αμπερόμετρο Name[es]=Amperímetro horizontal @@ -14,6 +15,7 @@ Name[pt]=Amperímetro Horizontal Name[pt_BR]=Amperímetro horizontal Name[ru]=Горизонтальный амперметр +Name[sk]=Vodorovný ampérmeter Name[sv]=Horisontell Amperemätare Name[uk]=Амперметр (горизонтально) Name[x-test]=xxHorizontal Ammeterxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/hpcapacitor.desktop calligra-2.4.3/flow/stencils/Circuit2/hpcapacitor.desktop --- calligra-2.4.0/flow/stencils/Circuit2/hpcapacitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/hpcapacitor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Horizontal Polarized Capacitor Name[ca]=Capacitador polaritzar horitzontal +Name[ca@valencia]=Capacitador polaritzar horitzontal Name[de]=Waagerechter gepolter Kondensator Name[el]=Οριζόντιος πολωμένος πυκνωτής Name[es]=Condensador horizontal polarizado @@ -14,6 +15,7 @@ Name[pt]=Condensador Horizontal Polarizado Name[pt_BR]=Capacitor horizontal polarizado Name[ru]=Горизонтальный полярный конденсатор +Name[sk]=Vodorovný polazirovaný kondenzátor Name[sv]=Horisontell polär kondensator Name[uk]=Поляризований конденсатор (горизонтально) Name[x-test]=xxHorizontal Polarized Capacitorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/hvoltmeter.desktop calligra-2.4.3/flow/stencils/Circuit2/hvoltmeter.desktop --- calligra-2.4.0/flow/stencils/Circuit2/hvoltmeter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/hvoltmeter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Horizontal Voltmeter Name[ca]=Voltímetre horitzontal +Name[ca@valencia]=Voltímetre horitzontal Name[de]=Waagerechtes Voltmeter Name[el]=Οριζόντιο βολτόμετρο Name[es]=Voltímetro horizontal @@ -14,6 +15,7 @@ Name[pt]=Voltímetro Horizontal Name[pt_BR]=Voltímetro horizontal Name[ru]=Горизонтальный вольтметр +Name[sk]=Vodorovný voltmeter Name[sv]=Horisontell voltmätare Name[uk]=Вольтметр (горизонтально) Name[x-test]=xxHorizontal Voltmeterxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/newhled.desktop calligra-2.4.3/flow/stencils/Circuit2/newhled.desktop --- calligra-2.4.0/flow/stencils/Circuit2/newhled.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/newhled.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Horizontal LED Name[ca]=LED horitzontal +Name[ca@valencia]=LED horitzontal Name[de]=Waagerechte LED Name[el]=Οριζόντιο LED Name[es]=LED horizontal Name[et]=Horisontaalne LED +Name[hu]=Vízszintes LED Name[it]=LED orizzontale Name[kk]=Жатық сәуледиод Name[nb]=Vannrett LED (DIN) @@ -14,6 +16,7 @@ Name[pt]=LED Horizontal Name[pt_BR]=LED Horizontal Name[ru]=Горизонтальный светодиод +Name[sk]=Vodorovná LED Name[sv]=Horisontell lysdiod Name[uk]=Світлодіод (горизонтально) Name[x-test]=xxHorizontal LEDxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/newvled.desktop calligra-2.4.3/flow/stencils/Circuit2/newvled.desktop --- calligra-2.4.0/flow/stencils/Circuit2/newvled.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/newvled.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Vertical LED Name[ca]=LED vertical +Name[ca@valencia]=LED vertical Name[de]=Senkrechte LED Name[el]=Κάθετο LED Name[es]=LED vertical Name[et]=Vertikaalne LED +Name[hu]=Függőleges LED Name[it]=LED verticale Name[kk]=Тік сәуледиод Name[nb]=Loddrett LED @@ -14,6 +16,7 @@ Name[pt]=LED Vertical Name[pt_BR]=LED vertical Name[ru]=Вертикальный светодиод +Name[sk]=Zvislá LED Name[sv]=Vertikal lysdiod Name[uk]=Світлодіод (вертикально) Name[x-test]=xxVertical LEDxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/opto.desktop calligra-2.4.3/flow/stencils/Circuit2/opto.desktop --- calligra-2.4.0/flow/stencils/Circuit2/opto.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/opto.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Optoisolator Name[ca]=Optoisolador +Name[ca@valencia]=Optoisolador Name[de]=Optokoppler Name[el]=Οπτικός απομονωτής Name[es]=Optoaislador @@ -13,6 +14,7 @@ Name[pt]=Opto-isolante Name[pt_BR]=Opto-isolante Name[ru]=Оптрон +Name[sk]=Optoizolant Name[sv]=Optoisolator Name[uk]=Оптрон Name[x-test]=xxOptoisolatorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/ramp.desktop calligra-2.4.3/flow/stencils/Circuit2/ramp.desktop --- calligra-2.4.0/flow/stencils/Circuit2/ramp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/ramp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Ramp Wave Name[ca]=Ona de rampa +Name[ca@valencia]=Ona de rampa Name[el]=Ramp Wave Name[es]=Onda rampa Name[et]=Saehammaslaine +Name[gl]=Onda de serra Name[it]=Onda a rampa Name[kk]=Көлбеу ара-тісті толқын Name[nb]=Sagtannbølge @@ -12,6 +14,7 @@ Name[pt]=Onda em Rampa Name[pt_BR]=Onda em rampa Name[ru]=Рампообразная волна +Name[sk]=Spádová vlna Name[sv]=Sågtandsvåg Name[uk]=Пилкоподібний сигнал Name[x-test]=xxRamp Wavexx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/relay.desktop calligra-2.4.3/flow/stencils/Circuit2/relay.desktop --- calligra-2.4.0/flow/stencils/Circuit2/relay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/relay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,12 +1,15 @@ [Desktop Entry] Name=Relay Name[ca]=Relé +Name[ca@valencia]=Relé Name[cs]=Přenos Name[de]=Relais Name[el]=Relay Name[es]=Relé Name[et]=Relee +Name[gl]=Retransmitir Name[it]=Relé +Name[ja]=リレー Name[kk]=Реле Name[nb]=Rele Name[nds]=Relais @@ -15,6 +18,7 @@ Name[pt]=Relé Name[pt_BR]=Relé Name[ru]=Реле +Name[sk]=Relé Name[sv]=Relä Name[uk]=Реле Name[x-test]=xxRelayxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/sine.desktop calligra-2.4.3/flow/stencils/Circuit2/sine.desktop --- calligra-2.4.0/flow/stencils/Circuit2/sine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/sine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Sine Wave Name[ca]=Ona sinusoïdal +Name[ca@valencia]=Ona sinusoïdal Name[de]=Sinuswelle Name[el]=Ημιτονοειδές κύμα Name[es]=Onda sinusoidal @@ -8,6 +9,7 @@ Name[fi]=Siniaalto Name[hu]=Szinuszhullám Name[it]=Onda sinusoidale +Name[ja]=サイン波 Name[kk]=Синусоидалық толқын Name[nb]=Sinusbølge Name[nds]=Sinus @@ -16,6 +18,7 @@ Name[pt]=Onda Sinusoidal Name[pt_BR]=Onda senoidal Name[ru]=Синусоидальная волна +Name[sk]=Sínusoida Name[sv]=Sinusvåg Name[ug]=سىنۇس ئەگرى سىزىقى Name[uk]=Синусоподібний сигнал diff -Nru calligra-2.4.0/flow/stencils/Circuit2/square.desktop calligra-2.4.3/flow/stencils/Circuit2/square.desktop --- calligra-2.4.0/flow/stencils/Circuit2/square.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/square.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Square Wave Name[ca]=Ona quadrada +Name[ca@valencia]=Ona quadrada Name[cs]=Obdélníková vlna Name[de]=Rechteckwelle Name[el]=Square Wave @@ -16,6 +17,7 @@ Name[pt]=Onda Quadrada Name[pt_BR]=Onda quadrada Name[ru]=Волна в виде меандра +Name[sk]=Štvorcová vlna Name[sv]=Fyrkantsvåg Name[uk]=Квадратний сигнал Name[x-test]=xxSquare Wavexx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/triac.desktop calligra-2.4.3/flow/stencils/Circuit2/triac.desktop --- calligra-2.4.0/flow/stencils/Circuit2/triac.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/triac.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=TRIAC Name[bg]=TRIAC Name[ca]=TRIAC +Name[ca@valencia]=TRIAC Name[cs]=TRIAK Name[de]=Doppeltransistor Name[el]=TRIAC diff -Nru calligra-2.4.0/flow/stencils/Circuit2/triangle.desktop calligra-2.4.3/flow/stencils/Circuit2/triangle.desktop --- calligra-2.4.0/flow/stencils/Circuit2/triangle.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/triangle.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Triangle Wave Name[ca]=Ona triangular +Name[ca@valencia]=Ona triangular Name[de]=Dreieckwelle Name[el]=Τριγωνικό κύμα Name[es]=Onda triangular Name[et]=Kolmnurklaine Name[it]=Onda triangolare +Name[ja]=三角波 Name[kk]=Ара-тісті толқын Name[nb]=Trekantbølge Name[nds]=Saagtahn @@ -14,6 +16,7 @@ Name[pt]=Onda Triangular Name[pt_BR]=Onda triangular Name[ru]=Треугольная волна +Name[sk]=Trojuholníková vlna Name[sv]=Triangelvåg Name[uk]=Зубчастий сигнал Name[x-test]=xxTriangle Wavexx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/vammeter.desktop calligra-2.4.3/flow/stencils/Circuit2/vammeter.desktop --- calligra-2.4.0/flow/stencils/Circuit2/vammeter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/vammeter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Vertical Ammeter Name[ca]=Amperímetre vertical +Name[ca@valencia]=Amperímetre vertical Name[de]=Senkrechtes Amperemeter Name[el]=Κάθετο αμπερόμετρο Name[es]=Amperímetro vertical @@ -14,6 +15,7 @@ Name[pt]=Amperímetro Vertical Name[pt_BR]=Amperímetro vertical Name[ru]=Вертикальный амперметр +Name[sk]=Zvislý ampérmeter Name[sv]=Vertikal Amperemätare Name[uk]=Амперметр (вертикально) Name[x-test]=xxVertical Ammeterxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/vpcapacitor.desktop calligra-2.4.3/flow/stencils/Circuit2/vpcapacitor.desktop --- calligra-2.4.0/flow/stencils/Circuit2/vpcapacitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/vpcapacitor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Vertical Polarized Capacitor Name[ca]=Capacitador polaritzat vertical +Name[ca@valencia]=Capacitador polaritzat vertical Name[de]=Senkrechter gepolter Kondensator Name[el]=Κάθετος πολωμένος πυκνωτής Name[es]=Condensador polarizado vertical @@ -14,6 +15,7 @@ Name[pt]=Condensador Vertical Polarizado Name[pt_BR]=Capacitor vertical polarizado Name[ru]=Вертикальный полярный конденсатор +Name[sk]=Zvislý polarizovaný kondenzátor Name[sv]=Vertikal polär kondensator Name[uk]=Поляризований конденсатор (вертикально) Name[x-test]=xxVertical Polarized Capacitorxx diff -Nru calligra-2.4.0/flow/stencils/Circuit2/vvoltmeter.desktop calligra-2.4.3/flow/stencils/Circuit2/vvoltmeter.desktop --- calligra-2.4.0/flow/stencils/Circuit2/vvoltmeter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Circuit2/vvoltmeter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Vertical Voltmeter Name[ca]=Voltímetre vertical +Name[ca@valencia]=Voltímetre vertical Name[de]=Sekrechtes Voltmeter Name[el]=Κάθετο βολτόμετρο Name[es]=Voltímetro vertical @@ -14,6 +15,7 @@ Name[pt]=Voltímetro Vertical Name[pt_BR]=Voltímetro vertical Name[ru]=Вертикальный вольтметр +Name[sk]=Vodorovný voltmeter Name[sv]=Vertikal voltmätare Name[uk]=Вольтметр (вертикально) Name[x-test]=xxVertical Voltmeterxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/1000.desktop calligra-2.4.3/flow/stencils/Cisco/1000.desktop --- calligra-2.4.0/flow/stencils/Cisco/1000.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/1000.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cisco 1000 Name[bg]=Cisco 1000 Name[ca]=Cisco 1000 +Name[ca@valencia]=Cisco 1000 Name[cs]=Cisco 1000 Name[de]=Cisco 1000 Name[el]=Cisco 1000 @@ -10,6 +11,7 @@ Name[fi]=Cisco 1000 Name[hu]=Cisco 1000 Name[it]=Cisco 1000 +Name[ja]=Cisco 1000 Name[kk]=Cisco 1000 Name[nb]=Cisco 1000 Name[nds]=Cisco 1000 @@ -18,6 +20,7 @@ Name[pt]=Cisco 1000 Name[pt_BR]=Cisco 1000 Name[ru]=Cisco 1000 +Name[sk]=Cisco 1000 Name[sv]=Cisco 1000 Name[uk]=Cisco 1000 Name[x-test]=xxCisco 1000xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/100baset_hub.desktop calligra-2.4.3/flow/stencils/Cisco/100baset_hub.desktop --- calligra-2.4.0/flow/stencils/Cisco/100baset_hub.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/100baset_hub.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=100BaseT Hub Name[bg]=100BaseT хъб Name[ca]=100BaseT Hub +Name[ca@valencia]=100BaseT Hub Name[de]=100BaseT Hub Name[el]=100BaseT Hub Name[es]=Concentrador 100 BaseT Name[et]=100BaseT jaotur +Name[hu]=100BaseT Hub Name[it]=Hub 100BaseT +Name[ja]=100BaseT ハブ Name[kk]=100BaseT хабы Name[nb]=100BaseT Hub Name[nds]=100BaseT-Nettknütt @@ -15,6 +18,7 @@ Name[pt]=Concentrador 100BaseT Name[pt_BR]=Concentrador 100BaseT Name[ru]=Повторитель 100BaseT +Name[sk]=100BaseT Hub Name[sv]=100BaseT nätnav Name[uk]=Концентратор 100BaseT Name[x-test]=xx100BaseT Hubxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/10700.desktop calligra-2.4.3/flow/stencils/Cisco/10700.desktop --- calligra-2.4.0/flow/stencils/Cisco/10700.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/10700.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=10700 Name[bg]=10700 Name[ca]=10700 +Name[ca@valencia]=10700 Name[cs]=10700 Name[de]=10700 Name[el]=10700 diff -Nru calligra-2.4.0/flow/stencils/Cisco/15200.desktop calligra-2.4.3/flow/stencils/Cisco/15200.desktop --- calligra-2.4.0/flow/stencils/Cisco/15200.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/15200.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=15200 Name[bg]=15200 Name[ca]=15200 +Name[ca@valencia]=15200 Name[cs]=15200 Name[de]=15200 Name[el]=15200 diff -Nru calligra-2.4.0/flow/stencils/Cisco/15800.desktop calligra-2.4.3/flow/stencils/Cisco/15800.desktop --- calligra-2.4.0/flow/stencils/Cisco/15800.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/15800.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=15800 Name[bg]=15800 Name[ca]=15800 +Name[ca@valencia]=15800 Name[cs]=15800 Name[de]=15800 Name[el]=15800 diff -Nru calligra-2.4.0/flow/stencils/Cisco/3174.desktop calligra-2.4.3/flow/stencils/Cisco/3174.desktop --- calligra-2.4.0/flow/stencils/Cisco/3174.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/3174.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=3174 (desktop) cluster controller Name[bg]=3174 (настолен) контролер на клъстър Name[ca]=3174 (desktop) cluster controller +Name[ca@valencia]=3174 (desktop) cluster controller Name[de]=3174 (Desktop-)Cluster-Controller Name[el]=3174 (επιφάνειας εργασίας) ελεγκτής συστοιχίας Name[es]=Controlador de cluster (escritorio) 3174 @@ -15,6 +16,7 @@ Name[pt]=controlador de 'cluster' 3174 (secretária) Name[pt_BR]=controlador de cluster (de mesa) 3174 Name[ru]=Управление кластером 3174 (рабочее место) +Name[sk]=3174 (desktop) cluster controller Name[sv]=3174 (skrivbord) gruppstyrenhet Name[uk]=3174 (настільний) контролер кластера Name[x-test]=xx3174 (desktop) cluster controllerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/3x74.desktop calligra-2.4.3/flow/stencils/Cisco/3x74.desktop --- calligra-2.4.0/flow/stencils/Cisco/3x74.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/3x74.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=3X74 (floor) cluster controller Name[bg]=3X74 (floor) контролер за клъстър Name[ca]=3X74 (floor) cluster controller +Name[ca@valencia]=3X74 (floor) cluster controller Name[de]=3X74 (Boden-)Cluster-Controller Name[el]=3X74 (δαπέδου) ελεγκτής συστοιχίας Name[es]=Controlador de cluster (suelo) 3X74 @@ -15,6 +16,7 @@ Name[pt]=controlador de 'cluster' 3X74 (chão) Name[pt_BR]=controlador de cluster (de chão) 3X74 Name[ru]=Управление кластером 3X74 (напольное) +Name[sk]=3X74 (floor) cluster controller Name[sv]=3X74 (golv) gruppstyrenhet Name[uk]=3X74 (стаціонарний) контролер кластеру Name[x-test]=xx3X74 (floor) cluster controllerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/5000.desktop calligra-2.4.3/flow/stencils/Cisco/5000.desktop --- calligra-2.4.0/flow/stencils/Cisco/5000.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/5000.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Workgroup 5000 Name[bg]=Работна група 5000 Name[ca]=Workgroup 5000 +Name[ca@valencia]=Workgroup 5000 Name[cs]=Workgroup 5000 Name[de]=Workgroup 5000 Name[el]=Workgroup 5000 @@ -16,6 +17,7 @@ Name[pt]=Grupo de Trabalho 5000 Name[pt_BR]=Grupo de trabalho 5000 Name[ru]=Рабочая группа 5000 +Name[sk]=Pracovná skupina 5000 Name[sv]=Workgroup 5000 Name[uk]=Workgroup 5000 Name[x-test]=xxWorkgroup 5000xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/5002.desktop calligra-2.4.3/flow/stencils/Cisco/5002.desktop --- calligra-2.4.0/flow/stencils/Cisco/5002.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/5002.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Workgroup 5002 Name[bg]=Работна група 5002 Name[ca]=Workgroup 5002 +Name[ca@valencia]=Workgroup 5002 Name[cs]=Workgroup 5002 Name[de]=Workgroup 5002 Name[el]=Workgroup 5002 @@ -16,6 +17,7 @@ Name[pt]=Grupo de Trabalho 5002 Name[pt_BR]=Grupo de trabalho 5002 Name[ru]=Рабочая группа 5002 +Name[sk]=Pracovná skupina 5002 Name[sv]=Workgroup 5002 Name[uk]=Workgroup 5002 Name[x-test]=xxWorkgroup 5002xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/5500.desktop calligra-2.4.3/flow/stencils/Cisco/5500.desktop --- calligra-2.4.0/flow/stencils/Cisco/5500.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/5500.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Workgroup 5500 Name[bg]=Работна група 5500 Name[ca]=Workgroup 5500 +Name[ca@valencia]=Workgroup 5500 Name[cs]=Workgroup 5500 Name[de]=Workgroup 5500 Name[el]=Workgroup 5500 @@ -16,6 +17,7 @@ Name[pt]=Grupo de Trabalho 5500 Name[pt_BR]=Grupo de trabalho 5500 Name[ru]=Рабочая группа 5500 +Name[sk]=Pracovná skupina 5500 Name[sv]=Workgroup 5500 Name[uk]=Workgroup 5500 Name[x-test]=xxWorkgroup 5500xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/6701.desktop calligra-2.4.3/flow/stencils/Cisco/6701.desktop --- calligra-2.4.0/flow/stencils/Cisco/6701.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/6701.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=6701 Name[bg]=6701 Name[ca]=6701 +Name[ca@valencia]=6701 Name[cs]=6701 Name[de]=6701 Name[el]=6701 diff -Nru calligra-2.4.0/flow/stencils/Cisco/6705.desktop calligra-2.4.3/flow/stencils/Cisco/6705.desktop --- calligra-2.4.0/flow/stencils/Cisco/6705.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/6705.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=6705 Name[bg]=6705 Name[ca]=6705 +Name[ca@valencia]=6705 Name[cs]=6705 Name[de]=6705 Name[el]=6705 diff -Nru calligra-2.4.0/flow/stencils/Cisco/6732.desktop calligra-2.4.3/flow/stencils/Cisco/6732.desktop --- calligra-2.4.0/flow/stencils/Cisco/6732.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/6732.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=6732 Name[bg]=6732 Name[ca]=6732 +Name[ca@valencia]=6732 Name[cs]=6732 Name[de]=6732 Name[el]=6732 diff -Nru calligra-2.4.0/flow/stencils/Cisco/7500ars.desktop calligra-2.4.3/flow/stencils/Cisco/7500ars.desktop --- calligra-2.4.0/flow/stencils/Cisco/7500ars.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/7500ars.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=7500ARS (7513) Router Name[ca]=Encaminador 7500ARS (7513) +Name[ca@valencia]=Encaminador 7500ARS (7513) Name[de]=7500ARS (7513)-Router Name[el]=7500ARS (7513) Router Name[es]=Enrutador 7500ARS (7513) @@ -16,6 +17,7 @@ Name[pt]=Encaminhador 7500ARS (7513) Name[pt_BR]=Roteador 7500ARS (7513) Name[ru]=7500ARS (7513) Маршрутизатор +Name[sk]=7500ARS (7513) Router Name[sv]=7500ARS (7513) Name[uk]=Маршрутизатор 7500ARS (7513) Name[x-test]=xx7500ARS (7513) Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/7505.desktop calligra-2.4.3/flow/stencils/Cisco/7505.desktop --- calligra-2.4.0/flow/stencils/Cisco/7505.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/7505.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=7505 Router Name[ca]=Encaminador 7505 +Name[ca@valencia]=Encaminador 7505 Name[cs]=7505 Router Name[de]=7505-Router Name[el]=7505 Router @@ -18,6 +19,7 @@ Name[pt]=Encaminhador 7505 Name[pt_BR]=Roteador 7505 Name[ru]=7505 Маршрутизатор +Name[sk]=7505 Router Name[sv]=7505 Name[uk]=Маршрутизатор 7505 Name[x-test]=xx7505 Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/7507.desktop calligra-2.4.3/flow/stencils/Cisco/7507.desktop --- calligra-2.4.0/flow/stencils/Cisco/7507.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/7507.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=7507 Router Name[ca]=Encaminador 7507 +Name[ca@valencia]=Encaminador 7507 Name[cs]=7507 Router Name[de]=7507-Router Name[el]=7507 Router @@ -18,6 +19,7 @@ Name[pt]=Encaminhador 7507 Name[pt_BR]=Roteador 7507 Name[ru]=7507 Маршрутизатор +Name[sk]=7507 Router Name[sv]=7507 Name[uk]=Маршрутизатор 7507 Name[x-test]=xx7507 Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/access_gateway.desktop calligra-2.4.3/flow/stencils/Cisco/access_gateway.desktop --- calligra-2.4.0/flow/stencils/Cisco/access_gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/access_gateway.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Access Gateway Name[ca]=Passarel·la d'accés +Name[ca@valencia]=Passarel·la d'accés Name[cs]=Přístupová brána Name[de]=Access Gateway Name[el]=Πύλη πρόσβασης @@ -15,6 +16,7 @@ Name[pt]='Gateway' de Acesso Name[pt_BR]=Gateway de acesso Name[ru]=Шлюз доступа +Name[sk]=Prístupová brána Name[sv]=Catalyst anslutningsförmedlingsnod Name[uk]=Шлюз доступу Name[x-test]=xxAccess Gatewayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/accesspoint.desktop calligra-2.4.3/flow/stencils/Cisco/accesspoint.desktop --- calligra-2.4.0/flow/stencils/Cisco/accesspoint.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/accesspoint.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=AccessPoint Name[ca]=PuntAccés +Name[ca@valencia]=PuntAccés Name[cs]=Přístupový bod Name[de]=AccessPoint Name[el]=Σημείο πρόσβασης @@ -8,6 +9,7 @@ Name[et]=Tugijaam Name[fi]=Tukiasema Name[it]=AccessPoint +Name[ja]=アクセスポイント Name[kk]=Қатынау нүктесі Name[nb]=Aksesspunkt Name[nds]=Togrieppunkt @@ -16,6 +18,7 @@ Name[pt]=Ponto de Acesso Name[pt_BR]=Ponto de acesso Name[ru]=Точка доступа +Name[sk]=Prístupový bod Name[sv]=Anslutningspunkt Name[uk]=Точка доступу Name[x-test]=xxAccessPointxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/access_server.desktop calligra-2.4.3/flow/stencils/Cisco/access_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/access_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/access_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Access server Name[ca]=Servidor d'accés +Name[ca@valencia]=Servidor d'accés Name[el]=Εξυπηρετητής πρόσβασης Name[es]=Servidor de acceso Name[et]=Pöördusserver @@ -13,6 +14,7 @@ Name[pt]=Servidor de acesso Name[pt_BR]=Servidor de acesso Name[ru]=Сервер Доступа +Name[sk]=Prístupový server Name[sv]=Åtkomstserver Name[uk]=Сервер доступу Name[x-test]=xxAccess serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/adm.desktop calligra-2.4.3/flow/stencils/Cisco/adm.desktop --- calligra-2.4.0/flow/stencils/Cisco/adm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/adm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=ADM Name[bg]=ADM Name[ca]=ADM +Name[ca@valencia]=ADM Name[de]=ADM Name[el]=ADM +Name[es]=ADM Name[et]=ADM Name[fi]=ADM +Name[hu]=ADM Name[it]=ADM Name[kk]=ADM Name[nb]=ADM diff -Nru calligra-2.4.0/flow/stencils/Cisco/androgynous_person.desktop calligra-2.4.3/flow/stencils/Cisco/androgynous_person.desktop --- calligra-2.4.0/flow/stencils/Cisco/androgynous_person.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/androgynous_person.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Androgynous Person Name[ca]=Persona andrògina +Name[ca@valencia]=Persona andrògina Name[el]=Ανδρόγυνο Name[es]=Persona andrógina Name[et]=Androgüün @@ -12,6 +13,7 @@ Name[pt]=Pessoa Andrógina Name[pt_BR]=Pessoa andrógena Name[ru]=Личность неизвестного пола +Name[sk]=Obojpohlavná osoba Name[sv]=Androgyn person Name[uk]=Особа невідомої статі Name[x-test]=xxAndrogynous Personxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/antenna.desktop calligra-2.4.3/flow/stencils/Cisco/antenna.desktop --- calligra-2.4.0/flow/stencils/Cisco/antenna.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/antenna.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=Antenna Name[bg]=Антена Name[ca]=Antenna +Name[ca@valencia]=Antenna Name[de]=Antenne Name[el]=Κεραία Name[es]=Antena Name[et]=Antenn Name[fi]=Antenni +Name[hu]=Antenna Name[it]=Antenna +Name[ja]=アンテナ Name[kk]=Антенна Name[nb]=Antenne Name[nds]=Antenn @@ -16,6 +19,7 @@ Name[pt]=Antena Name[pt_BR]=Antena Name[ru]=Антенна +Name[sk]=Anténa Name[sv]=Antenn Name[uk]=Антенна Name[x-test]=xxAntennaxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/asic.desktop calligra-2.4.3/flow/stencils/Cisco/asic.desktop --- calligra-2.4.0/flow/stencils/Cisco/asic.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/asic.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=ASIC Processor Name[bg]=Процесор ASIC Name[ca]=Processador ASIC +Name[ca@valencia]=Processador ASIC Name[cs]=Procesor ASIC Name[de]=ASIC-Prozessor Name[el]=Επεξεργαστής ASIC @@ -10,6 +11,7 @@ Name[fi]=ASIC-suoritin Name[hu]=ASIC processzor Name[it]=Processore ASIC +Name[ja]=ASIC プロセッサ Name[kk]=ASIC процесоры Name[nb]=ASIC-prosessor Name[nds]=ASIC-Perzesser @@ -18,6 +20,7 @@ Name[pt]=Processador ASIC Name[pt_BR]=Processador ASIC Name[ru]=ASIC обработчик +Name[sk]=Procesor ASIC Name[sv]=Kundanpassad processorkrets Name[uk]=Процесор ASIC Name[x-test]=xxASIC Processorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ata.desktop calligra-2.4.3/flow/stencils/Cisco/ata.desktop --- calligra-2.4.0/flow/stencils/Cisco/ata.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ata.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=ATA Name[bg]=ATA Name[ca]=ATA +Name[ca@valencia]=ATA Name[de]=ATA Name[el]=ATA Name[es]=ATA Name[et]=ATA Name[fi]=ATA +Name[hu]=ATA Name[it]=ATA +Name[ja]=ATA Name[kk]=ATA Name[nb]=ATA Name[nds]=ATA @@ -16,6 +19,7 @@ Name[pt]=ATA Name[pt_BR]=ATA Name[ru]=ATA +Name[sk]=ATA Name[sv]=ATA Name[ug]=ATA Name[uk]=ATA diff -Nru calligra-2.4.0/flow/stencils/Cisco/atm3800.desktop calligra-2.4.3/flow/stencils/Cisco/atm3800.desktop --- calligra-2.4.0/flow/stencils/Cisco/atm3800.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/atm3800.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,13 +2,16 @@ Name=ATM 3800 Name[bg]=ATM 3800 Name[ca]=ATM 3800 +Name[ca@valencia]=ATM 3800 Name[cs]=ATM 3800 Name[de]=ATM 3800 Name[el]=ATM 3800 Name[es]=ATM 3800 Name[et]=ATM 3800 Name[fi]=ATM 3800 +Name[hu]=ATM 3800 Name[it]=ATM 3800 +Name[ja]=ATM 3800 Name[kk]=ATM 3800 Name[nb]=ATM 3800 Name[nds]=ATM 3800 @@ -17,6 +20,7 @@ Name[pt]=ATM 3800 Name[pt_BR]=ATM 3800 Name[ru]=ATM 3800 +Name[sk]=ATM 3800 Name[sv]=ATM 3800 Name[uk]=ATM 3800 Name[x-test]=xxATM 3800xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/atm_fast_gigabit_etherswitch.desktop calligra-2.4.3/flow/stencils/Cisco/atm_fast_gigabit_etherswitch.desktop --- calligra-2.4.0/flow/stencils/Cisco/atm_fast_gigabit_etherswitch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/atm_fast_gigabit_etherswitch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=ATM Fast Gigabit Etherswitch Name[bg]=Бърз гигабит етернет комутатор ATM Name[ca]=ATM Fast Gigabit Etherswitch +Name[ca@valencia]=ATM Fast Gigabit Etherswitch Name[de]=ATM-Fast-Gigabit-Ether-Switch Name[el]=ATM Fast Gigabit Etherswitch +Name[es]=ATM Fast Gigabit Etherswitch Name[et]=ATM kiire gigabit-ethernetikommutaator +Name[hu]=ATM Fast Gigabit Etherswitch Name[it]=ATM Fast Gigabit Etherswitch Name[kk]=Жылдам гигабиттік ATM Etherswitch Name[nb]=ATM rask gigabit ethersvitsj @@ -14,6 +17,7 @@ Name[pt]=Comutador Ethernet Fast Gigabit ATM Name[pt_BR]=Comutador Ethernet Fast Gigabit ATM Name[ru]=ATM Быстрый Гигабитный эзернетовский коммутатор (свич) +Name[sk]=ATM Fast Gigabit Etherswitch Name[sv]=Snabb Gigabit ATM Ethernetväxel Name[uk]=Швидкісний гігабітовий Etherswitch ATM Name[x-test]=xxATM Fast Gigabit Etherswitchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/atm_router.desktop calligra-2.4.3/flow/stencils/Cisco/atm_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/atm_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/atm_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=ATM Router Name[bg]=Маршрутизатор ATM Name[ca]=Encaminador ATM +Name[ca@valencia]=Encaminador ATM Name[de]=ATM-Router Name[el]=Δρομολογητής ATM Name[es]=Enrutador ATM Name[et]=ATM marsruuter Name[fi]=ATM-reititin +Name[hu]=ATM Router Name[it]=ATM Router Name[kk]=ATM маршруттауышы Name[nb]=ATM-ruter @@ -16,6 +18,7 @@ Name[pt]=Encaminhador ATM Name[pt_BR]=Roteador ATM Name[ru]=Маршрутизатор ATM +Name[sk]=ATM Router Name[sv]=ATM-router Name[uk]=Маршрутизатор ATM Name[x-test]=xxATM Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/atm_switch.desktop calligra-2.4.3/flow/stencils/Cisco/atm_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/atm_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/atm_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=ATM Switch Name[bg]=Комутатор ATM Name[ca]=ATM Switch +Name[ca@valencia]=ATM Switch Name[de]=ATM-Switch Name[el]=Μεταγωγέας ATM Name[es]=Conmutador ATM Name[et]=ATM kommutaator Name[fi]=ATM-kytkin +Name[hu]=ATM Switch Name[it]=ATM Switch +Name[ja]=ATM スィッチ Name[kk]=ATM косқышы Name[nb]=ATM-svitsj Name[nds]=ATM-Ümschalter @@ -16,6 +19,7 @@ Name[pt]=Comutador de ATM Name[pt_BR]=Comutador ATM Name[ru]=Коммутатор ATM +Name[sk]=ATM Switch Name[sv]=ATM-växel Name[uk]=Комутатор ATM Name[x-test]=xxATM Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/atm_tag_switch_router.desktop calligra-2.4.3/flow/stencils/Cisco/atm_tag_switch_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/atm_tag_switch_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/atm_tag_switch_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=ATM Tag Switch Router Name[bg]=Комутиращ маршрутизатор ATM Name[ca]=Encaminador commutador ATM Tag +Name[ca@valencia]=Encaminador commutador ATM Tag Name[el]=ATM Tag Switch Router +Name[es]=ATM Tag Switch Router Name[et]=ATM Tag kommutaator-marsruuter Name[it]=ATM Tag Switch Router Name[kk]=ATM Tag қосқыш маршруттауышы @@ -13,6 +15,7 @@ Name[pt]=Encaminhador-Comutador ATM Name[pt_BR]=Roteador/Comutador ATM Tag Name[ru]=ATM маршрутизатор отметчик коммутатор +Name[sk]=Router prepínača značky ATM Name[sv]=ATM-taggväxelrouter Name[uk]=Маршрутизатор мереж ATM Name[x-test]=xxATM Tag Switch Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/automatic_protection_switching.desktop calligra-2.4.3/flow/stencils/Cisco/automatic_protection_switching.desktop --- calligra-2.4.0/flow/stencils/Cisco/automatic_protection_switching.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/automatic_protection_switching.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Automatic Protection Switching Name[ca]=Automatic Protection Switching +Name[ca@valencia]=Automatic Protection Switching Name[el]=Μεταγωγή αυτόματης προστασίας +Name[es]=Conmutador con protección automática Name[et]=Automaatkaitsekommutatsioon Name[it]=Automatic Protection Switching Name[kk]=Авто қоғау қосқышы @@ -12,6 +14,7 @@ Name[pt]=Comutação de Protecção Automática Name[pt_BR]=Comutador de proteção automática Name[ru]=Коммутирование с автоматической защитой +Name[sk]=Prepínanie automatickej ochrany Name[sv]=Automatisk skyddsomkoppling Name[uk]=Автоматичне перемикання захисту Name[x-test]=xxAutomatic Protection Switchingxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/bbfw.desktop calligra-2.4.3/flow/stencils/Cisco/bbfw.desktop --- calligra-2.4.0/flow/stencils/Cisco/bbfw.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/bbfw.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=BBFW Name[bg]=BBFW Name[ca]=BBFW +Name[ca@valencia]=BBFW Name[de]=BBFW Name[el]=BBFW +Name[es]=BBFW Name[et]=BBFW Name[fi]=BBFW +Name[hu]=BBFW Name[it]=BBFW Name[kk]=BBFW Name[nb]=BBFW diff -Nru calligra-2.4.0/flow/stencils/Cisco/bbfw_media.desktop calligra-2.4.3/flow/stencils/Cisco/bbfw_media.desktop --- calligra-2.4.0/flow/stencils/Cisco/bbfw_media.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/bbfw_media.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=BBFW media Name[bg]=Среда BBFW Name[ca]=BBFW media +Name[ca@valencia]=BBFW media Name[de]=BBFW-Media Name[el]=BBFW media +Name[es]=Medio BBFW Name[et]=BBFW meedium +Name[hu]=BBFW média Name[it]=BBFW media Name[kk]=BBFW тасушысы Name[nb]=BBFW-media @@ -14,6 +17,7 @@ Name[pt]=dispositivo BBFW Name[pt_BR]=Mídia BBFW Name[ru]=Носитель BBFW +Name[sk]=BBFW média Name[sv]=BBFW-media Name[uk]=Носій BBFW Name[x-test]=xxBBFW mediaxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/bbs.desktop calligra-2.4.3/flow/stencils/Cisco/bbs.desktop --- calligra-2.4.0/flow/stencils/Cisco/bbs.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/bbs.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=BBS Name[bg]=BBS Name[ca]=BBS +Name[ca@valencia]=BBS Name[de]=BBS Name[el]=BBS +Name[es]=BBS Name[et]=BBS Name[fi]=BBS +Name[hu]=BBS Name[it]=BBS Name[kk]=BBS Name[nb]=BBS @@ -15,6 +18,7 @@ Name[pt]=BBS Name[pt_BR]=BBS Name[ru]=BBS +Name[sk]=BBS Name[sv]=BBS Name[uk]=BBS Name[x-test]=xxBBSxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/bbsm.desktop calligra-2.4.3/flow/stencils/Cisco/bbsm.desktop --- calligra-2.4.0/flow/stencils/Cisco/bbsm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/bbsm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=BBSM Name[bg]=BBSM Name[ca]=BBSM +Name[ca@valencia]=BBSM Name[de]=BBSM Name[el]=BBSM +Name[es]=BBSM Name[et]=BBSM Name[fi]=BBSM +Name[hu]=BBSM Name[it]=BBSM Name[kk]=BBSM Name[nb]=BBSM diff -Nru calligra-2.4.0/flow/stencils/Cisco/branch_office_blue.desktop calligra-2.4.3/flow/stencils/Cisco/branch_office_blue.desktop --- calligra-2.4.0/flow/stencils/Cisco/branch_office_blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/branch_office_blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Branch office blue Name[ca]=Branca d'oficina blava +Name[ca@valencia]=Branca d'oficina blava Name[el]=Branch office blue +Name[es]=Sucursal azul Name[et]=Sinine harukontor Name[it]=Succursale blu Name[kk]=Көк филиал кеңсесі @@ -11,6 +13,7 @@ Name[pt]=Escritório azul Name[pt_BR]=Escritório azul Name[ru]=Офис отделения синий +Name[sk]=Branch office modrý Name[sv]=Filialkontor blått Name[uk]=Філія (синім) Name[x-test]=xxBranch office bluexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/branch_office.desktop calligra-2.4.3/flow/stencils/Cisco/branch_office.desktop --- calligra-2.4.0/flow/stencils/Cisco/branch_office.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/branch_office.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=Branch office Name[bg]=Клон на офис Name[ca]=Branca d'oficina +Name[ca@valencia]=Branca d'oficina Name[de]=Branch-Office Name[el]=Branch office +Name[es]=Sucursal Name[et]=Harukontor Name[it]=Succursale +Name[ja]=支店 Name[kk]=Филиал кеңсесі Name[nb]=Filialkontor Name[nds]=Branch-Kontoor @@ -14,6 +17,7 @@ Name[pt]=Escritório Name[pt_BR]=Escritório Name[ru]=Офис отделения +Name[sk]=Branch office Name[sv]=Filialkontor Name[uk]=Філія Name[x-test]=xxBranch officexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/branch_office_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/branch_office_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/branch_office_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/branch_office_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Branch office subdued Name[ca]=Branca d'oficina sotmesa +Name[ca@valencia]=Branca d'oficina sotmesa Name[el]=Branch office subdued +Name[es]=Sucursal poco activa Name[et]=Toonita harukontor Name[kk]=Басыңқы филиал кеңсесі Name[nb]=Filialkontor blå dempet @@ -10,6 +12,7 @@ Name[pt]=Escritório ultrapassado Name[pt_BR]=Escritório ultrapassado Name[ru]=Офис отделения приглушённый +Name[sk]=Branch office tlmený Name[sv]=Filialkontor diskret Name[uk]=Філія (притлумлено) Name[x-test]=xxBranch office subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/breakout_box.desktop calligra-2.4.3/flow/stencils/Cisco/breakout_box.desktop --- calligra-2.4.0/flow/stencils/Cisco/breakout_box.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/breakout_box.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=Breakout box Name[ca]=Breakout box +Name[ca@valencia]=Breakout box Name[de]=Breakout-Box Name[el]=Breakout box +Name[es]=Caja breakout Name[et]=Jaoturkarp Name[it]=Breakout box Name[kk]=Түйістіргіштер блогі @@ -13,6 +15,7 @@ Name[pt]=Caixa quebra Name[pt_BR]=Caixa quebra Name[ru]=Разбивающий модуль +Name[sk]=Pretrhnutá škatuľa Name[sv]=Kopplingslåda Name[uk]=Комутаційний пристрій Name[x-test]=xxBreakout boxxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/bridge.desktop calligra-2.4.3/flow/stencils/Cisco/bridge.desktop --- calligra-2.4.0/flow/stencils/Cisco/bridge.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/bridge.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Bridge Name[bg]=Мост Name[ca]=Pont +Name[ca@valencia]=Pont Name[cs]=Most Name[de]=Brücke Name[el]=Γέφυρα +Name[es]=Puente Name[et]=Sild Name[fi]=Silta +Name[hu]=Híd Name[it]=Bridge Name[kk]=Көпір Name[nb]=Bru @@ -16,6 +19,7 @@ Name[pt]=Ponte Name[pt_BR]=Ponte Name[ru]=Мост +Name[sk]=Most Name[sv]=Brygga Name[ug]=كۆۋرۈك Name[uk]=Міст diff -Nru calligra-2.4.0/flow/stencils/Cisco/broadband_router.desktop calligra-2.4.3/flow/stencils/Cisco/broadband_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/broadband_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/broadband_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=Broadband router Name[bg]=Широколентов маршрутизатор Name[ca]=Encaminador de banda ampla +Name[ca@valencia]=Encaminador de banda ampla Name[de]=Breitband-Router Name[el]=Ευρυζωνικός δρομολογητής +Name[es]=Enrutador de banda ancha Name[et]=Ruuter Name[fi]=Laajakaistareititin +Name[hu]=Széles sávú router Name[it]=Router a banda larga Name[kk]=Кеңжолақты маршруттауышы Name[nb]=Bredbåndsruter @@ -15,6 +18,7 @@ Name[pt]=Encaminhador banda larga Name[pt_BR]=Roteador de banda larga Name[ru]=Широковещательный маршрутизатор +Name[sk]=Širokopásmový router Name[sv]=Bredbandsrouter Name[uk]=Широкочастотний маршрутизатор Name[x-test]=xxBroadband routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/bts10200.desktop calligra-2.4.3/flow/stencils/Cisco/bts10200.desktop --- calligra-2.4.0/flow/stencils/Cisco/bts10200.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/bts10200.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=BTS 10200 Name[bg]=BTS 10200 Name[ca]=BTS 10200 +Name[ca@valencia]=BTS 10200 Name[de]=BTS 10200 Name[el]=BTS 10200 +Name[es]=BTS 10200 Name[et]=BTS 10200 Name[fi]=BTS 10200 +Name[hu]=BTS 10200 Name[it]=BTS 10200 Name[kk]=BTS 10200 Name[nb]=BTS 10200 diff -Nru calligra-2.4.0/flow/stencils/Cisco/cable_modem.desktop calligra-2.4.3/flow/stencils/Cisco/cable_modem.desktop --- calligra-2.4.0/flow/stencils/Cisco/cable_modem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cable_modem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=Cable Modem Name[bg]=Кабелен модем Name[ca]=Cable Modem +Name[ca@valencia]=Cable Modem Name[de]=Kabelmodem Name[el]=Καλωδιακό μόντεμ Name[es]=Cable Módem Name[et]=Kaablimodem Name[fi]=Kaapelimodeemi +Name[hu]=Kábelmodem Name[it]=Modem via cavo +Name[ja]=ケーブルモデム Name[kk]=Кабелдік модем Name[nb]=Kabelmodem Name[nds]=Kavelmodem @@ -16,6 +19,7 @@ Name[pt]=Modem por Cabo Name[pt_BR]=Modem por cabo Name[ru]=Кабельный Модем +Name[sk]=Káblový modem Name[sv]=Kabelmodem Name[uk]=Кабельний модем Name[x-test]=xxCable Modemxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ca.desktop calligra-2.4.3/flow/stencils/Cisco/ca.desktop --- calligra-2.4.0/flow/stencils/Cisco/ca.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ca.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=Cisco CA Name[bg]=Cisco CA Name[ca]=Cisco CA +Name[ca@valencia]=Cisco CA Name[de]=Cisco CA Name[el]=Cisco CA +Name[es]=Cisco CA Name[et]=Cisco CA Name[fi]=Cisco CA +Name[hu]=Cisco CA Name[it]=Cisco CA Name[kk]=Cisco CA Name[nb]=Cisco CA @@ -15,6 +18,7 @@ Name[pt]=AC Cisco Name[pt_BR]=AC Cisco Name[ru]=Cisco CA +Name[sk]=Cisco CA Name[sv]=Cisco certifikatutfärdare Name[uk]=Cisco CA Name[x-test]=xxCisco CAxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/callmanager.desktop calligra-2.4.3/flow/stencils/Cisco/callmanager.desktop --- calligra-2.4.0/flow/stencils/Cisco/callmanager.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/callmanager.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=CallManager Name[bg]=Управление на обаждания Name[ca]=CallManager +Name[ca@valencia]=CallManager Name[de]=CallManager Name[el]=CallManager +Name[es]=Gestor de llamadas Name[et]=CallManager Name[it]=CallManager Name[kk]=Қоңырау соғу менеджері @@ -14,6 +16,7 @@ Name[pt]=Gestor de Chamadas Name[pt_BR]=Gerenciador de chamadas Name[ru]=Менеджер вызовов +Name[sk]=Správca volaní Name[sv]=Uppringningshantering Name[uk]=Диспетчер дзвінків Name[x-test]=xxCallManagerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/car.desktop calligra-2.4.3/flow/stencils/Cisco/car.desktop --- calligra-2.4.0/flow/stencils/Cisco/car.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/car.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Car Name[bg]=Кола Name[ca]=Cotxe +Name[ca@valencia]=Cotxe Name[cs]=Auto Name[de]=Auto Name[el]=Car @@ -17,6 +18,7 @@ Name[pt]=Carro Name[pt_BR]=Carro Name[ru]=Машина +Name[sk]=Auto Name[sv]=Bil Name[uk]=Машина Name[x-test]=xxCarxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/carrier_routing_system.desktop calligra-2.4.3/flow/stencils/Cisco/carrier_routing_system.desktop --- calligra-2.4.0/flow/stencils/Cisco/carrier_routing_system.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/carrier_routing_system.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Carrier Routing System Name[ca]=Carrier Routing System +Name[ca@valencia]=Carrier Routing System Name[el]=Carrier Routing System +Name[es]=Sistema de enrutado de portadora Name[et]=Carrier Routing System Name[it]=Sistema instradamento carrier Name[kk]=Тасушыны маршруттау жүйесі @@ -11,6 +13,7 @@ Name[pt]=Sistema Encaminhamento Portadoras Name[pt_BR]=Sistema de roteamento de portadoras Name[ru]=Система маршрутизации носителя +Name[sk]=Nosný routovací systém Name[sv]=Carrier Routing System Name[uk]=Система маршрутизації носія Name[x-test]=xxCarrier Routing Systemxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/catalyst_access_gateway.desktop calligra-2.4.3/flow/stencils/Cisco/catalyst_access_gateway.desktop --- calligra-2.4.0/flow/stencils/Cisco/catalyst_access_gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/catalyst_access_gateway.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Catalyst Access Gateway Name[bg]=Шлюз за достъп Catalyst Name[ca]=Catalyst Access Gateway +Name[ca@valencia]=Catalyst Access Gateway Name[de]=Catalyst-Access-Gateway Name[el]=Catalyst Access Gateway +Name[es]=Pasarela de acceso Catalyst Name[et]=Catalysti pöörduslüüs Name[it]=Gateway d'accesso Cisco Name[kk]=Catalyst қатынау шлюзі @@ -14,6 +16,7 @@ Name[pt]='Gateway' Acesso Catalyst Name[pt_BR]=Gateway de acesso Catalyst Name[ru]=Шлюз доступа Catalyst +Name[sk]=Kontaktná prístupová brána Name[sv]=Catalyst anslutningsförmedlingsnod Name[uk]=Шлюз доступу Catalyst Name[x-test]=xxCatalyst Access Gatewayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/cddi_fddi_concentrator.desktop calligra-2.4.3/flow/stencils/Cisco/cddi_fddi_concentrator.desktop --- calligra-2.4.0/flow/stencils/Cisco/cddi_fddi_concentrator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cddi_fddi_concentrator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=CDDI-FDDI Name[bg]=CDDI-FDDI Name[ca]=CDDI-FDDI +Name[ca@valencia]=CDDI-FDDI Name[de]=CDDI-FDDI Name[el]=CDDI-FDDI +Name[es]=CDDI-FDDI Name[et]=CDDI-FDDI Name[fi]=CDDI-FDDI +Name[hu]=CDDI-FDDI Name[it]=CDDI-FDDI Name[kk]=CDDI-FDDI Name[nb]=CDDI-FDDI @@ -15,6 +18,7 @@ Name[pt]=CDDI-FDDI Name[pt_BR]=CDDI-FDDI Name[ru]=CDDI/FDDI концентратор +Name[sk]=CDDI-FDDI Name[sv]=CDDI-FDDI Name[uk]=CDDI-FDDI Name[x-test]=xxCDDI-FDDIxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/cdm.desktop calligra-2.4.3/flow/stencils/Cisco/cdm.desktop --- calligra-2.4.0/flow/stencils/Cisco/cdm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cdm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=CDM Content Distribution Manager Name[bg]=Управление за разпределяне на съдържанието CDM Name[ca]=CDM Content Distribution Manager +Name[ca@valencia]=CDM Content Distribution Manager Name[de]=CDM Content-Distribution-Manager Name[el]=CDM Διαχειριστής διανομής περιεχομένου +Name[es]=Administrador de distribución de contenido CDM Name[et]=CDM (Content Distribution Manager) Name[it]=CDM Content Distribution Manager Name[kk]=CDM (Мазмұнды үлестіру менеджері) @@ -14,6 +16,7 @@ Name[pt]=Gestor Distribuição Conteúdos CDM Name[pt_BR]=Gerenciador de distribuição de conteúdo (CDM) Name[ru]=CDM менеджер раздачи контента +Name[sk]=CDM Content Distribution Manager Name[sv]=CDM innehållsdistributionshantering Name[uk]=Менеджер розповсюдження даних CDM Name[x-test]=xxCDM Content Distribution Managerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/cellular_phone.desktop calligra-2.4.3/flow/stencils/Cisco/cellular_phone.desktop --- calligra-2.4.0/flow/stencils/Cisco/cellular_phone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cellular_phone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Cellular phone Name[bg]=Клетъчен телефон Name[ca]=Telèfon mòbil +Name[ca@valencia]=Telèfon mòbil Name[de]=Handy Name[el]=Κινητό τηλέφωνο Name[es]=Teléfono móvil Name[et]=Mobiiltelefon Name[fi]=Matkapuhelin Name[it]=Telefono cellulare +Name[ja]=携帯電話 Name[kk]=Ұялы телефон Name[nb]=Mobiltelefon Name[nds]=Mobiltelefoon @@ -16,6 +18,7 @@ Name[pt]=Telemóvel Name[pt_BR]=Telefone celular Name[ru]=Сотовый телефон +Name[sk]=Mobilný telefón Name[sv]=Mobiltelefon Name[uk]=Стільниковий телефон Name[x-test]=xxCellular phonexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/centri_firewall.desktop calligra-2.4.3/flow/stencils/Cisco/centri_firewall.desktop --- calligra-2.4.0/flow/stencils/Cisco/centri_firewall.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/centri_firewall.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Centri Firewall Name[bg]=Защитна стена Centri Name[ca]=Tallafocs Centri +Name[ca@valencia]=Tallafocs Centri Name[de]=Centri-Firewall Name[el]=Centri Firewall +Name[es]=Cortafuegos Centri Name[et]=Centri tulemüür Name[fi]=Centri-palomuuri Name[it]=Centri Firewall @@ -15,6 +17,7 @@ Name[pt]='Firewall' Centri Name[pt_BR]=Firewall Centri Name[ru]=Защитный экран Centri +Name[sk]=Centri Firewall Name[sv]=Centri-brandvägg Name[uk]=Брандмауер Centri Name[x-test]=xxCentri Firewallxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/channelized_pipe.desktop calligra-2.4.3/flow/stencils/Cisco/channelized_pipe.desktop --- calligra-2.4.0/flow/stencils/Cisco/channelized_pipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/channelized_pipe.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Channelized Pipe Name[ca]=Canonada canalitzada +Name[ca@valencia]=Canonada canalitzada Name[el]=Κατευθυνόμενος αγωγός +Name[es]=Conducto canalizado Name[et]=Mitme kanaliga toru Name[it]=Tubo canalizzato Name[kk]=Арна құбыры @@ -11,6 +13,7 @@ Name[pt]=Tubo em Canal Name[pt_BR]=Tubo canalizado Name[ru]=Канальная труба +Name[sk]=Združená rúra Name[sv]=Kanaliserad ledning Name[uk]=Канальна труба Name[x-test]=xxChannelized Pipexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/cisco_hub.desktop calligra-2.4.3/flow/stencils/Cisco/cisco_hub.desktop --- calligra-2.4.0/flow/stencils/Cisco/cisco_hub.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cisco_hub.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=Cisco Hub Name[bg]=Хъб Cisco Name[ca]=Cisco Hub +Name[ca@valencia]=Cisco Hub Name[cs]=Cisco - Hub Name[de]=Cisco Hub Name[el]=Cisco Hub Name[es]=Concentrador Cisco Name[et]=Cisco jaotur +Name[hu]=Cisco Hub Name[it]=Hub Cisco +Name[ja]=Cisco ハブ Name[kk]=Cisco хабы Name[nb]=Cisco Hub Name[nds]=Cisco-Nettknütt @@ -16,6 +19,7 @@ Name[pt]=Concentrador Cisco Name[pt_BR]=Concentrador Cisco Name[ru]=Cisco Повторитель +Name[sk]=Cisco Hub Name[sv]=Cisco nätnav Name[uk]=Концентратор Name[x-test]=xxCisco Hubxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ciscosecurity.desktop calligra-2.4.3/flow/stencils/Cisco/ciscosecurity.desktop --- calligra-2.4.0/flow/stencils/Cisco/ciscosecurity.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ciscosecurity.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=CiscoSecurity Name[bg]=CiscoSecurity Name[ca]=CiscoSecurity +Name[ca@valencia]=CiscoSecurity Name[de]=CiscoSecurity Name[el]=CiscoSecurity Name[es]=Seguridad Cisco @@ -15,6 +16,7 @@ Name[pt]=Segurança Cisco Name[pt_BR]=CiscoSecurity Name[ru]=Безопасность Cisco +Name[sk]=CiscoSecurity Name[sv]=Cisco-säkerhet Name[uk]=CiscoSecurity Name[x-test]=xxCiscoSecurityxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ciscoworks.desktop calligra-2.4.3/flow/stencils/Cisco/ciscoworks.desktop --- calligra-2.4.0/flow/stencils/Cisco/ciscoworks.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ciscoworks.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=CiscoWorks workstation Name[bg]=Работна станция CiscoWorks Name[ca]=Estació de treball CiscoWorks +Name[ca@valencia]=Estació de treball CiscoWorks Name[de]=CiscoWorks-Workstation Name[el]=Σταθμός εργασίας CiscoWorks Name[es]=Estación de trabajo CiscoWorks Name[et]=CiscoWorks tööjaam +Name[fi]=CiscoWorks-työasema Name[hu]=CiscoWorks munkaállomás Name[it]=CiscoWorks Workstation Name[kk]=CiscoWorks жұмыс станциясы @@ -16,6 +18,7 @@ Name[pt]=Estação CiscoWorks Name[pt_BR]=Estação de trabalho CiscoWorks Name[ru]=Рабочая станция Cisco +Name[sk]=CiscoWorks pracovná stanica Name[sv]=CiscoWorks arbetsstation Name[uk]=Робоча станція CiscoWorks Name[x-test]=xxCiscoWorks workstationxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ciscoworks_man.desktop calligra-2.4.3/flow/stencils/Cisco/ciscoworks_man.desktop --- calligra-2.4.0/flow/stencils/Cisco/ciscoworks_man.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ciscoworks_man.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=CiscoWorks Man Name[ca]=CiscoWorks Man +Name[ca@valencia]=CiscoWorks Man Name[el]=CiscoWorks Man Name[es]=Hombre CiscoWorks Name[et]=CiscoWorks inimene @@ -13,6 +14,7 @@ Name[pt]=CiscoWorks Man Name[pt_BR]=Man CiscoWorks Name[ru]=CiscoWorks чувак +Name[sk]=CiscoWorks muž Name[sv]=CiscoWorks man Name[uk]=Робітник Cisco Name[x-test]=xxCiscoWorks Manxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/class45_switch.desktop calligra-2.4.3/flow/stencils/Cisco/class45_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/class45_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/class45_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Class 4/5 switch Name[bg]=Комутатор клас 4/5 Name[ca]=Class 4/5 switch +Name[ca@valencia]=Class 4/5 switch Name[de]=Switch der Klasse 4/5 Name[el]=Class 4/5 switch Name[es]=Conmutador clase 4/5 Name[et]=Klass 4/5 kommutaator +Name[hu]=Class 4/5 switch Name[it]=Switch classe 4/5 Name[kk]=Класы 4/5 қосқыш Name[nb]=Klasse 4(5 svitsj @@ -15,6 +17,7 @@ Name[pt]=Comutador classe 4/5 Name[pt_BR]=Comutador Classe 4/5 Name[ru]=Коммутатор класса 4/5 +Name[sk]=Prepínač triedy 4/5 Name[sv]=Klass 4/5 växel Name[uk]=Комутатор 4/5 класу Name[x-test]=xxClass 4/5 switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/cloud_dark.desktop calligra-2.4.3/flow/stencils/Cisco/cloud_dark.desktop --- calligra-2.4.0/flow/stencils/Cisco/cloud_dark.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cloud_dark.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Cloud Dark Name[ca]=Núvol fosc +Name[ca@valencia]=Núvol fosc Name[el]=Νέφος σκούρο Name[es]=Nube oscura Name[et]=Tume pilv @@ -12,6 +13,7 @@ Name[pt]=Nuvem Escura Name[pt_BR]=Nuvem negra Name[ru]=Облако тёмное +Name[sk]=Oblak tmavý Name[sv]=Moln mörkt Name[uk]=Темна хмара Name[x-test]=xxCloud Darkxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/cloud.desktop calligra-2.4.3/flow/stencils/Cisco/cloud.desktop --- calligra-2.4.0/flow/stencils/Cisco/cloud.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cloud.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,12 +1,15 @@ [Desktop Entry] Name=Cloud Name[ca]=Núvol +Name[ca@valencia]=Núvol Name[cs]=Cloud Name[el]=Νέφος Name[es]=Nube Name[et]=Pilv +Name[fi]=Pilvi Name[ga]=Cloud Name[it]=Nuvola +Name[ja]=クラウド Name[kk]=Бұлт Name[nb]=Sky Name[nds]=Wulk @@ -15,6 +18,7 @@ Name[pt]=Nuvem Name[pt_BR]=Nuvem Name[ru]=Облако +Name[sk]=Oblak Name[sv]=Moln Name[ug]=بۇلۇت Name[uk]=Хмара diff -Nru calligra-2.4.0/flow/stencils/Cisco/cloud_gold.desktop calligra-2.4.3/flow/stencils/Cisco/cloud_gold.desktop --- calligra-2.4.0/flow/stencils/Cisco/cloud_gold.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cloud_gold.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Cloud Gold Name[ca]=Núvol daurat +Name[ca@valencia]=Núvol daurat Name[el]=Νέφος χρυσό Name[es]=Nube dorada Name[et]=Kuldne pilv @@ -12,6 +13,7 @@ Name[pt]=Nuvem Dourada Name[pt_BR]=Nuvem dourada Name[ru]=Облако золотое +Name[sk]=Oblak zlatý Name[sv]=Moln gyllene Name[uk]=Золота хмара Name[x-test]=xxCloud Goldxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/cloud_white.desktop calligra-2.4.3/flow/stencils/Cisco/cloud_white.desktop --- calligra-2.4.0/flow/stencils/Cisco/cloud_white.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cloud_white.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Cloud White Name[ca]=Núvol blanc +Name[ca@valencia]=Núvol blanc Name[el]=Νέφος λευκό Name[es]=Nube blanca Name[et]=Valge pilv @@ -13,6 +14,7 @@ Name[pt]=Nuvem Branca Name[pt_BR]=Nuvem branca Name[ru]=Облако белое +Name[sk]=Oblak biely Name[sv]=Moln vitt Name[uk]=Біла хмара Name[x-test]=xxCloud Whitexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/collection.desktop calligra-2.4.3/flow/stencils/Cisco/collection.desktop --- calligra-2.4.0/flow/stencils/Cisco/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cisco Name[bg]=Cisco Name[ca]=Cisco +Name[ca@valencia]=Cisco Name[cs]=Cisco Name[de]=Cisco Name[el]=Cisco @@ -9,6 +10,7 @@ Name[et]=Cisco Name[hu]=Cisco Name[it]=Cisco +Name[ja]=Cisco Name[kk]=Cisco Name[nb]=Cisco Name[nds]=Cisco @@ -17,6 +19,7 @@ Name[pt]=Cisco Name[pt_BR]=Cisco Name[ru]=Cisco +Name[sk]=Cisco Name[sv]=Cisco Name[ug]=Cisco Name[uk]=Cisco diff -Nru calligra-2.4.0/flow/stencils/Cisco/communications_server.desktop calligra-2.4.3/flow/stencils/Cisco/communications_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/communications_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/communications_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Communications server Name[bg]=Комуникационен сървър Name[ca]=Servidor de comunicacions +Name[ca@valencia]=Servidor de comunicacions Name[de]=Kommunikationsserver Name[el]=Εξυπηρετητής επικοινωνιών Name[es]=Servidor de comunicaciones @@ -15,6 +16,7 @@ Name[pt]=Servidor de comunicações Name[pt_BR]=Servidor de comunicações Name[ru]=Сервер связей +Name[sk]=Komunikačný server Name[sv]=Kommunikationsserver Name[uk]=Сервер зв'язку Name[x-test]=xxCommunications serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/concatenated_payload.desktop calligra-2.4.3/flow/stencils/Cisco/concatenated_payload.desktop --- calligra-2.4.0/flow/stencils/Cisco/concatenated_payload.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/concatenated_payload.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Concatenated Payload Name[ca]=Càrrega útil concatenada +Name[ca@valencia]=Càrrega útil concatenada Name[el]=Συγκέντρωση φόρτου Name[es]=Carga útil concatenada Name[et]=Ühendatud koormus @@ -12,6 +13,7 @@ Name[pt]=Dados Concatenados Name[pt_BR]=Dados concatenados Name[ru]=Соединённая нагрузка +Name[sk]=Concatenated Payload Name[sv]=Sammansatt nyttolast Name[uk]=З'єднане навантаження Name[x-test]=xxConcatenated Payloadxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/content_engine.desktop calligra-2.4.3/flow/stencils/Cisco/content_engine.desktop --- calligra-2.4.0/flow/stencils/Cisco/content_engine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/content_engine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Content Engine (Cache Director) Name[bg]=Инструмент за съдържание (Cache Director) Name[ca]=Content Engine (Cache Director) +Name[ca@valencia]=Content Engine (Cache Director) Name[el]=Content Engine (Cache Director) +Name[es]=Motor de contenidos (Director de caché) Name[et]=Content Engine (Cache Director) Name[it]=Content Engine (Cache Director) Name[kk]=Мазмұн тетігі (Кэшті басқару) @@ -13,6 +15,7 @@ Name[pt]=Motor Conteúdos (Director de 'Cache') Name[pt_BR]=Motor de conteúdo (diretor de cache) Name[ru]=Система управления содержимым (кэширующая) +Name[sk]=Content Engine (Cache Director) Name[sv]=Innehållsenhet (cachekopplingsenhet) Name[uk]=Обробник даних (спрямовуючий пристрій кешу) Name[x-test]=xxContent Engine (Cache Director)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/content_router.desktop calligra-2.4.3/flow/stencils/Cisco/content_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/content_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/content_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Content Service Router Name[bg]=Маршрутизатор за услуги на съдържание Name[ca]=Encaminador de servei de contingut +Name[ca@valencia]=Encaminador de servei de contingut Name[de]=Content-Service-Router Name[el]=Content Service Router +Name[es]=Enrutador de servicios de contenido Name[et]=Content Service marsruuter Name[it]=Router content service Name[kk]=Мазмұн қызмет маршруттауышы @@ -14,6 +16,7 @@ Name[pt]=Encaminhamento Serviços de Conteúdos Name[pt_BR]=Roteador de serviços de conteúdo Name[ru]=Маршрутизатор службы содержимого +Name[sk]=Router služby obsahu Name[sv]=Innehållstjänstrouter Name[uk]=Маршрутизатор служби даних Name[x-test]=xxContent Service Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/content_service_module.desktop calligra-2.4.3/flow/stencils/Cisco/content_service_module.desktop --- calligra-2.4.0/flow/stencils/Cisco/content_service_module.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/content_service_module.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Content Switch module Name[bg]=Модул за комутиране на съдържание Name[ca]=Mòdul de commutació de continguts +Name[ca@valencia]=Mòdul de commutació de continguts Name[de]=Content-Switch-Modul Name[el]=Content Switch module +Name[es]=Modulo conmutador de contenidos Name[et]=Sisukommutaatori moodul Name[it]=Modulo content switch Name[kk]=Мазмұн қосқыш модулі @@ -14,6 +16,7 @@ Name[pt]=Módulos do Comutador Conteúdos Name[pt_BR]=Módulo de comutador de conteúdo Name[ru]=Модуль коммутатора содержимого +Name[sk]=Modul prepínača obsahu Name[sv]=Innehållsväxelmodul Name[uk]=Модуль комутатора даних Name[x-test]=xxContent Switch modulexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/content_switch.desktop calligra-2.4.3/flow/stencils/Cisco/content_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/content_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/content_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Content Switch Name[bg]=Комутатор на съдържание Name[ca]=Content Switch +Name[ca@valencia]=Content Switch Name[de]=Content-Switch Name[el]=Content Switch +Name[es]=Conmutador de contenidos Name[et]=Sisukommutaator Name[it]=Content Switch Name[kk]=Мазмұн қосқышы @@ -13,6 +15,7 @@ Name[pt]=Comutador Conteúdos Name[pt_BR]=Comutador de conteúdo Name[ru]=Коммутатор содержимого +Name[sk]=Prepínač obshu Name[sv]=Innehållsväxel Name[uk]=Комутатор вмісту Name[x-test]=xxContent Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/csm-s.desktop calligra-2.4.3/flow/stencils/Cisco/csm-s.desktop --- calligra-2.4.0/flow/stencils/Cisco/csm-s.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/csm-s.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=CSM-S Name[bg]=CSM-S Name[ca]=CSM-S +Name[ca@valencia]=CSM-S Name[de]=CSM-S Name[el]=CSM-S +Name[es]=CSM-S Name[et]=CSM-S +Name[hu]=CSM-S Name[it]=CSM-S Name[kk]=CSM-S Name[nb]=CSM-S diff -Nru calligra-2.4.0/flow/stencils/Cisco/css1100.desktop calligra-2.4.3/flow/stencils/Cisco/css1100.desktop --- calligra-2.4.0/flow/stencils/Cisco/css1100.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/css1100.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Content Service Switch 1100 Name[bg]=Комутатор 1100 за услуги на съдържание Name[ca]=Content Service Switch 1100 +Name[ca@valencia]=Content Service Switch 1100 Name[de]=Content-Service-Switch 1100 Name[el]=Content Service Switch 1100 +Name[es]=Conmutador de servicios de contenido 1100 Name[et]=Content Service kommutaator 1100 Name[it]=Content Service Switch 1100 Name[kk]=Мазмұн қызметінің қосқышы 1100 @@ -14,6 +16,7 @@ Name[pt]=Comutador Serviço Conteúdos 1100 Name[pt_BR]=Comutador de serviço de conteúdo 1100 Name[ru]=Коммутатор поддержки содержимого 1100 +Name[sk]=Content Service Switch 1100 Name[sv]=Innehållstjänstväxel 1100 Name[uk]=Комутатор служб даних 1100 Name[x-test]=xxContent Service Switch 1100xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/csu_dsu.desktop calligra-2.4.3/flow/stencils/Cisco/csu_dsu.desktop --- calligra-2.4.0/flow/stencils/Cisco/csu_dsu.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/csu_dsu.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=CSU/DSU Name[bg]=CSU/DSU Name[ca]=CSU/DSU +Name[ca@valencia]=CSU/DSU Name[de]=CSU/DSU Name[el]=CSU/DSU +Name[es]=CSU/DSU Name[et]=CSU/DSU +Name[hu]=CSU/DSU Name[it]=CSU/DSU Name[kk]=CSU/DSU Name[nb]=CSU/DSU diff -Nru calligra-2.4.0/flow/stencils/Cisco/cte.desktop calligra-2.4.3/flow/stencils/Cisco/cte.desktop --- calligra-2.4.0/flow/stencils/Cisco/cte.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/cte.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Content Transformation Engine (CTE) Name[bg]=Инструмент за преобразуване на съдържанието (CTE) Name[ca]=Content Transformation Engine (CTE) +Name[ca@valencia]=Content Transformation Engine (CTE) Name[el]=Content Transformation Engine (CTE) +Name[es]=Motor de transformación de contenidos (CTE) Name[et]=Content Transformation Engine (CTE) Name[it]=Content Transformation Engine (CTE) Name[kk]=Мазмұнын түрлендіру тетігі (CTE) @@ -13,6 +15,7 @@ Name[pt]=Motor Transformação Conteúdos (CTE) Name[pt_BR]=Motor de transformação de conteúdos (CTE) Name[ru]=Система преобразования содержимого (CTE) +Name[sk]=Content Transformation Engine (CTE) Name[sv]=Innehållomvandlingsenhet (CTE) Name[uk]=CTE (рушій перетворення даних) Name[x-test]=xxContent Transformation Engine (CTE)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/data_center_switch.desktop calligra-2.4.3/flow/stencils/Cisco/data_center_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/data_center_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/data_center_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Data Center Switch Name[ca]=Data Center Switch +Name[ca@valencia]=Data Center Switch Name[el]=Data Center Switch +Name[es]=Conmutador de centro de datos Name[et]=Andmekeskuse kommutaator Name[it]=Data Center Switch Name[kk]=Орталық дерек қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador Centrais de Dados Name[pt_BR]=Comutador de central de dados Name[ru]=Центральный коммутатор данных +Name[sk]=Prepínač dátového centra Name[sv]=Datacenterväxel Name[uk]=Центральний комутатор даних Name[x-test]=xxData Center Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/data_center_switch_reversed.desktop calligra-2.4.3/flow/stencils/Cisco/data_center_switch_reversed.desktop --- calligra-2.4.0/flow/stencils/Cisco/data_center_switch_reversed.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/data_center_switch_reversed.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Data Center Switch Reversed Name[ca]=Data Center Switch Reversed +Name[ca@valencia]=Data Center Switch Reversed Name[el]=Έγινε αναστροφή μεταγωγέα κέντρου δεδομένων +Name[es]=Conmutador invertido de centro de datos Name[et]=Andmekeskuse kommutaator tagurpidi Name[it]=Data Center Switch Reversed Name[kk]=Орталық дерек кері қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador Centrais de Dados Invertido Name[pt_BR]=Comutador de central de dados invertido Name[ru]=Коммутатор Data Center обращённый +Name[sk]=Prepínač dátového centra reverzný Name[sv]=Datacenterväxel omvänd Name[uk]=Зворотний центральний комутатор даних Name[x-test]=xxData Center Switch Reversedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/data_switch_processor.desktop calligra-2.4.3/flow/stencils/Cisco/data_switch_processor.desktop --- calligra-2.4.0/flow/stencils/Cisco/data_switch_processor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/data_switch_processor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Data Switch Processor Name[ca]=Data Switch Processor +Name[ca@valencia]=Data Switch Processor Name[el]=Επεξεργαστής μεταγωγής δεδομένων +Name[es]=Procesador de conmutación de datos Name[et]=Andmekommutaatori protsessor Name[it]=Data Switch Processor Name[kk]=Дерек қосқыш процесоры @@ -11,6 +13,7 @@ Name[pt]=Processador Comutação Dados Name[pt_BR]=Processador de comutação de dados Name[ru]=Обработчик коммутации данных +Name[sk]=Procesor dátového prepínača Name[sv]=Dataväxelprocessor Name[uk]=Процесор комутації даних Name[x-test]=xxData Switch Processorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/detector.desktop calligra-2.4.3/flow/stencils/Cisco/detector.desktop --- calligra-2.4.0/flow/stencils/Cisco/detector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/detector.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=Detector Name[ca]=Detector +Name[ca@valencia]=Detector Name[de]=Detektor Name[el]=Ανιχνευτής +Name[es]=Detector Name[et]=Detektor Name[it]=Detector Name[kk]=Сезгіш diff -Nru calligra-2.4.0/flow/stencils/Cisco/digital_cross-connect.desktop calligra-2.4.3/flow/stencils/Cisco/digital_cross-connect.desktop --- calligra-2.4.0/flow/stencils/Cisco/digital_cross-connect.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/digital_cross-connect.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Digital Cross-Connect Name[ca]=Digital Cross-Connect +Name[ca@valencia]=Digital Cross-Connect Name[el]=Digital Cross-Connect +Name[es]=Conector en cruz digital Name[et]=Digitaalne ristühendus Name[it]=Digital Cross-Connect Name[kk]=Цифрлық торабы @@ -11,6 +13,7 @@ Name[pt]=Ligação Cruzada Digital Name[pt_BR]=Conexão cruzada digital Name[ru]=Цифровой разветвитель +Name[sk]=Digitálne prepojenie Name[sv]=Digital korskoppling Name[uk]=Цифровий розгалуджувач Name[x-test]=xxDigital Cross-Connectxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/director_fcis.desktop calligra-2.4.3/flow/stencils/Cisco/director_fcis.desktop --- calligra-2.4.0/flow/stencils/Cisco/director_fcis.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/director_fcis.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Director-class Fibre Channel intelligent switch Name[ca]=Director-class Fibre Channel intelligent switch +Name[ca@valencia]=Director-class Fibre Channel intelligent switch Name[el]=Έξυπνος διακόπτης καναλιού οπτικής ίνας διευθυντικής τάξης +Name[es]=Conmutador inteligente de clase Director de canal de fibra Name[et]=Director-klassi Fibre Channeli intelligentne kommutaator Name[it]=Switch intelligente Director-class Fibre Channel Name[kk]=Бағытауыш-класты талшық арнасының парасатты қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador inteligente Fibre Channel director Name[pt_BR]=Comutador inteligente de Fibre Channel de classe diretor Name[ru]=Интеллектуальный коммутатор носителя каналов управляющего класса +Name[sk]=Inteligentný prepínač Director-class Fibre Channel Name[sv]=Avancerad intelligent fiberkanalväxel Name[uk]=Інтелектуальний комутатор оптоволоконного каналу класу спрямовуючого пристрою Name[x-test]=xxDirector-class Fibre Channel intelligent switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/directory_server.desktop calligra-2.4.3/flow/stencils/Cisco/directory_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/directory_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/directory_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Directory Server Name[bg]=Директориен сървър Name[ca]=Servidor de directoris +Name[ca@valencia]=Servidor de directoris Name[de]=Verzeichnis-Server Name[el]=Εξυπηρετητής καταλόγου Name[es]=Servidor de directorio @@ -15,6 +16,7 @@ Name[pt]=Servidor de Directório Name[pt_BR]=Servidor de diretório Name[ru]=Сервер каталогов +Name[sk]=Adresárový server Name[sv]=Katalogserver Name[uk]=Сервер тек Name[x-test]=xxDirectory Serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/diskette.desktop calligra-2.4.3/flow/stencils/Cisco/diskette.desktop --- calligra-2.4.0/flow/stencils/Cisco/diskette.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/diskette.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=Diskette Name[bg]=Дискета Name[ca]=Disquet +Name[ca@valencia]=Disquet Name[de]=Diskette Name[el]=Δισκέτα Name[es]=Disquete Name[et]=Diskett +Name[fi]=Levyke Name[fr]=Disquette Name[it]=Disco floppy +Name[ja]=ディスケット Name[kk]=Дискета Name[nb]=Diskett Name[nds]=Diskett @@ -16,6 +19,7 @@ Name[pt]=Disquete Name[pt_BR]=Disquete Name[ru]=Дискета +Name[sk]=Disketa Name[sv]=Diskett Name[uk]=Дискета Name[x-test]=xxDiskettexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/disk_subsystem.desktop calligra-2.4.3/flow/stencils/Cisco/disk_subsystem.desktop --- calligra-2.4.0/flow/stencils/Cisco/disk_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/disk_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Disk subsystem Name[ca]=Subsistema de disc +Name[ca@valencia]=Subsistema de disc Name[el]=Υποσύστημα δίσκου Name[es]=Subsistema de disco Name[et]=Kettaseadmete alamsüsteem @@ -12,6 +13,7 @@ Name[pt]=Sub-sistema disco Name[pt_BR]=Sub-sistema do disco Name[ru]=Дисковая подсистема +Name[sk]=Diskový subsystém Name[sv]=Diskdelsystem Name[uk]=Дискова підсистема Name[x-test]=xxDisk subsystemxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/distributed_director.desktop calligra-2.4.3/flow/stencils/Cisco/distributed_director.desktop --- calligra-2.4.0/flow/stencils/Cisco/distributed_director.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/distributed_director.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Distributed Director Name[bg]=Разпределено пренасочване Name[ca]=Director distribuït +Name[ca@valencia]=Director distribuït Name[de]=Distributed Director Name[el]=Distributed Director +Name[es]=Director distribuido Name[et]=Distributed Director Name[it]=Distributed Director Name[kk]=Үлестірілген бағыттауыш @@ -14,6 +16,7 @@ Name[pt]=Director Distribuído Name[pt_BR]=Diretor distribuído Name[ru]=Распределённое управление +Name[sk]=Distribuovaný režisér Name[sv]=Distributerad kopplingsenhet Name[uk]=Розподілене керування Name[x-test]=xxDistributed Directorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/dot_dot.desktop calligra-2.4.3/flow/stencils/Cisco/dot_dot.desktop --- calligra-2.4.0/flow/stencils/Cisco/dot_dot.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/dot_dot.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Dot-Dot Name[bg]=Точка-точка Name[ca]=Punt-Punt +Name[ca@valencia]=Punt-Punt Name[el]=Dot-Dot +Name[es]=Punto a punto Name[et]=Punktiir Name[it]=Punto-Punto Name[kk]=Нүкте-нүкте @@ -12,6 +14,7 @@ Name[pt]=Ponto-Ponto Name[pt_BR]=Ponto-Ponto Name[ru]=Точка-точка +Name[sk]=Dot-Dot Name[sv]=Punkt-punkt Name[uk]=Точка-точка Name[x-test]=xxDot-Dotxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/dpt.desktop calligra-2.4.3/flow/stencils/Cisco/dpt.desktop --- calligra-2.4.0/flow/stencils/Cisco/dpt.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/dpt.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=DPT Name[bg]=DPT Name[ca]=DPT +Name[ca@valencia]=DPT Name[de]=DPT Name[el]=DPT +Name[es]=DPT Name[et]=DPT +Name[hu]=DPT Name[it]=DPT Name[kk]=DPT Name[nb]=DPT diff -Nru calligra-2.4.0/flow/stencils/Cisco/dslam.desktop calligra-2.4.3/flow/stencils/Cisco/dslam.desktop --- calligra-2.4.0/flow/stencils/Cisco/dslam.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/dslam.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=DSLAM Name[bg]=DSLAM Name[ca]=DSLAM +Name[ca@valencia]=DSLAM Name[de]=DSLAM Name[el]=DSLAM +Name[es]=DSLAM Name[et]=DSLAM +Name[hu]=DSLAM Name[it]=DSLAM Name[kk]=DSLAM Name[nb]=DSLAM diff -Nru calligra-2.4.0/flow/stencils/Cisco/dual_mode_accesspoint.desktop calligra-2.4.3/flow/stencils/Cisco/dual_mode_accesspoint.desktop --- calligra-2.4.0/flow/stencils/Cisco/dual_mode_accesspoint.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/dual_mode_accesspoint.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Dual Mode AccessPoint Name[ca]=Punt d'accés de mode dual +Name[ca@valencia]=Punt d'accés de mode dual Name[el]=Σημείο πρόσβασης αμφίδρομης λειτουργίας +Name[es]=Punto de acceso dual Name[et]=Kaherežiimne tugijaam Name[it]=Access point a doppia modalità Name[kk]=Қос режімді қатынау нүктесі @@ -12,6 +14,7 @@ Name[pt]=Ponto Acesso Modo Duplo Name[pt_BR]=Ponto de acesso de modo dual Name[ru]=Двусторонняя точка доступа +Name[sk]=Duálny prístupový bod Name[sv]=Tvåläges åtkomstpunkt Name[uk]=Дворежимна точка доступу Name[x-test]=xxDual Mode AccessPointxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/dwdm_filter.desktop calligra-2.4.3/flow/stencils/Cisco/dwdm_filter.desktop --- calligra-2.4.0/flow/stencils/Cisco/dwdm_filter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/dwdm_filter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=DWDM Filter Name[bg]=Филтър DWDM Name[ca]=Filtre DWDM +Name[ca@valencia]=Filtre DWDM Name[cs]=Filtr DWDM Name[de]=DWDM-Filter Name[el]=Φίλτρο DWDM +Name[es]=Filtro DWDM Name[et]=DWDM filter +Name[hu]=DWDM szűrő Name[it]=Filtro DWDM Name[kk]=DWDM сүзгісі Name[nb]=DWDM-filter @@ -15,6 +18,7 @@ Name[pt]=Filtro DWDM Name[pt_BR]=Filtro DWDM Name[ru]=Фильтр DWDM +Name[sk]=DWDM Filter Name[sv]=DWDM-filter Name[uk]=Фільтр DWDM Name[x-test]=xxDWDM Filterxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop calligra-2.4.3/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop --- calligra-2.4.0/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/edge_label_switch_router_with_netflow.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Edge Label Switch Router with NetFlow Name[ca]=Encaminador commutador Edge Label amb NetFlow +Name[ca@valencia]=Encaminador commutador Edge Label amb NetFlow Name[el]=Edge Label Switch Router with NetFlow +Name[es]=Etiqueta de borde de conmutador enrutador con NetFlow Name[et]=Edge Label kommutaator-marsruuter NetFlow'ga Name[it]=Edge Label Switch Router con NetFlow Name[kk]=Шеткі NetFlow қосқыш маршруттауышы @@ -11,6 +13,7 @@ Name[pt]=Comutador-Encaminhador Edge Label com NetFlow Name[pt_BR]=Roteador/Comutador Edge Label com NetFlow Name[ru]=Угловая метка коммутатор-маршрутизатора с поддержкой NetFlow +Name[sk]=Edge Label Switch Router s NetFlow Name[sv]=Edge etikettbytesrouter med nätflöde Name[uk]=Комутатор-маршрутизатор Edge з NetFlow Name[x-test]=xxEdge Label Switch Router with NetFlowxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/end_office.desktop calligra-2.4.3/flow/stencils/Cisco/end_office.desktop --- calligra-2.4.0/flow/stencils/Cisco/end_office.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/end_office.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=End Office Name[bg]=Краен офис Name[ca]=Final d'oficina +Name[ca@valencia]=Final d'oficina Name[de]=End-Office Name[el]=End Office +Name[es]=Fin de oficina Name[et]=Lõpptarbija +Name[gl]=Rematar Office Name[it]=End Office Name[kk]=Соңғы кеңсе Name[nb]=Endekontor @@ -14,6 +17,7 @@ Name[pt]=Escritório Final Name[pt_BR]=Escritório final Name[ru]=Конечный офис +Name[sk]=End Office Name[sv]=Slutkontorsväxel Name[uk]=Кінцевий офіс Name[x-test]=xxEnd Officexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/etherclient.desktop calligra-2.4.3/flow/stencils/Cisco/etherclient.desktop --- calligra-2.4.0/flow/stencils/Cisco/etherclient.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/etherclient.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=EtherClient Name[ca]=Client ether +Name[ca@valencia]=Client ether Name[de]=EtherClient Name[el]=EtherClient +Name[es]=Cliente ethernet Name[et]=Etherneti klient Name[it]=EtherClient Name[kk]=Ethernet клиенті diff -Nru calligra-2.4.0/flow/stencils/Cisco/fax.desktop calligra-2.4.3/flow/stencils/Cisco/fax.desktop --- calligra-2.4.0/flow/stencils/Cisco/fax.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/fax.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Fax Name[bg]=Факс Name[ca]=Fax +Name[ca@valencia]=Fax Name[cs]=Fax Name[de]=Fax Name[el]=Φαξ @@ -10,6 +11,7 @@ Name[fr]=Fax Name[hu]=Fax Name[it]=Fax +Name[ja]=ファクス Name[kk]=Факс Name[nb]=Faks Name[nds]=Fax diff -Nru calligra-2.4.0/flow/stencils/Cisco/fc_storage.desktop calligra-2.4.3/flow/stencils/Cisco/fc_storage.desktop --- calligra-2.4.0/flow/stencils/Cisco/fc_storage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/fc_storage.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=FC Storage Name[bg]=Хранилище FC Name[ca]=Emmagatzematge FC +Name[ca@valencia]=Emmagatzement FC Name[de]=FC-Speicher Name[el]=FC Storage +Name[es]=Almacenamiento FC Name[et]=FC salvesti Name[it]=Archiviazione FC +Name[ja]=FC ストレージ Name[kk]=АС жинақтауышы Name[nb]=FC-lagring Name[nds]=FC-Spieker @@ -14,6 +17,7 @@ Name[pt]=Armazenamento FC Name[pt_BR]=Armazenamento FC Name[ru]=Хранилище FC +Name[sk]=FC úložisko Name[sv]=Fiberkanallagring Name[uk]=Сховище FC Name[x-test]=xxFC Storagexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/fddi_ring.desktop calligra-2.4.3/flow/stencils/Cisco/fddi_ring.desktop --- calligra-2.4.0/flow/stencils/Cisco/fddi_ring.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/fddi_ring.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=FDDI Ring Name[bg]=Пръстен FDDI Name[ca]=Anell FDDI +Name[ca@valencia]=Anell FDDI Name[de]=FDDI-Ring Name[el]=Δακτύλιος FDDI +Name[es]=Anillo FDDI Name[et]=FDDI ring +Name[hu]=FDDI gyűrű Name[it]=Anello FDDI Name[kk]=FDDI сақинасы Name[nb]=FDDI-ring @@ -14,6 +17,7 @@ Name[pt]=Anel FDDI Name[pt_BR]=Anel de FDDI Name[ru]=Кольцо FDDI +Name[sk]=FDDI prstenec Name[sv]=FDDI-ring Name[uk]=Кільце FDDI Name[x-test]=xxFDDI Ringxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/file_cabinet.desktop calligra-2.4.3/flow/stencils/Cisco/file_cabinet.desktop --- calligra-2.4.0/flow/stencils/Cisco/file_cabinet.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/file_cabinet.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=File cabinet Name[bg]=Шкаф за файлове Name[ca]=Gabinet de fitxers +Name[ca@valencia]=Gavinet de fitxers Name[de]=Ordnerkabinett Name[el]=Αρχειοθήκη +Name[es]=Archivador de ficheros Name[et]=Mapikapp Name[it]=Schedario +Name[ja]=ファイルキャビネット Name[kk]=Құжат шкафы Name[nb]=Arkivskap Name[nds]=Dateischapp @@ -14,6 +17,7 @@ Name[pt]=Arquvo de ficheiros Name[pt_BR]=Armário de arquivos Name[ru]=Картотека +Name[sk]=Súborový kabinet Name[sv]=Arkivskåp Name[uk]=Шафа для документів Name[x-test]=xxFile cabinetxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/file_engine.desktop calligra-2.4.3/flow/stencils/Cisco/file_engine.desktop --- calligra-2.4.0/flow/stencils/Cisco/file_engine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/file_engine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=File Engine Name[ca]=Motor de fitxers +Name[ca@valencia]=Motor de fitxers Name[el]=Μηχανή αρχείων +Name[es]=Motor de archivos Name[et]=File Engine Name[it]=Motore file Name[kk]=Файлдар басқару тетігі @@ -11,6 +13,7 @@ Name[pt]=Motor de Ficheiros Name[pt_BR]=Motor de arquivos Name[ru]=Система управления файлами +Name[sk]=Súborový engine Name[sv]=Filutrustning Name[uk]=Система керування файлами Name[x-test]=xxFile Enginexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/file_server.desktop calligra-2.4.3/flow/stencils/Cisco/file_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/file_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/file_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=File Server Name[bg]=Файлов сървър Name[ca]=Servidor de fitxers +Name[ca@valencia]=Servidor de fitxers Name[de]=Datei-Server Name[el]=Εξυπηρετητής αρχείων Name[es]=Servidor de archivos Name[et]=Failiserver +Name[fi]=Tiedostopalvelin +Name[hu]=Fájlkiszolgáló Name[it]=Server di file +Name[ja]=ファイルサーバ Name[kk]=Файл сервері Name[nb]=Filtjener Name[nds]=Datei-Server @@ -15,6 +19,7 @@ Name[pt]=Servidor de Ficheiros Name[pt_BR]=Servidor de arquivos Name[ru]=Файловый сервер +Name[sk]=Súborový server Name[sv]=Filserver Name[uk]=Файловий сервер Name[x-test]=xxFile Serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/firewall.desktop calligra-2.4.3/flow/stencils/Cisco/firewall.desktop --- calligra-2.4.0/flow/stencils/Cisco/firewall.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/firewall.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Firewall Name[bg]=Защитна стена Name[ca]=Tallafocs +Name[ca@valencia]=Tallafocs Name[de]=Firewall Name[el]=Τείχος προστασίας Name[es]=Cortafuegos Name[et]=Tulemüür +Name[fi]=Palomuuri Name[fr]=Pare-feu +Name[hu]=Tűzfal Name[it]=Firewall Name[kk]=Желіаралық қалқан Name[nb]=Brannmur diff -Nru calligra-2.4.0/flow/stencils/Cisco/firewall_horizontal.desktop calligra-2.4.3/flow/stencils/Cisco/firewall_horizontal.desktop --- calligra-2.4.0/flow/stencils/Cisco/firewall_horizontal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/firewall_horizontal.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Firewall horizontal Name[ca]=Tallafocs horitzontal +Name[ca@valencia]=Tallafocs horitzontal Name[de]=Firewall waagerecht Name[el]=Τείχος προστασίας οριζόντιο Name[es]=Cortafuegos horizontal @@ -15,6 +16,7 @@ Name[pt]='Firewall' horizontal Name[pt_BR]=Firewall horizontal Name[ru]=Сетевой экран в горизонтальном ракурсе +Name[sk]=Firewall vodorovný Name[sv]=Brandvägg horisontell Name[uk]=Брандмауер (горизонтально) Name[x-test]=xxFirewall horizontalxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/firewall_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/firewall_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/firewall_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/firewall_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Firewall subdued Name[ca]=Tallafocs suavitzat +Name[ca@valencia]=Tallafocs suavitzat Name[el]=Τείχος προστασίας υποτονικό +Name[es]=Cortafuegos poco activo Name[et]=Toonita tulemüür Name[kk]=Басыңқы желіаралық қалқаны Name[nb]=Brannmur dempet @@ -10,6 +12,7 @@ Name[pt]='Firewall' ultrapassada Name[pt_BR]=Firewall ultrapassado Name[ru]=Защитный экран приглушённый +Name[sk]=Firewall tlmený Name[sv]=Brandvägg diskret Name[uk]=Брандмауер (притлумлено) Name[x-test]=xxFirewall subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/front_end_processor.desktop calligra-2.4.3/flow/stencils/Cisco/front_end_processor.desktop --- calligra-2.4.0/flow/stencils/Cisco/front_end_processor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/front_end_processor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=Front End Processor Name[ca]=Processador frontal +Name[ca@valencia]=Processador frontal Name[de]=Frontend-Prozessor Name[el]=Περιβάλλον επεξεργαστή +Name[es]=Procesador frontal Name[et]=Eesprotsessor Name[it]=Front End Processor Name[kk]=Алдыңғы процессор @@ -13,6 +15,7 @@ Name[pt]=Processador de Interface Name[pt_BR]=Processador de interface Name[ru]=Процессор передней панели +Name[sk]=Frontendový procesor Name[sv]=Frontprocessor Name[uk]=Процесор передньої панелі Name[x-test]=xxFront End Processorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/fwsm.desktop calligra-2.4.3/flow/stencils/Cisco/fwsm.desktop --- calligra-2.4.0/flow/stencils/Cisco/fwsm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/fwsm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Firewall Service Module Name[ca]=Mòdul de serveis del tallafocs +Name[ca@valencia]=Mòdul de serveis del tallafocs Name[de]=Firewall-Dienstmodul Name[el]=Άρθρωμα υπηρεσίας τείχους προστασίας Name[es]=Módulo de servicio del cortafuegos @@ -14,6 +15,7 @@ Name[pt]=Módulo Serviço 'Firewall' Name[pt_BR]=Módulo de serviço de Firewall Name[ru]=Модуль обслуживания защитного экрана +Name[sk]=Modul služby firewallu Name[sv]=Servicemodul för brandvägg Name[uk]=Модуль служби брандмауера Name[x-test]=xxFirewall Service Modulexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/general_appliance.desktop calligra-2.4.3/flow/stencils/Cisco/general_appliance.desktop --- calligra-2.4.0/flow/stencils/Cisco/general_appliance.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/general_appliance.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=General appliance Name[bg]=Обикновено устройство Name[ca]=Dispositiu general +Name[ca@valencia]=Dispositiu general Name[de]=Generisches Gerät Name[el]=Γενική συσκευή +Name[es]=Dispositivo general Name[et]=Tavaline seade Name[it]=Apparato generico Name[kk]=Жалпы құрал @@ -14,6 +16,7 @@ Name[pt]=Aplicativo Geral Name[pt_BR]=Aplicativo geral Name[ru]=Произвольное устройство +Name[sk]=Všeobecný spotrebič Name[sv]=Generell apparat Name[uk]=Узагальнений прилад Name[x-test]=xxGeneral appliancexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/generic_building_blue.desktop calligra-2.4.3/flow/stencils/Cisco/generic_building_blue.desktop --- calligra-2.4.0/flow/stencils/Cisco/generic_building_blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/generic_building_blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Generic Building blue Name[ca]=Edifici genèric blau +Name[ca@valencia]=Edifici genèric blau Name[el]=Κτήριο γενικής χρήσης μπλε +Name[es]=Edificio genérico azul Name[et]=Sinine tavaline hoone Name[it]=Edificio generico blu Name[kk]=Көк ғимарат @@ -12,6 +14,7 @@ Name[pt]=Edifício Genérico Azul Name[pt_BR]=Edifício genérico azul Name[ru]=Обычное синее строение +Name[sk]=Všeobecná budova modrá Name[sv]=Generell byggnad blå Name[uk]=Узагальнена будівля (синім) Name[x-test]=xxGeneric Building bluexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/generic_building.desktop calligra-2.4.3/flow/stencils/Cisco/generic_building.desktop --- calligra-2.4.0/flow/stencils/Cisco/generic_building.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/generic_building.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Generic Building Name[bg]=Обикновена сграда Name[ca]=Edifici genèric +Name[ca@valencia]=Edifici genèric Name[de]=Generisches Gebäude Name[el]=Κτήριο γενικής χρήσης +Name[es]=Edificio genérico Name[et]=Tavaline hoone Name[it]=Edificio generico Name[kk]=Ғимарат @@ -14,6 +16,7 @@ Name[pt]=Edifício Genérico Name[pt_BR]=Edifício genérico Name[ru]=Обычное строение +Name[sk]=Všeobecná budova Name[sv]=Generell byggnad Name[uk]=Узагальнена будівля Name[x-test]=xxGeneric Buildingxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/generic_building_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/generic_building_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/generic_building_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/generic_building_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Generic Building subdued Name[ca]=Edifici genèric suavitzat +Name[ca@valencia]=Edifici genèric suavitzat Name[el]=Κτήριο γενικής χρήσης υποτονικό +Name[es]=Edificio genérico poco activo Name[et]=Toonita tavaline hoone Name[kk]=Басыңқы ғимарат Name[nb]=Alminnelig bygning dempet @@ -10,6 +12,7 @@ Name[pt]=Edifício Genérico Ultrapassado Name[pt_BR]=Edifício genérico ultrapassado Name[ru]=Обычное приглушённое строение +Name[sk]=Všeobecná budova tlmená Name[sv]=Generell byggnad diskret Name[uk]=Узагальнена будівля (притлумлено) Name[x-test]=xxGeneric Building subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/generic_gateway.desktop calligra-2.4.3/flow/stencils/Cisco/generic_gateway.desktop --- calligra-2.4.0/flow/stencils/Cisco/generic_gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/generic_gateway.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Generic gateway Name[bg]=Обикновен шлюз Name[ca]=Passarel·la genèrica +Name[ca@valencia]=Passarel·la genèrica Name[de]=Generisches Gateway Name[el]=Πύλη γενικής χρήσης Name[es]=Puerta de enlace genérica Name[et]=Tavaline lüüs Name[it]=Gateway generico +Name[ja]=汎用ゲートウェイ Name[kk]=Жалпы шлюзі Name[nb]=Generisk portner Name[nds]=Allgemeen Döörreekner @@ -15,6 +17,7 @@ Name[pt]='Gateway' genérica Name[pt_BR]=Gateway genérico Name[ru]=Обычный шлюз +Name[sk]=Všeobecná brána Name[sv]=Generell förmedlingsnod Name[uk]=Узагальнений шлюз Name[x-test]=xxGeneric gatewayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/generic_processor.desktop calligra-2.4.3/flow/stencils/Cisco/generic_processor.desktop --- calligra-2.4.0/flow/stencils/Cisco/generic_processor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/generic_processor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Generic processor Name[bg]=Обикновен процесор Name[ca]=Processador genèric +Name[ca@valencia]=Processador genèric Name[de]=Generischer Prozessor Name[el]=Επεξεργαστής γενικής χρήσης Name[es]=Procesador genérico Name[et]=Tavaline protsessor Name[it]=Processore generico +Name[ja]=汎用プロセッサ Name[kk]=Жалпы процессор Name[nb]=Generisk prosessor Name[nds]=Allgemeen Perzesser @@ -15,6 +17,7 @@ Name[pt]=Processador genérico Name[pt_BR]=Processador genérico Name[ru]=Обычный процессор +Name[sk]=Všeobecný procesor Name[sv]=Generell processor Name[uk]=Стандартний процесор Name[x-test]=xxGeneric processorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/generic_softswitch.desktop calligra-2.4.3/flow/stencils/Cisco/generic_softswitch.desktop --- calligra-2.4.0/flow/stencils/Cisco/generic_softswitch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/generic_softswitch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Generic softswitch Name[bg]=Обикновен софтуерен комутатор Name[ca]=Commutador per programari genèric +Name[ca@valencia]=Commutador per programari genèric Name[de]=Generischer Soft-Switch Name[el]=Γενικός διακόπτης +Name[es]=Conmutador software genérico Name[et]=Üldine tarkvaraline kommutaator Name[it]=Softswich generico Name[kk]=Жалпы бағдарламалық қосқыш @@ -14,6 +16,7 @@ Name[pt]=Comutador por 'software' genérico Name[pt_BR]=Computador por software genérico Name[ru]=Обычный программный коммутатор +Name[sk]=Všeobecný softswitch Name[sv]=Generell programvaruväxel Name[uk]=Загальний програмний комутатор Name[x-test]=xxGeneric softswitchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/gigabit_switch_router_atm_tag.desktop calligra-2.4.3/flow/stencils/Cisco/gigabit_switch_router_atm_tag.desktop --- calligra-2.4.0/flow/stencils/Cisco/gigabit_switch_router_atm_tag.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/gigabit_switch_router_atm_tag.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Gigabit Switch Router (ATM Tag) Name[bg]=Гигабит комутиращ маршрутизатор (ATM Tag) Name[ca]=Encaminador Gigabit (etiqueta ATM) +Name[ca@valencia]=Encaminador Gigabit (etiqueta ATM) Name[de]=Gigabit-Switch-Router (ATM-Tag) Name[el]=Gigabit Switch Router (ATM Tag) +Name[es]=Enrutador conmutador Gigabit (ATM Tag) Name[et]=Gigabit-kommutaator-marsruuter (ATM Tag) Name[it]=Gigabit Switch Router (ATM Tag) Name[kk]=Гигабиттік қосқыш маршруттауышы (ATM Tag) @@ -14,6 +16,7 @@ Name[pt]=Encaminhador Gigabit (ATM) Name[pt_BR]=Roteador/Comutador Gigabit (ATM Tag) Name[ru]=Маршрутизатор-коммутатор с поддержкой гигабитной сети (метка ATM) +Name[sk]=Gigabit Switch Router (ATM Tag) Name[sv]=Gigabit växelrouter (ATM-tagg) Name[uk]=Маршрутизатор гігабітового комутатора (ATM Tag) Name[x-test]=xxGigabit Switch Router (ATM Tag)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/government_building.desktop calligra-2.4.3/flow/stencils/Cisco/government_building.desktop --- calligra-2.4.0/flow/stencils/Cisco/government_building.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/government_building.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Government Building Name[bg]=Правителствена сграда Name[ca]=Edifici governamental +Name[ca@valencia]=Edifici governamental Name[de]=Regierungsgebäude Name[el]=Κυβερνητικό κτήριο +Name[es]=Edificio gubernamental Name[et]=Valitsushoone Name[it]=Edificio governativo Name[kk]=Үкіметтік мекеме @@ -14,6 +16,7 @@ Name[pt]=Edifício Governamental Name[pt_BR]=Edifício governamental Name[ru]=Правительственное здание +Name[sk]=Vládna budova Name[sv]=Statlig byggnad Name[uk]=Урядова будівля Name[x-test]=xxGovernment Buildingxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/guard.desktop calligra-2.4.3/flow/stencils/Cisco/guard.desktop --- calligra-2.4.0/flow/stencils/Cisco/guard.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/guard.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Guard Name[ca]=Defensa +Name[ca@valencia]=Defensa Name[el]=Φρουρός +Name[es]=Guardia Name[et]=Guard Name[it]=Guard Name[kk]=Сақшы @@ -11,6 +13,7 @@ Name[pt]=Guarda Name[pt_BR]=Guarda Name[ru]=Хранитель +Name[sk]=Strážca Name[sv]=Vakt Name[uk]=Охоронець Name[x-test]=xxGuardxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/h323.desktop calligra-2.4.3/flow/stencils/Cisco/h323.desktop --- calligra-2.4.0/flow/stencils/Cisco/h323.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/h323.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=H.323 Name[bg]=H.323 Name[ca]=H.323 +Name[ca@valencia]=H.323 Name[cs]=H.323 Name[de]=H.323 Name[el]=H.323 @@ -9,6 +10,7 @@ Name[et]=H.323 Name[hu]=H.323 Name[it]=H.323 +Name[ja]=H.323 Name[kk]=H.323 Name[nb]=H.323 Name[nds]=H.323 diff -Nru calligra-2.4.0/flow/stencils/Cisco/handheld.desktop calligra-2.4.3/flow/stencils/Cisco/handheld.desktop --- calligra-2.4.0/flow/stencils/Cisco/handheld.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/handheld.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Handheld Name[bg]=Мобилно устройство Name[ca]=Mans lliures +Name[ca@valencia]=Mans lliures Name[cs]=Handheld Name[de]=PDA Name[el]=Χειρός +Name[es]=Handheld Name[et]=Pihuarvuti Name[it]=Palmare +Name[ja]=ハンドヘルド Name[kk]=Қалта құрылғысы Name[nb]=Håndholdt Name[nds]=Handreekner @@ -15,6 +18,7 @@ Name[pt]=Dispositivo Móvel Name[pt_BR]=Handheld Name[ru]=Карманный ПК +Name[sk]=Handheld Name[sv]=Handdator Name[uk]=Кишеньковий пристрій Name[x-test]=xxHandheldxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/headphones.desktop calligra-2.4.3/flow/stencils/Cisco/headphones.desktop --- calligra-2.4.0/flow/stencils/Cisco/headphones.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/headphones.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Headphones Name[bg]=Слушалки Name[ca]=Auriculars +Name[ca@valencia]=Auriculars Name[cs]=Sluchátka Name[de]=Kopfhörer Name[el]=Ακουστικά Name[es]=Auriculares Name[et]=Kõrvaklapid Name[it]=Cuffie +Name[ja]=ヘッドフォン Name[kk]=Құлаққаптар Name[nb]=Hodetelefoner Name[nds]=Kopphörers @@ -16,6 +18,7 @@ Name[pt]=Auscultadores Name[pt_BR]=Fone de ouvido Name[ru]=Наушники +Name[sk]=Slúchadlá Name[sv]=Hörlurar Name[ug]=تىڭشىغۇچ Name[uk]=Навушники diff -Nru calligra-2.4.0/flow/stencils/Cisco/home_office.desktop calligra-2.4.3/flow/stencils/Cisco/home_office.desktop --- calligra-2.4.0/flow/stencils/Cisco/home_office.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/home_office.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Home office Name[bg]=Домашен офис Name[ca]=Oficina a casa +Name[ca@valencia]=Oficina a casa Name[de]=Heimbüro Name[el]=Home office Name[es]=Oficina en casa @@ -15,6 +16,7 @@ Name[pt]=Sede Name[pt_BR]=Escritório pessoal Name[ru]=Домашний офис +Name[sk]=Home office Name[sv]=Hemmakontor Name[uk]=Домашній офіс Name[x-test]=xxHome officexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/hootphone.desktop calligra-2.4.3/flow/stencils/Cisco/hootphone.desktop --- calligra-2.4.0/flow/stencils/Cisco/hootphone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/hootphone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=HootPhone Name[bg]=HootPhone Name[ca]=Telèfon de sirena +Name[ca@valencia]=Telèfon de sirena Name[de]=HootPhone Name[el]=HootPhone +Name[es]=HootPhone Name[et]=HootPhone Name[it]=Telefono Hoot Name[kk]=Сылдырлаған телефон diff -Nru calligra-2.4.0/flow/stencils/Cisco/host.desktop calligra-2.4.3/flow/stencils/Cisco/host.desktop --- calligra-2.4.0/flow/stencils/Cisco/host.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/host.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Host Name[bg]=Хост Name[ca]=Màquina +Name[ca@valencia]=Màquina Name[cs]=Hostitel Name[de]=Rechner Name[el]=Υπολογιστής @@ -10,6 +11,7 @@ Name[fr]=Hôte Name[hu]=Gépnév Name[it]=Host +Name[ja]=ホスト Name[kk]=Хост Name[nb]=Vert Name[nds]=Reekner @@ -18,6 +20,7 @@ Name[pt]=Máquina Name[pt_BR]=Máquina Name[ru]=Узел +Name[sk]=Hostiteľ Name[sv]=Värddator Name[ug]=ماشىنا Name[uk]=Вузол diff -Nru calligra-2.4.0/flow/stencils/Cisco/house_blue.desktop calligra-2.4.3/flow/stencils/Cisco/house_blue.desktop --- calligra-2.4.0/flow/stencils/Cisco/house_blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/house_blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=House blue Name[ca]=Casa blava +Name[ca@valencia]=Casa blava Name[el]=House blue Name[es]=Casa azul Name[et]=Sinine hoone @@ -13,6 +14,7 @@ Name[pt]=Casa azul Name[pt_BR]=Casa azul Name[ru]=Синий дом +Name[sk]=Dom modrý Name[sv]=Hus blått Name[uk]=Будинок (синім) Name[x-test]=xxHouse bluexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/house.desktop calligra-2.4.3/flow/stencils/Cisco/house.desktop --- calligra-2.4.0/flow/stencils/Cisco/house.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/house.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=House Name[bg]=Къща Name[ca]=Casa +Name[ca@valencia]=Casa Name[cs]=Dům Name[el]=House Name[es]=Casa @@ -15,6 +16,7 @@ Name[pt]=Casa Name[pt_BR]=Casa Name[ru]=Дом +Name[sk]=Dom Name[sv]=Hus Name[ug]=House مۇزىكىسى Name[uk]=Будинок diff -Nru calligra-2.4.0/flow/stencils/Cisco/hp_mini.desktop calligra-2.4.3/flow/stencils/Cisco/hp_mini.desktop --- calligra-2.4.0/flow/stencils/Cisco/hp_mini.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/hp_mini.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=HP Mini Name[bg]=HP Mini Name[ca]=HP Mini +Name[ca@valencia]=HP Mini Name[de]=HP-Mini Name[el]=HP Mini Name[es]=HP Mini @@ -16,6 +17,7 @@ Name[pt]=HP Mini Name[pt_BR]=HP Mini Name[ru]=HP Мини +Name[sk]=HP Mini Name[sv]=HP-minidator Name[uk]=HP Mini Name[x-test]=xxHP Minixx diff -Nru calligra-2.4.0/flow/stencils/Cisco/hub.desktop calligra-2.4.3/flow/stencils/Cisco/hub.desktop --- calligra-2.4.0/flow/stencils/Cisco/hub.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/hub.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,16 @@ Name=Hub Name[bg]=Хъб Name[ca]=Concentrador +Name[ca@valencia]=Concentrador Name[cs]=Rozbočovač Name[de]=Hub Name[el]=Κόμβος Name[es]=Concentrador Name[et]=Jaotur +Name[fi]=Hubi +Name[hu]=Hub Name[it]=Hub +Name[ja]=ハブ Name[kk]=Хаб Name[nb]=Nettnav Name[nds]=Nettknütt @@ -16,6 +20,7 @@ Name[pt]=Concentrador Name[pt_BR]=Concentrador Name[ru]=Повторитель +Name[sk]=Rozbočovač Name[sv]=Nätnav Name[uk]=Концентратор Name[x-test]=xxHubxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/hub_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/hub_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/hub_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/hub_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Hub subdued Name[ca]=Concentrador suavitzat +Name[ca@valencia]=Concentrador suavitzat Name[el]=Κόμβος υποτονικός +Name[es]=Concentrador poco activo Name[et]=Toonita jaotur Name[kk]=Басыңқы хаб Name[nb]=Nettnav dempet @@ -10,6 +12,7 @@ Name[pt]=Concentrador ultrapassado Name[pt_BR]=Concentrador ultrapassado Name[ru]=Повторитель приглушённый +Name[sk]=Hub tlmený Name[sv]=Nätnav diskret Name[uk]=Концентратор (притлумлено) Name[x-test]=xxHub subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/iad_router.desktop calligra-2.4.3/flow/stencils/Cisco/iad_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/iad_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/iad_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=IAD router Name[bg]=Маршрутизатор IAD Name[ca]=Encaminador IAD +Name[ca@valencia]=Encaminador IAD Name[de]=IAD-Router Name[el]=Δρομολογητής IAD +Name[es]=Encaminador IAD Name[et]=IAD marsruuter Name[it]=Router IAD Name[kk]=IAD маршруттауышы @@ -14,6 +16,7 @@ Name[pt]=Encaminhador IAD Name[pt_BR]=Roteador IAD Name[ru]=Маршрутизатор IAD +Name[sk]=IAD router Name[sv]=IAD-router Name[uk]=Маршрутизатор IAD Name[x-test]=xxIAD routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ibm_mainframe.desktop calligra-2.4.3/flow/stencils/Cisco/ibm_mainframe.desktop --- calligra-2.4.0/flow/stencils/Cisco/ibm_mainframe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ibm_mainframe.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=IBM mainframe Name[bg]=Мейнфрейм IBM Name[ca]=Unitat principal IBM +Name[ca@valencia]=Unitat principal IBM Name[de]=IBM-Mainframe Name[el]=IBM mainframe Name[es]=Macrocomputadora IBM @@ -15,6 +16,7 @@ Name[pt]=Servidor principal IBM Name[pt_BR]=Servidor principal IBM Name[ru]=Мэйнфрейм IBM +Name[sk]=IBM mainframe Name[sv]=IBM-stordator Name[uk]=Мейнфрейм IBM Name[x-test]=xxIBM mainframexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ibm_mainframe_with_fep.desktop calligra-2.4.3/flow/stencils/Cisco/ibm_mainframe_with_fep.desktop --- calligra-2.4.0/flow/stencils/Cisco/ibm_mainframe_with_fep.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ibm_mainframe_with_fep.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=IBM mainframe with FEP Name[ca]=Unitat principal IBM amb FEP +Name[ca@valencia]=Unitat principal IBM amb FEP Name[de]=IBM-Mainframe mit FEP Name[el]=IBM mainframe with FEP +Name[es]=IBM mainframe con FEP Name[et]=IBM terminal FEP-iga Name[it]=IBM mainframe con FEP Name[kk]=IBM мейнфреймі (FEP-і бар) diff -Nru calligra-2.4.0/flow/stencils/Cisco/ibm_mini.desktop calligra-2.4.3/flow/stencils/Cisco/ibm_mini.desktop --- calligra-2.4.0/flow/stencils/Cisco/ibm_mini.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ibm_mini.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=IBM Mini (AS400) Name[bg]=IBM Mini (AS400) Name[ca]=IBM Mini (AS400) +Name[ca@valencia]=IBM Mini (AS400) Name[de]=IBM-Mini (AS400) Name[el]=IBM Mini (AS400) Name[es]=IBM Mini (AS400) @@ -15,6 +16,7 @@ Name[pt]=IBM Mini (AS400) Name[pt_BR]=IBM Mini (AS400) Name[ru]=Миникомпьютер IBM (AS400) +Name[sk]=IBM Mini (AS400) Name[sv]=IBM-minidator (AS400) Name[uk]=IBM Mini (AS400) Name[x-test]=xxIBM Mini (AS400)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ibm_tower.desktop calligra-2.4.3/flow/stencils/Cisco/ibm_tower.desktop --- calligra-2.4.0/flow/stencils/Cisco/ibm_tower.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ibm_tower.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=IBM Tower Name[bg]=Кула IBM Name[ca]=IBM Tower +Name[ca@valencia]=IBM Tower Name[de]=IBM-Tower Name[el]=IBM Tower Name[es]=Torre IBM @@ -15,6 +16,7 @@ Name[pt]=Torre IBM Name[pt_BR]=Torre IBM Name[ru]=Компьютер-башня IBM +Name[sk]=IBM Tower Name[sv]=IBM-torn Name[uk]=Комп’ютер IBM у корпусі «башта» Name[x-test]=xxIBM Towerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/icm.desktop calligra-2.4.3/flow/stencils/Cisco/icm.desktop --- calligra-2.4.0/flow/stencils/Cisco/icm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/icm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=ICM Name[bg]=ICM Name[ca]=ICM +Name[ca@valencia]=ICM Name[de]= Name[el]=ICM +Name[es]=ICM Name[et]=ICM +Name[hu]=ICM Name[it]=ICM Name[kk]=ICM Name[nb]=ICM @@ -14,6 +17,7 @@ Name[pt]=ICM Name[pt_BR]=ICM Name[ru]=ICM +Name[sk]=ICM Name[sv]=ICM Name[uk]=ICM Name[x-test]=xxICMxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ics.desktop calligra-2.4.3/flow/stencils/Cisco/ics.desktop --- calligra-2.4.0/flow/stencils/Cisco/ics.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ics.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=ICS Name[bg]=ICS Name[ca]=ICS +Name[ca@valencia]=ICS Name[cs]=ICS Name[de]=ICS Name[el]=ICS +Name[es]=ICS Name[et]=ICS +Name[hu]=ICS Name[it]=ICS Name[kk]=ICS Name[nb]=ICS diff -Nru calligra-2.4.0/flow/stencils/Cisco/intelliswitch_stack.desktop calligra-2.4.3/flow/stencils/Cisco/intelliswitch_stack.desktop --- calligra-2.4.0/flow/stencils/Cisco/intelliswitch_stack.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/intelliswitch_stack.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=IntelliSwitch Stack Name[ca]=IntelliSwitch Stack +Name[ca@valencia]=IntelliSwitch Stack Name[el]=IntelliSwitch Stack +Name[es]=IntelliSwitch Stack Name[et]=IntelliSwitch pinu Name[it]=IntelliSwitch Stack Name[kk]=IntelliSwitch стегі @@ -11,6 +13,7 @@ Name[pt]=Bloco IntelliSwitch Name[pt_BR]=Bloco IntelliSwitch Name[ru]=Стэк IntelliSwitch +Name[sk]=IntelliSwitch Stack Name[sv]=IntelliSwitch-stack Name[uk]=Стек IntelliSwitch Name[x-test]=xxIntelliSwitch Stackxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ios_firewall.desktop calligra-2.4.3/flow/stencils/Cisco/ios_firewall.desktop --- calligra-2.4.0/flow/stencils/Cisco/ios_firewall.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ios_firewall.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=IOS Firewall Name[bg]=Защитна стена IOS Name[ca]=Tallafocs IOS +Name[ca@valencia]=Tallafocs IÇOS Name[de]=IOS-Firewall Name[el]=IOS Firewall +Name[es]=Cortafuegos IOS Name[et]=IOS tulemüür Name[it]=IOS Firewall Name[kk]=IOS желіаралық қалқаны @@ -14,6 +16,7 @@ Name[pt]='Firewall' IOS Name[pt_BR]=Firewall IOS Name[ru]=Защитный экран IOS +Name[sk]=IOS Firewall Name[sv]=IOS-brandvägg Name[uk]=Брандмауер IOS Name[x-test]=xxIOS Firewallxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ios_slb.desktop calligra-2.4.3/flow/stencils/Cisco/ios_slb.desktop --- calligra-2.4.0/flow/stencils/Cisco/ios_slb.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ios_slb.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=IOS SLB Name[bg]=IOS SLB Name[ca]=IOS SLB +Name[ca@valencia]=IOS SLB Name[de]=IOS SLB Name[el]=IOS SLB +Name[es]=IOS SLB Name[et]=IOS SLB Name[it]=IOS SLB Name[kk]=IOS SLB diff -Nru calligra-2.4.0/flow/stencils/Cisco/ip.desktop calligra-2.4.3/flow/stencils/Cisco/ip.desktop --- calligra-2.4.0/flow/stencils/Cisco/ip.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ip.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=IP Name[bg]=IP Name[ca]=IP +Name[ca@valencia]=IP Name[cs]=IP Name[de]=IP Name[el]=IP +Name[es]=IP Name[et]=IP Name[hu]=IP Name[it]=IP @@ -16,6 +18,7 @@ Name[pt]=IP Name[pt_BR]=IP Name[ru]=IP +Name[sk]=IP Name[sv]=IP Name[ug]=IP Name[uk]=IP diff -Nru calligra-2.4.0/flow/stencils/Cisco/ip_dsl.desktop calligra-2.4.3/flow/stencils/Cisco/ip_dsl.desktop --- calligra-2.4.0/flow/stencils/Cisco/ip_dsl.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ip_dsl.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=IP DSL Name[bg]=IP DSL Name[ca]=IP DSL +Name[ca@valencia]=IP DSL Name[de]=IP-DSL Name[el]=IP DSL +Name[es]=IP DSL Name[et]=IP DSL +Name[hu]=IP DSL Name[it]=IP DSL Name[kk]=IP DSL Name[nb]=IP DSL @@ -14,6 +17,7 @@ Name[pt]=IP DSL Name[pt_BR]=IP DSL Name[ru]=IP DSL коммутатор +Name[sk]=IP DSL Name[sv]=Internet digital abonnentlinje Name[uk]=IP DSL Name[x-test]=xxIP DSLxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ip_old-style.desktop calligra-2.4.3/flow/stencils/Cisco/ip_old-style.desktop --- calligra-2.4.0/flow/stencils/Cisco/ip_old-style.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ip_old-style.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=IP Old-style Name[ca]=IP Old-style +Name[ca@valencia]=IP Old-style Name[el]=IP παλιό στιλ +Name[es]=IP estilo antiguo Name[et]=Vanas stiilis IP Name[it]=IP vecchio stile Name[kk]=IP ескі стилі @@ -11,6 +13,7 @@ Name[pt]=IP Antigo Name[pt_BR]=IP antigo Name[ru]=IP по старому стилю +Name[sk]=IP Old-style Name[sv]=Gammalmodig IP Name[uk]=IP (застаріле зображення) Name[x-test]=xxIP Old-stylexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ip_phone.desktop calligra-2.4.3/flow/stencils/Cisco/ip_phone.desktop --- calligra-2.4.0/flow/stencils/Cisco/ip_phone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ip_phone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=IP Phone Name[bg]=IP-телефон Name[ca]=IP Phone +Name[ca@valencia]=IP Phone Name[de]=IP-Telefon Name[el]=IP τηλέφωνο +Name[es]=Teléfono IP Name[et]=IP-telefon +Name[hu]=IP telefon Name[it]=Telefono IP Name[kk]=IP телефон Name[nb]=IP-telefon @@ -14,6 +17,7 @@ Name[pt]=Telefone IP Name[pt_BR]=Telefone IP Name[ru]=IP-телефон +Name[sk]=IP telefón Name[sv]=Internet-telefon Name[uk]=IP-телефон Name[x-test]=xxIP Phonexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ip_softphone.desktop calligra-2.4.3/flow/stencils/Cisco/ip_softphone.desktop --- calligra-2.4.0/flow/stencils/Cisco/ip_softphone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ip_softphone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=IP Softphone Name[bg]=Софтуерен IP-телефон Name[ca]=IP Softphone +Name[ca@valencia]=IP Softphone Name[de]=IP-SoftPhone Name[el]=IP εφαρμογή τηλεφωνίας +Name[es]=Teléfono IP por software Name[et]=IP Softphone Name[it]=Softphone IP Name[kk]=Бағдарламалық IP телефоны @@ -14,6 +16,7 @@ Name[pt]=Telefone SW IP Name[pt_BR]=Softphone IP Name[ru]=Программная телефония на IP +Name[sk]=IP Softphone Name[sv]=Internet programvarutelefon Name[uk]=Програмний IP-телефон Name[x-test]=xxIP Softphonexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ip_telephony_router.desktop calligra-2.4.3/flow/stencils/Cisco/ip_telephony_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/ip_telephony_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ip_telephony_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=IP Telephony Router Name[bg]=Маршрутизатор за IP-телефония Name[ca]=Encaminador de telefonia IP +Name[ca@valencia]=Encaminador de telefonia IP Name[de]=IP-Telefonie-Router Name[el]=IP δρομολογητής τηλεφωνίας +Name[es]=Encaminador de telefonía IP Name[et]=IP-telefoni marsruuter Name[it]=Router di telefonia IP Name[kk]=IP телефония маршруттауышы @@ -14,6 +16,7 @@ Name[pt]=Encaminhador Telefonia IP Name[pt_BR]=Roteador de Telefonia IP Name[ru]=Маршрутизатор IP-телефонии +Name[sk]=Router IP telefónie Name[sv]=Router för Internet-telefoni Name[uk]=Маршрутизатор IP-телефонії Name[x-test]=xxIP Telephony Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ip_transport_concentrator.desktop calligra-2.4.3/flow/stencils/Cisco/ip_transport_concentrator.desktop --- calligra-2.4.0/flow/stencils/Cisco/ip_transport_concentrator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ip_transport_concentrator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=IPTC Name[bg]=IPTC Name[ca]=IPTC +Name[ca@valencia]=IPTC Name[cs]=IPTC Name[de]=IPTC Name[el]=IPTC +Name[es]=IPTC Name[et]=IPTC Name[hu]=IPTC Name[it]=IPTC diff -Nru calligra-2.4.0/flow/stencils/Cisco/iptv_broadcast_server.desktop calligra-2.4.3/flow/stencils/Cisco/iptv_broadcast_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/iptv_broadcast_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/iptv_broadcast_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=IPTV broadcast server Name[bg]=Разпръскващ сървър IPTV Name[ca]=IPTV broadcast server +Name[ca@valencia]=IPTV broadcast server Name[de]=IPTV-Broadcast-Server Name[el]=Εξυπηρετητής μετάδοσης IPTV +Name[es]=Servidor IPTV de difusión Name[et]=IPTV marsruuter Name[it]=Server di trasmissione IPTV Name[kk]=IPTV кеңтарту сервері @@ -14,6 +16,7 @@ Name[pt]=Servidor difusão IPTV Name[pt_BR]=Servidor de transmissão IPTV Name[ru]=Широковещательный сервер IPTV +Name[sk]=IPTV vysielací server Name[sv]=Utsändningsserver för Internet-tv Name[ug]=IPTV تارقىتىش مۇلازىمېتىرى Name[uk]=Сервер трансляції інтернет-ТБ diff -Nru calligra-2.4.0/flow/stencils/Cisco/iptv_content_manager.desktop calligra-2.4.3/flow/stencils/Cisco/iptv_content_manager.desktop --- calligra-2.4.0/flow/stencils/Cisco/iptv_content_manager.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/iptv_content_manager.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=IPTV content manager Name[bg]=Управление на съдържание IPTV Name[ca]=IPTV content manager +Name[ca@valencia]=IPTV content manager Name[de]=IPTV-Inhalts-Manager Name[el]=Διαχειριστής περιεχομένου IPTV +Name[es]=gestor de contenido IPTV Name[et]=IPTV sisuhaldur Name[it]=Gestore contenuti IPTV Name[kk]=IPTV мазмұн менеджері @@ -14,6 +16,7 @@ Name[pt]=Gestor conteúdos IPTV Name[pt_BR]=Gerenciador de conteúdos IPTV Name[ru]=Менеджер содержимого IPTV +Name[sk]=Správca obsahu IPTV Name[sv]=Innehållshantering för Internet-tv Name[uk]=Керування даними інтернет-ТБ Name[x-test]=xxIPTV content managerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/iscsi_switch.desktop calligra-2.4.3/flow/stencils/Cisco/iscsi_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/iscsi_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/iscsi_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=iSCSI switch Name[ca]=iSCSI switch +Name[ca@valencia]=iSCSI switch Name[de]=iSCSI-Switch Name[el]=iSCSI switch -Name[es]=Switch iSCSI +Name[es]=Conmutador iSCSI Name[et]=iSCSI kommutaator +Name[hu]=iSCSI switch Name[it]=Switch iSCSI Name[kk]=iSCSI қосқышы Name[nb]=iSCSI-svitsj @@ -13,6 +15,7 @@ Name[pt]=Comutador iSCSI Name[pt_BR]=Comutador iSCSI Name[ru]=Коммутатор iSCSI +Name[sk]=iSCSI switch Name[sv]=iSCSI-växel Name[uk]=Комутатор iSCSI Name[x-test]=xxiSCSI switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/isdn_switch.desktop calligra-2.4.3/flow/stencils/Cisco/isdn_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/isdn_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/isdn_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=ISDN switch Name[bg]=Комутатор ISDN Name[ca]=ISDN switch +Name[ca@valencia]=ISDN switch Name[de]=ISDN-Switch Name[el]=ISDN switch +Name[es]=Conmutador ISDN Name[et]=ISDN kommutaator +Name[hu]=ISDN switch Name[it]=Switch ISDN Name[kk]=ISDN қосқышы Name[nb]=ISDN-svitsj @@ -14,6 +17,7 @@ Name[pt]=Comutador RDIS Name[pt_BR]=Comutador ISDN Name[ru]=ISDN коммутатор +Name[sk]=ISDN switch Name[sv]=ISDN-växel Name[uk]=Комутатор ISDN Name[x-test]=xxISDN switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/itp.desktop calligra-2.4.3/flow/stencils/Cisco/itp.desktop --- calligra-2.4.0/flow/stencils/Cisco/itp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/itp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=ITP Name[bg]=ITP Name[ca]=ITP +Name[ca@valencia]=ITP Name[de]=ITP Name[el]=ITP +Name[es]=ITP Name[et]=ITP +Name[hu]=ITP Name[it]=ITP Name[kk]=ITP Name[nb]=ITP diff -Nru calligra-2.4.0/flow/stencils/Cisco/jbod.desktop calligra-2.4.3/flow/stencils/Cisco/jbod.desktop --- calligra-2.4.0/flow/stencils/Cisco/jbod.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/jbod.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=JBOD Name[bg]=JBOD Name[ca]=JBOD +Name[ca@valencia]=JBOD Name[de]=JBOD Name[el]=JBOD +Name[es]=JBOD Name[et]=JBOD +Name[hu]=JBOD Name[it]=JBOD Name[kk]=JBOD Name[nb]=JBOD diff -Nru calligra-2.4.0/flow/stencils/Cisco/key.desktop calligra-2.4.3/flow/stencils/Cisco/key.desktop --- calligra-2.4.0/flow/stencils/Cisco/key.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/key.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Key Name[bg]=Ключ Name[ca]=Tecla +Name[ca@valencia]=Tecla Name[cs]=Klíč Name[el]=Κλειδί +Name[es]=Clave Name[et]=Võti Name[ga]=Eochair Name[hu]=Kulcs diff -Nru calligra-2.4.0/flow/stencils/Cisco/label_switch_router.desktop calligra-2.4.3/flow/stencils/Cisco/label_switch_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/label_switch_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/label_switch_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=ATM Tag Sw Gigabit Router Name[ca]=Encaminador ATM Tag Sw Gigabit +Name[ca@valencia]=Encaminador ATM Tag Sw Gigabit Name[de]=ATM-Tag SW-Gigabit-Router Name[el]=ATM Tag Sw Gigabit Router +Name[es]=Enrutador Gigabit ATM Tag Sw Name[et]=ATM Tag kommutaator gigabit-ruuter Name[it]=ATM Tag Sw Gigabit Router Name[kk]=ATM Tag Sw гигабиттіік маршруттауышы @@ -13,6 +15,7 @@ Name[pt]=Encaminhador Gigabit SW ATM Name[pt_BR]=Roteador Gigabit SW ATM Name[ru]=Софтовый маршрутизатор с поддержкой гигабитной сети (метка ATM) +Name[sk]=ATM Tag Sw Gigabit Router Name[sv]=Gigabit ATM-taggväxelrouter Name[uk]=Гігабітовий маршрутизатор ATM Tag Sw Name[x-test]=xxATM Tag Sw Gigabit Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/lan2lan_switch.desktop calligra-2.4.3/flow/stencils/Cisco/lan2lan_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/lan2lan_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/lan2lan_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=LAN2LAN Switch Name[ca]=LAN2LAN Switch +Name[ca@valencia]=LAN2LAN Switch Name[el]=Μεταγωγέας LAN2LAN +Name[es]=Conmutador LAN2LAN Name[et]=LAN2LAN kommutaator +Name[hu]=LAN2LAN Switch Name[it]=LAN2LAN Switch Name[kk]=LAN2LAN қосқышы Name[nb]=LAN2LAN-svitsj @@ -11,6 +14,7 @@ Name[pt]=Comutador LAN2LAN Name[pt_BR]=Comutador LAN2LAN Name[ru]=Коммутатор локальных сетей +Name[sk]=LAN2LAN Switch Name[sv]=Lokalt nätverk till lokalt nätverk-växel Name[uk]=Комутатор LAN2LAN Name[x-test]=xxLAN2LAN Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/lan_to_lan.desktop calligra-2.4.3/flow/stencils/Cisco/lan_to_lan.desktop --- calligra-2.4.0/flow/stencils/Cisco/lan_to_lan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/lan_to_lan.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=LAN to LAN Name[bg]=LAN до LAN Name[ca]=LAN to LAN +Name[ca@valencia]=LAN to LAN Name[de]=LAN zu LAN Name[el]=LAN to LAN +Name[es]=LAN a LAN Name[et]=LAN->LAN Name[it]=LAN to LAN Name[kk]=LAN - LAN @@ -14,6 +16,7 @@ Name[pt]=LAN para LAN Name[pt_BR]=LAN para LAN Name[ru]=Сеть-Сеть +Name[sk]=LAN to LAN Name[sv]=Lokalt nätverk till lokalt nätverk Name[uk]=LAN у LAN Name[x-test]=xxLAN to LANxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/laptop.desktop calligra-2.4.3/flow/stencils/Cisco/laptop.desktop --- calligra-2.4.0/flow/stencils/Cisco/laptop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/laptop.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Laptop Name[bg]=Лаптоп Name[ca]=Ordinador portàtil +Name[ca@valencia]=Ordinador portàtil Name[cs]=Notebook Name[de]=Laptop Name[el]=Φορητός Name[es]=Portátil Name[et]=Sülearvuti Name[ga]=Ríomhaire Glúine +Name[hu]=Laptop Name[it]=Portatile Name[kk]=Ноутбук Name[nb]=Bærbar @@ -17,6 +19,7 @@ Name[pt]=Portátil Name[pt_BR]=Laptop Name[ru]=Ноутбук +Name[sk]=Laptop Name[sv]=Bärbar dator Name[ug]=يان كومپيۇتېر Name[uk]=Ноутбук diff -Nru calligra-2.4.0/flow/stencils/Cisco/layer_2_remote_switch.desktop calligra-2.4.3/flow/stencils/Cisco/layer_2_remote_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/layer_2_remote_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/layer_2_remote_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Layer 2 Remote Switch Name[ca]=Layer 2 Remote Switch +Name[ca@valencia]=Layer 2 Remote Switch Name[el]=Layer 2 Remote Switch +Name[es]=Conmutador remoto de capa 2 Name[et]=Teise kihi kaugkommutaator Name[it]=Switch remoto layer 2 Name[kk]=2-деңгейлі қашық қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador Remoto Nível 2 Name[pt_BR]=Comutador remoto de camada 2 Name[ru]=Удалённый коммутатор второго уровня +Name[sk]=Vzdialený prepínač 2. vrstvy Name[sv]=Lager 2-fjärrväxel Name[uk]=Віддалений комутатор другого рівня Name[x-test]=xxLayer 2 Remote Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/layer3_switch.desktop calligra-2.4.3/flow/stencils/Cisco/layer3_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/layer3_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/layer3_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Layer 3 Switch Name[bg]=Комутатор слой 3 Name[ca]=Layer 3 Switch +Name[ca@valencia]=Layer 3 Switch Name[de]=Switch der Ebene 3 Name[el]=Layer 3 Switch +Name[es]=Conmutador de capa 3 Name[et]=Kolmanda kihi kommutaator Name[it]=Switch layer 3 Name[kk]=3-деңгейлі қосқышы @@ -14,6 +16,7 @@ Name[pt]=Comutador Nível 3 Name[pt_BR]=Comutador de camada 3 Name[ru]=Коммутатор третьего уровня +Name[sk]=Prepínač 3. vrstvy Name[sv]=Lager 3-växel Name[uk]=Комутатор третього рівня Name[x-test]=xxLayer 3 Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/lightweight_ap.desktop calligra-2.4.3/flow/stencils/Cisco/lightweight_ap.desktop --- calligra-2.4.0/flow/stencils/Cisco/lightweight_ap.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/lightweight_ap.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Lightweight AP Name[ca]=Lightweight AP +Name[ca@valencia]=Lightweight AP Name[el]=Lightweight AP +Name[es]=AP ligero Name[et]=Lightweight AP Name[it]=AP leggero Name[kk]=Жеңіл қатынау нүктесі @@ -11,6 +13,7 @@ Name[pt]=PA leve Name[pt_BR]=PA leve Name[ru]=Облегчённая точка доступа +Name[sk]=Ľahký prístupový bod Name[sv]=Lättviktig åtkomstpunkt Name[uk]=Малопотужна точка доступу Name[x-test]=xxLightweight APxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/localdirector.desktop calligra-2.4.3/flow/stencils/Cisco/localdirector.desktop --- calligra-2.4.0/flow/stencils/Cisco/localdirector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/localdirector.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=LocalDirector Name[bg]=LocalDirector Name[ca]=LocalDirector +Name[ca@valencia]=LocalDirector Name[de]=LocalDirector Name[el]=LocalDirector +Name[es]=Director local Name[et]=LocalDirector Name[it]=LocalDirector Name[kk]=Жергілікті бағыттауышы @@ -14,6 +16,7 @@ Name[pt]=Director Local Name[pt_BR]=LocalDirector Name[ru]=Локальный управляющий +Name[sk]=LocalDirector Name[sv]=Lokal kopplingsenhet Name[uk]=Локальний керівник Name[x-test]=xxLocalDirectorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/location_server.desktop calligra-2.4.3/flow/stencils/Cisco/location_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/location_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/location_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Location server Name[ca]=Servidor de localització +Name[ca@valencia]=Servidor de localització Name[el]=Εξυπηρετητής τοποθεσίας +Name[es]=Servidor de comunicaciones Name[et]=Asukohaserver Name[it]=Location server Name[kk]=Орналасу сервері @@ -11,6 +13,7 @@ Name[pt]=Servidor de localização Name[pt_BR]=Servidor de localização Name[ru]=Сервер расположения +Name[sk]=Server umiestnenia Name[sv]=Platsserver Name[uk]=Сервер розташування Name[x-test]=xxLocation serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/lock_and_key.desktop calligra-2.4.3/flow/stencils/Cisco/lock_and_key.desktop --- calligra-2.4.0/flow/stencils/Cisco/lock_and_key.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/lock_and_key.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=Lock and Key Name[ca]=Lock and Key +Name[ca@valencia]=Lock and Key Name[el]=Κλειδαριά και κλειδί +Name[es]=Cerrojo y llave Name[et]=Lukk ja võti +Name[hu]=Zár és kulcs Name[it]=Lucchetto e chiave Name[kk]=Құлып пен кілт Name[nb]=Lås og nøkkel @@ -12,6 +15,7 @@ Name[pt]=Cadeado e Chave Name[pt_BR]=Cadeado e chave Name[ru]=Ключ и замок +Name[sk]=Zámok a kľúč Name[sv]=Lås och nyckel Name[uk]=Замок і ключ Name[x-test]=xxLock and Keyxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/lock.desktop calligra-2.4.3/flow/stencils/Cisco/lock.desktop --- calligra-2.4.0/flow/stencils/Cisco/lock.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/lock.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Lock Name[bg]=Заключване Name[ca]=Lock +Name[ca@valencia]=Lock Name[cs]=Uzamknout Name[el]=Κλειδαριά +Name[es]=Bloquear Name[et]=Lukk Name[hu]=Zárolás Name[it]=Lucchetto @@ -15,6 +17,7 @@ Name[pt]=Cadeado Name[pt_BR]=Cadeado Name[ru]=Замок +Name[sk]=Zamknúť Name[sv]=Lås Name[ug]=قۇلۇپلا Name[uk]=Замок diff -Nru calligra-2.4.0/flow/stencils/Cisco/longreach_cpe.desktop calligra-2.4.3/flow/stencils/Cisco/longreach_cpe.desktop --- calligra-2.4.0/flow/stencils/Cisco/longreach_cpe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/longreach_cpe.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=LongReach CPE Name[bg]=CPE за далечни разстояния Name[ca]=LongReach CPE +Name[ca@valencia]=LongReach CPE Name[de]=LongReach-CPE Name[el]=LongReach CPE +Name[es]=LongReach CPE Name[et]=LongReach CPE Name[it]=LongReach CPE Name[kk]=LongReach CPE @@ -14,6 +16,7 @@ Name[pt]=CPE LongoAlcance Name[pt_BR]=CPE de longo alcance Name[ru]=LongReach CPE +Name[sk]=LongReach CPE Name[sv]=Kundlokalenhet med lång räckvidd Name[uk]=LongReach CPE Name[x-test]=xxLongReach CPExx diff -Nru calligra-2.4.0/flow/stencils/Cisco/macintosh.desktop calligra-2.4.3/flow/stencils/Cisco/macintosh.desktop --- calligra-2.4.0/flow/stencils/Cisco/macintosh.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/macintosh.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Macintosh Name[bg]=Macintosh Name[ca]=Macintosh +Name[ca@valencia]=Macintosh Name[cs]=Macintosh Name[de]=Macintosh Name[el]=Macintosh @@ -18,6 +19,7 @@ Name[pt]=Macintosh Name[pt_BR]=Macintosh Name[ru]=Макинтош +Name[sk]=Macintosh Name[sv]=Macintosh Name[ug]=Macintosh Name[uk]=Macintosh diff -Nru calligra-2.4.0/flow/stencils/Cisco/mac_woman.desktop calligra-2.4.3/flow/stencils/Cisco/mac_woman.desktop --- calligra-2.4.0/flow/stencils/Cisco/mac_woman.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mac_woman.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Mac Woman Name[bg]=Жена Mac Name[ca]=Dona Mac +Name[ca@valencia]=Dona Mac Name[de]=Mac-Woman Name[el]=Mac Woman Name[es]=Mujer Mac @@ -15,6 +16,7 @@ Name[pt]=Mulher Mac Name[pt_BR]=Mulher Mac Name[ru]=Женщина, работающая на Макинтоше +Name[sk]=Mac žena Name[sv]=Mac-kvinna Name[uk]=Жінка за Mac Name[x-test]=xxMac Womanxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mac_woman_right.desktop calligra-2.4.3/flow/stencils/Cisco/mac_woman_right.desktop --- calligra-2.4.0/flow/stencils/Cisco/mac_woman_right.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mac_woman_right.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Sitting Woman right Name[ca]=Dona asseguda dreta +Name[ca@valencia]=Dona asseguda dreta Name[el]=Sitting Woman right +Name[es]=Mujer sentada derecha Name[et]=Paremal istuv naine Name[it]=Donna seduta (destra) Name[kk]=Оң жақта отырған әйел @@ -11,6 +13,7 @@ Name[pt]=Mulher Sentada direita Name[pt_BR]=Mulher sentada direita Name[ru]=Сидящая женщина (в право) +Name[sk]=Sediaca žena vpravo Name[sv]=Sittande kvinna till höger Name[uk]=Жінка, що сидить (праворуч) Name[x-test]=xxSitting Woman rightxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/man_blue.desktop calligra-2.4.3/flow/stencils/Cisco/man_blue.desktop --- calligra-2.4.0/flow/stencils/Cisco/man_blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/man_blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=Man blue Name[ca]=Home blau +Name[ca@valencia]=Home blau Name[el]=Άνδρας μπλε +Name[es]=Hombre azul Name[et]=Sinine mees +Name[fi]=Mies, sininen Name[it]=Uomo blu Name[kk]=Көк адам Name[nb]=Mann blå @@ -12,6 +15,7 @@ Name[pt]=Homem azul Name[pt_BR]=Homem azul Name[ru]=Человек синего цвета +Name[sk]=Muž modrý Name[sv]=Man blå Name[uk]=Чоловік (синім) Name[x-test]=xxMan bluexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/man.desktop calligra-2.4.3/flow/stencils/Cisco/man.desktop --- calligra-2.4.0/flow/stencils/Cisco/man.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/man.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=Man Name[bg]=Мъж Name[ca]=Home +Name[ca@valencia]=Home Name[cs]=Muž Name[de]=Mann Name[el]=Άνδρας +Name[es]=Hombre Name[et]=Mees +Name[fi]=Mies Name[it]=Uomo Name[kk]=Адам Name[nb]=Mann @@ -15,6 +18,7 @@ Name[pt]=Homem Name[pt_BR]=Homem Name[ru]=Человек +Name[sk]=Muž Name[sv]=Man Name[uk]=Чоловік Name[x-test]=xxManxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/man_gold.desktop calligra-2.4.3/flow/stencils/Cisco/man_gold.desktop --- calligra-2.4.0/flow/stencils/Cisco/man_gold.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/man_gold.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=Man gold Name[ca]=Home daurat +Name[ca@valencia]=Home daurat Name[el]=Άνδρας χρυσός +Name[es]=Hombre dorado Name[et]=Kuldne mees +Name[fi]=Mies, keltainen Name[it]=Uomo dorato Name[kk]=Алтын адам Name[nb]=Mann gull @@ -11,6 +14,7 @@ Name[pt]=Homem dourado Name[pt_BR]=Homem dourado Name[ru]=Человек золотого цвета +Name[sk]=Muž zlatý Name[sv]=Man gyllene Name[uk]=Чоловік (золотавим) Name[x-test]=xxMan goldxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/man_red.desktop calligra-2.4.3/flow/stencils/Cisco/man_red.desktop --- calligra-2.4.0/flow/stencils/Cisco/man_red.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/man_red.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=Man red Name[ca]=Home vermell +Name[ca@valencia]=Home roig Name[el]=Άνδρας κόκκινος +Name[es]=Hombre rojo Name[et]=Punane mees +Name[fi]=Mies, punainen Name[it]=Uomo rosso Name[kk]=Қызыл адам Name[nb]=Mann rød @@ -11,6 +14,7 @@ Name[pt]=Homem vermelho Name[pt_BR]=Homem vermelho Name[ru]=Человек красного цвета +Name[sk]=Muž červený Name[sv]=Man röd Name[uk]=Чоловік (червоним) Name[x-test]=xxMan redxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/man_woman.desktop calligra-2.4.3/flow/stencils/Cisco/man_woman.desktop --- calligra-2.4.0/flow/stencils/Cisco/man_woman.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/man_woman.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=Man/Woman Name[bg]=Мъж/Жена Name[ca]=Home/Dona +Name[ca@valencia]=Home/Dona Name[de]=Mann/Frau Name[el]=Άνδρας/Γυναίκα +Name[es]=Hombre/Mujer Name[et]=Mees/naine +Name[hu]=Férfi/Nő Name[it]=Uomo/Donna Name[kk]=Еркек/Әйел Name[nb]=Mann/kvinne @@ -14,6 +17,7 @@ Name[pt]=Homem/Mulher Name[pt_BR]=Homem/Mulher Name[ru]=Мужчина/Женщина +Name[sk]=Muž/žena Name[sv]=Man/kvinna Name[uk]=Чоловік/Жінка Name[x-test]=xxMan/Womanxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mas_gateway.desktop calligra-2.4.3/flow/stencils/Cisco/mas_gateway.desktop --- calligra-2.4.0/flow/stencils/Cisco/mas_gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mas_gateway.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=MAS Gateway Name[bg]=Шлюз MAS Name[ca]=Passarel·la MAS +Name[ca@valencia]=Passarel·la MAS Name[de]=MAS-Gateway Name[el]=MAS Gateway +Name[es]=Pasarela MAS Name[et]=MAS lüüs Name[it]=Gateway MAS Name[kk]=MAS шлюзі @@ -14,6 +16,7 @@ Name[pt]='Gateway' MAS Name[pt_BR]=Gateway MAS Name[ru]=Шлюз MAS +Name[sk]=MAS brána Name[sv]=MAS-förmedlingsnod Name[uk]=Шлюз MAS Name[x-test]=xxMAS Gatewayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mau.desktop calligra-2.4.3/flow/stencils/Cisco/mau.desktop --- calligra-2.4.0/flow/stencils/Cisco/mau.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mau.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=MAU Name[bg]=MAU Name[ca]=MAU +Name[ca@valencia]=MAU Name[de]=MAU Name[el]=MAU +Name[es]=MAU Name[et]=MAU +Name[hu]=MAU Name[it]=MAU Name[kk]=MAU Name[nb]=MAU diff -Nru calligra-2.4.0/flow/stencils/Cisco/mcu.desktop calligra-2.4.3/flow/stencils/Cisco/mcu.desktop --- calligra-2.4.0/flow/stencils/Cisco/mcu.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mcu.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=MCU Name[bg]=MCU Name[ca]=MCU +Name[ca@valencia]=MCU Name[de]=MCU Name[el]=MCU +Name[es]=MCU Name[et]=MCU +Name[hu]=MCU Name[it]=MCU Name[kk]=MCU Name[nb]=MCU diff -Nru calligra-2.4.0/flow/stencils/Cisco/mdu.desktop calligra-2.4.3/flow/stencils/Cisco/mdu.desktop --- calligra-2.4.0/flow/stencils/Cisco/mdu.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mdu.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=MDU Name[bg]=MDU Name[ca]=MDU +Name[ca@valencia]=MDU Name[de]=MDU Name[el]=MDU +Name[es]=MDU Name[et]=MDU +Name[hu]=MDU Name[it]=MDU Name[kk]=MDU Name[nb]=MDU diff -Nru calligra-2.4.0/flow/stencils/Cisco/me1100.desktop calligra-2.4.3/flow/stencils/Cisco/me1100.desktop --- calligra-2.4.0/flow/stencils/Cisco/me1100.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/me1100.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=ME 1100 Name[bg]=ME 1100 Name[ca]=ME 1100 +Name[ca@valencia]=ME 1100 Name[de]=ME 1100 Name[el]=ME 1100 +Name[es]=ME 1100 Name[et]=ME 1100 +Name[hu]=ME 1100 Name[it]=ME 1100 Name[kk]=ME 1100 Name[nb]=ME 1100 diff -Nru calligra-2.4.0/flow/stencils/Cisco/medium_building_blue.desktop calligra-2.4.3/flow/stencils/Cisco/medium_building_blue.desktop --- calligra-2.4.0/flow/stencils/Cisco/medium_building_blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/medium_building_blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Medium Building blue Name[ca]=Edifici mitjà blau +Name[ca@valencia]=Edifici mitjà blau Name[el]=Μεσαίου μεγέθους κτήριο μπλε +Name[es]=Edificio medio azul Name[et]=Sinine keskmine hoone Name[it]=Edificio medio blu Name[kk]=Орташа көк ғимарат @@ -11,6 +13,7 @@ Name[pt]=Edifício Médio azul Name[pt_BR]=Edifício médio azul Name[ru]=Среднее строение синее +Name[sk]=Stredná budova modrá Name[sv]=Medelstor byggnad blå Name[uk]=Середня будівля (синім) Name[x-test]=xxMedium Building bluexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/medium_building.desktop calligra-2.4.3/flow/stencils/Cisco/medium_building.desktop --- calligra-2.4.0/flow/stencils/Cisco/medium_building.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/medium_building.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Medium Building Name[ca]=Edifici mitjà +Name[ca@valencia]=Edifici mitjà Name[el]=Μεσαίου μεγέθους κτήριο +Name[es]=Edificio medio Name[et]=Keskmine hoone Name[it]=Edificio medio Name[kk]=Орташа ғимарат @@ -11,6 +13,7 @@ Name[pt]=Edifício Médio Name[pt_BR]=Edifício médio Name[ru]=Среднее строение +Name[sk]=Stredná budova Name[sv]=Medelstor byggnad Name[uk]=Середня будівля Name[x-test]=xxMedium Buildingxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/medium_building_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/medium_building_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/medium_building_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/medium_building_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Medium Building subdued Name[ca]=Edifici mitjà suavitzat +Name[ca@valencia]=Edifici mitjà suavitzat Name[el]=Μεσαίου μεγέθους κτήριο υποτονικό +Name[es]=Edificio medio poco activo Name[et]=Toonita keskmine hoone Name[kk]=Басыңқы орташа ғимарат Name[nb]=Middels bygning dempet @@ -10,6 +12,7 @@ Name[pt]=Edifício Médio ultrapassado Name[pt_BR]=Edifício médio ultrapassado Name[ru]=Среднее строение приглушённое +Name[sk]=Stredná budova tlmená Name[sv]=Medelstor byggnad diskret Name[uk]=Середня будівля (притлумлено) Name[x-test]=xxMedium Building subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/metro1500.desktop calligra-2.4.3/flow/stencils/Cisco/metro1500.desktop --- calligra-2.4.0/flow/stencils/Cisco/metro1500.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/metro1500.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=Metro 1500 Name[bg]=Metro 1500 Name[ca]=Metro 1500 +Name[ca@valencia]=Metro 1500 Name[de]=Metro 1500 Name[el]=Metro 1500 +Name[es]=Metro 1500 Name[et]=Metro 1500 +Name[hu]=Metro 1500 Name[it]=Metro 1500 Name[kk]=Metro 1500 Name[nb]=Metro 1500 @@ -14,6 +17,7 @@ Name[pt]=Metro 1500 Name[pt_BR]=Metro 1500 Name[ru]=Metro 1500 +Name[sk]=Metro 1500 Name[sv]=Metro 1500 Name[uk]=Metro 1500 Name[x-test]=xxMetro 1500xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop calligra-2.4.3/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop --- calligra-2.4.0/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mgx_8000_series_voice_gateway.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=MGX 8000 Series Voice Gateway Name[ca]=MGX 8000 Series Voice Gateway +Name[ca@valencia]=MGX 8000 Series Voice Gateway Name[el]=Πύλη φωνητικής επικοινωνίας MGX 8000 +Name[es]=Pasarela de voz MGX 8000 Series Name[et]=MGX 8000 seeria kõnelüüs Name[it]=Voice Gateway Serie MGX 8000 Name[kk]=MGX 8000 сериялы телефон шлюзі @@ -11,6 +13,7 @@ Name[pt]='Gateway' Voz Série MGX 8000 Name[pt_BR]=Gateway' de voz série MGX 8000 Name[ru]=Голосовой шлюз серий MGX 8000 +Name[sk]=MGX 8000 Series Voice Gateway Name[sv]=Serie MGX-8000 röstförmedlingsnod Name[uk]=Голосовий шлюз серії MGX 8000 Name[x-test]=xxMGX 8000 Series Voice Gatewayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mgx8220.desktop calligra-2.4.3/flow/stencils/Cisco/mgx8220.desktop --- calligra-2.4.0/flow/stencils/Cisco/mgx8220.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mgx8220.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=MGX 8220 Name[bg]=MGX 8220 Name[ca]=MGX 8220 +Name[ca@valencia]=MGX 8220 Name[de]=MGX 8220 Name[el]=MGX 8220 +Name[es]=MGX 8220 Name[et]=MGX 8220 +Name[hu]=MGX 8220 Name[it]=MGX 8220 Name[kk]=MGX 8220 Name[nb]=MGX 8220 diff -Nru calligra-2.4.0/flow/stencils/Cisco/mgx8240.desktop calligra-2.4.3/flow/stencils/Cisco/mgx8240.desktop --- calligra-2.4.0/flow/stencils/Cisco/mgx8240.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mgx8240.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=MGX 8240 Name[bg]=MGX 8240 Name[ca]=MGX 8240 +Name[ca@valencia]=MGX 8240 Name[de]=MGX 8240 Name[el]=MGX 8240 +Name[es]=MGX 8240 Name[et]=MGX 8240 +Name[hu]=MGX 8240 Name[it]=MGX 8240 Name[kk]=MGX 8240 Name[nb]=MGX 8240 diff -Nru calligra-2.4.0/flow/stencils/Cisco/mgx8260.desktop calligra-2.4.3/flow/stencils/Cisco/mgx8260.desktop --- calligra-2.4.0/flow/stencils/Cisco/mgx8260.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mgx8260.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=MGX 8260 Name[bg]=MGX 8260 Name[ca]=MGX 8260 +Name[ca@valencia]=MGX 8260 Name[de]=MGX 8260 Name[el]=MGX 8260 +Name[es]=MGX 8260 Name[et]=MGX 8260 +Name[hu]=MGX 8260 Name[it]=MGX 8260 Name[kk]=MGX 8260 Name[nb]=MGX 8260 diff -Nru calligra-2.4.0/flow/stencils/Cisco/microphone.desktop calligra-2.4.3/flow/stencils/Cisco/microphone.desktop --- calligra-2.4.0/flow/stencils/Cisco/microphone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/microphone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Microphone Name[bg]=Микрофон Name[ca]=Micròfon +Name[ca@valencia]=Micròfon Name[cs]=Mikrofon Name[de]=Mikrophon Name[el]=Μικρόφωνο Name[es]=Micrófono Name[et]=Mikrofon +Name[hu]=Mikrofon Name[it]=Microfono Name[kk]=Микрофон Name[nb]=Mikrofon @@ -16,6 +18,7 @@ Name[pt]=Microfone Name[pt_BR]=Microfone Name[ru]=Микрофон +Name[sk]=Mikrofón Name[sv]=mikrofon Name[ug]=مىكروفون Name[uk]=Мікрофон diff -Nru calligra-2.4.0/flow/stencils/Cisco/microwebserver.desktop calligra-2.4.3/flow/stencils/Cisco/microwebserver.desktop --- calligra-2.4.0/flow/stencils/Cisco/microwebserver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/microwebserver.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=MicroWebserver Name[bg]=Микро web-сървър Name[ca]=MicroWebserver +Name[ca@valencia]=MicroWebserver Name[de]=MicroWebserver Name[el]=MicroWebserver +Name[es]=Micro servidor web Name[et]=Mikroveebiserver Name[it]=MicroWebserver Name[kk]=Микровебсервер diff -Nru calligra-2.4.0/flow/stencils/Cisco/mini_vax.desktop calligra-2.4.3/flow/stencils/Cisco/mini_vax.desktop --- calligra-2.4.0/flow/stencils/Cisco/mini_vax.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mini_vax.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=Mini VAX Name[bg]=Mini VAX Name[ca]=Mini VAX +Name[ca@valencia]=Mini VAX Name[de]=Mini VAX Name[el]=Mini VAX +Name[es]=Mini VAX Name[et]=Mini VAX +Name[hu]=Mini VAX Name[it]=Mini VAX Name[kk]=Mini VAX Name[nb]=Mini VAX @@ -13,6 +16,7 @@ Name[pt]=Mini VAX Name[pt_BR]=Mini VAX Name[ru]=Mini VAX +Name[sk]=Mini VAX Name[sv]=Mini-VAX Name[uk]=Mini VAX Name[x-test]=xxMini VAXxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mobile_access_ip_phone.desktop calligra-2.4.3/flow/stencils/Cisco/mobile_access_ip_phone.desktop --- calligra-2.4.0/flow/stencils/Cisco/mobile_access_ip_phone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mobile_access_ip_phone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Mobile Access IP Phone Name[ca]=Mobile Access IP Phone +Name[ca@valencia]=Mobile Access IP Phone Name[el]=Ασύρματο IP τηλέφωνο +Name[es]=Teléfono IP de acceso móvil Name[et]=Mobile Access IP-telefon Name[it]=Telefono IP accesso mobile Name[kk]=Мобайл қатынау IP телефоны @@ -11,6 +13,7 @@ Name[pt]=Telefone IP Acesso Móvel Name[pt_BR]=Telefone IP de acesso móvel Name[ru]=IP телефон мобильного доступа +Name[sk]=Mobile Access IP Phone Name[sv]=Mobil åtkomst IP-telefon Name[uk]=IP-телефон з мобільним доступом Name[x-test]=xxMobile Access IP Phonexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mobile_access_router.desktop calligra-2.4.3/flow/stencils/Cisco/mobile_access_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/mobile_access_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mobile_access_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Mobile Access Router Name[ca]=Encaminador d'accés mòbil +Name[ca@valencia]=Encaminador d'accés mòbil Name[el]=Ασύρματος δρομολογητής +Name[es]=Encaminador de acceso móvil Name[et]=Mobile Access marsruuter Name[it]=Mobile Access Router Name[kk]=Мобайл қатынау IP маршрутауышы @@ -11,6 +13,7 @@ Name[pt]=Encaminhador Acesso Móvel Name[pt_BR]=Roteador de acesso móvel Name[ru]=Маршрутизатор мобильного доступа +Name[sk]=Router mobilného prístupu Name[sv]=Mobil åtkomstrouter Name[uk]=Маршрутизатор мобільного доступу Name[x-test]=xxMobile Access Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/modem.desktop calligra-2.4.3/flow/stencils/Cisco/modem.desktop --- calligra-2.4.0/flow/stencils/Cisco/modem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/modem.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=Modem Name[bg]=Модем Name[ca]=Mòdem +Name[ca@valencia]=Mòdem Name[cs]=Modem Name[de]=Modem Name[el]=Modem Name[es]=Módem Name[et]=Modem Name[fi]=Modeemi +Name[gl]=Módem Name[hu]=Modem Name[it]=Modem Name[kk]=Модем diff -Nru calligra-2.4.0/flow/stencils/Cisco/moh_server.desktop calligra-2.4.3/flow/stencils/Cisco/moh_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/moh_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/moh_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=MoH server (Music on Hold) Name[bg]=Сървър MoH (Music on Hold) Name[ca]=MoH server (Music on Hold) +Name[ca@valencia]=MoH server (Music on Hold) Name[de]=MoH-Server (Music-on-Hold) Name[el]=MoH server (Music on Hold) +Name[es]=Servidor MoH (Music on Hold) Name[et]=MoH server (Music on Hold) Name[it]=Server MoH (Musica d'attesa) Name[kk]=MoH (Music on Hold) сервері @@ -13,6 +15,7 @@ Name[pt]=Servidor MoH (Música em Espera) Name[pt_BR]=Servidor MoH (música em espera) Name[ru]=MoH сервер (музыка во время задержки) +Name[sk]=MoH server (Music on Hold) Name[sv]=Musikserver (väntande musik) Name[uk]=Сервер MoH (Music on Hold) Name[x-test]=xxMoH server (Music on Hold)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/monitor.desktop calligra-2.4.3/flow/stencils/Cisco/monitor.desktop --- calligra-2.4.0/flow/stencils/Cisco/monitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/monitor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Monitor Name[bg]=Монитор Name[ca]=Monitor +Name[ca@valencia]=Monitor Name[cs]=Monitor Name[de]=Monitor Name[el]=Οθόνη @@ -16,6 +17,7 @@ Name[pt]=Monitor Name[pt_BR]=Monitor Name[ru]=Монитор +Name[sk]=Monitor Name[sv]=Bildskärm Name[ug]=ئېكران Name[uk]=Монітор diff -Nru calligra-2.4.0/flow/stencils/Cisco/multi-fabric_server_switch.desktop calligra-2.4.3/flow/stencils/Cisco/multi-fabric_server_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/multi-fabric_server_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/multi-fabric_server_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Multi-Fabric Server Switch Name[ca]=Commutador de servidor multifabricant +Name[ca@valencia]=Commutador de servidor multifabricant Name[el]=Multi-Fabric Server Switch +Name[es]=Conmutador servidor Multi-Fabric Name[et]=Mitmiktarindserveri kommutaator Name[it]=Multi-Fabric Server Switch Name[kk]=Multi-Fabric сервер қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador Servidor Multi-Material Name[pt_BR]=Comutador servidor multi-material Name[ru]=Сервер коммутации Multi-Fabric +Name[sk]=Multi-Fabric Server Switch Name[sv]=Flernätverks-serverväxel Name[uk]=Сервер комутації Multi-Fabric Name[x-test]=xxMulti-Fabric Server Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/multilayer_remote_switch.desktop calligra-2.4.3/flow/stencils/Cisco/multilayer_remote_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/multilayer_remote_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/multilayer_remote_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Multilayer Remote Switch Name[ca]=Commutador remota multicapa +Name[ca@valencia]=Commutador remota multicapa Name[el]=Πολυεπίπεδος απομακρυσμένος μεταγωγέας +Name[es]=Conmutador multicapa remoto Name[et]=Mitmekihiline kaugkommutaator Name[it]=Switch remoto multilayer Name[kk]=Көпқабатты қашық қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador Remoto Multi-Nível Name[pt_BR]=Comutador remoto multi-camada Name[ru]=Многоуровневый удалённый коммутатор +Name[sk]=Viacvrstvový vzdialený prepínač Name[sv]=Flerlagers-fjärrväxel Name[uk]=Віддалений багаторівневий комутатор Name[x-test]=xxMultilayer Remote Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/multilayer_switch.desktop calligra-2.4.3/flow/stencils/Cisco/multilayer_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/multilayer_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/multilayer_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Multilayer switch Name[bg]=Многослоен комутатор Name[ca]=Commutador multicapa +Name[ca@valencia]=Commutador multicapa Name[de]=Multilayer-Switch Name[el]=Πολυεπίπεδος μεταγωγέας +Name[es]=Conmutador multicapa Name[et]=Mitmekihiline kommutaator Name[it]=Switch multilayer Name[kk]=Көпқабатты қосқышы @@ -14,6 +16,7 @@ Name[pt]=Comutador Multi-Nível Name[pt_BR]=Comutador multi-camada Name[ru]=Многоуровневый коммутатор +Name[sk]=Viacvrstvový prepínač Name[sv]=Flerlagersväxel Name[uk]=Багаторівневий комутатор Name[x-test]=xxMultilayer switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop calligra-2.4.3/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop --- calligra-2.4.0/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/multilayer_switch_with_silicon.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Multilayer Switch with Silicon Name[ca]=Commutador multicapa amb silici +Name[ca@valencia]=Commutador multicapa amb silici Name[el]=Multilayer Switch with Silicon +Name[es]=Conmutador multicapa con silicio Name[et]=Mitmekihiline kommutaator räniga Name[it]=Switch multilayer con silicio Name[kk]=Silicon-ды қолдайтын қөпқабатты қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador Multi-Nível com Silício Name[pt_BR]=Comutador multi-camada com silício Name[ru]=Многоуровневый коммутатор с поддержкой Silicon +Name[sk]=Viacvrstvový prepínač s kremíkom Name[sv]=Flerlagersväxel med kisel Name[uk]=Багаторівневий комутатор з підтримкою Silicon Name[x-test]=xxMultilayer Switch with Siliconxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/multilayer_switch_with_silicon_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Multilayer Switch with Silicon subdued Name[ca]=Commutador multicapa amb silici suavitzat +Name[ca@valencia]=Commutador multicapa amb silici suavitzat Name[el]=Multilayer Switch with Silicon subdued +Name[es]=Conmutador multicapa poco activo con silicio Name[et]=Toonita mitmekihiline kommutaator räniga Name[kk]=Silicon-ны басыңқы қөпқабатты қосқышы Name[nb]=Flerlags-svitsj med Silicon, dempet @@ -10,6 +12,7 @@ Name[pt]=Comutador Multi-Nível com Silício ultrapassado Name[pt_BR]=Comutador multi-camada com silício ultrapassado Name[ru]=Многоуровневый коммутатор с поддержкой Silicon приглушённый +Name[sk]=Viacvrstvový prepínač s kremíkom tlmený Name[sv]=Flerlagersväxel med kisel diskret Name[uk]=Багаторівневий комутатор з підтримкою Silicon (притлумлено) Name[x-test]=xxMultilayer Switch with Silicon subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/multiswitch_device.desktop calligra-2.4.3/flow/stencils/Cisco/multiswitch_device.desktop --- calligra-2.4.0/flow/stencils/Cisco/multiswitch_device.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/multiswitch_device.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=MultiSwitch Device Name[bg]=Многокомутиращо устройство Name[ca]=Aparell multicommutador +Name[ca@valencia]=Aparell multicommutador Name[de]=MultiSwitch-Gerät Name[el]=MultiSwitch Device +Name[es]=Dispositivo Multiconmutador Name[et]=MultiSwitch seade Name[it]=Dispositivo multiswitch Name[kk]=Көпқосқыш құрылғысы @@ -13,6 +15,7 @@ Name[pt]=Dispositivo MultiSwitch Name[pt_BR]=Dispositivo multi-comutador Name[ru]=Устройство множественной коммутации +Name[sk]=Zariadenie viacnásobného prepínača Name[sv]=Flerväxelenhet Name[uk]=Пристрій мультикомутації Name[x-test]=xxMultiSwitch Devicexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/mux.desktop calligra-2.4.3/flow/stencils/Cisco/mux.desktop --- calligra-2.4.0/flow/stencils/Cisco/mux.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/mux.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=MUX Name[bg]=MUX Name[ca]=MUX +Name[ca@valencia]=MUX Name[de]=MUX Name[el]=MUX +Name[es]=MUX Name[et]=MUX Name[fi]=MUX +Name[hu]=MUX Name[it]=MUX Name[kk]=MUX Name[nb]=MUX diff -Nru calligra-2.4.0/flow/stencils/Cisco/nat.desktop calligra-2.4.3/flow/stencils/Cisco/nat.desktop --- calligra-2.4.0/flow/stencils/Cisco/nat.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/nat.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=NAT Name[bg]=NAT Name[ca]=NAT +Name[ca@valencia]=NAT Name[cs]=NAT Name[de]=NAT Name[el]=NAT Name[es]=NAT Name[et]=NAT Name[fi]=NAT +Name[hu]=NAT Name[it]=NAT Name[kk]=NAT Name[nb]=NAT diff -Nru calligra-2.4.0/flow/stencils/Cisco/netflow_router.desktop calligra-2.4.3/flow/stencils/Cisco/netflow_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/netflow_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/netflow_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=NetFlow router Name[bg]=Маршрутизатор NetFlow Name[ca]=Encaminador NetFlow +Name[ca@valencia]=Encaminador NetFlow Name[de]=NetFlow-Router Name[el]=Δρομολογητής NetFlow +Name[es]=Encaminador NetFlow Name[et]=NetFlow marsruuter Name[fi]=NetFlow-reititin Name[it]=Router NetFlow @@ -15,6 +17,7 @@ Name[pt]=Comutador NetFlow Name[pt_BR]=Roteador NetFlow Name[ru]=Маршрутизатор NetFlow +Name[sk]=NetFlow router Name[sv]=Nätflödesrouter Name[uk]=Маршрутизатор NetFlow Name[x-test]=xxNetFlow routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/netranger.desktop calligra-2.4.3/flow/stencils/Cisco/netranger.desktop --- calligra-2.4.0/flow/stencils/Cisco/netranger.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/netranger.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=NetRanger Name[bg]=NetRanger Name[ca]=NetRanger +Name[ca@valencia]=NetRanger Name[de]=NetRanger Name[el]=NetRanger +Name[es]=NetRanger Name[et]=NetRanger Name[it]=NetRanger Name[kk]=NetRanger diff -Nru calligra-2.4.0/flow/stencils/Cisco/netsonar.desktop calligra-2.4.3/flow/stencils/Cisco/netsonar.desktop --- calligra-2.4.0/flow/stencils/Cisco/netsonar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/netsonar.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=NetSonar Name[bg]=NetSonar Name[ca]=NetSonar +Name[ca@valencia]=NetSonar Name[de]=NetSonar Name[el]=NetSonar +Name[es]=NetSonar Name[et]=NetSonar Name[it]=NetSonar Name[kk]=NetSonar diff -Nru calligra-2.4.0/flow/stencils/Cisco/network_management.desktop calligra-2.4.3/flow/stencils/Cisco/network_management.desktop --- calligra-2.4.0/flow/stencils/Cisco/network_management.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/network_management.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,14 +2,16 @@ Name=Network Management Name[bg]=Управление на мрежа Name[ca]=Gestió de xarxes +Name[ca@valencia]=Gestió de xarxes Name[cs]=Správa sítě Name[de]=Netzwerkverwaltung Name[el]=Διαχείριση δικτύου -Name[es]=Gestión de red +Name[es]=Gestor de red Name[et]=Võrguhaldus Name[fi]=Verkonhallinta Name[hu]=Hálózatkezelő Name[it]=Gestione di rete +Name[ja]=ネットワーク管理 Name[kk]=Желі басқаруы Name[nb]=Nettverksstyring Name[nds]=Nettwarkpleeg @@ -18,6 +20,7 @@ Name[pt]=Gestão de Rede Name[pt_BR]=Gerenciamento de redes Name[ru]=Управление сетью +Name[sk]=Správa siete Name[sv]=Nätverkshantering Name[ug]=تور باشقۇرۇش Name[uk]=Керування мережею diff -Nru calligra-2.4.0/flow/stencils/Cisco/newton.desktop calligra-2.4.3/flow/stencils/Cisco/newton.desktop --- calligra-2.4.0/flow/stencils/Cisco/newton.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/newton.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Newton Name[ca]=Newton +Name[ca@valencia]=Newton Name[cs]=Newton Name[de]=Newton Name[el]=Newton @@ -8,6 +9,7 @@ Name[et]=Newton Name[fi]=Newton Name[fr]=Newton +Name[hu]=Newton Name[it]=Newton Name[kk]=Newton Name[nb]=Newton diff -Nru calligra-2.4.0/flow/stencils/Cisco/octel.desktop calligra-2.4.3/flow/stencils/Cisco/octel.desktop --- calligra-2.4.0/flow/stencils/Cisco/octel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/octel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Octel Name[bg]=Octel Name[ca]=Octel +Name[ca@valencia]=Octel Name[de]=Octel Name[el]=Octel +Name[es]=Octel Name[et]=Octel Name[fi]=Octel Name[it]=Octel diff -Nru calligra-2.4.0/flow/stencils/Cisco/ons15104.desktop calligra-2.4.3/flow/stencils/Cisco/ons15104.desktop --- calligra-2.4.0/flow/stencils/Cisco/ons15104.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ons15104.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=ONS15104 Name[bg]=ONS15104 Name[ca]=ONS15104 +Name[ca@valencia]=ONS15104 Name[cs]=ONS15104 Name[de]=ONS15104 Name[el]=ONS15104 +Name[es]=ONS15104 Name[et]=ONS15104 Name[fi]=ONS15104 +Name[hu]=ONS15104 Name[it]=ONS15104 Name[kk]=ONS15104 Name[nb]=ONS15104 diff -Nru calligra-2.4.0/flow/stencils/Cisco/ons15540.desktop calligra-2.4.3/flow/stencils/Cisco/ons15540.desktop --- calligra-2.4.0/flow/stencils/Cisco/ons15540.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ons15540.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=ONS15500 Name[bg]=ONS15500 Name[ca]=ONS15500 +Name[ca@valencia]=ONS15500 Name[cs]=ONS15500 Name[de]=ONS15500 Name[el]=ONS15500 +Name[es]=ONS15500 Name[et]=ONS15500 Name[fi]=ONS15500 +Name[hu]=ONS15500 Name[it]=ONS15500 Name[kk]=ONS15500 Name[nb]=ONS15500 diff -Nru calligra-2.4.0/flow/stencils/Cisco/optical_amplifier.desktop calligra-2.4.3/flow/stencils/Cisco/optical_amplifier.desktop --- calligra-2.4.0/flow/stencils/Cisco/optical_amplifier.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/optical_amplifier.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Optical Amplifier Name[bg]=Оптичен усилвател Name[ca]=Amplificador òptic +Name[ca@valencia]=Amplificador òptic Name[de]=Optischer Verstärker Name[el]=Οπτικός ενισχυτής +Name[es]=Amplificador óptico Name[et]=Optiline võimendi Name[it]=Amplificatore ottico Name[kk]=Оптикалық күшейткіші @@ -14,6 +16,7 @@ Name[pt]=Amplificador Óptico Name[pt_BR]=Amplificador ótico Name[ru]=Оптический усилитель +Name[sk]=Optický zosilňovač Name[sv]=Optisk förstärkare Name[uk]=Оптичний підсилювач Name[x-test]=xxOptical Amplifierxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/optical_cross-connect.desktop calligra-2.4.3/flow/stencils/Cisco/optical_cross-connect.desktop --- calligra-2.4.0/flow/stencils/Cisco/optical_cross-connect.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/optical_cross-connect.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Optical Cross-Connect Name[ca]=Connexió creuada òptica +Name[ca@valencia]=Connexió creuada òptica Name[el]=Οπτικό Cross-Connect +Name[es]=Conexión en cruz óptica Name[et]=Optiline ristühendus Name[it]=Optical Cross-Connect Name[kk]=Оптикалық торабы @@ -11,6 +13,7 @@ Name[pt]=Ligação Cruzada Óptica Name[pt_BR]=Conexão cruzada ótica Name[ru]=Оптический разветвитель +Name[sk]=Optické prepojenie Name[sv]=Optisk korskoppling Name[uk]=Оптичний розгалуджувач Name[x-test]=xxOptical Cross-Connectxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/optical_fiber.desktop calligra-2.4.3/flow/stencils/Cisco/optical_fiber.desktop --- calligra-2.4.0/flow/stencils/Cisco/optical_fiber.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/optical_fiber.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Optical Fiber Name[ca]=Fibra òptica +Name[ca@valencia]=Fibra òptica Name[el]=Οπτική ίνα +Name[es]=Fibra óptica Name[et]=Optiline kaabel Name[fi]=Valokuitu Name[it]=Fibra ottica @@ -12,6 +14,7 @@ Name[pt]=Fibra Óptica Name[pt_BR]=Fibra ótica Name[ru]=Оптическая линия +Name[sk]=Optické vlákno Name[sv]=Optisk fiber Name[uk]=Оптичне волокно Name[x-test]=xxOptical Fiberxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/optical_services_router.desktop calligra-2.4.3/flow/stencils/Cisco/optical_services_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/optical_services_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/optical_services_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Optical Services Router Name[bg]=Маршрутизатор за оптични услуги Name[ca]=Encaminador òptic de serveis +Name[ca@valencia]=Encaminador òptic de serveis Name[de]=Router für optische Dienste Name[el]=Δρομολογητής οπτικών υπηρεσιών +Name[es]=Encaminador de servicios ópticos Name[et]=Optiliste teenuste marsruuter Name[it]=Optical Services Router Name[kk]=Оптикалық қызметтер маршруттауышы @@ -14,6 +16,7 @@ Name[pt]=Encaminhamento Serviços Ópticos Name[pt_BR]=Roteador de serviços óticos Name[ru]=Маршрутизатор оптического транспорта +Name[sk]=Router optických služieb Name[sv]=Optisk tjänstrouter Name[uk]=Маршрутизатор оптичних служб Name[x-test]=xxOptical Services Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/optical_transport.desktop calligra-2.4.3/flow/stencils/Cisco/optical_transport.desktop --- calligra-2.4.0/flow/stencils/Cisco/optical_transport.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/optical_transport.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Optical Transport Name[bg]=Оптичен пренос Name[ca]=Transport òptic +Name[ca@valencia]=Transport òptic Name[de]=Optische Übertragung Name[el]=Οπτική μεταφορά +Name[es]=Transporte óptico Name[et]=Optiline side Name[it]=Trasporto ottico Name[kk]=Оптикалық тасымал @@ -13,6 +15,7 @@ Name[pt]=Transporte Óptico Name[pt_BR]=Transporte Ótico Name[ru]=Оптический транспорт +Name[sk]=Optický prenos Name[sv]=Optisk överföring Name[uk]=Оптичний передача Name[x-test]=xxOptical Transportxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pad.desktop calligra-2.4.3/flow/stencils/Cisco/pad.desktop --- calligra-2.4.0/flow/stencils/Cisco/pad.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pad.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=PAD X.28 Name[bg]=PAD X.28 Name[ca]=PAD X.28 +Name[ca@valencia]=PAD X.28 Name[de]=PAD X.28 Name[el]=PAD X.28 +Name[es]=PAD X.28 Name[et]=PAD X.28 Name[fi]=PAD X.28 +Name[hu]=PAD X.28 Name[it]=PAD X.28 Name[kk]=PAD X.28 Name[nb]=PAD X.28 diff -Nru calligra-2.4.0/flow/stencils/Cisco/pager.desktop calligra-2.4.3/flow/stencils/Cisco/pager.desktop --- calligra-2.4.0/flow/stencils/Cisco/pager.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pager.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Pager Name[bg]=Пейджър Name[ca]=Paginador +Name[ca@valencia]=Paginador Name[cs]=Přepínač ploch Name[el]=Pager +Name[es]=Buscapersonas Name[et]=Peiler Name[ga]=Brabhsálaí Leathanach Name[hu]=Csipogó diff -Nru calligra-2.4.0/flow/stencils/Cisco/pbx.desktop calligra-2.4.3/flow/stencils/Cisco/pbx.desktop --- calligra-2.4.0/flow/stencils/Cisco/pbx.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pbx.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=PBX Name[bg]=PBX Name[ca]=PBX +Name[ca@valencia]=PBX Name[de]=PBX Name[el]=PBX +Name[es]=PBX Name[et]=PBX +Name[hu]=PBX Name[it]=PBX Name[kk]=PBX Name[nb]=PBX diff -Nru calligra-2.4.0/flow/stencils/Cisco/pbx_switch.desktop calligra-2.4.3/flow/stencils/Cisco/pbx_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/pbx_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pbx_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=PBX Switch Name[bg]=Комутатор PBX Name[ca]=PBX Switch +Name[ca@valencia]=PBX Switch Name[de]=PBX-Switch Name[el]=Μεταγωγέας PBX +Name[es]=Conmutador PBX Name[et]=PBX kommutaator +Name[hu]=PBX Switch Name[it]=PBX Switch Name[kk]=PBX қосқышы Name[nb]=PBX-svitsj @@ -14,6 +17,7 @@ Name[pt]=Comutador PBX Name[pt_BR]=Comutador PBX Name[ru]=Коммутатор PBX +Name[sk]=PBX Switch Name[sv]=Publik telefoniväxel Name[uk]=Комутатор PBX Name[x-test]=xxPBX Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_adapter_card.desktop calligra-2.4.3/flow/stencils/Cisco/pc_adapter_card.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_adapter_card.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_adapter_card.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=PC Adapter Card Name[bg]=Адаптерна карта за PC Name[ca]=Targeta adaptadora de PC +Name[ca@valencia]=Targeta adaptadora de PC Name[de]=PC-Adapterkarte Name[el]=PC Adapter Card +Name[es]=Tarjeta adaptadora PC Name[et]=PC adapter Name[it]=PC Adattarore Name[kk]=ДК адаптер тақшасы @@ -14,6 +16,7 @@ Name[pt]=Placa Adaptadora PC Name[pt_BR]=Placa para PC Name[ru]=Плата адаптера для ПК +Name[sk]=PC Adapter karta Name[sv]=Anpassningskort för persondator Name[uk]=Плата адаптера для ПК Name[x-test]=xxPC Adapter Cardxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_card.desktop calligra-2.4.3/flow/stencils/Cisco/pc_card.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_card.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_card.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=PC Card Name[ca]=Targeta PC +Name[ca@valencia]=Targeta PC Name[cs]=PC Card Name[de]=PC-Karte Name[el]=PC Card +Name[es]=Tarjeta PC Name[et]=PC kaart Name[it]=Scheda PC Name[kk]=ДК тақшасы @@ -13,6 +15,7 @@ Name[pt]=Placa PC Name[pt_BR]=Placa PC Name[ru]=Плата для ПК +Name[sk]=PC karta Name[sv]=Persondatorkort Name[uk]=Картка для ПК Name[x-test]=xxPC Cardxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc.desktop calligra-2.4.3/flow/stencils/Cisco/pc.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=PC Name[bg]=Компютър Name[ca]=PC +Name[ca@valencia]=PC Name[cs]=PC Name[de]=PC Name[el]=PC +Name[es]=PC Name[et]=PC Name[fr]=PC +Name[hu]=PC Name[it]=PC Name[kk]=ДК Name[nb]=PC diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_man.desktop calligra-2.4.3/flow/stencils/Cisco/pc_man.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_man.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_man.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=PC Man Name[bg]=Човек PC Name[ca]=Home PC +Name[ca@valencia]=Home PC Name[de]=PC-Man Name[el]=PC Man +Name[es]=Hombre PC Name[et]=PC-mees Name[it]=PC Uomo Name[kk]=ДК-дегі адам @@ -13,6 +15,7 @@ Name[pt]=Homem PC Name[pt_BR]=Homem PC Name[ru]=Человек за персональным компьютером +Name[sk]=PC Man Name[sv]=Persondatorman Name[uk]=Чоловік за ПК Name[x-test]=xxPC Manxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_man_left.desktop calligra-2.4.3/flow/stencils/Cisco/pc_man_left.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_man_left.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_man_left.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=PC Man left Name[ca]=Home amb PC esquerra +Name[ca@valencia]=Home amb PC esquerra Name[el]=PC Man left +Name[es]=Hombre PC izquierda Name[et]=PC-mees vasakul Name[it]=PC Uomo (sinistra) Name[kk]=ДК сол жағындағы адам @@ -11,6 +13,7 @@ Name[pt]=Homem PC esquerda Name[pt_BR]=Homem PC esquerda Name[ru]=Человек за персональным компьютером (левый) +Name[sk]=PC muž vľavo Name[sv]=Persondatorman vänster Name[uk]=Чоловік за ПК (ліворуч) Name[x-test]=xxPC Man leftxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_router_card.desktop calligra-2.4.3/flow/stencils/Cisco/pc_router_card.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_router_card.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_router_card.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=PC Router Card Name[bg]=Маршрутизираща карта за PC Name[ca]=Targeta encaminadora per a PC +Name[ca@valencia]=Targeta encaminadora per a PC Name[de]=PC-Router-Karte Name[el]=PC Router Card +Name[es]=Tarjeta encaminador PC Name[et]=PC marsruuteri kaart Name[it]=PC Scheda router Name[kk]=ДК маршруттауыш тақшасы @@ -14,6 +16,7 @@ Name[pt]=Cartão Encaminhamento PC Name[pt_BR]=Placa de roteador PC Name[ru]=Плата маршрутизатора для ПК +Name[sk]=PC Router karta Name[sv]=Routerkort för persondator Name[uk]=Картка маршрутизатора для ПК Name[x-test]=xxPC Router Cardxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_software.desktop calligra-2.4.3/flow/stencils/Cisco/pc_software.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_software.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_software.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=PC Software Name[ca]=Programari per a PC +Name[ca@valencia]=Programari per a PC Name[de]=PC-Software Name[el]=PC Software +Name[es]=Software PC Name[et]=PC tarkvara Name[it]=PC Software Name[kk]=ДК бағдарламалық құралы @@ -13,6 +15,7 @@ Name[pt]='Software' para PC Name[pt_BR]=Software para PC Name[ru]=Программное обеспечение для ПК +Name[sk]=PC softvér Name[sv]=Programvara för persondator Name[uk]=Програмне забезпечення ПК Name[x-test]=xxPC Softwarexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_video.desktop calligra-2.4.3/flow/stencils/Cisco/pc_video.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_video.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_video.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=PC Video Name[bg]=Видео PC Name[ca]=Vídeo PC +Name[ca@valencia]=Vídeo PC Name[de]=PC-Video Name[el]=PC Video +Name[es]=Vídeo PC Name[et]=PC Video Name[it]=PC Video Name[kk]=ДК видео diff -Nru calligra-2.4.0/flow/stencils/Cisco/pc_with_router-based_software.desktop calligra-2.4.3/flow/stencils/Cisco/pc_with_router-based_software.desktop --- calligra-2.4.0/flow/stencils/Cisco/pc_with_router-based_software.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pc_with_router-based_software.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=PC with Router-Based Software Name[ca]=PC amb programari encaminador +Name[ca@valencia]=PC amb programari encaminador Name[el]=PC με λογισμικό δρομολόγησης +Name[es]=PC con software de encaminador Name[et]=PC ruuteripõhise tarkvaraga Name[it]=PC con software per il routing Name[kk]=Маршрутауыш негізінде бағдарламалы ДК @@ -11,6 +13,7 @@ Name[pt]=PC com 'Software' Encaminhador Name[pt_BR]=PC com software de roteamento Name[ru]=ПК с софтовым маршрутизатором +Name[sk]=PC s Router-Based Software Name[sv]=Persondator med routerbaserad programvara Name[uk]=ПК з програмним забезпеченням на основі маршрутизатора Name[x-test]=xxPC with Router-Based Softwarexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pda.desktop calligra-2.4.3/flow/stencils/Cisco/pda.desktop --- calligra-2.4.0/flow/stencils/Cisco/pda.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pda.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=PDA Name[bg]=PDA Name[ca]=PDA +Name[ca@valencia]=PDA Name[cs]=PDA Name[de]=PDA Name[el]=PDA Name[es]=PDA Name[et]=PDA Name[fr]=PDA +Name[hu]=PDA Name[it]=PDA Name[kk]=PDA Name[nb]=PDA diff -Nru calligra-2.4.0/flow/stencils/Cisco/phone_2.desktop calligra-2.4.3/flow/stencils/Cisco/phone_2.desktop --- calligra-2.4.0/flow/stencils/Cisco/phone_2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/phone_2.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=Phone 2 Name[bg]=Телефон 2 Name[ca]=Telèfon 2 +Name[ca@valencia]=Telèfon 2 Name[cs]=Telefon 2 Name[de]=Telefon 2 Name[el]=Τηλέφωνο 2 +Name[es]=Teléfono 2 Name[et]=Telefon 2 Name[it]=Telefono 2 Name[kk]=2-телефон @@ -15,6 +17,7 @@ Name[pt]=Telefone 2 Name[pt_BR]=Telefone 2 Name[ru]=Телефон 2 +Name[sk]=Telefón 2 Name[sv]=Telefon 2 Name[uk]=Телефон 2 Name[x-test]=xxPhone 2xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/phone_appliance.desktop calligra-2.4.3/flow/stencils/Cisco/phone_appliance.desktop --- calligra-2.4.0/flow/stencils/Cisco/phone_appliance.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/phone_appliance.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Phone Appliance Name[ca]=Aplicació de telèfon +Name[ca@valencia]=Aplicació de telèfon Name[el]=Τηλεφωνική συσκευή +Name[es]=Dispositivo telefónico Name[et]=Telefoniseade Name[it]=Apparato telefonico Name[kk]=Телефон аппараты @@ -11,6 +13,7 @@ Name[pt]=Aplicação Telefónica Name[pt_BR]=Aparelho de telefone Name[ru]=Устройство телефона +Name[sk]=Telefónny spotrebič Name[sv]=Telefonapparat Name[uk]=Прилад телефону Name[x-test]=xxPhone Appliancexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/phone.desktop calligra-2.4.3/flow/stencils/Cisco/phone.desktop --- calligra-2.4.0/flow/stencils/Cisco/phone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/phone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=Phone Name[bg]=Телефон Name[ca]=Telèfon +Name[ca@valencia]=Telèfon Name[cs]=Telefon Name[de]=Telefon Name[el]=Τηλέφωνο +Name[es]=Teléfono Name[et]=Telefon Name[ga]=Fón Name[hu]=Telefon @@ -17,6 +19,7 @@ Name[pt]=Telefone Name[pt_BR]=Telefone Name[ru]=Телефон +Name[sk]=Telefón Name[sv]=Telefon Name[ug]=تېلېفون Name[uk]=Телефон diff -Nru calligra-2.4.0/flow/stencils/Cisco/phone_ethernet.desktop calligra-2.4.3/flow/stencils/Cisco/phone_ethernet.desktop --- calligra-2.4.0/flow/stencils/Cisco/phone_ethernet.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/phone_ethernet.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Phone Ethernet Name[ca]=Telèfon Ethernet +Name[ca@valencia]=Telèfon Ethernet Name[el]=Phone Ethernet +Name[es]=Teléfono ethernet Name[et]=Telefoni-Ethernet Name[it]=Telefono Ethernet Name[kk]=Телефон Ethernet-ті @@ -11,6 +13,7 @@ Name[pt]=Telefone Ethernet Name[pt_BR]=Telefone Ethernet Name[ru]=Сеть телефона +Name[sk]=Telefónny ethernet Name[sv]=Telefon Ethernet Name[uk]=Мережа телефону Name[x-test]=xxPhone Ethernetxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/phone_fax.desktop calligra-2.4.3/flow/stencils/Cisco/phone_fax.desktop --- calligra-2.4.0/flow/stencils/Cisco/phone_fax.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/phone_fax.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=Phone/Fax Name[bg]=Телефон/Факс Name[ca]=Telèfon/Fax +Name[ca@valencia]=Telèfon/Fax Name[de]=Telefon/Fax Name[el]=Τηλέφωνο/Φαξ +Name[es]=Teléfono/Fax Name[et]=Telefon/faks +Name[hu]=Telefon/fax Name[it]=Telefono/Fax Name[kk]=Тел./Факс Name[nb]=Telefon/faks @@ -14,6 +17,7 @@ Name[pt]=Telefone/Fax Name[pt_BR]=Telefone/Fax Name[ru]=Телефон/Факс +Name[sk]=Telefón/fax Name[sv]=Telefon/telefax Name[uk]=Телефакс Name[x-test]=xxPhone/Faxxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/phone_feature.desktop calligra-2.4.3/flow/stencils/Cisco/phone_feature.desktop --- calligra-2.4.0/flow/stencils/Cisco/phone_feature.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/phone_feature.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Phone Feature Name[ca]=Característica de telèfon +Name[ca@valencia]=Característica de telèfon Name[el]=Χαρακτηριστικό τηλεφώνου +Name[es]=Funcionalidad del teléfono Name[et]=Lihtne telefon Name[it]=Funzionalità telefono Name[kk]=Телефон мүмкіншілігі @@ -11,6 +13,7 @@ Name[pt]=Funcionalidade Telefone Name[pt_BR]=Funcionalidade de telefone Name[ru]=Дополнение телефона +Name[sk]=Telefónna funkcia Name[sv]=Telefonfunktion Name[uk]=Додатки телефону Name[x-test]=xxPhone Featurexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pix_firewall.desktop calligra-2.4.3/flow/stencils/Cisco/pix_firewall.desktop --- calligra-2.4.0/flow/stencils/Cisco/pix_firewall.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pix_firewall.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=PIX Firewall Name[bg]=Защитна стена PIX Name[ca]=Tallafocs PIX +Name[ca@valencia]=Tallafocs PIX Name[de]=PIX-Firewall Name[el]=PIX Firewall +Name[es]=Cortafuegos PIX Name[et]=PIX tulemüür +Name[hu]=PIX tűzfal Name[it]=Firewall PIX Name[kk]=PIX желіаралық қалқаны Name[nb]=PIX brannmur @@ -14,6 +17,7 @@ Name[pt]='Firewall' PIX Name[pt_BR]=Firewall PIX Name[ru]=Защитный экран PIX +Name[sk]=PIX Firewall Name[sv]=PIX-brandvägg Name[uk]=Брандмауер PIX Name[x-test]=xxPIX Firewallxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pix_firewall_left.desktop calligra-2.4.3/flow/stencils/Cisco/pix_firewall_left.desktop --- calligra-2.4.0/flow/stencils/Cisco/pix_firewall_left.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pix_firewall_left.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=PIX Firewall Left Name[ca]=Tallafocs PIX esquerra +Name[ca@valencia]=Tallafocs PIX esquerra Name[el]=PIX Firewall Left +Name[es]=Cortafuegos PIX izquierda Name[et]=PIX tulemüür vasakul Name[it]=Firewall PIX (sinistra) Name[kk]=Сол жақ PIX желіаралық қалқаны @@ -11,6 +13,7 @@ Name[pt]='Firewall' PIX Esquerda Name[pt_BR]=Firewall PIX esquerda Name[ru]=Защитный экран PIX левый +Name[sk]=PIX Firewall vľavo Name[sv]=PIX-brandvägg vänster Name[uk]=Брандмауер PIX (ліворуч) Name[x-test]=xxPIX Firewall Leftxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/printer.desktop calligra-2.4.3/flow/stencils/Cisco/printer.desktop --- calligra-2.4.0/flow/stencils/Cisco/printer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/printer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Printer Name[bg]=Принтер Name[ca]=Impressora +Name[ca@valencia]=Impressora Name[cs]=Tiskárna Name[de]=Drucker Name[el]=Εκτυπωτής @@ -10,6 +11,7 @@ Name[fr]=Imprimante Name[hu]=Nyomtató Name[it]=Stampante +Name[ja]=プリンタ Name[kk]=Принтер Name[nb]=Skriver Name[nds]=Drucker @@ -18,6 +20,7 @@ Name[pt]=Impressora Name[pt_BR]=Impressora Name[ru]=Принтер +Name[sk]=Tlačiareň Name[sv]=Skrivare Name[ug]=پرىنتېر Name[uk]=Принтер diff -Nru calligra-2.4.0/flow/stencils/Cisco/programmable_switch.desktop calligra-2.4.3/flow/stencils/Cisco/programmable_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/programmable_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/programmable_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Programmable Switch Name[bg]=Програмируем комутатор Name[ca]=Commutador programable +Name[ca@valencia]=Enrutador programable Name[de]=Programmierbarer Switch Name[el]=Programmable Switch +Name[es]=Conmutador programable Name[et]=Programmeeritav kommutaator Name[it]=Switch programmabile Name[kk]=Бағдарламаулы қосқыш @@ -14,6 +16,7 @@ Name[pt]=Comutador Programável Name[pt_BR]=Comutador programável Name[ru]=Программируемый коммутатор +Name[sk]=Programovateľný prepínač Name[sv]=Programmerbar växel Name[uk]=Програмований комутатор Name[x-test]=xxProgrammable Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/protocol_translator.desktop calligra-2.4.3/flow/stencils/Cisco/protocol_translator.desktop --- calligra-2.4.0/flow/stencils/Cisco/protocol_translator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/protocol_translator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Protocol Translator Name[bg]=Преобразувател на протокол Name[ca]=Traductor de protocol +Name[ca@valencia]=Traductor de protocol Name[el]=Μεταφραστής πρωτοκόλλου +Name[es]=Traductor de protocolo Name[et]=Protokolli translaator Name[it]=Traduttore di protocollo Name[kk]=Протокол аударғышы @@ -13,6 +15,7 @@ Name[pt]=Tradutor de Protocolos Name[pt_BR]=Tradutor de Protocolos Name[ru]=Преобразователь протокола +Name[sk]=Prekladač protokolu Name[sv]=Protokollöversättare Name[uk]=Транслятор протоколу Name[x-test]=xxProtocol Translatorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/pxf.desktop calligra-2.4.3/flow/stencils/Cisco/pxf.desktop --- calligra-2.4.0/flow/stencils/Cisco/pxf.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/pxf.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=PXF Name[bg]=PXF Name[ca]=PXF +Name[ca@valencia]=PXF Name[de]=PXF Name[el]=PXF +Name[es]=PXF Name[et]=PXF +Name[hu]=PXF Name[it]=PXF Name[kk]=PXF Name[nb]=PXF diff -Nru calligra-2.4.0/flow/stencils/Cisco/radio_tower.desktop calligra-2.4.3/flow/stencils/Cisco/radio_tower.desktop --- calligra-2.4.0/flow/stencils/Cisco/radio_tower.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/radio_tower.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Radio Tower Name[bg]=Радиокула Name[ca]=Torre de ràdio +Name[ca@valencia]=Torre de ràdio Name[de]=Funkturm Name[el]=Ραδιοφωνικός πύργος +Name[es]=Torre de radio Name[et]=Raadiotorn Name[it]=Ponte radio Name[kk]=Радиомұнара @@ -14,6 +16,7 @@ Name[pt]=Torre Rádio Name[pt_BR]=Torre de rádio Name[ru]=Радиовышка +Name[sk]=Rádiová veža Name[sv]=Radiotorn Name[uk]=Радіовежа Name[x-test]=xxRadio Towerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/ratemux.desktop calligra-2.4.3/flow/stencils/Cisco/ratemux.desktop --- calligra-2.4.0/flow/stencils/Cisco/ratemux.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ratemux.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=RateMUX Name[bg]=RateMUX Name[ca]=RateMUX +Name[ca@valencia]=RateMUX Name[de]=RateMUX Name[el]=RateMUX +Name[es]=Tasa de MUX Name[et]=RateMUX Name[it]=RateMUX Name[kk]=RateMUX @@ -14,6 +16,7 @@ Name[pt]=RateMUX Name[pt_BR]=RateMUX Name[ru]=RateMUX +Name[sk]=RateMUX Name[sv]=Hastighetsmultiplexer Name[uk]=RateMUX Name[x-test]=xxRateMUXxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/relational_database.desktop calligra-2.4.3/flow/stencils/Cisco/relational_database.desktop --- calligra-2.4.0/flow/stencils/Cisco/relational_database.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/relational_database.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Relational Database Name[bg]=Релационна база от данни Name[ca]=Base de dades relacional +Name[ca@valencia]=Base de dades relacional Name[de]=Relationale Datenbank Name[el]=Σχεσιακή βάση δεδομένων Name[es]=Base de datos relacional @@ -15,6 +16,7 @@ Name[pt]=Base de Dados Relacional Name[pt_BR]=Banco de dados relacional Name[ru]=Реляционная база данных +Name[sk]=Relačná databáza Name[sv]=Relationsdatabas Name[uk]=Реляційна база даних Name[x-test]=xxRelational Databasexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/repeater.desktop calligra-2.4.3/flow/stencils/Cisco/repeater.desktop --- calligra-2.4.0/flow/stencils/Cisco/repeater.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/repeater.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Repeater Name[bg]=Повторител Name[ca]=Repetidor +Name[ca@valencia]=Repetidor Name[cs]=Opakovač Name[de]=Repeater Name[el]=Επαναλήπτης @@ -17,6 +18,7 @@ Name[pt]=Repetidor Name[pt_BR]=Repetidor Name[ru]=Повторитель +Name[sk]=Opakovač Name[sv]=Repeterare Name[uk]=Повторювач Name[x-test]=xxRepeaterxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/router.desktop calligra-2.4.3/flow/stencils/Cisco/router.desktop --- calligra-2.4.0/flow/stencils/Cisco/router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/router.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,12 +1,14 @@ [Desktop Entry] Name=Router Name[ca]=Encaminador +Name[ca@valencia]=Encaminador Name[cs]=Router Name[de]=Router Name[el]=Δρομολογητής Name[es]=Enrutador Name[et]=Ruuter Name[fi]=Reititin +Name[gl]=Router Name[hu]=Router Name[it]=Router Name[kk]=Маршруттауыш diff -Nru calligra-2.4.0/flow/stencils/Cisco/router_in_building.desktop calligra-2.4.3/flow/stencils/Cisco/router_in_building.desktop --- calligra-2.4.0/flow/stencils/Cisco/router_in_building.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/router_in_building.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Router in building Name[bg]=Маршрутизатор в сграда Name[ca]=Encaminador en edifici +Name[ca@valencia]=Encaminador en edifici Name[el]=Δρομολογητής σε κτήριο +Name[es]=Enrutador en edificio Name[et]=Marsruuter hoones Name[it]=Edificio con router Name[kk]=Ғимараттағы маршруттауыш @@ -13,6 +15,7 @@ Name[pt]=Encaminhador em edifício Name[pt_BR]=Roteador em edifício Name[ru]=Маршрутизатор в здании +Name[sk]=Router v budove Name[sv]=Router i byggnad Name[uk]=Маршрутизатор в будівлі Name[x-test]=xxRouter in buildingxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/router_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/router_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/router_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/router_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Router subdued Name[ca]=Encaminador suavitzat +Name[ca@valencia]=Encaminador suavitzat Name[el]=Δρομολογητής υποτονικός +Name[es]=Enrutador poco activo Name[et]=Toonita marsruuter Name[kk]=Басыңқы маршруттауыш Name[nb]=Ruter dempet @@ -10,6 +12,7 @@ Name[pt]=Encaminhador ultrapassado Name[pt_BR]=Roteador ultrapassado Name[ru]=Маршрутизатор приглушённый +Name[sk]=Router tlmený Name[sv]=Router diskret Name[uk]=Маршрутизатор (притлумлено) Name[x-test]=xxRouter subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/router_with_firewall.desktop calligra-2.4.3/flow/stencils/Cisco/router_with_firewall.desktop --- calligra-2.4.0/flow/stencils/Cisco/router_with_firewall.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/router_with_firewall.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=Router with Firewall Name[bg]=Маршрутизатор със защитна стена Name[ca]=Encaminador amb tallafocs +Name[ca@valencia]=Encaminador amb tallafocs Name[cs]=Router s firewallem Name[de]=Router mit Firewall Name[el]=Δρομολογητής με τείχος προστασίας +Name[es]=Enrutador con cortafuegos Name[et]=Tulemüüriga ruuter Name[fr]=Routeur avec pare-feu Name[hu]=Router tűzfallal @@ -17,6 +19,7 @@ Name[pt]=Encaminhador com 'Firewall' Name[pt_BR]=Roteador com Firewall Name[ru]=Маршрутизатор с защитным сетевым экраном +Name[sk]=Router s firewallom Name[sv]=Router med brandvägg Name[uk]=Маршрутизатор з брандмауером Name[x-test]=xxRouter with Firewallxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/router_with_silicon_switch.desktop calligra-2.4.3/flow/stencils/Cisco/router_with_silicon_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/router_with_silicon_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/router_with_silicon_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Router with Silicon Switch Name[bg]=Маршрутизатор с комутатор Silicon Name[ca]=Encaminador amb commutador de silici +Name[ca@valencia]=Encaminador amb commutador de silici Name[el]=Δρομολογητής με Silicon Switch +Name[es]=Enrutador con conmutador de silicio Name[et]=Marsruuter ränikommutaatoriga Name[it]=Router con switch al silicio Name[kk]=Маршруттауыш Silicon қосқышымен @@ -13,6 +15,7 @@ Name[pt]=Encaminhador com Comutação Silício Name[pt_BR]=Roteador com comutador Silicon Name[ru]=Маршрутизатор с коммутатором Silicon +Name[sk]=Router s kremíkovým prepínačom Name[sv]=Router med kiselväxel Name[uk]=Маршрутизатор з комутатором Silicon Name[x-test]=xxRouter with Silicon Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/route_switch_processor.desktop calligra-2.4.3/flow/stencils/Cisco/route_switch_processor.desktop --- calligra-2.4.0/flow/stencils/Cisco/route_switch_processor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/route_switch_processor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Route Switch Processor Name[bg]=Процесор за комутиране на маршрути Name[ca]=Processador de commutació de rutes +Name[ca@valencia]=Processador de commutació de rutes Name[de]=Router-Switch-Prozessor Name[el]=Επεξεργαστής δρομολόγησης +Name[es]=Procesador de conmutación de rutas Name[et]=Marsruuter-kommutaatori protsessor Name[it]=Route Switch Processor Name[kk]=Маршруттауыш қосқыш процесоры @@ -14,6 +16,7 @@ Name[pt]=Processador Comutação Redes Name[pt_BR]=Processador de comutação de rotas Name[ru]=Обработчик переключения маршрутизации +Name[sk]=Procesor prepínača trasy Name[sv]=Linjeväxelprocessor Name[uk]=Процесор комутації маршрутів Name[x-test]=xxRoute Switch Processorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/route_switch_processor_with_si.desktop calligra-2.4.3/flow/stencils/Cisco/route_switch_processor_with_si.desktop --- calligra-2.4.0/flow/stencils/Cisco/route_switch_processor_with_si.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/route_switch_processor_with_si.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Route Switch Processor with Si Name[ca]=Processador de commutació de rutes amb Si +Name[ca@valencia]=Processador de commutació de rutes amb Si Name[el]=Επεξεργαστής δρομολόγησης με Si +Name[es]=Procesador de conmutación de rutas con Silicio Name[et]=Marsruuter-kommutaatori protsessor räniga Name[it]=Route Switch Processor con Si Name[kk]=Si-ді қолдайтын маршруттауыш қосқыш процесоры @@ -11,6 +13,7 @@ Name[pt]=Processador Comutação Redes com Si Name[pt_BR]=Processador de comutação de rotas com Si Name[ru]=Обработчик переключения маршрутизации с поддержкой Si +Name[sk]=Procesor prepínača trasy s Si Name[sv]=Linjeväxelprocessor med kisel Name[uk]=Процесор комутації маршрутів з підтримкою Si Name[x-test]=xxRoute Switch Processor with Sixx diff -Nru calligra-2.4.0/flow/stencils/Cisco/rps.desktop calligra-2.4.3/flow/stencils/Cisco/rps.desktop --- calligra-2.4.0/flow/stencils/Cisco/rps.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/rps.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=RPS Name[bg]=RPS Name[ca]=RPS +Name[ca@valencia]=RPS Name[de]=RPS Name[el]=RPS +Name[es]=RPS Name[et]=RPS +Name[hu]=RPS Name[it]=RPS Name[kk]=RPS Name[nb]=RPS diff -Nru calligra-2.4.0/flow/stencils/Cisco/running_man.desktop calligra-2.4.3/flow/stencils/Cisco/running_man.desktop --- calligra-2.4.0/flow/stencils/Cisco/running_man.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/running_man.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Running man Name[bg]=Тичащ мъж Name[ca]=Home corrent +Name[ca@valencia]=Home corrent Name[de]=Laufender Mann Name[el]=Running man +Name[es]=Hombre corriendo Name[et]=Jooksev mees Name[it]=Uomo che corre Name[kk]=Жүгіруші @@ -14,6 +16,7 @@ Name[pt]=Homem a correr Name[pt_BR]=Homem correndo Name[ru]=Бегущий человек +Name[sk]=Bežiaci muž Name[sv]=Springande man Name[uk]=Чоловік, що біжить Name[x-test]=xxRunning manxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/running_man_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/running_man_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/running_man_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/running_man_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Running man subdued Name[ca]=Home corrent suavitzat +Name[ca@valencia]=Home corrent suavitzat Name[el]=Running man subdued +Name[es]=Hombre corriendo poco activo Name[et]=Toonita jooksev mees Name[kk]=Басыңқы жүгіруші Name[nb]=Løpende mann dempet @@ -10,6 +12,7 @@ Name[pt]=Homem a correr ultrapassado Name[pt_BR]=Homem correndo ultrapassado Name[ru]=Бегущий человек приглушённый +Name[sk]=Bežiaci človek tlmený Name[sv]=Springande man diskret Name[uk]=Жінка, що біжить (притлумлено) Name[x-test]=xxRunning man subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/running_woman.desktop calligra-2.4.3/flow/stencils/Cisco/running_woman.desktop --- calligra-2.4.0/flow/stencils/Cisco/running_woman.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/running_woman.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Running woman Name[bg]=Тичаща жена Name[ca]=Dona corrent +Name[ca@valencia]=Dona corrent Name[el]=Running woman +Name[es]=Mujer corriendo Name[et]=Jooksev naine Name[it]=Donna che corre Name[kk]=Жүгіруші әйел @@ -13,6 +15,7 @@ Name[pt]=Mulher a correr Name[pt_BR]=Mulher correndo Name[ru]=Бегущая женщина +Name[sk]=Bežiaca žena Name[sv]=Springande kvinna Name[uk]=Жінка, що біжить Name[x-test]=xxRunning womanxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/satellite.desktop calligra-2.4.3/flow/stencils/Cisco/satellite.desktop --- calligra-2.4.0/flow/stencils/Cisco/satellite.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/satellite.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=Satellite Name[bg]=Спътник Name[ca]=Satèl·lit +Name[ca@valencia]=Satèl·lit Name[cs]=Satelit Name[de]=Satellit Name[el]=Δορυφόρος +Name[es]=Satélite Name[et]=Satelliit Name[it]=Satellite Name[kk]=Жерсерік @@ -14,6 +16,7 @@ Name[pt]=Satélite Name[pt_BR]=Satélite Name[ru]=Спутник +Name[sk]=Satelit Name[sv]=Satellit Name[ug]=سۈنئىي ھەمراھ Name[uk]=Супутник diff -Nru calligra-2.4.0/flow/stencils/Cisco/satellite_dish.desktop calligra-2.4.3/flow/stencils/Cisco/satellite_dish.desktop --- calligra-2.4.0/flow/stencils/Cisco/satellite_dish.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/satellite_dish.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Satellite dish Name[bg]=Сателитна чиния Name[ca]=Plat satèl·lit +Name[ca@valencia]=Plat satèl·lit Name[de]=Satellitenschüssel Name[el]=Δορυφορικό πιάτο +Name[es]=Disco de satélite Name[et]=Satelliiditaldrik Name[it]=Parabola Name[kk]=Жерсерік табақшасы @@ -14,6 +16,7 @@ Name[pt]=Prato de satélite Name[pt_BR]=Prato do satélite Name[ru]=Спутниковая тарелка +Name[sk]=Satelitný tanier Name[sv]=Satellitparabol Name[uk]=Супутникова тарілка Name[x-test]=xxSatellite dishxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/sc2200.desktop calligra-2.4.3/flow/stencils/Cisco/sc2200.desktop --- calligra-2.4.0/flow/stencils/Cisco/sc2200.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/sc2200.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=SC2200 (Signalling Controller) Name[bg]=SC2200 (контролер за сигнализация) Name[ca]=SC2200 (Signalling Controller) +Name[ca@valencia]=SC2200 (Signalling Controller) Name[de]=SC2200 (Signalregler) Name[el]=SC2200 (ελεγκτής σήματος) +Name[es]=SC2200 (controlador de señales) Name[et]=SC2200 (signaalikontroller) Name[it]=SC2200 (controllo di segnalazione) Name[kk]=SC2200 (сигнал контроллері) @@ -14,6 +16,7 @@ Name[pt]=SC2200 (Controlador de Sinais) Name[pt_BR]=SC2200 (Controlador de Sinalização) Name[ru]=SC2200 (Сигнальный Контроллер) +Name[sk]=SC2200 (Signalling Controller) Name[sv]=SC2200 (signalstyrenhet) Name[uk]=SC2200 (сигнальний контролер) Name[x-test]=xxSC2200 (Signalling Controller)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/sc2200_vsc3000_host.desktop calligra-2.4.3/flow/stencils/Cisco/sc2200_vsc3000_host.desktop --- calligra-2.4.0/flow/stencils/Cisco/sc2200_vsc3000_host.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/sc2200_vsc3000_host.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=SC2200/VSC3000 host Name[bg]=Хост SC2200/VSC3000 Name[ca]=SC2200/VSC3000 host +Name[ca@valencia]=SC2200/VSC3000 host Name[de]=SC2200/VSC3000-Rechner Name[el]=SC2200/VSC3000 host +Name[es]=Servidor SC2200/VSC3000 Name[et]=SC2200/VSC3000 masin Name[it]=SC2200/VSC3000 host Name[kk]=SC2200/VSC3000 хосты @@ -14,6 +16,7 @@ Name[pt]=Máquina SC2200/VSC3000 Name[pt_BR]=máquina SC2200/VSC3000 Name[ru]=Узел SC2200/VSC3000 +Name[sk]=SC2200/VSC3000 host Name[sv]=SC2200/VSC3000-värddator Name[uk]=Вузол SC2200/VSC3000 Name[x-test]=xxSC2200/VSC3000 hostxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/scanner.desktop calligra-2.4.3/flow/stencils/Cisco/scanner.desktop --- calligra-2.4.0/flow/stencils/Cisco/scanner.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/scanner.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Scanner Name[bg]=Скенер Name[ca]=Escànner +Name[ca@valencia]=Escànner Name[cs]=Skener Name[de]=Scanner Name[el]=Σαρωτής +Name[es]=Escáner Name[et]=Skanner Name[ga]=Scanóir +Name[hu]=Szkenner Name[it]=Scanner Name[kk]=Сканер Name[nb]=Skanner @@ -15,6 +18,7 @@ Name[pt]=Digitalizador Name[pt_BR]=Digitalizador Name[ru]=Сканер +Name[sk]=Skener Name[sv]=Bildläsare Name[ug]=سايلىغۇچ Name[uk]=Сканер diff -Nru calligra-2.4.0/flow/stencils/Cisco/security_appliance.desktop calligra-2.4.3/flow/stencils/Cisco/security_appliance.desktop --- calligra-2.4.0/flow/stencils/Cisco/security_appliance.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/security_appliance.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Security appliance Name[ca]=Aplicació de seguretat +Name[ca@valencia]=Aplicació de seguretat Name[el]=Συσκευή ασφάλειας +Name[es]=Dispositivo de seguridad Name[et]=Turbeseade Name[it]=Apparato di sicurezza Name[kk]=Қауіпсіздік жабдығы @@ -11,6 +13,7 @@ Name[pt]=Aplicação de segurança Name[pt_BR]=Aplicação de segurança Name[ru]=Устройство безопасности +Name[sk]=Bezpečnostný prostriedok Name[sv]=Säkerhetsapparat Name[uk]=Пристрій захисту Name[x-test]=xxSecurity appliancexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/server_switch.desktop calligra-2.4.3/flow/stencils/Cisco/server_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/server_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/server_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Server Switch Name[ca]=Commutador de servidor +Name[ca@valencia]=Commutador de servidor Name[el]=Server Switch +Name[es]=Conmutador servidor Name[et]=Serveri kommutaator Name[it]=Server Switch Name[kk]=Сервер қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador de Servidor Name[pt_BR]=Comutador de servidor Name[ru]=Сервер с маршрутизатором +Name[sk]=Serverový prepínač Name[sv]=Serverväxel Name[uk]=Сервер з маршрутизатором Name[x-test]=xxServer Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/server_with_pc_router.desktop calligra-2.4.3/flow/stencils/Cisco/server_with_pc_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/server_with_pc_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/server_with_pc_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Server with PC Router Name[bg]=Сървър с PC-маршрутизатор Name[ca]=Servidor amb encaminador de PC +Name[ca@valencia]=Servidor amb encaminador de PC Name[el]=Εξυπηρετητής με PC δρομολογητή +Name[es]=Servidor con enrutador PC Name[et]=Server PC marsruuteriga Name[it]=Server con PC Router Name[kk]=Сервер ДК маршруттауышымен @@ -13,6 +15,7 @@ Name[pt]=Servidor com Encaminhador PC Name[pt_BR]=Servidor com roteador PC Name[ru]=Сервер с маршрутизатором на ПК +Name[sk]=Server s PC routerom Name[sv]=Server med persondatorrouter Name[uk]=Сервер з ПК-маршрутизатором Name[x-test]=xxServer with PC Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/service_control.desktop calligra-2.4.3/flow/stencils/Cisco/service_control.desktop --- calligra-2.4.0/flow/stencils/Cisco/service_control.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/service_control.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Service Control Name[ca]=Control de servei +Name[ca@valencia]=Control de servei Name[el]=Service Control +Name[es]=Control de servicio Name[et]=Teenuste haldur Name[it]=Controllo di servizio Name[kk]=Қызмет басқаруы @@ -11,6 +13,7 @@ Name[pt]=Controlo de Serviços Name[pt_BR]=Controle de serviço Name[ru]=Обслуживающая точка +Name[sk]=Ovládač služby Name[sv]=Tjänststyrning Name[uk]=Точка обслуговування Name[x-test]=xxService Controlxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/sip_proxy_server.desktop calligra-2.4.3/flow/stencils/Cisco/sip_proxy_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/sip_proxy_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/sip_proxy_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=SIP Proxy server Name[bg]=Сървър-посредник SIP Name[ca]=Servidor proxy SIP +Name[ca@valencia]=Servidor proxy SIP Name[de]=SIP-Proxy-Server Name[el]=Ενδιάμεσος εξυπηρετητής SIP +Name[es]=Servidor proxy SIP Name[et]=SIP puhverserver Name[it]=SIP Proxy server Name[kk]=SIP прокси сервері @@ -14,6 +16,7 @@ Name[pt]=Servidor 'proxy' SIP Name[pt_BR]=Servidor 'Proxy' SIP Name[ru]=Прокси-сервер SIP +Name[sk]=SIP Proxy server Name[sv]=SIP-proxyserver Name[uk]=Проксі-сервер SIP Name[x-test]=xxSIP Proxy serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/sitting_woman.desktop calligra-2.4.3/flow/stencils/Cisco/sitting_woman.desktop --- calligra-2.4.0/flow/stencils/Cisco/sitting_woman.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/sitting_woman.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Sitting woman Name[bg]=Седяща жена Name[ca]=Dona asseguda +Name[ca@valencia]=Dona asseguda Name[de]=Sitzende Frau Name[el]=Sitting woman +Name[es]=Mujer sentada Name[et]=Istuv naine Name[it]=Donna seduta Name[kk]=Отырған әйел diff -Nru calligra-2.4.0/flow/stencils/Cisco/small_business.desktop calligra-2.4.3/flow/stencils/Cisco/small_business.desktop --- calligra-2.4.0/flow/stencils/Cisco/small_business.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/small_business.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Small Business Name[bg]=Малък бизнес Name[ca]=Petit negoci +Name[ca@valencia]=Petit negoci Name[el]=Μικρή επιχείρηση +Name[es]=Empresa pequeña Name[et]=Väikeettevõte Name[it]=Piccola azienda Name[kk]=Шағын іскерлік @@ -13,6 +15,7 @@ Name[pt]=Micro-Negócios Name[pt_BR]=Pequenos Negócios Name[ru]=Малый бизнес +Name[sk]=Small Business Name[sv]=Småföretag Name[uk]=Невеликий бізнес Name[x-test]=xxSmall Businessxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/small_hub.desktop calligra-2.4.3/flow/stencils/Cisco/small_hub.desktop --- calligra-2.4.0/flow/stencils/Cisco/small_hub.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/small_hub.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Small hub Name[bg]=Малък хъб Name[ca]=Petit concentrador +Name[ca@valencia]=Petit concentrador Name[de]=Kleiner Hub Name[el]=Μικρός αναμεταδότης +Name[es]=Concentrador pequeño Name[et]=Väike jaotur Name[it]=Hub piccolo Name[kk]=Кіші хаб @@ -14,6 +16,7 @@ Name[pt]=Concentrador pequeno Name[pt_BR]=Concentrador pequeno Name[ru]=Маленький повторитель +Name[sk]=Malý hub Name[sv]=Litet nätnav Name[uk]=Маленький концентратор Name[x-test]=xxSmall hubxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/softphone.desktop calligra-2.4.3/flow/stencils/Cisco/softphone.desktop --- calligra-2.4.0/flow/stencils/Cisco/softphone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/softphone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Softphone Name[bg]=Софтуерен телефон Name[ca]=Softphone +Name[ca@valencia]=Softphone Name[de]=Softphone Name[el]=Εφαρμογή τηλεφωνίας +Name[es]=Teléfono por software Name[et]=Softphone Name[it]=Softphone Name[kk]=Бағдарламалық телефоны @@ -14,6 +16,7 @@ Name[pt]=Telefone SW Name[pt_BR]=Telefone por software Name[ru]=Программный телефон +Name[sk]=Softphone Name[sv]=Internet programvarutelefon Name[uk]=Програмний телефон Name[x-test]=xxSoftphonexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/software-based_router_on_file_server.desktop calligra-2.4.3/flow/stencils/Cisco/software-based_router_on_file_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/software-based_router_on_file_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/software-based_router_on_file_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Software based server Name[bg]=Софтуерно базиран сървър Name[ca]=Servidor basat en programari +Name[ca@valencia]=Servidor basat en programari Name[de]=Software-basierter Server Name[el]=Εξυπηρετητής με λογισμικό +Name[es]=Servidor basado en software Name[et]=Tarkvaraline server Name[it]=Server basato su software Name[kk]=Бағдарламалық сервері @@ -14,6 +16,7 @@ Name[pt]=Servidor por SW Name[pt_BR]=Servidor baseado em software Name[ru]=Софтовый сервер +Name[sk]=Softvérový server Name[sv]=Progravarubaserad server Name[uk]=Програмний сервер Name[x-test]=xxSoftware based serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/sonet_mux.desktop calligra-2.4.3/flow/stencils/Cisco/sonet_mux.desktop --- calligra-2.4.0/flow/stencils/Cisco/sonet_mux.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/sonet_mux.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,11 @@ Name=SONET MUX Name[bg]=SONET MUX Name[ca]=SONET MUX +Name[ca@valencia]=SONET MUX Name[el]=SONET MUX +Name[es]=SONET MUX Name[et]=SONET MUX +Name[hu]=SONET MUX Name[it]=SONET MUX Name[kk]=SONET MUX Name[nb]=SONET MUX @@ -12,6 +15,7 @@ Name[pt]=MUX SONET Name[pt_BR]=MUX SONET Name[ru]=Переключатель SONET +Name[sk]=SONET MUX Name[sv]=SONET-multiplexer Name[uk]=SONET MUX Name[x-test]=xxSONET MUXxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/speaker.desktop calligra-2.4.3/flow/stencils/Cisco/speaker.desktop --- calligra-2.4.0/flow/stencils/Cisco/speaker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/speaker.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=Speaker Name[bg]=Тонколона Name[ca]=Altaveu +Name[ca@valencia]=Altaveu Name[cs]=Reproduktor Name[de]=PC-Lautsprecher Name[el]=Ηχείο +Name[es]=Altavoz Name[et]=Valjuhääldi +Name[fi]=Kaiutin Name[it]=Altoparlante Name[kk]=Динамик Name[nb]=Høyttaler @@ -15,6 +18,7 @@ Name[pt]=Altifalante Name[pt_BR]=Alto-falante Name[ru]=Динамик +Name[sk]=Reproduktor Name[sv]=Högtalare Name[ug]=ياڭراتقۇ Name[uk]=Гучномовець diff -Nru calligra-2.4.0/flow/stencils/Cisco/ssl_terminator.desktop calligra-2.4.3/flow/stencils/Cisco/ssl_terminator.desktop --- calligra-2.4.0/flow/stencils/Cisco/ssl_terminator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ssl_terminator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=SSL Terminator Name[ca]=SSL Terminator +Name[ca@valencia]=SSL Terminator Name[de]=SSL-Terminator Name[el]=SSL Terminator +Name[es]=Terminador SSL Name[et]=SSL-terminaator Name[it]=Terminatore SSL Name[kk]=SSL аятауыш @@ -13,6 +15,7 @@ Name[pt]=Terminação SSL Name[pt_BR]=Terminador SSL Name[ru]=Динамик +Name[sk]=SSL terminátor Name[sv]=SSL-terminering Name[uk]=Термінатор SSL Name[x-test]=xxSSL Terminatorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/standing_man.desktop calligra-2.4.3/flow/stencils/Cisco/standing_man.desktop --- calligra-2.4.0/flow/stencils/Cisco/standing_man.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/standing_man.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Standing Man Name[bg]=Стоящ мъж Name[ca]=Home dempeus +Name[ca@valencia]=Home dempeus Name[de]=Stehender Mann Name[el]=Standing Man +Name[es]=Hombre de pie Name[et]=Seisev mees Name[it]=Uomo in piedi Name[kk]=Тұрған адам @@ -14,6 +16,7 @@ Name[pt]=Homem de Pé Name[pt_BR]=Homem de pé Name[ru]=Стоящий человек +Name[sk]=Stojaci muž Name[sv]=Stående man Name[uk]=Чоловік, що стоїть Name[x-test]=xxStanding Manxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/stb.desktop calligra-2.4.3/flow/stencils/Cisco/stb.desktop --- calligra-2.4.0/flow/stencils/Cisco/stb.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/stb.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,12 @@ [Desktop Entry] Name=STB (set top box) Name[ca]=STB (set top box) +Name[ca@valencia]=STB (set top box) Name[de]=STB (Digitalempfänger) Name[el]=STB (set top box) +Name[es]=STB (set top box) Name[et]=STB (teleriboks) +Name[hu]=STB (set top box) Name[it]=STB (set top box) Name[kk]=STB (қондырғы қорабы) Name[nb]=STB (set top box) @@ -12,6 +15,7 @@ Name[pt]=STB (caixa 'set top') Name[pt_BR]=STB (set top box - caixa de 'set top') Name[ru]=STB (модуль установки) +Name[sk]=STB (set top box) Name[sv]=Digitalbox Name[uk]=STB (модуль встановлення) Name[x-test]=xxSTB (set top box)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/storage_array.desktop calligra-2.4.3/flow/stencils/Cisco/storage_array.desktop --- calligra-2.4.0/flow/stencils/Cisco/storage_array.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/storage_array.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,7 +2,9 @@ Name=Storage array Name[bg]=Масив хранилища Name[ca]=Matriu d'emmagatzematge +Name[ca@valencia]=MAtriu d'emmagatzement Name[el]=Αποθηκευτική διάταξη +Name[es]=Array de almacenamiento Name[et]=Salvestusmassiiv Name[it]=Storage array Name[kk]=Жинатауыш жиымы @@ -13,6 +15,7 @@ Name[pt]=Bloco armazenamento Name[pt_BR]=Conjunto de armazenamento Name[ru]=Массив данных +Name[sk]=Úložné pole Name[sv]=Lagringssamling Name[uk]=Масив даних Name[x-test]=xxStorage arrayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/storage_router.desktop calligra-2.4.3/flow/stencils/Cisco/storage_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/storage_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/storage_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Storage Router Name[bg]=Маршрутизатор за хранилище Name[ca]=Encaminador d'emmagatzematge +Name[ca@valencia]=Encaminador d'emmagatzematge Name[de]=Speicher-Router Name[el]=Δρομολογητής αποθήκευσης +Name[es]=Enrutador de almacenamiento Name[et]=Salvestusmarsruuter Name[it]=Router archiviazione Name[kk]=Жинақтауыш маршрутизаторы @@ -14,6 +16,7 @@ Name[pt]=Encaminhador Armazenamento Name[pt_BR]=Roteador de armazenamento Name[ru]=Маршрутизатор хранилища +Name[sk]=Úložiskový router Name[sv]=Lagringsrouter Name[uk]=Маршрутизатор сховища Name[x-test]=xxStorage Routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/storage_solution_engine.desktop calligra-2.4.3/flow/stencils/Cisco/storage_solution_engine.desktop --- calligra-2.4.0/flow/stencils/Cisco/storage_solution_engine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/storage_solution_engine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Storage Solution Engine Name[ca]=Motor de solucions d'emmagatzematge +Name[ca@valencia]=Motor de solucions d'emmagatzement Name[el]=Storage Solution Engine +Name[es]=Motor de solución de almacenamiento Name[et]=Storage Solution Engine Name[it]=Motore soluzione di archiviazione Name[kk]=Жинақтауыш шешімінің тетігі @@ -11,6 +13,7 @@ Name[pt]=Motor Solução Armazenamento Name[pt_BR]=Motor de solução de armazenamento Name[ru]=Решение по хранению данных +Name[sk]=Engine úložného riešenia Name[sv]=Lagringsutrustning Name[uk]=Рушій рішень зберігання Name[x-test]=xxStorage Solution Enginexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/stp.desktop calligra-2.4.3/flow/stencils/Cisco/stp.desktop --- calligra-2.4.0/flow/stencils/Cisco/stp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/stp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=STP Name[bg]=STP Name[ca]=STP +Name[ca@valencia]=STP Name[de]=STP Name[el]=STP +Name[es]=STP Name[et]=STP +Name[hu]=STP Name[it]=STP Name[kk]=STP Name[nb]=STP diff -Nru calligra-2.4.0/flow/stencils/Cisco/sun_workstation.desktop calligra-2.4.3/flow/stencils/Cisco/sun_workstation.desktop --- calligra-2.4.0/flow/stencils/Cisco/sun_workstation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/sun_workstation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=SUN workstation Name[bg]=Работна станция SUN Name[ca]=Estació de treball Sun +Name[ca@valencia]=Estació de treball Sun Name[de]=SUN-Workstation Name[el]=Σταθμός εργασίας SUN Name[es]=Estación de trabajo SUN Name[et]=SUN tööjaam Name[hu]=SUN munkaállomás Name[it]=SUN workstation +Name[ja]=Sun ワークステーション Name[kk]=SUN жұмыс станциясы Name[nb]=SUN arbeidsstasjon Name[nds]=SUN-Arbeitreekner @@ -16,6 +18,7 @@ Name[pt]=Estação SUN Name[pt_BR]=Estação de Trabalho SUN Name[ru]=Рабочая станция SUN +Name[sk]=Pracovná stanica SUN Name[sv]=Sun arbetsstation Name[uk]=Робоча станція SUN Name[x-test]=xxSUN workstationxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/supercomputer.desktop calligra-2.4.3/flow/stencils/Cisco/supercomputer.desktop --- calligra-2.4.0/flow/stencils/Cisco/supercomputer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/supercomputer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Supercomputer Name[bg]=Суперкомпютър Name[ca]=Superordinador +Name[ca@valencia]=Superordinador Name[de]=Supercomputer Name[el]=Υπερυπολογιστής +Name[es]=Supercomputador Name[et]=Superarvuti Name[hu]=Szuperszámítógép Name[it]=Supercomputer +Name[ja]=スーパーコンピュータ Name[kk]=Суперкомпьютер Name[nb]=Superdator Name[nl]=Supercomputer @@ -14,6 +17,7 @@ Name[pt]=Super-computador Name[pt_BR]=Super-computador Name[ru]=Суперкомпьютер +Name[sk]=Superpočítač Name[sv]=Superdator Name[uk]=Суперкомп'ютер Name[x-test]=xxSupercomputerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/svx.desktop calligra-2.4.3/flow/stencils/Cisco/svx.desktop --- calligra-2.4.0/flow/stencils/Cisco/svx.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/svx.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=SVX (interchangeable with End office) Name[bg]=SVX (заменяем с краен офис) Name[ca]=SVX (interchangeable with End office) +Name[ca@valencia]=SVX (interchangeable with End office) Name[de]=SVX (austauschbar mit End-Office) Name[el]=SVX (interchangeable with End office) +Name[es]=SVX (intercambiable con el final de la oficina) Name[et]=SVX (vahetatav lõpptarbijaga) Name[it]=SVX (interscambio con l'ufficio finale) Name[kk]=SVX (соңғы кеңсесімен ауыстырылатын) @@ -14,6 +16,7 @@ Name[pt]=SVX (intercâmbio com escritório final) Name[pt_BR]=SVX (intercambiável com o escritório final) Name[ru]=SVX (взаимозаменяем с конечным офисом) +Name[sk]=SVX (zameniteľné s End office) Name[sv]=SVX (utbytbar mot slutkontorsväxel) Name[uk]=SVX (з взаємообміном, з кінцевою телефонною станцією) Name[x-test]=xxSVX (interchangeable with End office)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/switch_processor.desktop calligra-2.4.3/flow/stencils/Cisco/switch_processor.desktop --- calligra-2.4.0/flow/stencils/Cisco/switch_processor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/switch_processor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Switch Processor Name[ca]=Processador de commutació +Name[ca@valencia]=Processador de commutació Name[el]=Επεξεργαστής μεταγωγής +Name[es]=Procesador de conmutación Name[et]=Kommutaatori protsessor Name[it]=Switch Processor Name[kk]=Қосқыш процесоры @@ -12,6 +14,7 @@ Name[pt]=Processador de Comutação Name[pt_BR]=Processador de comutação de rotas Name[ru]=Коммутаторный процессор +Name[sk]=Prepínací procesor Name[sv]=Linjeväxelprocessor Name[uk]=Процесор комутації маршрутів Name[x-test]=xxSwitch Processorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/system_controller.desktop calligra-2.4.3/flow/stencils/Cisco/system_controller.desktop --- calligra-2.4.0/flow/stencils/Cisco/system_controller.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/system_controller.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=System controller Name[bg]=Системен контролер Name[ca]=Controlador del sistema +Name[ca@valencia]=Controlador del sistema Name[de]=System-Controller Name[el]=Ελεγκτής συστήματος +Name[es]=Controlador del sistema Name[et]=Süsteemikontroller Name[it]=Controller di sistema Name[kk]=Жүйе контроллері @@ -14,6 +16,7 @@ Name[pt]=Controlador sistema Name[pt_BR]=Controlador de sistema Name[ru]=Контроллер системы +Name[sk]=Systémový ovládač Name[sv]=Systemstyrenhet Name[uk]=Системний контролер Name[x-test]=xxSystem controllerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/tablet.desktop calligra-2.4.3/flow/stencils/Cisco/tablet.desktop --- calligra-2.4.0/flow/stencils/Cisco/tablet.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/tablet.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Tablet Name[bg]=Таблет Name[ca]=Tauleta +Name[ca@valencia]=Tauleta Name[cs]=Tablet Name[de]=Tablett Name[el]=Tablet @@ -9,6 +10,7 @@ Name[et]=Tahvelarvuti Name[hu]=Rajztábla Name[it]=Tablet +Name[ja]=タブレット Name[kk]=Планшет Name[nb]=Tegneplate Name[nds]=Tablett @@ -17,6 +19,7 @@ Name[pt]=Tablete Name[pt_BR]=Tablet Name[ru]=Портативный компьютер +Name[sk]=Tablet Name[sv]=Ritplatta Name[ug]=سەزگۈر تاختا Name[uk]=Планшет diff -Nru calligra-2.4.0/flow/stencils/Cisco/tape_array.desktop calligra-2.4.3/flow/stencils/Cisco/tape_array.desktop --- calligra-2.4.0/flow/stencils/Cisco/tape_array.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/tape_array.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Tape array Name[ca]=Cinta matriu +Name[ca@valencia]=Cinta matriu Name[el]=Tape array +Name[es]=Array de cintas Name[et]=Lindimassiiv Name[it]=Array di nastri Name[kk]=Таспа (жиым) @@ -11,6 +13,7 @@ Name[pt]=Bloco fitas magnéticas Name[pt_BR]=Conjunto de fitas magnéticas Name[ru]=Массив данных на ленте +Name[sk]=Páskové pole Name[sv]=Bandgrupp Name[uk]=Стрічковий масив Name[x-test]=xxTape arrayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/tdm_router.desktop calligra-2.4.3/flow/stencils/Cisco/tdm_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/tdm_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/tdm_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=TDM router Name[bg]=Маршрутизатор TDM Name[ca]=Encaminador TDM +Name[ca@valencia]=Encaminador TDM Name[de]=TDM-Router Name[el]=Δρομολογητής TDM +Name[es]=Encaminador TDM Name[et]=TDM ruuter Name[it]=Router TDM Name[kk]=TDM маршруттауышы @@ -14,6 +16,7 @@ Name[pt]=Encaminhador TDM Name[pt_BR]=Roteador TDM Name[ru]=Маршрутизатор TDM +Name[sk]=TDM router Name[sv]=Tidsdelningsmultiplexrouter Name[uk]=Маршрутизатор TDM Name[x-test]=xxTDM routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/telecommuter.desktop calligra-2.4.3/flow/stencils/Cisco/telecommuter.desktop --- calligra-2.4.0/flow/stencils/Cisco/telecommuter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/telecommuter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Telecommuter Name[bg]=Човек, работещ отдалечено Name[ca]=Telecommutador +Name[ca@valencia]=Telecommutador Name[de]=Telecommuter Name[el]=Telecommuter +Name[es]=Teleconmutador Name[et]=Telekommutaator Name[it]=Telecommutatore Name[kk]=Үйіндегі қызметкер @@ -14,6 +16,7 @@ Name[pt]=Tele-comutador Name[pt_BR]=Telecomutador Name[ru]=Телекоммутатор +Name[sk]=Telecommuter Name[sv]=Telependlare Name[uk]=Кур'єр Name[x-test]=xxTelecommuterxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/telecommuter_house.desktop calligra-2.4.3/flow/stencils/Cisco/telecommuter_house.desktop --- calligra-2.4.0/flow/stencils/Cisco/telecommuter_house.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/telecommuter_house.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Telecommuter house Name[bg]=Отдалечено работно място Name[ca]=Casa telecommutador +Name[ca@valencia]=Casa telecommutador Name[de]=Telecommuter-Haus Name[el]=Telecommuter house +Name[es]=Casa de teleconmutación Name[et]=Telekommunikatsioonihoone Name[it]=Telecommutatore casa Name[kk]=Үйдегі компьютер @@ -14,6 +16,7 @@ Name[pt]=Alojamento Tele-comutador Name[pt_BR]=Casa de telecomutador Name[ru]=Телекоммуникационное здание +Name[sk]=Telekomunikačná budova Name[sv]=Telependlarhus Name[uk]=Будинок надомника Name[x-test]=xxTelecommuter housexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/telecommuter_house_router.desktop calligra-2.4.3/flow/stencils/Cisco/telecommuter_house_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/telecommuter_house_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/telecommuter_house_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Telecommuter house/router Name[bg]=Отдалечено работно място/маршрутизатор Name[ca]=Casa/encaminador telecommutador +Name[ca@valencia]=Casa/encaminador telecommutador Name[de]=Telecommuter-Haus/-Router Name[el]=Telecommuter house/router +Name[es]=Casa/enrutador de teleconmutación Name[et]=Telekommutaator/marsruuter Name[it]=Telecommutatore casa/router Name[kk]=Үйдегі компьютер/маршруттауыш @@ -14,6 +16,7 @@ Name[pt]=Alojamento/encaminhamento tele-comutador Name[pt_BR]=Casa de telecomutador/roteador Name[ru]=Телекоммуникационное здание/маршрутизатор +Name[sk]=Telekomunikačný dom/router Name[sv]=Telependlarhus/router Name[uk]=Домівка/маршрутизатор надомника Name[x-test]=xxTelecommuter house/routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/telecommuter_house_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/telecommuter_house_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/telecommuter_house_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/telecommuter_house_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Telecommuter house subdued Name[ca]=Casa telecommutador suavitzat +Name[ca@valencia]=Casa telecommutador suavitzat Name[el]=Telecommuter house subdued +Name[es]=Casa de teleconmutación poco activa Name[et]=Toonita telekommunikatsioonihoone Name[kk]=Басыңқы үйдегі компьютер Name[nb]=Telependler-hus dempet @@ -10,6 +12,7 @@ Name[pt]=Alojamento tele-comutador ultrapassado Name[pt_BR]=Casa de telecomutador/roteador ultrapassada Name[ru]=Телекоммуникационное здание приглушённое +Name[sk]=Telekomunikačná budova tlmená Name[sv]=Telependlarhus diskret Name[uk]=Будинок надомника (притлумлено) Name[x-test]=xxTelecommuter house subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/terminal.desktop calligra-2.4.3/flow/stencils/Cisco/terminal.desktop --- calligra-2.4.0/flow/stencils/Cisco/terminal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/terminal.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Terminal Name[bg]=Терминал Name[ca]=Terminal +Name[ca@valencia]=Terminal Name[cs]=Terminál Name[de]=Terminal Name[el]=Τερματικό @@ -10,6 +11,7 @@ Name[ga]=Teirminéal Name[hu]=Terminál Name[it]=Terminale +Name[ja]=端末 Name[kk]=Терминал Name[nb]=Terminal Name[nl]=Terminal diff -Nru calligra-2.4.0/flow/stencils/Cisco/terminal_server.desktop calligra-2.4.3/flow/stencils/Cisco/terminal_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/terminal_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/terminal_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Terminal Server Name[bg]=Терминален сървър Name[ca]=Servidor de terminal +Name[ca@valencia]=Servidor de terminal Name[de]=Terminal-Server Name[el]=Τερματικός εξυπηρετητής +Name[es]=Servidor terminal Name[et]=Terminalserver Name[it]=Terminal server Name[kk]=Терминал сервері @@ -13,6 +15,7 @@ Name[pt]=Servidor de Terminal Name[pt_BR]=Servidor de terminais Name[ru]=Терминал-сервер +Name[sk]=Terminálový server Name[sv]=Terminalserver Name[uk]=Термінальний сервер Name[x-test]=xxTerminal Serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/tokenring.desktop calligra-2.4.3/flow/stencils/Cisco/tokenring.desktop --- calligra-2.4.0/flow/stencils/Cisco/tokenring.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/tokenring.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,14 @@ Name=TokenRing Name[bg]=TokenRing Name[ca]=TokenRing +Name[ca@valencia]=TokenRing Name[de]=TokenRing Name[el]=TokenRing +Name[es]=TokenRing Name[et]=Lubaring +Name[hu]=TokenRing Name[it]=TokenRing +Name[ja]=トークンリング Name[kk]=TokenRing Name[nb]=TokenRing Name[nds]=Token Ring @@ -14,6 +18,7 @@ Name[pt]=Anél Token-Ring Name[pt_BR]=TokenRing Name[ru]=TokenRing +Name[sk]=TokenRing Name[sv]=Token ring Name[uk]=TokenRing Name[x-test]=xxTokenRingxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/transpath.desktop calligra-2.4.3/flow/stencils/Cisco/transpath.desktop --- calligra-2.4.0/flow/stencils/Cisco/transpath.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/transpath.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Transpath Name[bg]=Transpath Name[ca]=Transpath +Name[ca@valencia]=Transpath Name[de]=Transpath Name[el]=Transpath +Name[es]=Ruta de transporte Name[et]=Transpath Name[it]=Transpath Name[kk]=Transpath @@ -14,6 +16,7 @@ Name[pt]=Transpath Name[pt_BR]=Transpath Name[ru]=Transpath +Name[sk]=Transpath Name[sv]=Överföringsväg Name[uk]=Спосіб зв’язку Name[x-test]=xxTranspathxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/truck.desktop calligra-2.4.3/flow/stencils/Cisco/truck.desktop --- calligra-2.4.0/flow/stencils/Cisco/truck.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/truck.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=Truck Name[bg]=Камион Name[ca]=Truck +Name[ca@valencia]=Truck Name[de]=LKW Name[el]=Φορτηγό +Name[es]=Camión Name[et]=Veoauto Name[it]=Camion +Name[ja]=トラック Name[kk]=Жүк машина Name[nb]=Lastebil Name[nl]=Vrachtwagen @@ -13,6 +16,7 @@ Name[pt]=Camião Name[pt_BR]=Caminhão Name[ru]=Грузовик +Name[sk]=Truck Name[sv]=Lastbil Name[uk]=Вантажівка Name[x-test]=xxTruckxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/turret.desktop calligra-2.4.3/flow/stencils/Cisco/turret.desktop --- calligra-2.4.0/flow/stencils/Cisco/turret.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/turret.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Turret Name[ca]=Torreta +Name[ca@valencia]=Torreta Name[el]=Πυργίσκος +Name[es]=Torreta Name[et]=Keskjaam Name[it]=Torretta Name[kk]=Пульт @@ -12,6 +14,7 @@ Name[pt]=Torre Name[pt_BR]=Torre Name[ru]=Башенка +Name[sk]=Turret Name[sv]=Torn Name[uk]=Турель Name[x-test]=xxTurretxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/tv.desktop calligra-2.4.3/flow/stencils/Cisco/tv.desktop --- calligra-2.4.0/flow/stencils/Cisco/tv.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/tv.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=TV Name[bg]=Телевизия Name[ca]=TV +Name[ca@valencia]=TV Name[cs]=TV Name[de]=TV Name[el]=Τηλεόραση +Name[es]=TV Name[et]=TV +Name[hu]=TV Name[it]=TV +Name[ja]=テレビ Name[kk]=ТВ Name[nb]=TV Name[nds]=Feernsehn diff -Nru calligra-2.4.0/flow/stencils/Cisco/ubr910_cable_dsu.desktop calligra-2.4.3/flow/stencils/Cisco/ubr910_cable_dsu.desktop --- calligra-2.4.0/flow/stencils/Cisco/ubr910_cable_dsu.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ubr910_cable_dsu.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=uBR910 Name[bg]=uBR910 Name[ca]=uBR910 +Name[ca@valencia]=uBR910 Name[de]=uBR910 Name[el]=uBR910 +Name[es]=uBR910 Name[et]=uBR910 Name[hu]=uBR910 Name[it]=uBR910 @@ -15,6 +17,7 @@ Name[pt]=uBR910 Name[pt_BR]=uBR910 Name[ru]=uBR910 +Name[sk]=uBR910 Name[sv]=uBR910 Name[uk]=uBR910 Name[x-test]=xxuBR910xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/umg_series.desktop calligra-2.4.3/flow/stencils/Cisco/umg_series.desktop --- calligra-2.4.0/flow/stencils/Cisco/umg_series.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/umg_series.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=uMG series Name[ca]=sèrie uMG +Name[ca@valencia]=sèrie uMG Name[el]=uMG series +Name[es]=Serie uMG Name[et]=uMG seeria +Name[hu]=uMG sorozat Name[it]=Serie uMG Name[kk]=uMG тізбегі Name[nb]=uMG serie @@ -11,6 +14,7 @@ Name[pt]=Série uMG Name[pt_BR]=Série uMG Name[ru]=uMG серии +Name[sk]=uMG séria Name[sv]=Serie uMG Name[uk]=Серія uMG Name[x-test]=xxuMG seriesxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/unity_express.desktop calligra-2.4.3/flow/stencils/Cisco/unity_express.desktop --- calligra-2.4.0/flow/stencils/Cisco/unity_express.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/unity_express.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Unity Express Name[ca]=Unity Express +Name[ca@valencia]=Unity Express Name[el]=Unity Express +Name[es]=Unity Express Name[et]=Unity Express Name[it]=Unity Express Name[kk]=Unity Express @@ -11,6 +13,7 @@ Name[pt]=Unity Express Name[pt_BR]=Unity Express Name[ru]=Unity Express +Name[sk]=Unity Express Name[sv]=Unity Express Name[uk]=Unity Express Name[x-test]=xxUnity Expressxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/unity_server.desktop calligra-2.4.3/flow/stencils/Cisco/unity_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/unity_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/unity_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=Unity server Name[bg]=Съвместен сървър Name[ca]=Servidor Unity +Name[ca@valencia]=Servidor Unity Name[de]=Unity-Server Name[el]=Εξυπηρετητής Unity +Name[es]=Servidor Unity Name[et]=Unity server +Name[hu]=Unity kiszolgáló Name[it]=Server Unity Name[kk]=Unity сервері Name[nb]=Unity-tjener @@ -14,6 +17,7 @@ Name[pt]=Servidor Unity Name[pt_BR]=Servidor Unity Name[ru]=Серверный модуль +Name[sk]=Unity server Name[sv]=Unity-server Name[uk]=Сервер Unity Name[x-test]=xxUnity serverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/universal_gateway.desktop calligra-2.4.3/flow/stencils/Cisco/universal_gateway.desktop --- calligra-2.4.0/flow/stencils/Cisco/universal_gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/universal_gateway.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Universal Gateway Name[bg]=Универсален шлюз Name[ca]=Passarel·la universal +Name[ca@valencia]=Passarel·la universal Name[de]=Universelles Gateway Name[el]=Καθολική πύλη +Name[es]=Pasarela universal Name[et]=Universaalne lüüs Name[it]=Gateway universale Name[kk]=Әмбебап шлюзі @@ -14,6 +16,7 @@ Name[pt]='Gateway' Universal Name[pt_BR]=Gateway universal Name[ru]=Универсальный шлюз +Name[sk]=Univerzálna brána Name[sv]=Universell förmedlingsnod Name[uk]=Універсальний шлюз Name[x-test]=xxUniversal Gatewayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/university.desktop calligra-2.4.3/flow/stencils/Cisco/university.desktop --- calligra-2.4.0/flow/stencils/Cisco/university.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/university.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=University Name[bg]=Университет Name[ca]=Universitat +Name[ca@valencia]=Universitat Name[cs]=Univerzita Name[de]=Universität Name[el]=Πανεπιστήμιο @@ -9,6 +10,7 @@ Name[et]=Ülikool Name[hu]=Egyetem Name[it]=Università +Name[ja]=大学 Name[kk]=Университет Name[nb]=Universitet Name[nds]=Universiteet @@ -17,6 +19,7 @@ Name[pt]=Universidade Name[pt_BR]=Universidade Name[ru]=Университет +Name[sk]=Univerzita Name[sv]=Universitet Name[ug]=ئالىي مەكتەپ Name[uk]=Університет diff -Nru calligra-2.4.0/flow/stencils/Cisco/ups.desktop calligra-2.4.3/flow/stencils/Cisco/ups.desktop --- calligra-2.4.0/flow/stencils/Cisco/ups.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/ups.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=UPS Name[bg]=Непрекъсваемо токозахранване Name[ca]=UPS +Name[ca@valencia]=UPS Name[cs]=UPS Name[de]=USV Name[el]=UPS +Name[es]=UPS Name[et]=UPS +Name[hu]=UPS Name[it]=UPS +Name[ja]=UPS Name[kk]=UPS Name[nb]=UPS Name[nl]=UPS diff -Nru calligra-2.4.0/flow/stencils/Cisco/video_camera.desktop calligra-2.4.3/flow/stencils/Cisco/video_camera.desktop --- calligra-2.4.0/flow/stencils/Cisco/video_camera.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/video_camera.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=Video camera Name[bg]=Видеокамера Name[ca]=Càmera de vídeo +Name[ca@valencia]=Càmera de vídeo Name[de]=Videokamera Name[el]=Βιντεοκάμερα Name[es]=Videocámara Name[et]=Videokaamera Name[fr]=Caméra vidéo Name[it]=Videocamera +Name[ja]=ビデオカメラ Name[kk]=Бейнекамера Name[nb]=Videokamera Name[nds]=Videokamera @@ -16,6 +18,7 @@ Name[pt]=Câmara vídeo Name[pt_BR]=Câmera de vídeo Name[ru]=Видеокамера +Name[sk]=Videokamera Name[sv]=Videokamera Name[uk]=Відеокамера Name[x-test]=xxVideo cameraxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/video_camera_right.desktop calligra-2.4.3/flow/stencils/Cisco/video_camera_right.desktop --- calligra-2.4.0/flow/stencils/Cisco/video_camera_right.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/video_camera_right.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Video Camera right Name[ca]=Càmera de vídeo a la dreta +Name[ca@valencia]=Càmera de vídeo a la dreta Name[el]=Βιντεοκάμερα δεξιά +Name[es]=Cámara de vídeo derecha Name[et]=Parempoolne videokaamera Name[it]=Videocamera (destra) Name[kk]=Бейнекамера (оң жақ) @@ -11,6 +13,7 @@ Name[pt]=Câmara vídeo direita Name[pt_BR]=Câmera de vídeo direita Name[ru]=Видеокамера (вправо) +Name[sk]=Video kamera vpravo Name[sv]=Videokamera höger Name[uk]=Відеокамера (праворуч) Name[x-test]=xxVideo Camera rightxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/vip.desktop calligra-2.4.3/flow/stencils/Cisco/vip.desktop --- calligra-2.4.0/flow/stencils/Cisco/vip.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/vip.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,14 @@ Name=VIP Name[bg]=VIP Name[ca]=VIP +Name[ca@valencia]=VIP Name[de]=VIP Name[el]=VIP +Name[es]=VIP Name[et]=VIP +Name[hu]=VIP Name[it]=VIP +Name[ja]=VIP Name[kk]=VIP Name[nb]=VIP Name[nds]=VIP diff -Nru calligra-2.4.0/flow/stencils/Cisco/virtual_layer_switch.desktop calligra-2.4.3/flow/stencils/Cisco/virtual_layer_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/virtual_layer_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/virtual_layer_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Virtual Layer Switch Name[ca]=Virtual Layer Switch +Name[ca@valencia]=Virtual Layer Switch Name[el]=Virtual Layer Switch +Name[es]=Conmutador de capa virtual Name[et]=Virtuaalse kihi kommutaator Name[it]=Virtual Layer Switch Name[kk]=Виртуалды деңгейлі қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador Virtual de Níveis Name[pt_BR]=Comutador virtual de camadas Name[ru]=Коммутатор виртуальных слоёв +Name[sk]=Virtuálny prepínač vrstiev Name[sv]=Virtuell lager-växel Name[uk]=Комутатор віртуальних рівнів Name[x-test]=xxVirtual Layer Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/vn2900.desktop calligra-2.4.3/flow/stencils/Cisco/vn2900.desktop --- calligra-2.4.0/flow/stencils/Cisco/vn2900.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/vn2900.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=VN2900 Name[bg]=VN2900 Name[ca]=VN2900 +Name[ca@valencia]=VN2900 Name[cs]=VN2900 Name[de]=VN2900 Name[el]=VN2900 +Name[es]=VN2900 Name[et]=VN2900 +Name[hu]=VN2900 Name[it]=VN2900 +Name[ja]=VN2900 Name[kk]=VN2900 Name[nb]=VN2900 Name[nds]=VN2900 diff -Nru calligra-2.4.0/flow/stencils/Cisco/vn5900.desktop calligra-2.4.3/flow/stencils/Cisco/vn5900.desktop --- calligra-2.4.0/flow/stencils/Cisco/vn5900.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/vn5900.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=VN5900 Name[bg]=VN5900 Name[ca]=VN5900 +Name[ca@valencia]=VN5900 Name[cs]=VN5900 Name[de]=VN5900 Name[el]=VN5900 +Name[es]=VN5900 Name[et]=VN5900 +Name[hu]=VN5900 Name[it]=VN5900 +Name[ja]=VN5900 Name[kk]=VN5900 Name[nb]=VN5900 Name[nds]=VN5900 diff -Nru calligra-2.4.0/flow/stencils/Cisco/vn5902.desktop calligra-2.4.3/flow/stencils/Cisco/vn5902.desktop --- calligra-2.4.0/flow/stencils/Cisco/vn5902.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/vn5902.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=VN5902 Name[bg]=VN5902 Name[ca]=VN5902 +Name[ca@valencia]=VN5902 Name[cs]=VN5902 Name[de]=VN5902 Name[el]=VN5902 +Name[es]=VN5902 Name[et]=VN5902 +Name[hu]=VN5902 Name[it]=VN5902 +Name[ja]=VN5902 Name[kk]=VN5902 Name[nb]=VN5902 Name[nds]=VN5902 diff -Nru calligra-2.4.0/flow/stencils/Cisco/voice-enabled_access_server.desktop calligra-2.4.3/flow/stencils/Cisco/voice-enabled_access_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/voice-enabled_access_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/voice-enabled_access_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Voice commserver Name[bg]=Гласов комсървър Name[ca]=Voice commserver +Name[ca@valencia]=Voice commserver Name[de]=Voice-Commserver Name[el]=Εξυπηρετητής φωνητικής επικοινωνίας +Name[es]=Servidor de comunicación de voz Name[et]=Häälsuhtluse server Name[it]=Voice commserver Name[kk]=Дауыс байланыс сервері @@ -14,6 +16,7 @@ Name[pt]=Servidor com. voz Name[pt_BR]=Servidor de comunicações de voz Name[ru]=Сервер голосовой связи +Name[sk]=Hlasový komunikačný server Name[sv]=Röstkommunikationsserver Name[uk]=Сервер голосового зв'язку Name[x-test]=xxVoice commserverxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/voice-enabled_atm_switch.desktop calligra-2.4.3/flow/stencils/Cisco/voice-enabled_atm_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/voice-enabled_atm_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/voice-enabled_atm_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Voice ATM Switch Name[bg]=Гласов комутатор ATM Name[ca]=Voice ATM Switch +Name[ca@valencia]=Voice ATM Switch Name[de]=Voice-ATM-Switch Name[el]=Μεταγωγέας φωνής ATM +Name[es]=Conmutador ATM de voz Name[et]=ATM häälekommutaator Name[it]=Voice ATM Switch Name[kk]=Дауыс ATM қосқышы @@ -14,6 +16,7 @@ Name[pt]=Comutador ATM Voz Name[pt_BR]=Comutador de voz ATM Name[ru]=Голосовой коммутатор ATM +Name[sk]=Hlasový ATM prepínač Name[sv]=ATM-röstväxel Name[uk]=Голосовий комутатор ATM Name[x-test]=xxVoice ATM Switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/voice-enabled_router.desktop calligra-2.4.3/flow/stencils/Cisco/voice-enabled_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/voice-enabled_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/voice-enabled_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Voice router Name[bg]=Гласов маршрутизатор Name[ca]=Encaminador de veu +Name[ca@valencia]=Encaminador de veu Name[de]=Voice-Router Name[el]=Δρομολογητής φωνής +Name[es]=Enrutador de voz Name[et]=Helimarsruuter Name[it]=Voice router Name[kk]=Дауыс маршруттауыш @@ -14,6 +16,7 @@ Name[pt]=Encaminhador voz Name[pt_BR]=Roteador de voz Name[ru]=Голосовой маршрутизатор +Name[sk]=Hlasový router Name[sv]=Röstrouter Name[uk]=Голосовий маршрутизатор Name[x-test]=xxVoice routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/voice_switch2.desktop calligra-2.4.3/flow/stencils/Cisco/voice_switch2.desktop --- calligra-2.4.0/flow/stencils/Cisco/voice_switch2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/voice_switch2.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=Voice switch 2 Name[ca]=Commutador de veu 2 +Name[ca@valencia]=Commutador de veu 2 Name[de]=Voice-Switch 2 Name[el]=Μεταγωγέας φωνής 2 +Name[es]=Conmutador de voz 2 Name[et]=Häälekommutaator 2 Name[it]=Voice switch 2 Name[kk]=Дауыс қосқышы 2 @@ -13,6 +15,7 @@ Name[pt]=Comutador voz 2 Name[pt_BR]=Comutador de voz 2 Name[ru]=Голосовой коммутатор 2 +Name[sk]=Hlasový prepínač 2 Name[sv]=Röstväxel 2 Name[uk]=Голосовий комутатор 2 Name[x-test]=xxVoice switch 2xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/vpn_concentrator.desktop calligra-2.4.3/flow/stencils/Cisco/vpn_concentrator.desktop --- calligra-2.4.0/flow/stencils/Cisco/vpn_concentrator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/vpn_concentrator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=VPN concentrator Name[bg]=Концентратор VPN Name[ca]=Concentrador VPN +Name[ca@valencia]=Concentrador VPN Name[de]=VPN-Konzentrator Name[el]=Συγκεντρωτής VPN +Name[es]=Concentrador VPN Name[et]=VPN kontsentraator Name[it]=Concentratore VPN Name[kk]=VPN шоғырлауышы @@ -14,6 +16,7 @@ Name[pt]=Concentrador VPN Name[pt_BR]=Concentrador VPN Name[ru]=Концентратор VPN +Name[sk]=VPN koncentrátor Name[sv]=Koncentrator för virtuellt privat nätverk Name[uk]=Концентратор VPN Name[x-test]=xxVPN concentratorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/vpn_gateway.desktop calligra-2.4.3/flow/stencils/Cisco/vpn_gateway.desktop --- calligra-2.4.0/flow/stencils/Cisco/vpn_gateway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/vpn_gateway.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=VPN Gateway Name[bg]=Шлюз VPN Name[ca]=Passarel·la VPN +Name[ca@valencia]=Passarel·la VPN Name[cs]=Brána VPN Name[de]=VPN-Gateway Name[el]=Πύλη VPN +Name[es]=Pasarela VPN Name[et]=VPN lüüs Name[it]=Gateway VPN +Name[ja]=VPN ゲートウェイ Name[kk]=VPN шлюзі Name[nb]=VPN-portner Name[nds]=VPN-Döörreekner @@ -15,6 +18,7 @@ Name[pt]='Gateway' VPN Name[pt_BR]=Gateway de VPN Name[ru]=Шлюз VPN +Name[sk]=VPN brána Name[sv]=Förmedlingsnod för virtuellt privat nätverk Name[uk]=Шлюз VPN Name[x-test]=xxVPN Gatewayxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/vsc3000.desktop calligra-2.4.3/flow/stencils/Cisco/vsc3000.desktop --- calligra-2.4.0/flow/stencils/Cisco/vsc3000.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/vsc3000.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Virtual switch controller (VSC 3000) Name[bg]=Виртуален контролер за комутиране (VSC 3000) Name[ca]=Virtual switch controller (VSC 3000) +Name[ca@valencia]=Virtual switch controller (VSC 3000) Name[de]=Virtual-Switch-Controller (VSC 3000) Name[el]=Εικονικός ελεγκτής μεταγωγής (VSC 3000) +Name[es]=Controlador de conmutación virtual (VSC 3000) Name[et]=Virtuaalkommutaatori kontroller (VSC 3000) Name[it]=Virtual switch controller (VSC 3000) Name[kk]=Виртуалды қосқыш контроллері (VSC 3000) @@ -14,6 +16,7 @@ Name[pt]=Controlador comutação virtual (VSC 3000) Name[pt_BR]=Controlador de comutador virtual (VSC 3000) Name[ru]=Виртуальный контроллер коммутации (VSC 3000) +Name[sk]=Virtual switch controller (VSC 3000) Name[sv]=Virtuell växelstyrenhet (VSC 3000) Name[uk]=Віртуальний контролер комутатора (VSC 3000) Name[x-test]=xxVirtual switch controller (VSC 3000)xx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wan.desktop calligra-2.4.3/flow/stencils/Cisco/wan.desktop --- calligra-2.4.0/flow/stencils/Cisco/wan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wan.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=WAN Name[bg]=WAN Name[ca]=WAN +Name[ca@valencia]=WAN Name[de]=WAN Name[el]=WAN Name[es]=WAN Name[et]=WAN +Name[hu]=WAN Name[it]=WAN +Name[ja]=WAN Name[kk]=WAN Name[nb]=WAN Name[nds]=WAN diff -Nru calligra-2.4.0/flow/stencils/Cisco/wavelength_router.desktop calligra-2.4.3/flow/stencils/Cisco/wavelength_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/wavelength_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wavelength_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=Wavelength router Name[ca]=Encaminador Wavelength +Name[ca@valencia]=Encaminador Wavelength Name[de]=Wavelength-Router Name[el]=Δρομολογητής μήκους κύματος +Name[es]=Encaminador de longitud de onda Name[et]=Lainepikkuse marsruuter Name[it]=Wavelength router Name[kk]=Толқын маршруттауышы @@ -13,6 +15,7 @@ Name[pt]=Encaminhador comprimento onda Name[pt_BR]=Roteador de comprimento de onda Name[ru]=Маршрутизатор Wavelenght +Name[sk]=Router vlnovej dĺžky Name[sv]=Våglängdsrouter Name[uk]=Бездротовий маршрутизатор Name[x-test]=xxWavelength routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wdm.desktop calligra-2.4.3/flow/stencils/Cisco/wdm.desktop --- calligra-2.4.0/flow/stencils/Cisco/wdm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wdm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=WDM Name[bg]=WDM Name[ca]=WDM +Name[ca@valencia]=WDM Name[de]=WDM Name[el]=WDM +Name[es]=WDM Name[et]=WDM +Name[hu]=WDM Name[it]=WDM Name[kk]=WDM Name[nb]=WDM diff -Nru calligra-2.4.0/flow/stencils/Cisco/web_browser.desktop calligra-2.4.3/flow/stencils/Cisco/web_browser.desktop --- calligra-2.4.0/flow/stencils/Cisco/web_browser.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/web_browser.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Web browser Name[bg]=Уеб-браузър Name[ca]=Navegador web +Name[ca@valencia]=Navegador web Name[cs]=Webový prohlížeč Name[de]=Webbrowser Name[el]=Περιηγητής ιστού @@ -10,6 +11,7 @@ Name[fr]=Navigateur web Name[hu]=Webböngésző Name[it]=Browser web +Name[ja]=ウェブブラウザ Name[kk]=Веб браузері Name[nb]=Nettleser Name[nds]=Nettkieker @@ -18,6 +20,7 @@ Name[pt]=Navegador Web Name[pt_BR]=Navegador Web Name[ru]=Браузер +Name[sk]=Webový prehliadač Name[sv]=Webbläsare Name[uk]=Переглядач інтернету Name[x-test]=xxWeb browserxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/web_cluster.desktop calligra-2.4.3/flow/stencils/Cisco/web_cluster.desktop --- calligra-2.4.0/flow/stencils/Cisco/web_cluster.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/web_cluster.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Web cluster Name[bg]=Уеб-клъстър Name[ca]=Clúster web +Name[ca@valencia]=Clúster web Name[de]=Web-Cluster Name[el]=Συστοιχία ιστού +Name[es]=Cluster de web Name[et]=Veebiklaster Name[it]=Cluster web Name[kk]=Веб кластері @@ -14,6 +16,7 @@ Name[pt]='Cluster' Web Name[pt_BR]=Cluster Web Name[ru]=Кластер веб-серверов +Name[sk]=Webový klaster Name[sv]=Webbkluster Name[uk]=Вебкластер Name[x-test]=xxWeb clusterxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wi-fi_tag.desktop calligra-2.4.3/flow/stencils/Cisco/wi-fi_tag.desktop --- calligra-2.4.0/flow/stencils/Cisco/wi-fi_tag.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wi-fi_tag.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Wi-Fi Tag Name[ca]=Etiqueta Wifi +Name[ca@valencia]=Etiqueta Wifi Name[el]=Ετικέτα Wi-Fi +Name[es]=Etiqueta Wi-Fi Name[et]=Wi-Fi lokaator Name[it]=Wi-Fi Tag Name[kk]=Wi-Fi белгісі @@ -11,6 +13,7 @@ Name[pt]=Marcador Wi-Fi Name[pt_BR]=Marcador Wi-Fi Name[ru]=Метка Wi-Fi +Name[sk]=Wi-Fi Tag Name[sv]=Wi-Fi-etikett Name[uk]=Мітка Wi-Fi Name[x-test]=xxWi-Fi Tagxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wireless_bridge.desktop calligra-2.4.3/flow/stencils/Cisco/wireless_bridge.desktop --- calligra-2.4.0/flow/stencils/Cisco/wireless_bridge.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wireless_bridge.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,11 @@ Name=Wireless Bridge Name[bg]=Безжичен мост Name[ca]=Pont sense fils +Name[ca@valencia]=Pont sense fils Name[el]=Γέφυρα ασύρματης επικοινωνίας +Name[es]=Puente inalámbrico Name[et]=Juhtmeta side sild +Name[hu]=Vezeték nélküli híd Name[it]=Bridge wireless Name[kk]=Сымсыз көпір Name[nb]=Trådløs bru @@ -13,6 +16,7 @@ Name[pt]=Ponte Sem-Fios Name[pt_BR]=Ponte sem fio Name[ru]=Беспроводной мост +Name[sk]=Bezdrôtový most Name[sv]=Trådlös brygga Name[uk]=Бездротовий міст Name[x-test]=xxWireless Bridgexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wireless_connectivity.desktop calligra-2.4.3/flow/stencils/Cisco/wireless_connectivity.desktop --- calligra-2.4.0/flow/stencils/Cisco/wireless_connectivity.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wireless_connectivity.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,11 @@ Name=Wireless Connectivity Name[bg]=Безжична свързаност Name[ca]=Connectivitat sense fils +Name[ca@valencia]=Connectivitat sense fils Name[el]=Συνδεσιμότητα ασύρματης επικοινωνίας +Name[es]=Conectividad inalámbrica Name[et]=Juhtmeta ühendus +Name[hu]=Vezeték nélküli összekapcsolhatóság Name[it]=Connettività wireless Name[kk]=Сымсыз қосылым Name[nb]=Trådløs forbindelse @@ -12,6 +15,7 @@ Name[pt]=Conectividade Sem-Fios Name[pt_BR]=Conectividade sem fio Name[ru]=Беспроводное подключение +Name[sk]=Bezdrôtová konektivita Name[sv]=Trådlös anslutning Name[uk]=Можливість бездротового з'єднання Name[x-test]=xxWireless Connectivityxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wireless.desktop calligra-2.4.3/flow/stencils/Cisco/wireless.desktop --- calligra-2.4.0/flow/stencils/Cisco/wireless.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wireless.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,13 +2,16 @@ Name=Wireless Name[bg]=Безжично Name[ca]=Sense fils +Name[ca@valencia]=Sense fils Name[cs]=Bezdrátové Name[el]=Ασύρματο +Name[es]=Inalámbrico Name[et]=Juhtmeta Name[fr]=Wireless Name[ga]=Gan Sreang Name[hu]=Vezeték nélküli Name[it]=Wireless +Name[ja]=ワイヤレス Name[kk]=Сымсыз Name[nb]=Trådløs Name[nl]=Draadloos @@ -16,6 +19,7 @@ Name[pt]=Sem-Fios Name[pt_BR]=Rede sem fio Name[ru]=Беспроводное +Name[sk]=Bezdrôtové Name[sv]=Trådlös Name[ug]=سىمسىز Name[uk]=Бездротовий diff -Nru calligra-2.4.0/flow/stencils/Cisco/wireless_location_appliance.desktop calligra-2.4.3/flow/stencils/Cisco/wireless_location_appliance.desktop --- calligra-2.4.0/flow/stencils/Cisco/wireless_location_appliance.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wireless_location_appliance.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Wireless Location Appliance Name[ca]=Aplicació d'ubicació sense fils +Name[ca@valencia]=Aplicació d'ubicació sense fils Name[el]=Συσκευή ασύρματης θέσης +Name[es]=Dispositivo de localización inalámbrico Name[et]=Wireless Location Appliance Name[it]=Wireless Location Appliance Name[kk]=Орнын анықтау сымсыз аппараты @@ -11,6 +13,7 @@ Name[pt]=Módulo Localização Sem-Fios Name[pt_BR]=Aplicação de localização da rede sem fio Name[ru]=Устройство беспроводного расположения +Name[sk]=Prostriedok bezdrôtovej polohy Name[sv]=Trådlös lokaliseringsutrustning Name[uk]=Пристрій бездротового розташування Name[x-test]=xxWireless Location Appliancexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wireless_router.desktop calligra-2.4.3/flow/stencils/Cisco/wireless_router.desktop --- calligra-2.4.0/flow/stencils/Cisco/wireless_router.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wireless_router.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,14 @@ [Desktop Entry] Name=Wireless router Name[ca]=Encaminador sense fils +Name[ca@valencia]=Encaminador sense fils Name[de]=Funk-Router Name[el]=Ασύρματος δρομολογητής +Name[es]=Enrutador inalámbrico Name[et]=Juhtmeta side marsruuter +Name[hu]=Vezeték nélküli router Name[it]=Router wireless +Name[ja]=ワイヤレスルータ Name[kk]=Сымсыз маршруттауышы Name[nb]=Trådløs ruter Name[nds]=Funknettweger @@ -13,6 +17,7 @@ Name[pt]=Encaminhador sem-fios Name[pt_BR]=Roteador de rede sem fio Name[ru]=Маршрутизатор беспроводной сети +Name[sk]=Bezdrôtový router Name[sv]=Trådlös router Name[uk]=Бездротовий маршрутизатор Name[x-test]=xxWireless routerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wireless_transport.desktop calligra-2.4.3/flow/stencils/Cisco/wireless_transport.desktop --- calligra-2.4.0/flow/stencils/Cisco/wireless_transport.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wireless_transport.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Wireless Transport Name[bg]=Безжичен пренос Name[ca]=Transport sense fils +Name[ca@valencia]=Transport sense fils Name[de]=Drahtlose Übertragung Name[el]=Ασύρματη μεταφορά +Name[es]=Transporte inalámbrico Name[et]=Juhtmeta side Name[it]=Trasporto wireless Name[kk]=Сымсыз тасымал @@ -14,6 +16,7 @@ Name[pt]=Transporte Sem-Fios Name[pt_BR]=Transporte sem fio Name[ru]=Беспроводной транспорт +Name[sk]=Bezdrôtový prenos Name[sv]=Trådlös överföring Name[uk]=Бездротова передача Name[x-test]=xxWireless Transportxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/wlan_controller.desktop calligra-2.4.3/flow/stencils/Cisco/wlan_controller.desktop --- calligra-2.4.0/flow/stencils/Cisco/wlan_controller.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/wlan_controller.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=WLAN controller Name[ca]=Controlador WLAN +Name[ca@valencia]=Controlador WLAN Name[de]=WLAN-Controller Name[el]=Ελεγκτής WLAN Name[es]=Controlador de WLAN @@ -14,6 +15,7 @@ Name[pt]=Controlador WLAN Name[pt_BR]=Controlador WLAN Name[ru]=Контроллер беспроводной сети +Name[sk]=WLAN ovládač Name[sv]=Styrenhet för trådlöst lokalt nätverk Name[uk]=Контролер WLAN Name[x-test]=xxWLAN controllerxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/woman_blue.desktop calligra-2.4.3/flow/stencils/Cisco/woman_blue.desktop --- calligra-2.4.0/flow/stencils/Cisco/woman_blue.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/woman_blue.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=Woman blue Name[ca]=Dona blava +Name[ca@valencia]=Dona blava Name[el]=Γυναίκα μπλε +Name[es]=Mujer azul Name[et]=Sinine naine +Name[fi]=Nainen, sininen Name[it]=Donna blu Name[kk]=Көк әйел Name[nb]=Kvinne blå @@ -11,6 +14,7 @@ Name[pt]=Mulher azul Name[pt_BR]=Mulher azul Name[ru]=Женщина синяя +Name[sk]=Žena modrá Name[sv]=Kvinna blå Name[uk]=Жінка (синім) Name[x-test]=xxWoman bluexx diff -Nru calligra-2.4.0/flow/stencils/Cisco/woman.desktop calligra-2.4.3/flow/stencils/Cisco/woman.desktop --- calligra-2.4.0/flow/stencils/Cisco/woman.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/woman.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=Woman Name[bg]=Жена Name[ca]=Dona +Name[ca@valencia]=Dona Name[cs]=Žena Name[de]=Frau Name[el]=Γυναίκα +Name[es]=Mujer Name[et]=Naine +Name[fi]=Nainen Name[it]=Donna +Name[ja]=女性 Name[kk]=Әйел Name[nb]=Kvinne Name[nds]=Fru @@ -15,6 +19,7 @@ Name[pt]=Mulher Name[pt_BR]=Mulher Name[ru]=Женщина +Name[sk]=Žena Name[sv]=Kvinna Name[uk]=Жінка Name[x-test]=xxWomanxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/woman_gold.desktop calligra-2.4.3/flow/stencils/Cisco/woman_gold.desktop --- calligra-2.4.0/flow/stencils/Cisco/woman_gold.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/woman_gold.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=Woman gold Name[ca]=Dona daurada +Name[ca@valencia]=Dona daurada Name[el]=Γυναίκα χρυσή +Name[es]=Mujer dorada Name[et]=Kuldne naine +Name[fi]=Nainen, keltainen Name[it]=Donna dorata Name[kk]=Алтын әйел Name[nb]=Kvinne gull @@ -11,6 +14,7 @@ Name[pt]=Mulher dourada Name[pt_BR]=Mulher dourada Name[ru]=Женщина золотистая +Name[sk]=Žena zlatá Name[sv]=Kvinna gyllene Name[uk]=Жінка (золотавим) Name[x-test]=xxWoman goldxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/woman_red.desktop calligra-2.4.3/flow/stencils/Cisco/woman_red.desktop --- calligra-2.4.0/flow/stencils/Cisco/woman_red.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/woman_red.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,11 @@ [Desktop Entry] Name=Woman red Name[ca]=Dona vermella +Name[ca@valencia]=Dona vermella Name[el]=Γυναίκα κόκκινη +Name[es]=Mujer roja Name[et]=Punane naine +Name[fi]=Nainen, punainen Name[it]=Donna rossa Name[kk]=Қызыл әйел Name[nb]=Kvinne rød @@ -11,6 +14,7 @@ Name[pt]=Mulher vermelha Name[pt_BR]=Mulher vermelha Name[ru]=Женщина красная +Name[sk]=Žena červená Name[sv]=Kvinna röd Name[uk]=Жінка (червоним) Name[x-test]=xxWoman redxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/workgroup_director.desktop calligra-2.4.3/flow/stencils/Cisco/workgroup_director.desktop --- calligra-2.4.0/flow/stencils/Cisco/workgroup_director.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/workgroup_director.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Workgroup director Name[bg]=Управление на работна група Name[ca]=Director de treball de grup +Name[ca@valencia]=Director de treball de grup Name[de]=Arbeitsgruppenleiter Name[el]=Workgroup director +Name[es]=Director de grupo de trabajo Name[et]=Töögrupi ülem Name[it]=Workgroup director Name[kk]=Жұмыс тобы бағыттауышы @@ -14,6 +16,7 @@ Name[pt]=Director grupo trabalho Name[pt_BR]=Diretor de grupo de trabalho Name[ru]=Руководитель рабочей группы +Name[sk]=Riaditeľ pracovnej skupiny Name[sv]=Kopplingsenhet för arbetsgrupp Name[uk]=Координатор робочої групи Name[x-test]=xxWorkgroup directorxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/workgroup_fcis.desktop calligra-2.4.3/flow/stencils/Cisco/workgroup_fcis.desktop --- calligra-2.4.0/flow/stencils/Cisco/workgroup_fcis.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/workgroup_fcis.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Workgroup Fibre Channel intelligent switch Name[ca]=Commutador intel·ligent de canal de fibra de treball de grup +Name[ca@valencia]=Commutador intel·ligent de canal de fibra de treball de grup Name[el]=Workgroup Fibre Channel intelligent switch +Name[es]=Conmutador inteligente Workgroup Fibre Channel Name[et]=Töögrupi Fibre Channel intelligentne kommutaator Name[it]=Switch intelligente Workgroup Fibre Channel Name[kk]=Жұмыс тобы талшық арнасының парасатты қосқышы @@ -11,6 +13,7 @@ Name[pt]=Comutador inteligente Fibre Channel Name[pt_BR]=Comutador inteligente de Fibre Channel Name[ru]=Интеллектуальный переключатель канала рабочей группы +Name[sk]=Inteligentný prepínač Workgroup Fibre Channel Name[sv]=Intelligent fiberkanalväxel för arbetsgrupp Name[uk]=Інтелектуальний комутатор оптоволоконного каналу класу робочої групи Name[x-test]=xxWorkgroup Fibre Channel intelligent switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/workgroup_switch.desktop calligra-2.4.3/flow/stencils/Cisco/workgroup_switch.desktop --- calligra-2.4.0/flow/stencils/Cisco/workgroup_switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/workgroup_switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Workgroup switch Name[bg]=Комутатор за работна група Name[ca]=Commutador de treball de grup +Name[ca@valencia]=Commutador de treball de grup Name[de]=Arbeitsgruppen-Switch Name[el]=Workgroup switch +Name[es]=Conmutador Workgroup Name[et]=Töögrupi kommutaator Name[it]=Workgroup switch Name[kk]=Жұмыс тобы қосқышы @@ -14,6 +16,7 @@ Name[pt]=Comutador grupo trabalho Name[pt_BR]=Comutador de grupo de trabalho Name[ru]=Коммутатор рабочей группы +Name[sk]=Prepínač pracovných skupín Name[sv]=Arbetsgruppsväxel Name[uk]=Комутатор робочої групи Name[x-test]=xxWorkgroup switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/workgroup_switch_subdued.desktop calligra-2.4.3/flow/stencils/Cisco/workgroup_switch_subdued.desktop --- calligra-2.4.0/flow/stencils/Cisco/workgroup_switch_subdued.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/workgroup_switch_subdued.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=Workgroup switch Subdued Name[ca]=Commutador de treball de grup suavitzat +Name[ca@valencia]=Commutador de treball de grup suavitzat Name[el]=Workgroup switch Subdued +Name[es]=Conmutador Workgroup poco activo Name[et]=Toonita töögrupi kommutaator Name[kk]=Басыңқы жұмыс тобы қосқышы Name[nb]=Arbeidsgruppe-svitsj dempet @@ -10,6 +12,7 @@ Name[pt]=Comutador grupo trabalho ultrapassado Name[pt_BR]=Comutador de grupo de trabalho ultrapassado Name[ru]=Коммутатор рабочей группы приглушённый +Name[sk]=Prepínač pracovných skupín tlmený Name[sv]=Arbetsgruppsväxel diskret Name[uk]=Комутатор робочої групи (притлумлено) Name[x-test]=xxWorkgroup switch Subduedxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/workgroup_switch_voice-enabled.desktop calligra-2.4.3/flow/stencils/Cisco/workgroup_switch_voice-enabled.desktop --- calligra-2.4.0/flow/stencils/Cisco/workgroup_switch_voice-enabled.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/workgroup_switch_voice-enabled.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Voice switch Name[bg]=Комутиране на глас Name[ca]=Commutador de veu +Name[ca@valencia]=Commutador de veu Name[de]=Voice-Switch Name[el]=Μεταγωγέας φωνής +Name[es]=Conmutador de voz Name[et]=Häälekommutaator Name[it]=Voice switch Name[kk]=Дауыс қосқышы @@ -14,6 +16,7 @@ Name[pt]=Comutador voz Name[pt_BR]=Comutador de voz Name[ru]=Голосовой коммутатор +Name[sk]=Hlasový prepínač Name[sv]=Röstväxel Name[uk]=Голосовий комутатор Name[x-test]=xxVoice switchxx diff -Nru calligra-2.4.0/flow/stencils/Cisco/workstation.desktop calligra-2.4.3/flow/stencils/Cisco/workstation.desktop --- calligra-2.4.0/flow/stencils/Cisco/workstation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/workstation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,13 +2,16 @@ Name=Workstation Name[bg]=Работна станция Name[ca]=Estació de treball +Name[ca@valencia]=Estació de treball Name[cs]=Prac. stanice Name[de]=Workstation Name[el]=Σταθμός εργασίας Name[es]=Estación de trabajo Name[et]=Tööjaam +Name[fi]=Työasema Name[hu]=Munkaállomás Name[it]=Workstation +Name[ja]=ワークステーション Name[kk]=Жұмыс станциясы Name[nb]=Arbeidsstasjon Name[nds]=Arbeitreekner @@ -17,6 +20,7 @@ Name[pt]=Estação trabalho Name[pt_BR]=Estação de trabalho Name[ru]=Рабочая станция +Name[sk]=Pracovná stanica Name[sv]=Arbetsstation Name[ug]=Workstation Name[uk]=Робоча станція diff -Nru calligra-2.4.0/flow/stencils/Cisco/www_server.desktop calligra-2.4.3/flow/stencils/Cisco/www_server.desktop --- calligra-2.4.0/flow/stencils/Cisco/www_server.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cisco/www_server.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,13 +2,16 @@ Name=WWW server Name[bg]=Сървър WWW Name[ca]=Servidor WWW +Name[ca@valencia]=Servidor WWW Name[cs]=Server WWW Name[de]=WWW-Server Name[el]=Εξυπηρετητής WWW Name[es]=Servidor WWW Name[et]=Veebiserver +Name[fi]=WWW-palvelin Name[hu]=WWW-kiszolgáló Name[it]=Server WWW +Name[ja]=ウェブサーバ Name[kk]=WWW сервері Name[nb]=WWW-tjener Name[nds]=WWW-Server @@ -17,6 +20,7 @@ Name[pt]=Servidor WWW Name[pt_BR]=Servidor WWW Name[ru]=Веб-сервер +Name[sk]=WWW server Name[sv]=Webbserver Name[uk]=Вебсервер Name[x-test]=xxWWW serverxx diff -Nru calligra-2.4.0/flow/stencils/Civil/bvrest.desktop calligra-2.4.3/flow/stencils/Civil/bvrest.desktop --- calligra-2.4.0/flow/stencils/Civil/bvrest.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/bvrest.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Bivalent Vertical Rest Name[bg]=Двоен вертикален остатък Name[ca]=Descans vertical bivalent +Name[ca@valencia]=Descans vertical bivalent Name[de]=Zweiwertige senkrechte Stütze Name[el]=Bivalent Vertical Rest +Name[es]=Descanso vertical bivalente Name[et]=Kahevalentne vertikaalne rest Name[it]=Resto verticale bivalente Name[kk]=Кос тік тірек @@ -14,6 +16,7 @@ Name[pt]=Descanso Vertical Bivalente Name[pt_BR]=Descanso vertical bivalente Name[ru]=Двусторонняя вертикальная опора +Name[sk]=Bivalentný zvislý zvyšok Name[sv]=Bivalent vertikalt stöd Name[uk]=Нерухома опора Name[x-test]=xxBivalent Vertical Restxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_aerator.desktop calligra-2.4.3/flow/stencils/Civil/civil_aerator.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_aerator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_aerator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Aerator Name[bg]=Аератор Name[ca]=Airejador +Name[ca@valencia]=Airejador Name[de]=Lüfter Name[el]=Aerator +Name[es]=Aireador Name[et]=Aeraator Name[it]=Aeratore Name[kk]=Аэратор @@ -13,6 +15,7 @@ Name[pt]=Aerator Name[pt_BR]=Aerador Name[ru]=Аэратор +Name[sk]=Aerátor Name[sv]=Luftare Name[uk]=Аератор Name[x-test]=xxAeratorxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_arrow_right.desktop calligra-2.4.3/flow/stencils/Civil/civil_arrow_right.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_arrow_right.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_arrow_right.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Right Arrow Name[bg]=Стрелка надясно Name[ca]=Fletxa dreta +Name[ca@valencia]=Fletxa dreta Name[cs]=Šipka doprava Name[da]=Pil til højre Name[de]=Pfeil nach rechts @@ -9,6 +10,7 @@ Name[es]=Flecha derecha Name[et]=Nool paremale Name[fr]=Flèche droit +Name[gl]=Frecha dereita Name[hu]=Jobbra nyíl Name[it]=Freccia a destra Name[kk]=Оң жақ жебесі @@ -19,6 +21,7 @@ Name[pt]=Seta Direita Name[pt_BR]=Seta à direita Name[ru]=Стрелка вправо +Name[sk]=Šípka doprava Name[sv]=Högerpil Name[ug]=ئوڭ يا ئوق Name[uk]=Стрілка праворуч diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_arrow_up.desktop calligra-2.4.3/flow/stencils/Civil/civil_arrow_up.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_arrow_up.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_arrow_up.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,15 @@ Name=Up Arrow Name[bg]=Стрелка нагоре Name[ca]=Fletxa amunt +Name[ca@valencia]=Fletxa amunt Name[cs]=Šipka nahoru Name[da]=Pil op Name[de]=Pfeil nach oben Name[el]=Πάνω βέλος Name[es]=Flecha arriba Name[et]=Nool üles +Name[fi]=Nuoli ylös +Name[gl]=Frecha cara a arriba Name[hu]=Felfelé nyíl Name[it]=Freccia in su Name[kk]=Жоғары жебесі @@ -18,6 +21,7 @@ Name[pt]=Seta Cima Name[pt_BR]=Seta para cima Name[ru]=Стрелка вверх +Name[sk]=Šípka hore Name[sv]=Uppåtpil Name[ug]=ئۈستى يا ئوق Name[uk]=Стрілка вгору diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_backflow_preventer.desktop calligra-2.4.3/flow/stencils/Civil/civil_backflow_preventer.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_backflow_preventer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_backflow_preventer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Backflow Preventer Name[bg]=Предпазител срещу обратен поток Name[ca]=Previsor de corrent invers +Name[ca@valencia]=Previsor de corrent invers Name[de]=Rückflussverhinderer Name[el]=Backflow Preventer +Name[es]=Válvula anti-retorno Name[et]=Tagasilöögiklapp Name[it]=Prevenzione da riflusso Name[kk]=Қайтар ағын басқышы @@ -14,6 +16,7 @@ Name[pt]=Prevenção Refluxo Name[pt_BR]=Bloqueio de refluxo Name[ru]=Предохранитель обратного потока +Name[sk]=Backflow Preventer Name[sv]=Backflödesventil Name[uk]=Запобіжник зворотного потоку Name[x-test]=xxBackflow Preventerxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_basin.desktop calligra-2.4.3/flow/stencils/Civil/civil_basin.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_basin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_basin.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Basin Name[bg]=Резервоар Name[ca]=Pica +Name[ca@valencia]=Pica Name[de]=Becken Name[el]=Basin +Name[es]=Lavabo Name[et]=Bassein Name[it]=Bacino Name[kk]=Резервуар @@ -14,6 +16,7 @@ Name[pt]=Canal Name[pt_BR]=Canal Name[ru]=Резервуар +Name[sk]=Povodie Name[sv]=Bassäng Name[uk]=Резервуар Name[x-test]=xxBasinxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_container.desktop calligra-2.4.3/flow/stencils/Civil/civil_container.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_container.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_container.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Container Name[bg]=Контейнер Name[ca]=Contenidor +Name[ca@valencia]=Contenidor Name[cs]=Kontejner Name[de]=Container Name[el]=Υποδοχέας Name[es]=Contenedor Name[et]=Konteiner Name[it]=Container +Name[ja]=コンテナ Name[kk]=Контейнер Name[nb]=Beholder Name[nds]=Gelaats @@ -16,6 +18,7 @@ Name[pt]=Contentor Name[pt_BR]=Contentor Name[ru]=Контейнер +Name[sk]=Kontajner Name[sv]=Behållare Name[ug]=قاچا Name[uk]=Контейнер diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_final-settling_basin.desktop calligra-2.4.3/flow/stencils/Civil/civil_final-settling_basin.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_final-settling_basin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_final-settling_basin.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Final-Settling Basin Name[bg]=Краен резервоар за утаяване Name[ca]=Pica d'assentament final +Name[ca@valencia]=Pica d'assentament final Name[de]=Becken zur endgültigen Entsorgung Name[el]=Final-Settling Basin +Name[es]=Ubicación final de un lavabo Name[et]=Settebassein Name[it]=Stagno di decantazione Name[kk]=Ақырғы тұндырғыш @@ -14,6 +16,7 @@ Name[pt]=Canal Assento Final Name[pt_BR]=Canal de assentamento final Name[ru]=Резервуар конечной обработки +Name[sk]=Koncová odkalovacia nádrž Name[sv]=Slutsedimenteringsbassäng Name[uk]=Резервуар для кінцевого продукту Name[x-test]=xxFinal-Settling Basinxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_frequency_converter.desktop calligra-2.4.3/flow/stencils/Civil/civil_frequency_converter.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_frequency_converter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_frequency_converter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Frequency Converter Name[bg]=Преобразувател на честоти Name[ca]=Convertidor de freqüències +Name[ca@valencia]=Convertidor de freqüències Name[de]=Frequenzwandler Name[el]=Μετατροπέας συχνότητας +Name[es]=Convertidor de frecuencia Name[et]=Sageduskonverter Name[it]=Convertitore di frequenza Name[kk]=Жиілік аударғышы @@ -14,6 +16,7 @@ Name[pt]=Conversor Frequência Name[pt_BR]=Conversor de frequência Name[ru]=Преобразователь частоты +Name[sk]=Konvertor frekvencie Name[sv]=Frekvensomvandlare Name[uk]=Перетворювач частот Name[x-test]=xxFrequency Converterxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_gas_bottle.desktop calligra-2.4.3/flow/stencils/Civil/civil_gas_bottle.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_gas_bottle.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_gas_bottle.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,12 @@ Name=Gas Bottle Name[bg]=Газова бутилка Name[ca]=Ampolla de gas +Name[ca@valencia]=Ampolla de gas Name[de]=Gasflasche Name[el]=Μπουκάλα αερίου +Name[es]=Botella de gas Name[et]=Gaasiballoon +Name[hu]=Gázpalack Name[it]=Bombola di gas Name[kk]=Газ баллоны Name[nb]=Gassflaske @@ -14,6 +17,7 @@ Name[pt]=Botija Gás Name[pt_BR]=Garrafa de gás Name[ru]=Газовый баллон +Name[sk]=Plynová nádoba Name[sv]=Gastub Name[uk]=Газовий балон Name[x-test]=xxGas Bottlexx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_horizontal_limiting_line.desktop calligra-2.4.3/flow/stencils/Civil/civil_horizontal_limiting_line.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_horizontal_limiting_line.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_horizontal_limiting_line.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Horizontal Limiting Line Name[bg]=Хоризонтална ограничаваща линия Name[ca]=Línia limitadora horitzontal +Name[ca@valencia]=Línia limitadora horitzontal Name[de]=Waagerechte Begrenzungslinie Name[el]=Οριζόντια περιοριστική γραμμή +Name[es]=Línea de limitación horizontal Name[et]=Horisontaalne piirjoon Name[it]=Linea di delimitazione orizzontale Name[kk]=Жатық шектеу сызығы @@ -13,6 +15,7 @@ Name[pt]=Linha Limitação Horizontal Name[pt_BR]=Linha limitadora horizontal Name[ru]=Горизонтальная ограничивающая линия +Name[sk]=Vodorovná deliaca čiara Name[sv]=Horisontell avgränsningslinje Name[uk]=Горизонтальний обмежувач Name[x-test]=xxHorizontal Limiting Linexx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_horizontal_valve.desktop calligra-2.4.3/flow/stencils/Civil/civil_horizontal_valve.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_horizontal_valve.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_horizontal_valve.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Horizontal Valve Name[bg]=Хоризонтална клапа Name[ca]=Vàlvula horitzontal +Name[ca@valencia]=Vàlvula horitzontal Name[de]=Waagerechtes Ventil Name[el]=Οριζόντια βαλβίδα +Name[es]=Válvula horizontal Name[et]=Horisontaalne siiber Name[it]=Valvola orizzontale Name[kk]=Жатық шұра @@ -14,6 +16,7 @@ Name[pt]=Válvula Horizontal Name[pt_BR]=Válvula horizontal Name[ru]=Горизонтальный клапан +Name[sk]=Vodorovný valec Name[sv]=Horisontell ventil Name[uk]=Горизонтальний клапан Name[x-test]=xxHorizontal Valvexx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_motor.desktop calligra-2.4.3/flow/stencils/Civil/civil_motor.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_motor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_motor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,14 @@ Name=Motor Name[bg]=Двигател Name[ca]=Motor +Name[ca@valencia]=Motor Name[de]=Motor Name[el]=Κινητήρας +Name[es]=Motor Name[et]=Mootor +Name[hu]=Motor Name[it]=Motore +Name[ja]=モーター Name[kk]=Мотор Name[nb]=Motor Name[nds]=Motor @@ -14,6 +18,7 @@ Name[pt]=Motor Name[pt_BR]=Motor Name[ru]=Двигатель +Name[sk]=Motor Name[sv]=Motor Name[uk]=Двигун Name[x-test]=xxMotorxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_preliminary_clarification_tank.desktop calligra-2.4.3/flow/stencils/Civil/civil_preliminary_clarification_tank.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_preliminary_clarification_tank.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_preliminary_clarification_tank.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Preliminary Clarification Tank Name[bg]=Резервоар за предварително пречистване Name[ca]=Tanc clarificador preliminar +Name[ca@valencia]=Tanc clarificador preliminar Name[de]=Vorklärbecken Name[el]=Preliminary Clarification Tank +Name[es]=Tanque de clarificación preliminar Name[et]=Eelpuhastustank Name[it]=Cisterna di purificazione preliminare Name[kk]=Алдын-ала тазалау бак @@ -14,6 +16,7 @@ Name[pt]=Tanque Clarificação Preliminar Name[pt_BR]=Tanque de clarificação preliminar Name[ru]=Резервуар предварительной очистки +Name[sk]=Preliminary Clarification Tank Name[sv]=Förberedande eftersedimenteringstank Name[uk]=Цистерна попереднього очищення Name[x-test]=xxPreliminary Clarification Tankxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_rotor.desktop calligra-2.4.3/flow/stencils/Civil/civil_rotor.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_rotor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_rotor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,16 @@ Name=Rotor Name[bg]=Ротор Name[ca]=Rotor +Name[ca@valencia]=Rotor Name[cs]=Rotor Name[de]=Rotor Name[el]=Στροφέας +Name[es]=Rotor Name[et]=Rootor Name[ga]=Rotor +Name[hu]=Rotor Name[it]=Rotore +Name[ja]=ローター Name[kk]=Ротор Name[nb]=Rotor Name[nds]=Rotor diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_soil.desktop calligra-2.4.3/flow/stencils/Civil/civil_soil.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_soil.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_soil.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,13 @@ Name=Soil Name[bg]=Почва Name[ca]=Sòl +Name[ca@valencia]=Sòl Name[de]=Erdreich Name[el]=Soil +Name[es]=Tierra Name[et]=Maapind Name[it]=Terra +Name[ja]=土 Name[kk]=Топрақ Name[nb]=Jord Name[nds]=Bodden @@ -14,6 +17,7 @@ Name[pt]=Solo Name[pt_BR]=Solo Name[ru]=Почва +Name[sk]=Pôda Name[sv]=Jord Name[uk]=Ґрунт Name[x-test]=xxSoilxx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_vertical_limiting_line.desktop calligra-2.4.3/flow/stencils/Civil/civil_vertical_limiting_line.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_vertical_limiting_line.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_vertical_limiting_line.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Vertical Limiting Line Name[bg]=Вертикална ограничаваща линия Name[ca]=Línia limitadora vertical +Name[ca@valencia]=Línia limitadora vertical Name[de]=Senkrechte Begrenzungslinie Name[el]=Κάθετη περιοριστική γραμμή +Name[es]=Línea de limitación vertical Name[et]=Vertikaalne piirjoon Name[it]=Linea di delimitazione verticale Name[kk]=Тік шектеу сызығы @@ -13,6 +15,7 @@ Name[pt]=Linha Limitação Vertical Name[pt_BR]=Linha limitadora vertical Name[ru]=Вертикальная ограничивающая линия +Name[sk]=Zvlislá deliaca čiara Name[sv]=Vertikal avgränsningslinje Name[uk]=Вертикальний обмежувач Name[x-test]=xxVertical Limiting Linexx diff -Nru calligra-2.4.0/flow/stencils/Civil/civil_vertical_propeller.desktop calligra-2.4.3/flow/stencils/Civil/civil_vertical_propeller.desktop --- calligra-2.4.0/flow/stencils/Civil/civil_vertical_propeller.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/civil_vertical_propeller.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Vertical Propeller Name[bg]=Вертикална перка Name[ca]=Propulsor vertical +Name[ca@valencia]=Propelent vertical Name[de]=Senkrechter Propeller Name[el]=Κάθετη έλικα +Name[es]=Hélice vertical Name[et]=Vertikaalne propeller Name[it]=Propulsore verticale Name[kk]=Тік пропеллер @@ -13,6 +15,7 @@ Name[pt]=Propulsor Vertical Name[pt_BR]=Propulsor vertical Name[ru]=Вертикальный вентилятор +Name[sk]=Zvislá vrtuľa Name[sv]=Vertikal propeller Name[uk]=Вертикальний гвинт Name[x-test]=xxVertical Propellerxx diff -Nru calligra-2.4.0/flow/stencils/Civil/collection.desktop calligra-2.4.3/flow/stencils/Civil/collection.desktop --- calligra-2.4.0/flow/stencils/Civil/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Civil Name[bg]=Граждански Name[ca]=Civil +Name[ca@valencia]=Civil Name[de]=Bauwesen Name[el]=Civil +Name[es]=Civil Name[et]=Ehitus Name[it]=Civile Name[kk]=Инженерлік @@ -13,6 +15,7 @@ Name[pt]=Civil Name[pt_BR]=Civil Name[ru]=Гражданское +Name[sk]=Civilné Name[sv]=Väg och vatten Name[uk]=Будівництво Name[x-test]=xxCivilxx diff -Nru calligra-2.4.0/flow/stencils/Civil/hcompressor.desktop calligra-2.4.3/flow/stencils/Civil/hcompressor.desktop --- calligra-2.4.0/flow/stencils/Civil/hcompressor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/hcompressor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Horizontal Compressor Name[bg]=Хоризонтален компресор Name[ca]=Compressor horitzontal +Name[ca@valencia]=Compressor horitzontal Name[de]=Waagerechter Kompressor Name[el]=Οριζόντιος συμπιεστής +Name[es]=Compresor horizontal Name[et]=Horisontaalne kompressor Name[it]=Compressore orizzontale Name[kk]=Жатық компрессор @@ -14,6 +16,7 @@ Name[pt]=Compressor Horizontal Name[pt_BR]=Compressor horizontal Name[ru]=Горизонтальный компрессор +Name[sk]=Vodorovný kompresor Name[sv]=Horisontell kompressor Name[uk]=Горизонтальний компресор Name[x-test]=xxHorizontal Compressorxx diff -Nru calligra-2.4.0/flow/stencils/Civil/hpump.desktop calligra-2.4.3/flow/stencils/Civil/hpump.desktop --- calligra-2.4.0/flow/stencils/Civil/hpump.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/hpump.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Horizontal Pump Name[bg]=Хоризонтална помпа Name[ca]=Bomba horitzontal +Name[ca@valencia]=Bomba horitzontal Name[de]=Waagerechte Pumpe Name[el]=Horizontal Pump +Name[es]=Bomba horizontal Name[et]=Horisontaalne pump Name[it]=Pompa orizzontale Name[kk]=Жатық сорғыш @@ -14,6 +16,7 @@ Name[pt]=Bomba Horizontal Name[pt_BR]=Bomba horizontal Name[ru]=Горизонтальный насос +Name[sk]=Vodorovná pumpa Name[sv]=Horisontell pump Name[uk]=Насос (горизонтально) Name[x-test]=xxHorizontal Pumpxx diff -Nru calligra-2.4.0/flow/stencils/Civil/hrest.desktop calligra-2.4.3/flow/stencils/Civil/hrest.desktop --- calligra-2.4.0/flow/stencils/Civil/hrest.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/hrest.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Horizontal Rest Name[bg]=Хоризонтален остатък Name[ca]=Descans horitzontal +Name[ca@valencia]=Descans horitzontal Name[de]=Waagerechte Stütze Name[el]=Horizontal Rest +Name[es]=Descanso horizontal Name[et]=Horisontaalne rest Name[it]=Resto orizzontale Name[kk]=Жақ тірек @@ -14,6 +16,7 @@ Name[pt]=Descanso Horizontal Name[pt_BR]=Descanso horizontal Name[ru]=Горизонтальная опора +Name[sk]=Vodorovný zvyšok Name[sv]=Horisontellt stöd Name[uk]=Горизонтальна опора Name[x-test]=xxHorizontal Restxx diff -Nru calligra-2.4.0/flow/stencils/Civil/line.desktop calligra-2.4.3/flow/stencils/Civil/line.desktop --- calligra-2.4.0/flow/stencils/Civil/line.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/line.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Reference Line Name[bg]=Указателна линия Name[ca]=Línia de referència +Name[ca@valencia]=Línia de referència Name[de]=Bezugslinie Name[el]=Γραμμή αναφοράς Name[es]=Línea de referencia @@ -15,6 +16,7 @@ Name[pt]=Linha de Referência Name[pt_BR]=Linha de referência Name[ru]=Базовая линия +Name[sk]=Referenčný riadok Name[sv]=Horisontell avgränsningslinje Name[uk]=Лінія відліку Name[x-test]=xxReference Linexx diff -Nru calligra-2.4.0/flow/stencils/Civil/vcompressor.desktop calligra-2.4.3/flow/stencils/Civil/vcompressor.desktop --- calligra-2.4.0/flow/stencils/Civil/vcompressor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/vcompressor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Vertical Compressor Name[bg]=Вертикален компресор Name[ca]=Compressor vertical +Name[ca@valencia]=Compressor vertical Name[de]=Senkrechter Kompressor Name[el]=Κατακόρυφος συμπιεστής +Name[es]=Compresor vertical Name[et]=Vertikaalne kompressor Name[it]=Compressore verticale Name[kk]=Тік компрессор @@ -14,6 +16,7 @@ Name[pt]=Compressor Vertical Name[pt_BR]=Compressor vertical Name[ru]=Вертикальный компрессор +Name[sk]=Zvislý kompresor Name[sv]=Vertikal kompressor Name[uk]=Вертикальний компресор Name[x-test]=xxVertical Compressorxx diff -Nru calligra-2.4.0/flow/stencils/Civil/vpump.desktop calligra-2.4.3/flow/stencils/Civil/vpump.desktop --- calligra-2.4.0/flow/stencils/Civil/vpump.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/vpump.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Vertical Pump Name[bg]=Вертикална помпа Name[ca]=Bomba vertical +Name[ca@valencia]=Bomba vertical Name[de]=Senkrechte Pumpe Name[el]=Κατακόρυφη αντλία +Name[es]=Bomba vertical Name[et]=Vertikaalne pump Name[it]=Pompa verticale Name[kk]=Тік сорғыш @@ -14,6 +16,7 @@ Name[pt]=Bomba Vertical Name[pt_BR]=Bomba vertical Name[ru]=Вертикальный насос +Name[sk]=Zvislá pumpa Name[sv]=Vertikal pump Name[uk]=Вертикальний насос Name[x-test]=xxVertical Pumpxx diff -Nru calligra-2.4.0/flow/stencils/Civil/vrest.desktop calligra-2.4.3/flow/stencils/Civil/vrest.desktop --- calligra-2.4.0/flow/stencils/Civil/vrest.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/vrest.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,8 +2,10 @@ Name=Vertical Rest Name[bg]=Вертикален остатък Name[ca]=Descans vertical +Name[ca@valencia]=Descans vertical Name[de]=Senkrechte Stütze Name[el]=Vertical Rest +Name[es]=Descanso vertical Name[et]=Vertikaalne rest Name[it]=Resto verticale Name[kk]=Тік тірек @@ -14,6 +16,7 @@ Name[pt]=Descanso Vertical Name[pt_BR]=Descanso vertical Name[ru]=Вертикальная опора +Name[sk]=Zvislý zvyšok Name[sv]=Vertikalt stöd Name[uk]=Вертикальна опора Name[x-test]=xxVertical Restxx diff -Nru calligra-2.4.0/flow/stencils/Civil/water_level.desktop calligra-2.4.3/flow/stencils/Civil/water_level.desktop --- calligra-2.4.0/flow/stencils/Civil/water_level.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Civil/water_level.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=Water Level Name[bg]=Ниво на водата Name[ca]=Nivell d'aigua +Name[ca@valencia]=Nivell d'aigua Name[cs]=Vodní hladina: Name[de]=Wasserspiegel Name[el]=Επίπεδο ύδατος +Name[es]=Nivel del agua Name[et]=Veetase Name[hu]=Vízszint Name[it]=Livello dell'acqua +Name[ja]=水位 Name[kk]=Су деңгейі Name[nb]=Vannstand Name[nds]=Waterstand @@ -16,6 +19,7 @@ Name[pt]=Nível Água Name[pt_BR]=Nível da água Name[ru]=Уровень воды +Name[sk]=Hladina vody Name[sv]=Vattennivå Name[uk]=Рівень води Name[x-test]=xxWater Levelxx diff -Nru calligra-2.4.0/flow/stencils/CMOS/collection.desktop calligra-2.4.3/flow/stencils/CMOS/collection.desktop --- calligra-2.4.0/flow/stencils/CMOS/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,15 @@ Name=CMOS Name[bg]=CMOS Name[ca]=CMOS +Name[ca@valencia]=CMOS Name[de]=CMOS Name[el]=CMOS +Name[es]=CMOS Name[et]=CMOS Name[fi]=CMOS +Name[hu]=CMOS Name[it]=CMOS +Name[ja]=CMOS Name[kk]=CMOS Name[nb]=CMOS Name[nds]=CMOS diff -Nru calligra-2.4.0/flow/stencils/CMOS/gnd_h.desktop calligra-2.4.3/flow/stencils/CMOS/gnd_h.desktop --- calligra-2.4.0/flow/stencils/CMOS/gnd_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/gnd_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=gnd h Name[ca]=gnd h +Name[ca@valencia]=gnd h Name[el]=gnd h +Name[es]=tierra h Name[et]=Horisontaalne maa Name[fi]=gnd h Name[it]=gnd h +Name[ja]=gnd h Name[kk]=gnd h Name[nb]=jord vannr Name[nl]=gnd h diff -Nru calligra-2.4.0/flow/stencils/CMOS/gnd_v.desktop calligra-2.4.3/flow/stencils/CMOS/gnd_v.desktop --- calligra-2.4.0/flow/stencils/CMOS/gnd_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/gnd_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=gnd v Name[ca]=gnd v +Name[ca@valencia]=gnd v Name[el]=gnd v +Name[es]=tierra v Name[et]=Vertikaalne maa Name[fi]=gnd v Name[it]=gnd v +Name[ja]=gnd v Name[kk]=gnd v Name[nb]=jord loddr Name[nl]=gnd v diff -Nru calligra-2.4.0/flow/stencils/CMOS/nmos_h.desktop calligra-2.4.3/flow/stencils/CMOS/nmos_h.desktop --- calligra-2.4.0/flow/stencils/CMOS/nmos_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/nmos_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=nmos h Name[ca]=nmos h +Name[ca@valencia]=nmos h Name[el]=nmos h +Name[es]=nmos h Name[et]=Horisontaalne NMOS Name[fi]=nmos h Name[it]=nmos h +Name[ja]=nmos h Name[kk]=nmos h Name[nb]=nmos vannr Name[nl]=nmos h diff -Nru calligra-2.4.0/flow/stencils/CMOS/nmos_v.desktop calligra-2.4.3/flow/stencils/CMOS/nmos_v.desktop --- calligra-2.4.0/flow/stencils/CMOS/nmos_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/nmos_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=nmos v Name[ca]=nmos v +Name[ca@valencia]=nmos v Name[el]=nmos v +Name[es]=nmos v Name[et]=Vertikaalne NMOS Name[fi]=nmos v Name[it]=nmos v +Name[ja]=nmos v Name[kk]=nmos v Name[nb]=nmos loddr Name[nl]=nmos v diff -Nru calligra-2.4.0/flow/stencils/CMOS/pmos_h.desktop calligra-2.4.3/flow/stencils/CMOS/pmos_h.desktop --- calligra-2.4.0/flow/stencils/CMOS/pmos_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/pmos_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=pmos h Name[ca]=pmos h +Name[ca@valencia]=pmos h Name[el]=pmos h +Name[es]=pmos h Name[et]=Horisontaalne PMOS Name[fi]=pmos h Name[it]=pmos h +Name[ja]=pmos h Name[kk]=pmos h Name[nb]=pmos vannr Name[nl]=pmos h diff -Nru calligra-2.4.0/flow/stencils/CMOS/pmos_v.desktop calligra-2.4.3/flow/stencils/CMOS/pmos_v.desktop --- calligra-2.4.0/flow/stencils/CMOS/pmos_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/pmos_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=pmos v Name[ca]=pmos v +Name[ca@valencia]=pmos v Name[el]=pmos v +Name[es]=pmos v Name[et]=Vertikaalne PMOS Name[fi]=pmos v Name[it]=pmos v +Name[ja]=pmos v Name[kk]=pmos v Name[nb]=pmos loddr Name[nl]=pmos v diff -Nru calligra-2.4.0/flow/stencils/CMOS/vdd_h.desktop calligra-2.4.3/flow/stencils/CMOS/vdd_h.desktop --- calligra-2.4.0/flow/stencils/CMOS/vdd_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/vdd_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=vdd h Name[ca]=vdd h +Name[ca@valencia]=vdd h Name[el]=vdd h +Name[es]=vdd h Name[et]=Horisontaalne VDD Name[fi]=vdd h Name[it]=vdd h +Name[ja]=vdd h Name[kk]=vdd h Name[nb]=vdd vannr Name[nl]=vdd h diff -Nru calligra-2.4.0/flow/stencils/CMOS/vdd_v.desktop calligra-2.4.3/flow/stencils/CMOS/vdd_v.desktop --- calligra-2.4.0/flow/stencils/CMOS/vdd_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/CMOS/vdd_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=vdd v Name[ca]=vdd v +Name[ca@valencia]=vdd v Name[el]=vdd v +Name[es]=vdd v Name[et]=Vertikaalne VDD Name[fi]=vdd v Name[it]=vdd v +Name[ja]=vdd v Name[kk]=vdd v Name[nb]=vdd loddr Name[nl]=vdd v diff -Nru calligra-2.4.0/flow/stencils/Contact/c_if.desktop calligra-2.4.3/flow/stencils/Contact/c_if.desktop --- calligra-2.4.0/flow/stencils/Contact/c_if.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/c_if.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=if Name[ca]=if +Name[ca@valencia]=if Name[cs]=když Name[el]=if +Name[es]=if Name[et]=if Name[fi]=if +Name[hu]=ha Name[it]=if Name[kk]=егер Name[nb]=hvis @@ -13,6 +16,7 @@ Name[pt]=se Name[pt_BR]=se Name[ru]=Если +Name[sk]=if Name[sv]=om Name[ug]=if Name[uk]=if diff -Nru calligra-2.4.0/flow/stencils/Contact/c_ifnot.desktop calligra-2.4.3/flow/stencils/Contact/c_ifnot.desktop --- calligra-2.4.0/flow/stencils/Contact/c_ifnot.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/c_ifnot.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=ifnot Name[ca]=ifnot +Name[ca@valencia]=ifnot Name[el]=ifnot +Name[es]=ifnot Name[et]=ifnot Name[fi]=ifnot Name[it]=ifnot @@ -12,6 +14,7 @@ Name[pt]=senão Name[pt_BR]=senão Name[ru]=Если не +Name[sk]=ifnot Name[sv]=om inte Name[uk]=ifnot Name[x-test]=xxifnotxx diff -Nru calligra-2.4.0/flow/stencils/Contact/c_lamp.desktop calligra-2.4.3/flow/stencils/Contact/c_lamp.desktop --- calligra-2.4.0/flow/stencils/Contact/c_lamp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/c_lamp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=lamp Name[ca]=làmpada +Name[ca@valencia]=làmpada Name[de]=Lampe Name[el]=lamp +Name[es]=lámpara Name[et]=Lamp Name[it]=lamp +Name[ja]=ランプ Name[kk]=лампа Name[nb]=lampe Name[nl]=lamp @@ -12,6 +15,7 @@ Name[pt]=lâmpada Name[pt_BR]=lâmpada Name[ru]=Лампа +Name[sk]=lampa Name[sv]=lampa Name[uk]=lamp Name[x-test]=xxlampxx diff -Nru calligra-2.4.0/flow/stencils/Contact/collection.desktop calligra-2.4.3/flow/stencils/Contact/collection.desktop --- calligra-2.4.0/flow/stencils/Contact/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Contact Name[ca]=Contacte +Name[ca@valencia]=Contacte Name[cs]=kontakt Name[de]=Kontakt Name[el]=Επαφή +Name[es]=Contacto Name[et]=Kontakt Name[ga]=Teagmháil Name[hu]=Névjegy @@ -15,6 +17,7 @@ Name[pt]=Contacto Name[pt_BR]=Contato Name[ru]=Контакт +Name[sk]=Kontakt Name[sv]=Kontakt Name[ug]=ئالاقەداش Name[uk]=Контакт diff -Nru calligra-2.4.0/flow/stencils/Contact/c_relay.desktop calligra-2.4.3/flow/stencils/Contact/c_relay.desktop --- calligra-2.4.0/flow/stencils/Contact/c_relay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/c_relay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=relay Name[bg]=реле Name[ca]=relé +Name[ca@valencia]=relé Name[cs]=přenos Name[de]=Relais Name[el]=relay +Name[es]=relé Name[et]=Relee Name[it]=relé +Name[ja]=リレー Name[kk]=Реле Name[nb]=rele Name[nl]=Relais @@ -14,6 +17,7 @@ Name[pt]=relé Name[pt_BR]=relé Name[ru]=Реле +Name[sk]=relé Name[sv]=relä Name[uk]=реле Name[x-test]=xxrelayxx diff -Nru calligra-2.4.0/flow/stencils/Contact/l_if.desktop calligra-2.4.3/flow/stencils/Contact/l_if.desktop --- calligra-2.4.0/flow/stencils/Contact/l_if.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_if.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=if Name[ca]=if +Name[ca@valencia]=if Name[cs]=když Name[el]=if +Name[es]=if Name[et]=if Name[fi]=if +Name[hu]=ha Name[it]=if Name[kk]=егер Name[nb]=hvis @@ -13,6 +16,7 @@ Name[pt]=se Name[pt_BR]=se Name[ru]=Если +Name[sk]=if Name[sv]=om Name[ug]=if Name[uk]=if diff -Nru calligra-2.4.0/flow/stencils/Contact/l_ifnot.desktop calligra-2.4.3/flow/stencils/Contact/l_ifnot.desktop --- calligra-2.4.0/flow/stencils/Contact/l_ifnot.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_ifnot.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=ifnot Name[ca]=ifnot +Name[ca@valencia]=ifnot Name[el]=ifnot +Name[es]=ifnot Name[et]=ifnot Name[fi]=ifnot Name[it]=ifnot @@ -12,6 +14,7 @@ Name[pt]=senão Name[pt_BR]=senão Name[ru]=Если не +Name[sk]=ifnot Name[sv]=om inte Name[uk]=ifnot Name[x-test]=xxifnotxx diff -Nru calligra-2.4.0/flow/stencils/Contact/l_out.desktop calligra-2.4.3/flow/stencils/Contact/l_out.desktop --- calligra-2.4.0/flow/stencils/Contact/l_out.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_out.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=out Name[ca]=fora +Name[ca@valencia]=fora Name[cs]=ven Name[el]=out +Name[es]=salida Name[et]=out Name[fi]=out Name[it]=out @@ -13,6 +15,7 @@ Name[pt]=saída Name[pt_BR]=saída Name[ru]=out +Name[sk]=von Name[sv]=ut Name[uk]=out Name[x-test]=xxoutxx diff -Nru calligra-2.4.0/flow/stencils/Contact/l_outj.desktop calligra-2.4.3/flow/stencils/Contact/l_outj.desktop --- calligra-2.4.0/flow/stencils/Contact/l_outj.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_outj.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=outj Name[ca]=outj +Name[ca@valencia]=outj Name[el]=outj +Name[es]=salida j Name[et]=outj Name[fi]=outj Name[it]=outj diff -Nru calligra-2.4.0/flow/stencils/Contact/l_outnot.desktop calligra-2.4.3/flow/stencils/Contact/l_outnot.desktop --- calligra-2.4.0/flow/stencils/Contact/l_outnot.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_outnot.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=outnot Name[ca]=outnot +Name[ca@valencia]=outnot Name[el]=outnot +Name[es]=salida no Name[et]=outnot Name[fi]=outnot Name[it]=outnot diff -Nru calligra-2.4.0/flow/stencils/Contact/l_outrcep.desktop calligra-2.4.3/flow/stencils/Contact/l_outrcep.desktop --- calligra-2.4.0/flow/stencils/Contact/l_outrcep.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_outrcep.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=outrcep Name[ca]=outrcep +Name[ca@valencia]=outrcep Name[el]=outrcep +Name[es]=salida recep Name[et]=outrcep Name[fi]=outrcep Name[it]=outrcep diff -Nru calligra-2.4.0/flow/stencils/Contact/l_outr.desktop calligra-2.4.3/flow/stencils/Contact/l_outr.desktop --- calligra-2.4.0/flow/stencils/Contact/l_outr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_outr.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=outr Name[ca]=outr +Name[ca@valencia]=outr Name[el]=outr +Name[es]=salida r Name[et]=outr Name[fi]=outr Name[it]=outr diff -Nru calligra-2.4.0/flow/stencils/Contact/l_outs.desktop calligra-2.4.3/flow/stencils/Contact/l_outs.desktop --- calligra-2.4.0/flow/stencils/Contact/l_outs.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_outs.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=outs Name[ca]=outs +Name[ca@valencia]=outs Name[el]=outs +Name[es]=salida s Name[et]=outs Name[fi]=outs Name[it]=outs diff -Nru calligra-2.4.0/flow/stencils/Contact/l_sout.desktop calligra-2.4.3/flow/stencils/Contact/l_sout.desktop --- calligra-2.4.0/flow/stencils/Contact/l_sout.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_sout.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=sout Name[ca]=sout +Name[ca@valencia]=sout Name[el]=sout +Name[es]=salida s Name[et]=sout Name[fi]=sout Name[it]=sout @@ -12,6 +14,7 @@ Name[pt]=saída-s Name[pt_BR]=saída-s Name[ru]=sout +Name[sk]=sout Name[sv]=s ut Name[uk]=sout Name[x-test]=xxsoutxx diff -Nru calligra-2.4.0/flow/stencils/Contact/l_soutnot.desktop calligra-2.4.3/flow/stencils/Contact/l_soutnot.desktop --- calligra-2.4.0/flow/stencils/Contact/l_soutnot.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_soutnot.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=soutnot Name[ca]=soutnot +Name[ca@valencia]=soutnot Name[el]=soutnot +Name[es]=salida s no Name[et]=soutnot Name[fi]=soutnot Name[it]=soutnot diff -Nru calligra-2.4.0/flow/stencils/Contact/l_soutr.desktop calligra-2.4.3/flow/stencils/Contact/l_soutr.desktop --- calligra-2.4.0/flow/stencils/Contact/l_soutr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_soutr.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=soutr Name[ca]=soutr +Name[ca@valencia]=soutr Name[el]=soutr +Name[es]=salida s r Name[et]=soutr Name[fi]=soutr Name[it]=soutr diff -Nru calligra-2.4.0/flow/stencils/Contact/l_souts.desktop calligra-2.4.3/flow/stencils/Contact/l_souts.desktop --- calligra-2.4.0/flow/stencils/Contact/l_souts.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Contact/l_souts.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,9 @@ [Desktop Entry] Name=souts Name[ca]=souts +Name[ca@valencia]=souts Name[el]=souts +Name[es]=salida s s Name[et]=souts Name[fi]=souts Name[it]=souts diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/b-integrator.desktop calligra-2.4.3/flow/stencils/Cybernetics/b-integrator.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/b-integrator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/b-integrator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,9 @@ [Desktop Entry] Name=b-integrator Name[ca]=integrador-b +Name[ca@valencia]=integrado-b Name[el]=b-integrator -Name[es]=integrador inferior +Name[es]=integrador b Name[et]=Alumine integreerimislüli Name[it]=b-integrator Name[kk]=b-интегратор @@ -12,6 +13,7 @@ Name[pt]=integrador-b Name[pt_BR]=integrador-b Name[ru]=b-интегратор +Name[sk]=b-integrator Name[sv]=b-integrator Name[uk]=Інтегратор (вхід знизу) Name[x-test]=xxb-integratorxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/b-minus.desktop calligra-2.4.3/flow/stencils/Cybernetics/b-minus.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/b-minus.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/b-minus.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,9 @@ [Desktop Entry] Name=b-minus Name[ca]=b-minus +Name[ca@valencia]=b-minus Name[el]=b-minus -Name[es]=sustracción de la entrada inferior +Name[es]=menos b Name[et]=Alumine miinus Name[it]=b-minus Name[kk]=b-minus @@ -12,6 +13,7 @@ Name[pt]=b-menos Name[pt_BR]=b-menos Name[ru]=b-minus +Name[sk]=b-minus Name[sv]=b-minus Name[uk]=Суматор (віднімання входу знизу) Name[x-test]=xxb-minusxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/b-sens.desktop calligra-2.4.3/flow/stencils/Cybernetics/b-sens.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/b-sens.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/b-sens.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,9 @@ [Desktop Entry] Name=b-sens Name[ca]=b-sens +Name[ca@valencia]=b-sens Name[el]=b-sens -Name[es]=sensor inferior +Name[es]=sensor b Name[et]=Alumine sensor Name[it]=b-sens Name[kk]=b-sens @@ -12,6 +13,7 @@ Name[pt]=b-sensor Name[pt_BR]=b-sensor Name[ru]=b-sens +Name[sk]=b-sens Name[sv]=b-sensor Name[uk]=Датчик (знизу) Name[x-test]=xxb-sensxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/collection.desktop calligra-2.4.3/flow/stencils/Cybernetics/collection.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Cybernetics Name[ca]=Cibernètica +Name[ca@valencia]=Cibernètica Name[de]=Regelungstechnik Name[el]=Κυβερνητική Name[es]=Cibernética diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/delta-t.desktop calligra-2.4.3/flow/stencils/Cybernetics/delta-t.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/delta-t.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/delta-t.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=delta-t Name[ca]=delta-t +Name[ca@valencia]=delta-t Name[el]=delta-t Name[es]=delta-t Name[et]=Delta-t @@ -12,6 +13,7 @@ Name[pt]=delta-t Name[pt_BR]=delta-t Name[ru]=дельта-t +Name[sk]=delta-t Name[sv]=delta-t Name[uk]=Часова затримка Name[x-test]=xxdelta-txx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/empty-func.desktop calligra-2.4.3/flow/stencils/Cybernetics/empty-func.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/empty-func.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/empty-func.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=empty-func Name[ca]=funció-buit +Name[ca@valencia]=funció-buit Name[el]=empty-func Name[es]=función vacía Name[et]=Tühi funktsioon @@ -12,6 +13,7 @@ Name[pt]=função-vazia Name[pt_BR]=função vazia Name[ru]=Пустая функция +Name[sk]=prázdna funkcia Name[sv]=tom-funktion Name[uk]=Шаблон для нетипових характеристик Name[x-test]=xxempty-funcxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/factor-0to-1.desktop calligra-2.4.3/flow/stencils/Cybernetics/factor-0to-1.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/factor-0to-1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/factor-0to-1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=factor-0to-1 Name[ca]=factor-0to-1 +Name[ca@valencia]=factor-0to-1 Name[el]=factor-0to-1 Name[es]=factor entre 0 y -1 Name[et]=Tegur 0 kuni -1 @@ -12,6 +13,7 @@ Name[pt]=factor-0para-1 Name[pt_BR]=fator 0 para -1 Name[ru]=фактор-0к-1 +Name[sk]=factor-0to-1 Name[sv]=faktor-0till-1 Name[uk]=Сталий множник від 0 до -1 Name[x-test]=xxfactor-0to-1xx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/factor-0to1.desktop calligra-2.4.3/flow/stencils/Cybernetics/factor-0to1.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/factor-0to1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/factor-0to1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=factor-0to1 Name[ca]=factor-0to1 +Name[ca@valencia]=factor-0to1 Name[el]=factor-0to1 Name[es]=factor entre 0 y 1 Name[et]=Tegur 0 kuni 1 @@ -12,6 +13,7 @@ Name[pt]=factor-0para1 Name[pt_BR]=fator 0 para 1 Name[ru]=фактор-0к1 +Name[sk]=factor-0to1 Name[sv]=faktor-0till1 Name[uk]=Сталий множник від 0 до 1 Name[x-test]=xxfactor-0to1xx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/factor-greater1.desktop calligra-2.4.3/flow/stencils/Cybernetics/factor-greater1.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/factor-greater1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/factor-greater1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=factor-greater1 Name[ca]=factor-greater1 +Name[ca@valencia]=factor-greater1 Name[el]=factor-greater1 Name[es]=factor mayor que 1 Name[et]=Tegur suurem kui 1 @@ -12,6 +13,7 @@ Name[pt]=factor-maior1 Name[pt_BR]=fator maior que 1 Name[ru]=фактор-больше1 +Name[sk]=factor-greater1 Name[sv]=faktor-större-än-1 Name[uk]=Сталий множник, більший за 1 Name[x-test]=xxfactor-greater1xx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/factor-smaller-1.desktop calligra-2.4.3/flow/stencils/Cybernetics/factor-smaller-1.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/factor-smaller-1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/factor-smaller-1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=factor-smaller-1 Name[ca]=factor-smaller-1 +Name[ca@valencia]=factor-smaller-1 Name[el]=factor-smaller-1 Name[es]=factor menor que 1 Name[et]=Tegur väiksem kui -1 @@ -12,6 +13,7 @@ Name[pt]=factor-menor-1 Name[pt_BR]=fator menor que -1 Name[ru]=фактор-меньше-1 +Name[sk]=factor-smaller-1 Name[sv]=faktor-mindre-än-1 Name[uk]=Сталий множник, менший за 1 Name[x-test]=xxfactor-smaller-1xx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/full-wave-rectifier.desktop calligra-2.4.3/flow/stencils/Cybernetics/full-wave-rectifier.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/full-wave-rectifier.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/full-wave-rectifier.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=full-wave-rectifier Name[ca]=full-wave-rectifier +Name[ca@valencia]=full-wave-rectifier Name[de]=Zweiweggleichrichter Name[el]=full-wave-rectifier Name[es]=rectificador de onda completa @@ -13,6 +14,7 @@ Name[pt]=rectificador-onda-completa Name[pt_BR]=retificador onda-completa Name[ru]=Выпрямитель полной волны +Name[sk]=full-wave-rectifier Name[sv]=helvågslikriktare Name[uk]=Повний міст (модуль) Name[x-test]=xxfull-wave-rectifierxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/half-wave-rectifier.desktop calligra-2.4.3/flow/stencils/Cybernetics/half-wave-rectifier.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/half-wave-rectifier.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/half-wave-rectifier.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=half-wave-rectifier Name[ca]=half-wave-rectifier +Name[ca@valencia]=half-wave-rectifier Name[de]=Einweggleichrichter Name[el]=half-wave-rectifier Name[es]=rectificador de onda media @@ -13,6 +14,7 @@ Name[pt]=rectificador-meia-onda Name[pt_BR]=retificador meia-onda Name[ru]=Выпрямитель полуволны +Name[sk]=half-wave-rectifier Name[sv]=halvvågslikriktare Name[uk]=Напівміст Name[x-test]=xxhalf-wave-rectifierxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/hpf.desktop calligra-2.4.3/flow/stencils/Cybernetics/hpf.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/hpf.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/hpf.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=hpf Name[ca]=hpf +Name[ca@valencia]=hpf Name[el]=hpf Name[es]=filtro paso alto Name[et]=Kõrgpääsfilter diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/l-integrator.desktop calligra-2.4.3/flow/stencils/Cybernetics/l-integrator.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/l-integrator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/l-integrator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=l-integrator Name[ca]=integrador-I +Name[ca@valencia]=integrador-I Name[el]=l-integrator Name[es]=integrador izquierdo Name[et]=Vasak integreerimislüli @@ -12,6 +13,7 @@ Name[pt]=integrador-l Name[pt_BR]=integrador-l Name[ru]=l-интегратор +Name[sk]=l-integrator Name[sv]=v-integrator Name[uk]=Інтегратор (вхід ліворуч) Name[x-test]=xxl-integratorxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/l-minus.desktop calligra-2.4.3/flow/stencils/Cybernetics/l-minus.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/l-minus.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/l-minus.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=l-minus Name[ca]=l-minus +Name[ca@valencia]=l-minus Name[el]=l-minus Name[es]=sustracción de la entrada izquierda Name[et]=Vasak miinus @@ -11,6 +12,7 @@ Name[pl]=l-minus Name[pt]=l-menos Name[pt_BR]=l-menos +Name[sk]=l-minus Name[sv]=v-minus Name[uk]=Суматор (віднімання входу ліворуч) Name[x-test]=xxl-minusxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/lpf.desktop calligra-2.4.3/flow/stencils/Cybernetics/lpf.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/lpf.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/lpf.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=lpf Name[ca]=lpf +Name[ca@valencia]=lpf Name[el]=lpf Name[es]=filtro paso bajo Name[et]=Madalpääsfilter diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/l-sens.desktop calligra-2.4.3/flow/stencils/Cybernetics/l-sens.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/l-sens.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/l-sens.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=l-sens Name[ca]=l-sens +Name[ca@valencia]=l-sens Name[el]=l-sens Name[es]=sensor izquierdo Name[et]=Vasak sensor @@ -11,6 +12,7 @@ Name[pl]=l-sens Name[pt]=l-sensor Name[pt_BR]=l-sensor +Name[sk]=l-sens Name[sv]=v-sensor Name[uk]=Датчик (ліворуч) Name[x-test]=xxl-sensxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/negative-shift.desktop calligra-2.4.3/flow/stencils/Cybernetics/negative-shift.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/negative-shift.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/negative-shift.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=negative-shift Name[ca]=negative-shift +Name[ca@valencia]=negative-shift Name[el]=negative-shift Name[es]=desplazamiento negativo Name[et]=Negatiivne siire @@ -12,6 +13,7 @@ Name[pt]=desvio-negativo Name[pt_BR]=desvio negativo Name[ru]=Сдвиг влево +Name[sk]=záporný posun Name[sv]=negativ-skift Name[uk]=Стале від’ємне зміщення за Oy Name[x-test]=xxnegative-shiftxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/positive-shift.desktop calligra-2.4.3/flow/stencils/Cybernetics/positive-shift.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/positive-shift.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/positive-shift.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=positive-shift Name[ca]=positive-shift +Name[ca@valencia]=positive-shift Name[el]=positive-shift Name[es]=desplazamiento positivo Name[et]=Positiivne siire @@ -12,6 +13,7 @@ Name[pt]=desvio-positivo Name[pt_BR]=desvio positivo Name[ru]=Сдвиг вправо +Name[sk]=kladný posun Name[sv]=positiv-skift Name[uk]=Стале додатне зміщення за Oy Name[x-test]=xxpositive-shiftxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/product.desktop calligra-2.4.3/flow/stencils/Cybernetics/product.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/product.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/product.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=product Name[ca]=producte +Name[ca@valencia]=producte Name[cs]=produkt Name[el]=προϊόν Name[es]=producto @@ -13,6 +14,7 @@ Name[pt]=produto Name[pt_BR]=produto Name[ru]=Продукт +Name[sk]=produkt Name[sv]=produkt Name[uk]=Добуток Name[x-test]=xxproductxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/relay.desktop calligra-2.4.3/flow/stencils/Cybernetics/relay.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/relay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/relay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=relay Name[bg]=реле Name[ca]=relé +Name[ca@valencia]=relé Name[cs]=přenos Name[de]=Relais Name[el]=relay +Name[es]=relé Name[et]=Relee Name[it]=relé +Name[ja]=リレー Name[kk]=Реле Name[nb]=rele Name[nl]=Relais @@ -14,6 +17,7 @@ Name[pt]=relé Name[pt_BR]=relé Name[ru]=Реле +Name[sk]=relé Name[sv]=relä Name[uk]=реле Name[x-test]=xxrelayxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/r-integrator.desktop calligra-2.4.3/flow/stencils/Cybernetics/r-integrator.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/r-integrator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/r-integrator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=r-integrator Name[ca]=integrador-r +Name[ca@valencia]=integrador-r Name[el]=r-integrator Name[es]=integrador derecho Name[et]=Parem integreerimislüli @@ -12,6 +13,7 @@ Name[pt]=integrador-r Name[pt_BR]=integrator-r Name[ru]=r-интегратор +Name[sk]=r-integrator Name[sv]=h-integrator Name[uk]=Інтегратор (вхід праворуч) Name[x-test]=xxr-integratorxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/r-minus.desktop calligra-2.4.3/flow/stencils/Cybernetics/r-minus.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/r-minus.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/r-minus.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=r-minus Name[ca]=r-minus +Name[ca@valencia]=r-minus Name[el]=r-minus Name[es]=sustracción de la entrada derecha Name[et]=Parem miinus @@ -11,6 +12,7 @@ Name[pl]=r-minus Name[pt]=r-menos Name[pt_BR]=r-menos +Name[sk]=r-minus Name[sv]=h-minus Name[uk]=Суматор (віднімання входу праворуч) Name[x-test]=xxr-minusxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/r-sens.desktop calligra-2.4.3/flow/stencils/Cybernetics/r-sens.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/r-sens.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/r-sens.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=r-sens Name[ca]=r-sens +Name[ca@valencia]=r-sens Name[el]=r-sens Name[es]=sensor derecho Name[et]=Parem sensor @@ -11,6 +12,7 @@ Name[pl]=r-sens Name[pt]=r-sensor Name[pt_BR]=r-sensor +Name[sk]=r-sens Name[sv]=h-sensor Name[uk]=Датчик (праворуч) Name[x-test]=xxr-sensxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/saturation.desktop calligra-2.4.3/flow/stencils/Cybernetics/saturation.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/saturation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/saturation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=saturation Name[bg]=насищане Name[ca]=saturació +Name[ca@valencia]=saturació Name[cs]=nasycení Name[el]=κορεσμός Name[es]=saturación @@ -14,6 +15,7 @@ Name[pt]=saturação Name[pt_BR]=saturação Name[ru]=Насыщенность +Name[sk]=sýtosť Name[sv]=mättnad Name[ug]=تويۇنۇشچانلىقى Name[uk]=Характеристика насиченості diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/sigmoid.desktop calligra-2.4.3/flow/stencils/Cybernetics/sigmoid.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/sigmoid.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/sigmoid.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=sigmoid Name[ca]=sigmoid +Name[ca@valencia]=sigmoid Name[el]=σιγμοειδής Name[es]=sigmoide Name[et]=Sigmoid diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/sine.desktop calligra-2.4.3/flow/stencils/Cybernetics/sine.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/sine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/sine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=sine Name[ca]=sinusoïdal +Name[ca@valencia]=sinusoïdal Name[cs]=sinus Name[de]=Sinus Name[el]=ημίτονο @@ -14,6 +15,7 @@ Name[pt]=seno Name[pt_BR]=seno Name[ru]=Синусоидальная +Name[sk]=sínus Name[sv]=sinus Name[uk]=Синусоподібна характеристика або вхідний сигнал Name[x-test]=xxsinexx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/sum.desktop calligra-2.4.3/flow/stencils/Cybernetics/sum.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/sum.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/sum.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=sum Name[ca]=sum +Name[ca@valencia]=sum Name[cs]=suma Name[el]=άθροισμα Name[es]=suma @@ -13,6 +14,7 @@ Name[pt]=soma Name[pt_BR]=soma Name[ru]=sum +Name[sk]=sum Name[sv]=summa Name[uk]=сума Name[x-test]=xxsumxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/t-integrator.desktop calligra-2.4.3/flow/stencils/Cybernetics/t-integrator.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/t-integrator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/t-integrator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=t-integrator Name[ca]=integrador-t +Name[ca@valencia]=integrador-t Name[el]=t-integrator Name[es]=integrador superior Name[et]=Ülemine integreerimislüli @@ -12,6 +13,7 @@ Name[pt]=integrador-t Name[pt_BR]=integrador-t Name[ru]=t-интегратор +Name[sk]=t-integrator Name[sv]=t-integrator Name[uk]=Інтегратор (вхід згори) Name[x-test]=xxt-integratorxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/t-minus.desktop calligra-2.4.3/flow/stencils/Cybernetics/t-minus.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/t-minus.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/t-minus.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=t-minus Name[ca]=t-minus +Name[ca@valencia]=t-minus Name[el]=t-minus Name[es]=sustracción de la entrada superior Name[et]=Ülemine miinus @@ -11,6 +12,7 @@ Name[pl]=t-minus Name[pt]=t-menos Name[pt_BR]=t-menos +Name[sk]=t-minus Name[sv]=t-minus Name[uk]=Суматор (віднімання входу згори) Name[x-test]=xxt-minusxx diff -Nru calligra-2.4.0/flow/stencils/Cybernetics/t-sens.desktop calligra-2.4.3/flow/stencils/Cybernetics/t-sens.desktop --- calligra-2.4.0/flow/stencils/Cybernetics/t-sens.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Cybernetics/t-sens.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=t-sens Name[ca]=t-sens +Name[ca@valencia]=t-sens Name[el]=t-sens Name[es]=sensor superior Name[et]=Ülemine sensor @@ -11,6 +12,7 @@ Name[pl]=t-sens Name[pt]=t-sensor Name[pt_BR]=t-sensor +Name[sk]=t-sens Name[sv]=t-sensor Name[uk]=Датчик (згори) Name[x-test]=xxt-sensxx diff -Nru calligra-2.4.0/flow/stencils/Digital/add_h.desktop calligra-2.4.3/flow/stencils/Digital/add_h.desktop --- calligra-2.4.0/flow/stencils/Digital/add_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/add_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=add h Name[ca]=add h +Name[ca@valencia]=add h Name[el]=add h Name[es]=ADD horizontal Name[et]=Horisontaalne lisamine @@ -12,6 +13,7 @@ Name[pt]=adição v Name[pt_BR]=adição h Name[ru]=add h +Name[sk]=add h Name[sv]=addera h Name[uk]=Додавання (горизонтально) Name[x-test]=xxadd hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/add_v.desktop calligra-2.4.3/flow/stencils/Digital/add_v.desktop --- calligra-2.4.0/flow/stencils/Digital/add_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/add_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=add v Name[ca]=add v +Name[ca@valencia]=add v Name[el]=add v Name[es]=ADD vertical Name[et]=Vertikaalne lisamine @@ -12,6 +13,7 @@ Name[pt]=adição v Name[pt_BR]=adição v Name[ru]=add v +Name[sk]=add v Name[sv]=addera v Name[uk]=Додавання (вертикально) Name[x-test]=xxadd vxx diff -Nru calligra-2.4.0/flow/stencils/Digital/and_h.desktop calligra-2.4.3/flow/stencils/Digital/and_h.desktop --- calligra-2.4.0/flow/stencils/Digital/and_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/and_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=and h Name[ca]=and h +Name[ca@valencia]=and h Name[el]=and h Name[es]=AND horizontal Name[et]=Horisontaalne ja @@ -12,6 +13,7 @@ Name[pt]=and h Name[pt_BR]=e h Name[ru]=and h +Name[sk]=and h Name[sv]=och h Name[uk]=Логічне «І» (горизонтально) Name[x-test]=xxand hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/and_v.desktop calligra-2.4.3/flow/stencils/Digital/and_v.desktop --- calligra-2.4.0/flow/stencils/Digital/and_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/and_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=and v Name[ca]=and v +Name[ca@valencia]=and v Name[el]=and v Name[es]=AND vertical Name[et]=Vertikaalne ja @@ -12,6 +13,7 @@ Name[pt]=and v Name[pt_BR]=e v Name[ru]=and v +Name[sk]=and v Name[sv]=och v Name[uk]=Логічне «І» (вертикально) Name[x-test]=xxand vxx diff -Nru calligra-2.4.0/flow/stencils/Digital/buff_h.desktop calligra-2.4.3/flow/stencils/Digital/buff_h.desktop --- calligra-2.4.0/flow/stencils/Digital/buff_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/buff_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=buff h Name[ca]=buff h +Name[ca@valencia]=buff h Name[el]=buff h Name[es]=bufer horizontal Name[et]=Horisontaalne puhver diff -Nru calligra-2.4.0/flow/stencils/Digital/buff_v.desktop calligra-2.4.3/flow/stencils/Digital/buff_v.desktop --- calligra-2.4.0/flow/stencils/Digital/buff_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/buff_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=buff v Name[ca]=buff v +Name[ca@valencia]=buff v Name[el]=buff v Name[es]=bufer vertical Name[et]=Vertikaalne puhver diff -Nru calligra-2.4.0/flow/stencils/Digital/collection.desktop calligra-2.4.3/flow/stencils/Digital/collection.desktop --- calligra-2.4.0/flow/stencils/Digital/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Digital Name[ca]=Digital +Name[ca@valencia]=Digital Name[cs]=Digital Name[de]=Digital Name[el]=Ψηφιακό @@ -14,6 +15,7 @@ Name[pt]=Digital Name[pt_BR]=Digital Name[ru]=Цифровой +Name[sk]=Digitálne Name[sv]=Digitalt Name[uk]=Обробка цифрових даних Name[x-test]=xxDigitalxx diff -Nru calligra-2.4.0/flow/stencils/Digital/conn.desktop calligra-2.4.3/flow/stencils/Digital/conn.desktop --- calligra-2.4.0/flow/stencils/Digital/conn.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/conn.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=conn Name[ca]=conn +Name[ca@valencia]=conn Name[el]=conn Name[es]=conexión Name[et]=Ühendus diff -Nru calligra-2.4.0/flow/stencils/Digital/inv_h.desktop calligra-2.4.3/flow/stencils/Digital/inv_h.desktop --- calligra-2.4.0/flow/stencils/Digital/inv_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/inv_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=inv h Name[ca]=inv h +Name[ca@valencia]=inv h Name[el]=inv h Name[es]=inversor horizontal Name[et]=Horisontaalne inverter @@ -12,6 +13,7 @@ Name[pt]=inv h Name[pt_BR]=inv h Name[ru]=inv h +Name[sk]=inv h Name[sv]=inv h Name[uk]=ІНВ (горизонтально) Name[x-test]=xxinv hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/inv_v.desktop calligra-2.4.3/flow/stencils/Digital/inv_v.desktop --- calligra-2.4.0/flow/stencils/Digital/inv_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/inv_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=inv v Name[ca]=inv v +Name[ca@valencia]=inv v Name[el]=inv v Name[es]=inversor vertical Name[et]=Vertikaalne inverter @@ -12,6 +13,7 @@ Name[pt]=inv v Name[pt_BR]=inv v Name[ru]=inv v +Name[sk]=inv v Name[sv]=inv v Name[uk]=ІНВ (вертикально) Name[x-test]=xxinv vxx diff -Nru calligra-2.4.0/flow/stencils/Digital/mux_h.desktop calligra-2.4.3/flow/stencils/Digital/mux_h.desktop --- calligra-2.4.0/flow/stencils/Digital/mux_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/mux_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=mux h Name[ca]=mux h +Name[ca@valencia]=mux h Name[el]=mux h Name[es]=multiplexor horizontal Name[et]=Horiontaalne multipleksor @@ -12,6 +13,7 @@ Name[pt]=mux h Name[pt_BR]=mux h Name[ru]=mux h +Name[sk]=mux h Name[sv]=mux h Name[uk]=Мультиплексор (горизонтально) Name[x-test]=xxmux hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/mux_v.desktop calligra-2.4.3/flow/stencils/Digital/mux_v.desktop --- calligra-2.4.0/flow/stencils/Digital/mux_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/mux_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=mux v Name[ca]=mux v +Name[ca@valencia]=mux v Name[el]=mux v Name[es]=multiplexor horizontal Name[et]=Vertikaalne multipleksor @@ -12,6 +13,7 @@ Name[pt]=mux v Name[pt_BR]=mux v Name[ru]=mux v +Name[sk]=mux v Name[sv]=mux v Name[uk]=Мультиплексор (вертикально) Name[x-test]=xxmux vxx diff -Nru calligra-2.4.0/flow/stencils/Digital/nand_h.desktop calligra-2.4.3/flow/stencils/Digital/nand_h.desktop --- calligra-2.4.0/flow/stencils/Digital/nand_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/nand_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=nand h Name[ca]=nand h +Name[ca@valencia]=nand h Name[el]=nand h Name[es]=NAND horizontal Name[et]=Horisontaalne mitte-ja @@ -12,6 +13,7 @@ Name[pt]=nand h Name[pt_BR]=nand h Name[ru]=nand h +Name[sk]=nand h Name[sv]=nand h Name[uk]=І-НІ (горизонтально) Name[x-test]=xxnand hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/nand_v.desktop calligra-2.4.3/flow/stencils/Digital/nand_v.desktop --- calligra-2.4.0/flow/stencils/Digital/nand_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/nand_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=nand v Name[ca]=nand v +Name[ca@valencia]=nand v Name[el]=nand v Name[es]=NAND vertical Name[et]=Vertikaalne mitte-ja @@ -12,6 +13,7 @@ Name[pt]=nand v Name[pt_BR]=nand v Name[ru]=nand v +Name[sk]=nand v Name[sv]=nand v Name[uk]=І-НІ (вертикально) Name[x-test]=xxnand vxx diff -Nru calligra-2.4.0/flow/stencils/Digital/nor_h.desktop calligra-2.4.3/flow/stencils/Digital/nor_h.desktop --- calligra-2.4.0/flow/stencils/Digital/nor_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/nor_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=nor h Name[ca]=nor h +Name[ca@valencia]=nor h Name[el]=nor h Name[es]=NOR horizontal Name[et]=Horisontaalne mitte-või @@ -12,6 +13,7 @@ Name[pt]=nor h Name[pt_BR]=nor h Name[ru]=nor h +Name[sk]=nor h Name[sv]=nor h Name[uk]=Запер. «АБО» (горизонтально) Name[x-test]=xxnor hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/nor_v.desktop calligra-2.4.3/flow/stencils/Digital/nor_v.desktop --- calligra-2.4.0/flow/stencils/Digital/nor_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/nor_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=nor v Name[ca]=nor v +Name[ca@valencia]=nor v Name[el]=nor v Name[es]=NOR vertical Name[et]=Vertikaalne mitte-või @@ -12,6 +13,7 @@ Name[pt]=nor v Name[pt_BR]=nor v Name[ru]=nor v +Name[sk]=nor v Name[sv]=nor v Name[uk]=Запер. «АБО» (вертикально) Name[x-test]=xxnor vxx diff -Nru calligra-2.4.0/flow/stencils/Digital/or_h.desktop calligra-2.4.3/flow/stencils/Digital/or_h.desktop --- calligra-2.4.0/flow/stencils/Digital/or_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/or_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=or h Name[ca]=or h +Name[ca@valencia]=or h Name[el]=or h Name[es]=OR horizontal Name[et]=Horisontaalne või @@ -12,6 +13,7 @@ Name[pt]=or h Name[pt_BR]=or h Name[ru]=or h +Name[sk]=or h Name[sv]=or h Name[uk]=Логічне «АБО» (горизонтально) Name[x-test]=xxor hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/or_v.desktop calligra-2.4.3/flow/stencils/Digital/or_v.desktop --- calligra-2.4.0/flow/stencils/Digital/or_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/or_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=or v Name[ca]=or v +Name[ca@valencia]=or v Name[el]=or v Name[es]=OR vertical Name[et]=Vertikaalne või @@ -12,6 +13,7 @@ Name[pt]=or v Name[pt_BR]=or v Name[ru]=or v +Name[sk]=or v Name[sv]=or v Name[uk]=Логічне «АБО» (вертикально) Name[x-test]=xxor vxx diff -Nru calligra-2.4.0/flow/stencils/Digital/reg_h.desktop calligra-2.4.3/flow/stencils/Digital/reg_h.desktop --- calligra-2.4.0/flow/stencils/Digital/reg_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/reg_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=reg h Name[ca]=reg h +Name[ca@valencia]=reg h Name[el]=reg h Name[es]=regulador horizontal Name[et]=Horisontaalne register diff -Nru calligra-2.4.0/flow/stencils/Digital/reg_v.desktop calligra-2.4.3/flow/stencils/Digital/reg_v.desktop --- calligra-2.4.0/flow/stencils/Digital/reg_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/reg_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=reg v Name[ca]=reg v +Name[ca@valencia]=reg v Name[el]=reg v Name[es]=regulador vertical Name[et]=Vertikaalne register diff -Nru calligra-2.4.0/flow/stencils/Digital/xnor_h.desktop calligra-2.4.3/flow/stencils/Digital/xnor_h.desktop --- calligra-2.4.0/flow/stencils/Digital/xnor_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/xnor_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=xnor h Name[ca]=xnor h +Name[ca@valencia]=xnor h Name[el]=xnor h Name[es]=XNOR horizontal Name[et]=Horisontaalne välistav mitte-või diff -Nru calligra-2.4.0/flow/stencils/Digital/xnor_v.desktop calligra-2.4.3/flow/stencils/Digital/xnor_v.desktop --- calligra-2.4.0/flow/stencils/Digital/xnor_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/xnor_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=xnor v Name[ca]=xnor v +Name[ca@valencia]=xnor v Name[el]=xnor v Name[es]=XNOR vertical Name[et]=Vertikaalne välistav mitte-või diff -Nru calligra-2.4.0/flow/stencils/Digital/xor_h.desktop calligra-2.4.3/flow/stencils/Digital/xor_h.desktop --- calligra-2.4.0/flow/stencils/Digital/xor_h.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/xor_h.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=xor h Name[ca]=xor h +Name[ca@valencia]=xor h Name[el]=xor h Name[es]=XOR horizontal Name[et]=Horisontaalne välistav või @@ -12,6 +13,7 @@ Name[pt]=xor h Name[pt_BR]=xor h Name[ru]=xor h +Name[sk]=xor h Name[sv]=xor h Name[uk]=Виключне «АБО» (горизонтально) Name[x-test]=xxxor hxx diff -Nru calligra-2.4.0/flow/stencils/Digital/xor_v.desktop calligra-2.4.3/flow/stencils/Digital/xor_v.desktop --- calligra-2.4.0/flow/stencils/Digital/xor_v.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Digital/xor_v.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=xor v Name[ca]=xor v +Name[ca@valencia]=xor v Name[el]=xor v Name[es]=XOR vertical Name[et]=Vertikaalne välistav või @@ -12,6 +13,7 @@ Name[pt]=xor v Name[pt_BR]=xor v Name[ru]=xor v +Name[sk]=xor v Name[sv]=xor v Name[uk]=Виключне «АБО» (вертикально) Name[x-test]=xxxor vxx diff -Nru calligra-2.4.0/flow/stencils/Edpc/and.desktop calligra-2.4.3/flow/stencils/Edpc/and.desktop --- calligra-2.4.0/flow/stencils/Edpc/and.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Edpc/and.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=And Operator Name[ca]=Operador I +Name[ca@valencia]=Operador I Name[de]=Und-Operator Name[el]=Τελεστής and Name[es]=Operador And Name[et]=Ja-tehe +Name[hu]=És operátor Name[it]=Operatore AND Name[kk]=Логикалық ЖӘНЕ операторы Name[nb]=And-operator @@ -13,6 +15,7 @@ Name[pt]=Operador E Name[pt_BR]=Operador E Name[ru]=Оператор «И» +Name[sk]=And operátor Name[sv]=Och-operator Name[uk]=Оператор «І» Name[x-test]=xxAnd Operatorxx diff -Nru calligra-2.4.0/flow/stencils/Edpc/collection.desktop calligra-2.4.3/flow/stencils/Edpc/collection.desktop --- calligra-2.4.0/flow/stencils/Edpc/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Edpc/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Edpc Name[ca]=Edpc +Name[ca@valencia]=Edpc Name[de]=Edpc Name[el]=Edpc Name[es]=EDPC diff -Nru calligra-2.4.0/flow/stencils/Edpc/function.desktop calligra-2.4.3/flow/stencils/Edpc/function.desktop --- calligra-2.4.0/flow/stencils/Edpc/function.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Edpc/function.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Function Name[bg]=Функция Name[ca]=Funció +Name[ca@valencia]=Funció Name[cs]=Funkce Name[de]=Funktion Name[el]=Συνάρτηση @@ -17,6 +18,7 @@ Name[pt]=Função Name[pt_BR]=Função Name[ru]=Функция +Name[sk]=Funkcia Name[sv]=Funktion Name[ug]=فۇنكسىيە Name[uk]=Функція diff -Nru calligra-2.4.0/flow/stencils/Edpc/or.desktop calligra-2.4.3/flow/stencils/Edpc/or.desktop --- calligra-2.4.0/flow/stencils/Edpc/or.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Edpc/or.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Or Operator Name[ca]=Operador O +Name[ca@valencia]=Operador O Name[de]=Oder-Operator Name[el]=Τελεστής or Name[es]=Operador Or Name[et]=Või-tehe +Name[hu]=Vagy operátor Name[it]=Operatore OR Name[kk]=Логикалық НЕМЕСЕ операторы Name[nb]=Or-operator @@ -13,6 +15,7 @@ Name[pt]=Operador Ou Name[pt_BR]=Operador OU Name[ru]=Оператор «ИЛИ» +Name[sk]=Or operátor Name[sv]=Eller-operator Name[uk]=Оператор «АБО» Name[x-test]=xxOr Operatorxx diff -Nru calligra-2.4.0/flow/stencils/Edpc/organisation_unit.desktop calligra-2.4.3/flow/stencils/Edpc/organisation_unit.desktop --- calligra-2.4.0/flow/stencils/Edpc/organisation_unit.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Edpc/organisation_unit.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Organisation Unit Name[ca]=Unitat d'organització +Name[ca@valencia]=Unitat d'organització Name[el]=Μονάδα οργανισμού Name[es]=Unidad de organización Name[et]=Organisatsiooniüksus @@ -13,6 +14,7 @@ Name[pt]=Unidade Organizacional Name[pt_BR]=Unidade organizacional Name[ru]=Организационный блок +Name[sk]=Organizačná jednotka Name[sv]=Organisationsenhet Name[uk]=Модуль впорядкування Name[x-test]=xxOrganisation Unitxx diff -Nru calligra-2.4.0/flow/stencils/Edpc/xor.desktop calligra-2.4.3/flow/stencils/Edpc/xor.desktop --- calligra-2.4.0/flow/stencils/Edpc/xor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Edpc/xor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=XOR Operator Name[ca]=Operador XOR +Name[ca@valencia]=Operador XOR Name[de]=XOR-Operator Name[el]=Τελεστής XOR Name[es]=Operador XOR @@ -14,6 +15,7 @@ Name[pt]=Operador XOR Name[pt_BR]=Operador XOR Name[ru]=Оператор «исключающее ИЛИ» +Name[sk]=XOR operátor Name[sv]=XOR-operator Name[uk]=Оператор виключного «АБО» Name[x-test]=xxXOR Operatorxx diff -Nru calligra-2.4.0/flow/stencils/Electric/cnx.desktop calligra-2.4.3/flow/stencils/Electric/cnx.desktop --- calligra-2.4.0/flow/stencils/Electric/cnx.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/cnx.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=connpoint Name[bg]=точка на свързване Name[ca]=connpoint +Name[ca@valencia]=connpoint Name[cs]=Access Name[el]=connpoint Name[es]=punto de conexión @@ -14,6 +15,7 @@ Name[pt]=ponto-ligação Name[pt_BR]=ponto de conexão Name[ru]=точка соединения +Name[sk]=connpoint Name[sv]=anslutningspunkt Name[uk]=Точка з’єднання Name[x-test]=xxconnpointxx diff -Nru calligra-2.4.0/flow/stencils/Electric/collection.desktop calligra-2.4.3/flow/stencils/Electric/collection.desktop --- calligra-2.4.0/flow/stencils/Electric/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Electric Name[bg]=Електрически Name[ca]=Electric +Name[ca@valencia]=Electric Name[cs]=Elektrika Name[de]=Elektrik Name[el]=Ηλεκτρικό @@ -16,6 +17,7 @@ Name[pt]=Eléctrico Name[pt_BR]=Elétrico Name[ru]=Электрические +Name[sk]=Elektrické Name[sv]=Elektriskt Name[uk]=Електрика Name[x-test]=xxElectricxx diff -Nru calligra-2.4.0/flow/stencils/Electric/command.desktop calligra-2.4.3/flow/stencils/Electric/command.desktop --- calligra-2.4.0/flow/stencils/Electric/command.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/command.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=command Name[bg]=команда Name[ca]=command +Name[ca@valencia]=command Name[cs]=příkaz Name[el]=εντολή Name[es]=comando @@ -15,6 +16,7 @@ Name[pt]=comando Name[pt_BR]=comando Name[ru]=команда +Name[sk]=príkaz Name[sv]=kommando Name[ug]=بۇيرۇق Name[uk]=Керівний механізм реле (горизонтально) diff -Nru calligra-2.4.0/flow/stencils/Electric/contact_f.desktop calligra-2.4.3/flow/stencils/Electric/contact_f.desktop --- calligra-2.4.0/flow/stencils/Electric/contact_f.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/contact_f.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=contact f Name[ca]=contact f +Name[ca@valencia]=contact f Name[el]=contact f Name[es]=contacto cerrado Name[et]=Suletud kontakt @@ -12,6 +13,7 @@ Name[pt]=contacto-f Name[pt_BR]=contato f Name[ru]=контакт f +Name[sk]=kontakt f Name[sv]=kontakt f Name[uk]=Нормально замкнутий контакт (горизонтально) Name[x-test]=xxcontact fxx diff -Nru calligra-2.4.0/flow/stencils/Electric/contact_o.desktop calligra-2.4.3/flow/stencils/Electric/contact_o.desktop --- calligra-2.4.0/flow/stencils/Electric/contact_o.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/contact_o.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=contact o Name[ca]=contact o +Name[ca@valencia]=contact o Name[el]=contact o Name[es]=contacto abierto Name[et]=Avatud kontakt @@ -12,6 +13,7 @@ Name[pt]=contacto-o Name[pt_BR]=contato o Name[ru]=контакт o +Name[sk]=kontakt o Name[sv]=kontakt öppen Name[uk]=Нормально розімкнутий контакт (горизонтально) Name[x-test]=xxcontact oxx diff -Nru calligra-2.4.0/flow/stencils/Electric/intpos_f.desktop calligra-2.4.3/flow/stencils/Electric/intpos_f.desktop --- calligra-2.4.0/flow/stencils/Electric/intpos_f.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/intpos_f.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=intpos f Name[ca]=intpos f +Name[ca@valencia]=intpos f Name[el]=intpos f Name[es]=interruptor en posición cerrada Name[et]=Suletud lõpulüliti @@ -12,6 +13,7 @@ Name[pt]=intpos f Name[pt_BR]=intpos f Name[ru]=intpos f +Name[sk]=intpos f Name[sv]=mellanlägg f Name[uk]=Нормально замкнутий перемикач (горизонтально) Name[x-test]=xxintpos fxx diff -Nru calligra-2.4.0/flow/stencils/Electric/intpos_o.desktop calligra-2.4.3/flow/stencils/Electric/intpos_o.desktop --- calligra-2.4.0/flow/stencils/Electric/intpos_o.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/intpos_o.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=intpos o Name[ca]=intpos o +Name[ca@valencia]=intpos o Name[el]=intpos o Name[es]=interruptor en posición abierta Name[et]=Avatud lõpulüliti @@ -12,6 +13,7 @@ Name[pt]=intpos o Name[pt_BR]=intpos o Name[ru]=intpos o +Name[sk]=intpos o Name[sv]=mellanlägg öppet Name[uk]=Нормально розімкнутий перемикач (горизонтально) Name[x-test]=xxintpos oxx diff -Nru calligra-2.4.0/flow/stencils/Electric/lamp.desktop calligra-2.4.3/flow/stencils/Electric/lamp.desktop --- calligra-2.4.0/flow/stencils/Electric/lamp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/lamp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,13 @@ [Desktop Entry] Name=lamp Name[ca]=làmpada +Name[ca@valencia]=làmpada Name[de]=Lampe Name[el]=lamp +Name[es]=lámpara Name[et]=Lamp Name[it]=lamp +Name[ja]=ランプ Name[kk]=лампа Name[nb]=lampe Name[nl]=lamp @@ -12,6 +15,7 @@ Name[pt]=lâmpada Name[pt_BR]=lâmpada Name[ru]=Лампа +Name[sk]=lampa Name[sv]=lampa Name[uk]=lamp Name[x-test]=xxlampxx diff -Nru calligra-2.4.0/flow/stencils/Electric/relay.desktop calligra-2.4.3/flow/stencils/Electric/relay.desktop --- calligra-2.4.0/flow/stencils/Electric/relay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/relay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=relay Name[bg]=реле Name[ca]=relé +Name[ca@valencia]=relé Name[cs]=přenos Name[de]=Relais Name[el]=relay +Name[es]=relé Name[et]=Relee Name[it]=relé +Name[ja]=リレー Name[kk]=Реле Name[nb]=rele Name[nl]=Relais @@ -14,6 +17,7 @@ Name[pt]=relé Name[pt_BR]=relé Name[ru]=Реле +Name[sk]=relé Name[sv]=relä Name[uk]=реле Name[x-test]=xxrelayxx diff -Nru calligra-2.4.0/flow/stencils/Electric/vcommand.desktop calligra-2.4.3/flow/stencils/Electric/vcommand.desktop --- calligra-2.4.0/flow/stencils/Electric/vcommand.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/vcommand.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vcommand Name[ca]=vcommand +Name[ca@valencia]=vcommand Name[el]=vcommand Name[es]=comando vertical Name[et]=Vertikaalne kontaktor @@ -12,6 +13,7 @@ Name[pt]=comando-v Name[pt_BR]=comando-v Name[ru]=vcommand +Name[sk]=vcommand Name[sv]=vertikalt kommando Name[uk]=Керівний механізм реле (вертикально) Name[x-test]=xxvcommandxx diff -Nru calligra-2.4.0/flow/stencils/Electric/vcontact_f.desktop calligra-2.4.3/flow/stencils/Electric/vcontact_f.desktop --- calligra-2.4.0/flow/stencils/Electric/vcontact_f.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/vcontact_f.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vcontact f Name[ca]=vcontact f +Name[ca@valencia]=vcontact f Name[el]=vcontact f Name[es]=contacto vertical cerrado Name[et]=Vertikaalne suletud kontakt @@ -12,6 +13,7 @@ Name[pt]=contacto-v f Name[pt_BR]=contato-v f Name[ru]=vcontact f +Name[sk]=vcontact f Name[sv]=vertikal kontakt f Name[uk]=Нормально замкнутий контакт (вертикально) Name[x-test]=xxvcontact fxx diff -Nru calligra-2.4.0/flow/stencils/Electric/vcontact_o.desktop calligra-2.4.3/flow/stencils/Electric/vcontact_o.desktop --- calligra-2.4.0/flow/stencils/Electric/vcontact_o.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/vcontact_o.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vcontact o Name[ca]=vcontact o +Name[ca@valencia]=vcontact o Name[el]=vcontact o Name[es]=contacto abierto vertical Name[et]=Vertikaalne avatud kontakt @@ -12,6 +13,7 @@ Name[pt]=contacto-v o Name[pt_BR]=contato-v o Name[ru]=vcontact o +Name[sk]=vcontact o Name[sv]=vertikal kontakt öppen Name[uk]=Нормально розімкнутий контакт (вертикально) Name[x-test]=xxvcontact oxx diff -Nru calligra-2.4.0/flow/stencils/Electric/vintpos_f.desktop calligra-2.4.3/flow/stencils/Electric/vintpos_f.desktop --- calligra-2.4.0/flow/stencils/Electric/vintpos_f.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/vintpos_f.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vintpos f Name[ca]=vintpos f +Name[ca@valencia]=vintpos f Name[el]=vintpos f Name[es]=interruptor vertical en posición cerrada Name[et]=Vertikaalne suletud lõpulüliti @@ -12,6 +13,7 @@ Name[pt]=intpos-v f Name[pt_BR]=intpos-v f Name[ru]=vintpos f +Name[sk]=vintpos f Name[sv]=vertikalt mellanlägg f Name[uk]=Нормально замкнутий перемикач (вертикально) Name[x-test]=xxvintpos fxx diff -Nru calligra-2.4.0/flow/stencils/Electric/vintpos_o.desktop calligra-2.4.3/flow/stencils/Electric/vintpos_o.desktop --- calligra-2.4.0/flow/stencils/Electric/vintpos_o.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/vintpos_o.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vintpos o Name[ca]=vintpos o +Name[ca@valencia]=vintpos o Name[el]=vintpos o Name[es]=interruptor vertical en posición abierta Name[et]=Vertikaalne avatud lõpulüliti @@ -12,6 +13,7 @@ Name[pt]=intpos-v o Name[pt_BR]=intpos-v o Name[ru]=vintpos o +Name[sk]=vintpos o Name[sv]=vertikalt mellanlägg öppet Name[uk]=Нормально розімкнутий перемикач (вертикально) Name[x-test]=xxvintpos oxx diff -Nru calligra-2.4.0/flow/stencils/Electric/vlamp.desktop calligra-2.4.3/flow/stencils/Electric/vlamp.desktop --- calligra-2.4.0/flow/stencils/Electric/vlamp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/vlamp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vlamp Name[ca]=vlamp +Name[ca@valencia]=vlamp Name[el]=vlamp Name[es]=lámpara vertical Name[et]=Vertikaalne lamp diff -Nru calligra-2.4.0/flow/stencils/Electric/vrelay.desktop calligra-2.4.3/flow/stencils/Electric/vrelay.desktop --- calligra-2.4.0/flow/stencils/Electric/vrelay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric/vrelay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vrelay Name[ca]=vrelay +Name[ca@valencia]=vrelay Name[el]=vrelay Name[es]=relé vertical Name[et]=Vertikaalne relee diff -Nru calligra-2.4.0/flow/stencils/Electric2/ckt-breaker.desktop calligra-2.4.3/flow/stencils/Electric2/ckt-breaker.desktop --- calligra-2.4.0/flow/stencils/Electric2/ckt-breaker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric2/ckt-breaker.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ckt-breaker Name[ca]=ckt-breaker +Name[ca@valencia]=ckt-breaker Name[el]=ckt-breaker Name[es]=interruptor ckt Name[et]=Automaatkaitselüliti @@ -12,6 +13,7 @@ Name[pt]=quebra-circ Name[pt_BR]=quebra-circ Name[ru]=Автоматический выключатель +Name[sk]=ckt-breaker Name[sv]=strömbrytare Name[uk]=Автоматичний вимикач Name[x-test]=xxckt-breakerxx diff -Nru calligra-2.4.0/flow/stencils/Electric2/collection.desktop calligra-2.4.3/flow/stencils/Electric2/collection.desktop --- calligra-2.4.0/flow/stencils/Electric2/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric2/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Electric2 Name[bg]=Електрически2 Name[ca]=Electric2 +Name[ca@valencia]=Electric2 Name[cs]=Elektrika2 Name[de]=Elektrik2 Name[el]=Electric2 @@ -15,6 +16,7 @@ Name[pl]=Elektryczny2 Name[pt]=Eléctrico2 Name[pt_BR]=Elétrico2 +Name[sk]=Electric2 Name[sv]=Elektriskt 2 Name[uk]=Електрика 2 Name[x-test]=xxElectric2xx diff -Nru calligra-2.4.0/flow/stencils/Electric2/generator.desktop calligra-2.4.3/flow/stencils/Electric2/generator.desktop --- calligra-2.4.0/flow/stencils/Electric2/generator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric2/generator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=generator Name[bg]=генератор Name[ca]=generador +Name[ca@valencia]=generador Name[cs]=generátor Name[de]=Generator Name[el]=γεννήτρια Name[es]=generador Name[et]=Generaator Name[it]=generatore +Name[ja]=発電器 Name[kk]=генератор Name[nb]=generator Name[nl]=generator @@ -15,6 +17,7 @@ Name[pt]=gerador Name[pt_BR]=gerador Name[ru]=генератор +Name[sk]=generátor Name[sv]=generator Name[uk]=Генератор Name[x-test]=xxgeneratorxx diff -Nru calligra-2.4.0/flow/stencils/Electric2/isolator.desktop calligra-2.4.3/flow/stencils/Electric2/isolator.desktop --- calligra-2.4.0/flow/stencils/Electric2/isolator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric2/isolator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=isolator Name[bg]=изолатор Name[ca]=isolador +Name[ca@valencia]=isolador Name[de]=Isolator Name[el]=απομονωτής Name[es]=aislante @@ -14,6 +15,7 @@ Name[pt]=isolador Name[pt_BR]=isolador Name[ru]=изолятор +Name[sk]=izolant Name[sv]=isolator Name[uk]=Ізолятор Name[x-test]=xxisolatorxx diff -Nru calligra-2.4.0/flow/stencils/Electric2/transformer.desktop calligra-2.4.3/flow/stencils/Electric2/transformer.desktop --- calligra-2.4.0/flow/stencils/Electric2/transformer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electric2/transformer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=transformer Name[bg]=трансформатор Name[ca]=transformador +Name[ca@valencia]=transformador Name[el]=μετασχηματιστής Name[es]=transformador Name[et]=Transformaator Name[it]=trasformatore +Name[ja]=変圧器 Name[kk]=трансформатор Name[nb]=transformator Name[nl]=transformator @@ -13,6 +15,7 @@ Name[pt]=transformador Name[pt_BR]=transformador Name[ru]=трансформатор +Name[sk]=transformátor Name[sv]=transformator Name[uk]=Трансформатор Name[x-test]=xxtransformerxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/ampermeter.desktop calligra-2.4.3/flow/stencils/Electronic/ampermeter.desktop --- calligra-2.4.0/flow/stencils/Electronic/ampermeter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/ampermeter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=ampermeter Name[bg]=амперметър Name[ca]=amperímetre +Name[ca@valencia]=amperímetre Name[de]=Amperemeter Name[el]=αμπερόμετρο Name[es]=amperímetro Name[et]=Ampermeeter Name[it]=amperometro +Name[ja]=電流計 Name[kk]=амперметр Name[nb]=amperemeter Name[nds]=Stroommeter diff -Nru calligra-2.4.0/flow/stencils/Electronic/antenna.desktop calligra-2.4.3/flow/stencils/Electronic/antenna.desktop --- calligra-2.4.0/flow/stencils/Electronic/antenna.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/antenna.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=antenna Name[bg]=антена Name[ca]=antenna +Name[ca@valencia]=antenna Name[de]=Antenne Name[el]=κεραία Name[es]=antena Name[et]=Antenn Name[it]=antenna +Name[ja]=アンテナ Name[kk]=антенна Name[nb]=antenne Name[nds]=Antenn @@ -15,6 +17,7 @@ Name[pt]=antena Name[pt_BR]=antena Name[ru]=антенна +Name[sk]=anténa Name[sv]=antenn Name[uk]=Антенна Name[x-test]=xxantennaxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/bell.desktop calligra-2.4.3/flow/stencils/Electronic/bell.desktop --- calligra-2.4.0/flow/stencils/Electronic/bell.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/bell.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=bell Name[bg]=звънец Name[ca]=campana +Name[ca@valencia]=campana Name[cs]=zvonek Name[el]=κουδούνι Name[es]=campana @@ -16,6 +17,7 @@ Name[pt]=campainha Name[pt_BR]=campainha Name[ru]=Звонок +Name[sk]=zvonček Name[sv]=ringklocka Name[uk]=Дзвінок Name[x-test]=xxbellxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/button.desktop calligra-2.4.3/flow/stencils/Electronic/button.desktop --- calligra-2.4.0/flow/stencils/Electronic/button.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/button.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=button Name[bg]=бутон Name[ca]=botó +Name[ca@valencia]=botó Name[cs]=tlačítko Name[el]=κουμπί Name[es]=botón Name[et]=Nupp Name[it]=pulsante +Name[ja]=ボタン Name[kk]=батырма Name[nb]=knapp Name[nl]=knop @@ -14,6 +16,7 @@ Name[pt]=botão Name[pt_BR]=botão Name[ru]=Кнопка +Name[sk]=tlačidlo Name[sv]=knapp Name[ug]=كۇنۇپكا Name[uk]=Кнопка diff -Nru calligra-2.4.0/flow/stencils/Electronic/capacitor.desktop calligra-2.4.3/flow/stencils/Electronic/capacitor.desktop --- calligra-2.4.0/flow/stencils/Electronic/capacitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/capacitor.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=capacitor Name[bg]=кондензатор Name[ca]=capacitador +Name[ca@valencia]=capacitador Name[cs]=kondenzátor Name[de]=Kondensator Name[el]=πυκνωτής Name[es]=condensador Name[et]=Kondensaator Name[it]=condensatore +Name[ja]=コンデンサ Name[kk]=конденсатор Name[nb]=kondensator Name[nds]=Kondensator @@ -16,6 +18,7 @@ Name[pt]=condensador Name[pt_BR]=capacitor Name[ru]=Конденсатор +Name[sk]=kondenzátor Name[sv]=kondensator Name[uk]=Конденсатор Name[x-test]=xxcapacitorxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/capacitor_electrolytic.desktop calligra-2.4.3/flow/stencils/Electronic/capacitor_electrolytic.desktop --- calligra-2.4.0/flow/stencils/Electronic/capacitor_electrolytic.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/capacitor_electrolytic.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=capacitor electrolytic Name[bg]=електролитен кондензатор Name[ca]=capacitador electrolític +Name[ca@valencia]=capacitador electrolític Name[de]=Elektrolytkondensator Name[el]=ηλεκτρολυτικός πυκνωτής Name[es]=condensador electrolítico Name[et]=Elektrolüütiline kondensaator Name[it]=condensatore elettrolitico +Name[ja]=電解コンデンサ Name[kk]=элетролитит-конденсатор Name[nb]=elektrolyttkondensator Name[nds]=Elko @@ -15,6 +17,7 @@ Name[pt]=condensador electrolítico Name[pt_BR]=capacitor eletrolítico Name[ru]=Электролитический конденсатор +Name[sk]=kondenzátor elektrolytický Name[sv]=elektrolytkondensator Name[uk]=Електролітичний конденсатор Name[x-test]=xxcapacitor electrolyticxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/collection.desktop calligra-2.4.3/flow/stencils/Electronic/collection.desktop --- calligra-2.4.0/flow/stencils/Electronic/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Electronic Name[ca]=Electrònic +Name[ca@valencia]=Electrònic Name[cs]=Elektronická Name[de]=Elektronik Name[el]=Ηλεκτρονικό @@ -16,6 +17,7 @@ Name[pt]=Electrónico Name[pt_BR]=Eletrônico Name[ru]=Электронные +Name[sk]=Elektronické Name[sv]=Elektronik Name[ug]=ئېلېكترونلۇق مۇزىكا Name[uk]=Електроніка diff -Nru calligra-2.4.0/flow/stencils/Electronic/contact.desktop calligra-2.4.3/flow/stencils/Electronic/contact.desktop --- calligra-2.4.0/flow/stencils/Electronic/contact.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/contact.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=contact Name[bg]=контакт Name[ca]=contacte +Name[ca@valencia]=contacte Name[cs]=kontakt Name[de]=Kontakt Name[el]=επαφή @@ -15,6 +16,7 @@ Name[pt]=contacto Name[pt_BR]=contato Name[ru]=Контакт +Name[sk]=kontakt Name[sv]=kontakt Name[ug]=ئالاقەداش Name[uk]=Контакт diff -Nru calligra-2.4.0/flow/stencils/Electronic/contact_pair.desktop calligra-2.4.3/flow/stencils/Electronic/contact_pair.desktop --- calligra-2.4.0/flow/stencils/Electronic/contact_pair.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/contact_pair.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=contact pair Name[ca]=parell de contactes +Name[ca@valencia]=parell de contactes Name[el]=ζεύγος επαφής Name[es]=par de contactos Name[et]=Kontaktipaar @@ -12,6 +13,7 @@ Name[pt]=par de contactos Name[pt_BR]=par de contatos Name[ru]=Контактная пара +Name[sk]=kontaktný pár Name[sv]=kontaktpar Name[uk]=Пара контактів Name[x-test]=xxcontact pairxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/crystal.desktop calligra-2.4.3/flow/stencils/Electronic/crystal.desktop --- calligra-2.4.0/flow/stencils/Electronic/crystal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/crystal.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=crystal Name[bg]=кристал Name[ca]=cristall +Name[ca@valencia]=cristal Name[cs]=krystal Name[el]=crystal Name[es]=cristal Name[et]=Kristall Name[hu]=kristály Name[it]=cristallo +Name[ja]=クリスタル Name[kk]=кристалл Name[nb]=krystall Name[nl]=kristal @@ -15,6 +17,7 @@ Name[pt]=cristal Name[pt_BR]=cristal Name[ru]=Кристалл +Name[sk]=kryštál Name[sv]=kristall Name[uk]=Кристал Name[x-test]=xxcrystalxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/diac.desktop calligra-2.4.3/flow/stencils/Electronic/diac.desktop --- calligra-2.4.0/flow/stencils/Electronic/diac.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/diac.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=diac Name[ca]=diac +Name[ca@valencia]=diac Name[de]=Zweiweg-Schaltdiode Name[el]=diac Name[es]=Diac diff -Nru calligra-2.4.0/flow/stencils/Electronic/di_gate.desktop calligra-2.4.3/flow/stencils/Electronic/di_gate.desktop --- calligra-2.4.0/flow/stencils/Electronic/di_gate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/di_gate.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=di gate Name[ca]=porta di +Name[ca@valencia]=porta di Name[el]=di gate Name[es]=puerta di Name[et]=Kahe paisuga väljatransistor @@ -12,6 +13,7 @@ Name[pt]=porta-DI Name[pt_BR]=porta DI Name[ru]=Диодный клапан +Name[sk]=di brána Name[sv]=dubbelgrind Name[uk]=DI-шлюз Name[x-test]=xxdi gatexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/diode_inverse.desktop calligra-2.4.3/flow/stencils/Electronic/diode_inverse.desktop --- calligra-2.4.0/flow/stencils/Electronic/diode_inverse.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/diode_inverse.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=diode inverse Name[ca]=diode invertit +Name[ca@valencia]=diode invertit Name[el]=αντίστροφη δίοδος Name[es]=diodo inverso Name[et]=Pöörddiood @@ -12,6 +13,7 @@ Name[pt]=díodo inverso Name[pt_BR]=diodo inverso Name[ru]=Обратный диод +Name[sk]=dióda inverzná Name[sv]=diod invers Name[uk]=Обернений діод Name[x-test]=xxdiode inversexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/diode_schottky.desktop calligra-2.4.3/flow/stencils/Electronic/diode_schottky.desktop --- calligra-2.4.0/flow/stencils/Electronic/diode_schottky.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/diode_schottky.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=diode schottky Name[ca]=diode schottky +Name[ca@valencia]=diode schottky Name[de]=Schottky-Diode Name[el]=δίοδος schottky Name[es]=diodo schottky diff -Nru calligra-2.4.0/flow/stencils/Electronic/diode_tunnel.desktop calligra-2.4.3/flow/stencils/Electronic/diode_tunnel.desktop --- calligra-2.4.0/flow/stencils/Electronic/diode_tunnel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/diode_tunnel.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=diode tunnel Name[ca]=diode tunnel +Name[ca@valencia]=diode tunnel Name[de]=Tunneldiode Name[el]=δίαυλος διόδου Name[es]=diodo túnel @@ -14,6 +15,7 @@ Name[pt]=díodo túnel Name[pt_BR]=diodo túnel Name[ru]=Туннельный диод +Name[sk]=dióda tunelová Name[sv]=diod tunnel Name[uk]=Тунельний діод Name[x-test]=xxdiode tunnelxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/diode_zenner.desktop calligra-2.4.3/flow/stencils/Electronic/diode_zenner.desktop --- calligra-2.4.0/flow/stencils/Electronic/diode_zenner.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/diode_zenner.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=diode zener Name[bg]=ценеров диод Name[ca]=diode zener +Name[ca@valencia]=diode zener Name[cs]=Zenerova dioda Name[de]=Zener-Diode Name[el]=δίοδος zener @@ -16,6 +17,7 @@ Name[pt]=díodo zener Name[pt_BR]=diodo zener Name[ru]=Зенеровский диод +Name[sk]=dióda zenerova Name[sv]=diod Zener Name[uk]=Стабілітрон Name[x-test]=xxdiode zenerxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/engine.desktop calligra-2.4.3/flow/stencils/Electronic/engine.desktop --- calligra-2.4.0/flow/stencils/Electronic/engine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/engine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=engine Name[bg]=двигател Name[ca]=motor +Name[ca@valencia]=motor Name[cs]=motor Name[el]=μηχανή Name[es]=motor @@ -15,6 +16,7 @@ Name[pt]=motor Name[pt_BR]=motor Name[ru]=Движок +Name[sk]=motor Name[sv]=motor Name[uk]=Двигун Name[x-test]=xxenginexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/ground.desktop calligra-2.4.3/flow/stencils/Electronic/ground.desktop --- calligra-2.4.0/flow/stencils/Electronic/ground.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/ground.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=ground Name[bg]=заземяване Name[ca]=terra +Name[ca@valencia]=terre Name[cs]=zem Name[de]=Masse Name[el]=γείωση @@ -16,6 +17,7 @@ Name[pt]=terra Name[pt_BR]=terra Name[ru]=Земля +Name[sk]=zem Name[sv]=jord Name[uk]=Земля Name[x-test]=xxgroundxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/headphone.desktop calligra-2.4.3/flow/stencils/Electronic/headphone.desktop --- calligra-2.4.0/flow/stencils/Electronic/headphone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/headphone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=headphone Name[bg]=слушалки Name[ca]=Cascos +Name[ca@valencia]=Cascos Name[cs]=sluchátka Name[de]=Kopfhörer Name[el]=ακουστικό Name[es]=auricular Name[et]=Kõrvaklapid +Name[hu]=fejhallgató Name[it]=cuffia +Name[ja]=ヘッドフォン Name[kk]=құлағылық Name[nb]=hodetelefon Name[nds]=Kopphörer @@ -16,6 +19,7 @@ Name[pt]=auscultador Name[pt_BR]=fone de ouvido Name[ru]=Наушники +Name[sk]=slúchadlá Name[sv]=hörlur Name[uk]=Навушники Name[x-test]=xxheadphonexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/inductor.desktop calligra-2.4.3/flow/stencils/Electronic/inductor.desktop --- calligra-2.4.0/flow/stencils/Electronic/inductor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/inductor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=inductor Name[bg]=бобина Name[ca]=inductor +Name[ca@valencia]=inductor Name[de]=Drosselspule Name[el]=πηνίο Name[es]=inductor diff -Nru calligra-2.4.0/flow/stencils/Electronic/led_display.desktop calligra-2.4.3/flow/stencils/Electronic/led_display.desktop --- calligra-2.4.0/flow/stencils/Electronic/led_display.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/led_display.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=led display Name[ca]=led display +Name[ca@valencia]=led display Name[de]=LED-Anzeige Name[el]=λαμπάκι led Name[es]=pantalla LED @@ -13,6 +14,7 @@ Name[pt]=ecrã LED Name[pt_BR]=tela de Led Name[ru]=Светодиодное табло +Name[sk]=led displej Name[sv]=lysdiodskärm Name[uk]=Рідкокристалічний дисплей Name[x-test]=xxled displayxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/microphone.desktop calligra-2.4.3/flow/stencils/Electronic/microphone.desktop --- calligra-2.4.0/flow/stencils/Electronic/microphone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/microphone.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=microphone Name[bg]=микрофон Name[ca]=micròfon +Name[ca@valencia]=micròfon Name[cs]=mikrofon Name[de]=Mikrofon Name[el]=μικρόφωνο Name[es]=micrófono Name[et]=Mikrofon +Name[hu]=mikrofon Name[it]=microfono +Name[ja]=マイク Name[kk]=микрофон Name[nb]=mikrofon Name[nds]=Mikrofoon @@ -16,6 +19,7 @@ Name[pt]=microfone Name[pt_BR]=microfone Name[ru]=Микрофон +Name[sk]=mikrofón Name[sv]=mikrofon Name[uk]=Мікрофон Name[x-test]=xxmicrophonexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/photo_emiting_part.desktop calligra-2.4.3/flow/stencils/Electronic/photo_emiting_part.desktop --- calligra-2.4.0/flow/stencils/Electronic/photo_emiting_part.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/photo_emiting_part.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=photo emitting part Name[ca]=Part foto emissora +Name[ca@valencia]=Part foto emissora Name[el]=φωτο εκπέμπον μέρος Name[es]=componente foto-emisor Name[et]=Valgust kiirgav komponent @@ -12,6 +13,7 @@ Name[pt]=componente foto-emissor Name[pt_BR]=componente foto-emissor Name[ru]=Фотоизлучательный элемент +Name[sk]=svetlo emitujúca časť Name[sv]=fotoemitter Name[uk]=Випромінювач світла Name[x-test]=xxphoto emitting partxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/photo_sensitive_part.desktop calligra-2.4.3/flow/stencils/Electronic/photo_sensitive_part.desktop --- calligra-2.4.0/flow/stencils/Electronic/photo_sensitive_part.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/photo_sensitive_part.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=photo sensitive part Name[ca]=part fotosensible +Name[ca@valencia]=part fotosensible Name[el]=φωτο ευαίσθητο μέρος Name[es]=componente fotosensible Name[et]=Valgustundlik komponent @@ -12,6 +13,7 @@ Name[pt]=componente foto-sensível Name[pt_BR]=componente foto-sensível Name[ru]=Фоточувствительный элемент +Name[sk]=svetlocitlivá časť Name[sv]=fotokänslig komponent Name[uk]=Фоточутлива деталь Name[x-test]=xxphoto sensitive partxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/port_in.desktop calligra-2.4.3/flow/stencils/Electronic/port_in.desktop --- calligra-2.4.0/flow/stencils/Electronic/port_in.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/port_in.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=port in Name[ca]=port in +Name[ca@valencia]=port in Name[el]=θύρα εισόδου Name[es]=puerto de entrada Name[et]=Port sisse @@ -12,6 +13,7 @@ Name[pt]=porta entrada Name[pt_BR]=porta de entrada Name[ru]=Входящий порт +Name[sk]=port in Name[sv]=port in Name[uk]=Вхідний порт Name[x-test]=xxport inxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/port_inout.desktop calligra-2.4.3/flow/stencils/Electronic/port_inout.desktop --- calligra-2.4.0/flow/stencils/Electronic/port_inout.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/port_inout.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=port inout Name[ca]=port inout +Name[ca@valencia]=port inout Name[el]=θύρα εισόδου-εξόδου Name[es]=puerto de E/S Name[et]=Port sisse-välja @@ -12,6 +13,7 @@ Name[pt]=porta entrada-saída Name[pt_BR]=porta de entrada e saída Name[ru]=Двусторонний порт +Name[sk]=port inout Name[sv]=port in-ut Name[uk]=Вхідний/Вихідний порт Name[x-test]=xxport inoutxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/port_out.desktop calligra-2.4.3/flow/stencils/Electronic/port_out.desktop --- calligra-2.4.0/flow/stencils/Electronic/port_out.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/port_out.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=port out Name[ca]=port out +Name[ca@valencia]=port out Name[el]=θύρα εξόδου Name[es]=puerto de salida Name[et]=Port välja @@ -12,6 +13,7 @@ Name[pt]=porta saída Name[pt_BR]=porta de saída Name[ru]=Исходящий порт +Name[sk]=port out Name[sv]=port ut Name[uk]=Вихідний порт Name[x-test]=xxport outxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/potenciometer.desktop calligra-2.4.3/flow/stencils/Electronic/potenciometer.desktop --- calligra-2.4.0/flow/stencils/Electronic/potenciometer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/potenciometer.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[de]=Potentiometer Name[el]=ποτενσιόμετρο Name[es]=potenciómetro +Name[et]=Potentsiomeeter Name[hu]=potenciométer Name[it]=potenziometro Name[kk]=потенциометр diff -Nru calligra-2.4.0/flow/stencils/Electronic/source_current.desktop calligra-2.4.3/flow/stencils/Electronic/source_current.desktop --- calligra-2.4.0/flow/stencils/Electronic/source_current.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/source_current.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=source current Name[ca]=font actual +Name[ca@valencia]=font actual Name[el]=ένταση πηγής Name[es]=fuente de corriente Name[et]=Vooluallikas @@ -12,6 +13,7 @@ Name[pt]=corrente fonte Name[pt_BR]=corrente de fonte Name[ru]=Источник тока +Name[sk]=zdroj prúdu Name[sv]=källa ström Name[uk]=Джерело струму Name[x-test]=xxsource currentxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/source.desktop calligra-2.4.3/flow/stencils/Electronic/source.desktop --- calligra-2.4.0/flow/stencils/Electronic/source.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/source.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=source Name[ca]=font +Name[ca@valencia]=font Name[cs]=zdroj Name[de]=Quelle Name[el]=πηγή @@ -16,6 +17,7 @@ Name[pt]=fonte Name[pt_BR]=fonte Name[ru]=Источник +Name[sk]=zdroj Name[sv]=källa Name[ug]=مەنبە Name[uk]=Джерело струму або його вимірювач diff -Nru calligra-2.4.0/flow/stencils/Electronic/source_substitution.desktop calligra-2.4.3/flow/stencils/Electronic/source_substitution.desktop --- calligra-2.4.0/flow/stencils/Electronic/source_substitution.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/source_substitution.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=source substitution Name[ca]=substitució de font +Name[ca@valencia]=substitució de font Name[el]=αντικατάσταση πηγής Name[es]=substitución de fuente Name[et]=Vooluvaheldi @@ -11,6 +12,7 @@ Name[pl]=odejmowanie źródła Name[pt]=substituição fonte Name[pt_BR]=substituição de fonte +Name[sk]=nahradenie zdroja Name[sv]=källersättning Name[uk]=Замінник лінеаризованого джерела струму Name[x-test]=xxsource substitutionxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/source_voltage_alternating.desktop calligra-2.4.3/flow/stencils/Electronic/source_voltage_alternating.desktop --- calligra-2.4.0/flow/stencils/Electronic/source_voltage_alternating.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/source_voltage_alternating.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=source voltage alternating Name[ca]=font de voltatge altern +Name[ca@valencia]=font de voltatge altern Name[el]=εναλλαγή τάσης πηγής Name[es]=fuente de tensión alterna Name[et]=Vahelduvpinge allikas @@ -12,6 +13,7 @@ Name[pt]=tensão alternada fonte Name[pt_BR]=tensão alternada de fonte Name[ru]=Источник переменного тока +Name[sk]=zdroj striedavého napätia Name[sv]=källa växelspänning Name[uk]=Джерело змінного струму Name[x-test]=xxsource voltage alternatingxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/source_voltage.desktop calligra-2.4.3/flow/stencils/Electronic/source_voltage.desktop --- calligra-2.4.0/flow/stencils/Electronic/source_voltage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/source_voltage.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=source voltage Name[ca]=font de voltatge +Name[ca@valencia]=font de voltatge Name[de]=Spannungsquelle Name[el]=τάση πηγής Name[es]=tensión de fuente @@ -13,6 +14,7 @@ Name[pt]=tensão fonte Name[pt_BR]=tensão de fonte Name[ru]=Источник напряжения +Name[sk]=zdroj napätia Name[sv]=källa spänning Name[uk]=Джерело напруги Name[x-test]=xxsource voltagexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/source_voltage_direct.desktop calligra-2.4.3/flow/stencils/Electronic/source_voltage_direct.desktop --- calligra-2.4.0/flow/stencils/Electronic/source_voltage_direct.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/source_voltage_direct.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=source voltage direct Name[ca]=font directa de voltatge +Name[ca@valencia]=font directa de voltatge Name[el]=τάση πηγής συνεχής Name[es]=fuente de tensión directa Name[et]=Alalispinge allikas @@ -12,6 +13,7 @@ Name[pt]=tensão directa fonte Name[pt_BR]=tensão direta de fonte Name[ru]=Источник постоянного тока +Name[sk]=zdroj jednosmerného napätia Name[sv]=direktspänningskälla Name[uk]=Джерело постійного струму Name[x-test]=xxsource voltage directxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_npn_1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor bipolar npn 1 Name[ca]=transistor bipolar npn 1 +Name[ca@valencia]=transistor bipolar npn 1 Name[el]=διπολικό τρανζίστορ npn 1 Name[es]=transistor bipolar NPN 1 Name[et]=Bipolaartransistor npn 1 @@ -12,6 +13,7 @@ Name[pt]=transístor bipolar NPN 1 Name[pt_BR]=transistor bipolar npn 1 Name[ru]=Биполярный транзистор npn 1 +Name[sk]=tranzistor bipolárny npn 1 Name[sv]=transistor bipolär NPN 1 Name[uk]=Біполярний транзистор NPN 1 Name[x-test]=xxtransistor bipolar npn 1xx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_npn_2.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor bipolar npn 2 Name[ca]=transistor bipolar npn 2 +Name[ca@valencia]=transistor bipolar npn 2 Name[el]=διπολικό τρανζίστορ npn 2 Name[es]=transistor bipolar NPN 2 Name[et]=Bipolaartransistor npn 2 @@ -12,6 +13,7 @@ Name[pt]=transístor bipolar NPN 2 Name[pt_BR]=transistor bipolar npn 2 Name[ru]=Биполярный транзистор npn 2 +Name[sk]=tranzistor bipolárny npn 2 Name[sv]=transistor bipolär NPN 2 Name[uk]=Біполярний транзистор NPN 2 Name[x-test]=xxtransistor bipolar npn 2xx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_pnp_1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor bipolar pnp 1 Name[ca]=transistor bipolar pnp 1 +Name[ca@valencia]=transistor bipolar pnp 1 Name[el]=διπολικό τρανζίστορ pnp 1 Name[es]=transistor bipolar PNP 1 Name[et]=Bipolaartransistor pnp 1 @@ -12,6 +13,7 @@ Name[pt]=transístor bipolar PNP 1 Name[pt_BR]=transistor bipolar pnp 1 Name[ru]=Биполярный транзистор pnp 1 +Name[sk]=tranzistor bipolárny pnp 1 Name[sv]=transistor bipolär PNP 1 Name[uk]=Біполярний транзистор PNP 1 Name[x-test]=xxtransistor bipolar pnp 1xx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_bipolar_pnp_2.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor bipolar pnp 2 Name[ca]=transistor bipolar pnp 2 +Name[ca@valencia]=transistor bipolar pnp 2 Name[el]=διπολικό τρανζίστορ pnp 2 Name[es]=transistor bipolar PNP 2 Name[et]=Bipolaartransistor pnp 2 @@ -12,6 +13,7 @@ Name[pt]=transístor bipolar PNP 2 Name[pt_BR]=transistor bipolar pnp 2 Name[ru]=Биполярный транзистор pnp 2 +Name[sk]=tranzistor bipolárny pnp 2 Name[sv]=transistor bipolär PNP 2 Name[uk]=Біполярний транзистор PNP 2 Name[x-test]=xxtransistor bipolar pnp 2xx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_jfe_n.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_jfe_n.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_jfe_n.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_jfe_n.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor jfe n Name[ca]=transistor jfe n +Name[ca@valencia]=transistor jfe n Name[el]=transistor jfe n Name[es]=transistor JFE N Name[et]=Transistor jfe n @@ -12,6 +13,7 @@ Name[pt]=transístor JFE N Name[pt_BR]=transistor jfe n Name[ru]=Транзистор jfe n +Name[sk]=tranzistor jfe n Name[sv]=transistor jfe n Name[uk]=Польовий N-канальний транзистор Name[x-test]=xxtransistor jfe nxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_jfe_p.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_jfe_p.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_jfe_p.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_jfe_p.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor jfe p Name[ca]=transistor jfe p +Name[ca@valencia]=transistor jfe p Name[el]=transistor jfe p Name[es]=transistor JFE P Name[et]=Transistor jfe p @@ -12,6 +13,7 @@ Name[pt]=transístor JFE P Name[pt_BR]=transistor jfe p Name[ru]=Транзистор jfe p +Name[sk]=tranzistor jfe p Name[sv]=transistor jfe p Name[uk]=Польовий P-канальний транзистор Name[x-test]=xxtransistor jfe pxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_c_n.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_c_n.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_c_n.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_c_n.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor misfe c n Name[ca]=transistor misfe c n +Name[ca@valencia]=transistor misfe c n Name[el]=transistor misfe c n Name[es]=transistor MISFE C N Name[et]=Transistor misfe c n @@ -12,6 +13,7 @@ Name[pt]=transístor MISFE C N Name[pt_BR]=transistor misfe c n Name[ru]=Транзистор misfe c n +Name[sk]=tranzistor misfe c n Name[sv]=transistor misfe c n Name[uk]=Метал-оксидний (збіднення) N-канальний транзистор Name[x-test]=xxtransistor misfe c nxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_c_p.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_c_p.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_c_p.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_c_p.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor misfe c p Name[ca]=transistor misfe c p +Name[ca@valencia]=transistor misfe c p Name[el]=transistor misfe c p Name[es]=transistor MISFE C P Name[et]=Transistor misfe c p @@ -12,6 +13,7 @@ Name[pt]=transístor MISFE C P Name[pt_BR]=transistor misfe c p Name[ru]=Транзистор misfe c p +Name[sk]=tranzistor misfe c p Name[sv]=transistor misfe c p Name[uk]=Метал-оксидний (збіднення) P-канальний транзистор Name[x-test]=xxtransistor misfe c pxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_i_n.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_i_n.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_i_n.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_i_n.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor misfe i n Name[ca]=transistor misfe i n +Name[ca@valencia]=transistor misfe i n Name[el]=transistor misfe i n Name[es]=transistor MISFE I N Name[et]=Transistor misfe i n @@ -12,6 +13,7 @@ Name[pt]=transístor MISFE I N Name[pt_BR]=transistor misfe i n Name[ru]=Транзистор misfe i n +Name[sk]=tranzistor misfe i n Name[sv]=transistor misfe i n Name[uk]=Метал-оксидний (збагачення) N-канальний транзистор Name[x-test]=xxtransistor misfe i nxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_i_p.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_i_p.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_misfe_i_p.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_misfe_i_p.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor misfe i p Name[ca]=transistor misfe i p +Name[ca@valencia]=transistor misfe i p Name[el]=transistor misfe i p Name[es]=transitor MISFE I P Name[et]=Transistor misfe i p @@ -12,6 +13,7 @@ Name[pt]=transístor MISFE I P Name[pt_BR]=transistor misfe i p Name[ru]=Транзистор misfe i p +Name[sk]=tranzistor misfe i p Name[sv]=transistor misfe i p Name[uk]=Метал-оксидний (збагачення) P-канальний транзистор Name[x-test]=xxtransistor misfe i pxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/transistor_single_pn.desktop calligra-2.4.3/flow/stencils/Electronic/transistor_single_pn.desktop --- calligra-2.4.0/flow/stencils/Electronic/transistor_single_pn.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/transistor_single_pn.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transistor single pn Name[ca]=transistor single pn +Name[ca@valencia]=transistor single pn Name[el]=transistor single pn Name[es]=transistor simple PN Name[et]=Transistor single pn @@ -12,6 +13,7 @@ Name[pt]=transístor simples PN Name[pt_BR]=transistor simples pn Name[ru]=Транзистор single pn +Name[sk]=tranzistor jednoduchý pn Name[sv]=transistor enkel pn Name[uk]=Єдине позначення PN-канального транзистора Name[x-test]=xxtransistor single pnxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/triac.desktop calligra-2.4.3/flow/stencils/Electronic/triac.desktop --- calligra-2.4.0/flow/stencils/Electronic/triac.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/triac.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=triac Name[ca]=triac +Name[ca@valencia]=triac Name[cs]=triak Name[de]=Doppeltransistor Name[el]=triac @@ -15,6 +16,7 @@ Name[pt]=triac Name[pt_BR]=triac Name[ru]=Симистор +Name[sk]=triak Name[sv]=triac Name[uk]=Симістор Name[x-test]=xxtriacxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/tyristor_diode.desktop calligra-2.4.3/flow/stencils/Electronic/tyristor_diode.desktop --- calligra-2.4.0/flow/stencils/Electronic/tyristor_diode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/tyristor_diode.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=tyristor diode Name[ca]=diode tiristor +Name[ca@valencia]=diode tiristor Name[de]=Tyristor-Diode Name[el]=δίοδος θυρίστορ Name[es]=diodo tíristor diff -Nru calligra-2.4.0/flow/stencils/Electronic/tyristor_triode.desktop calligra-2.4.3/flow/stencils/Electronic/tyristor_triode.desktop --- calligra-2.4.0/flow/stencils/Electronic/tyristor_triode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/tyristor_triode.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=tyristor triode Name[ca]=triode tiristor +Name[ca@valencia]=triode tiristor Name[de]=Tyristor-Triode Name[el]=τρίοδος θυρίστορ Name[es]=triodo tíristor diff -Nru calligra-2.4.0/flow/stencils/Electronic/vacuum_diode.desktop calligra-2.4.3/flow/stencils/Electronic/vacuum_diode.desktop --- calligra-2.4.0/flow/stencils/Electronic/vacuum_diode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/vacuum_diode.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vacuum diode Name[ca]=diode de buit +Name[ca@valencia]=diode de buit Name[de]=Vakuum-Diode Name[el]=δίοδος κενού Name[es]=diodo vacío @@ -13,6 +14,7 @@ Name[pt]=díodo vácuo Name[pt_BR]=diodo de vácuo Name[ru]=Вакуумный диод +Name[sk]=vákuová dióda Name[sv]=vakuumdiod Name[uk]=Вакуумний діод Name[x-test]=xxvacuum diodexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/vacuum_pentode.desktop calligra-2.4.3/flow/stencils/Electronic/vacuum_pentode.desktop --- calligra-2.4.0/flow/stencils/Electronic/vacuum_pentode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/vacuum_pentode.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vacuum pentode Name[ca]=pentode de buit +Name[ca@valencia]=pentode de buit Name[de]=Vakuum-Pentode Name[el]=πέντοδος κενού Name[es]=pentodo vacío @@ -13,6 +14,7 @@ Name[pt]=pêntodo vácuo Name[pt_BR]=pentodo de vácuo Name[ru]=Вакуумный пентод +Name[sk]=vákuová pentóda Name[sv]=vakuumpentod Name[uk]=Вакуумний пентод Name[x-test]=xxvacuum pentodexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/vacuum_triode.desktop calligra-2.4.3/flow/stencils/Electronic/vacuum_triode.desktop --- calligra-2.4.0/flow/stencils/Electronic/vacuum_triode.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/vacuum_triode.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=vacuum triode Name[ca]=triode de buit +Name[ca@valencia]=triode de buit Name[de]=Vakuum-Triode Name[el]=τρίοδος κενού Name[es]=triodo vacío @@ -13,6 +14,7 @@ Name[pt]=tríodo vácuo Name[pt_BR]=triodo de vácuo Name[ru]=Вакуумный триод +Name[sk]=vákuová trióda Name[sv]=vakuumtriod Name[uk]=Вакуумний тріод Name[x-test]=xxvacuum triodexx diff -Nru calligra-2.4.0/flow/stencils/Electronic/variable_linear_part.desktop calligra-2.4.3/flow/stencils/Electronic/variable_linear_part.desktop --- calligra-2.4.0/flow/stencils/Electronic/variable_linear_part.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/variable_linear_part.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=variable linear part Name[ca]=part lineal variable +Name[ca@valencia]=part lineal variable Name[el]=μεταβλητό γραμμικό μέρος Name[es]=parte lineal variable Name[et]=Muutuja lineaarne komponent @@ -12,6 +13,7 @@ Name[pt]=parte linear variável Name[pt_BR]=componente linear variável Name[ru]=Переменная линейная часть +Name[sk]=premenná lineárna časť Name[sv]=variabel linjär komponent Name[uk]=Лінійно змінна деталь Name[x-test]=xxvariable linear partxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/variable_nonlinear_part.desktop calligra-2.4.3/flow/stencils/Electronic/variable_nonlinear_part.desktop --- calligra-2.4.0/flow/stencils/Electronic/variable_nonlinear_part.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/variable_nonlinear_part.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=variable nonlinear part Name[ca]=part variable no lineal +Name[ca@valencia]=part variable no lineal Name[el]=μεταβλητό μη γραμμικό μέρος Name[es]=parte no lineal variable Name[et]=Muutuja mittelineaarne komponent @@ -12,6 +13,7 @@ Name[pt]=parte não-linear variável Name[pt_BR]=componente não-linear variável Name[ru]=Переменная нелинейная часть +Name[sk]=premenná nelineárna časť Name[sv]=variabel icke-linjär komponent Name[uk]=Нелінійно змінна деталь Name[x-test]=xxvariable nonlinear partxx diff -Nru calligra-2.4.0/flow/stencils/Electronic/varicap.desktop calligra-2.4.3/flow/stencils/Electronic/varicap.desktop --- calligra-2.4.0/flow/stencils/Electronic/varicap.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/varicap.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=varicap Name[ca]=varicap +Name[ca@valencia]=varicap Name[de]=Abstimmdiode Name[el]=varicap Name[es]=condensador variable diff -Nru calligra-2.4.0/flow/stencils/Electronic/voltmeter.desktop calligra-2.4.3/flow/stencils/Electronic/voltmeter.desktop --- calligra-2.4.0/flow/stencils/Electronic/voltmeter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Electronic/voltmeter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=voltmeter Name[bg]=волтметър Name[ca]=voltímetre +Name[ca@valencia]=voltímetre Name[cs]=voltmetr Name[de]=Voltmeter Name[el]=βολτόμετρο diff -Nru calligra-2.4.0/flow/stencils/Flags/afghanistan.desktop calligra-2.4.3/flow/stencils/Flags/afghanistan.desktop --- calligra-2.4.0/flow/stencils/Flags/afghanistan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/afghanistan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Afghanistan Name[bg]=Афганистан Name[ca]=Afganistan +Name[ca@valencia]=Afganistan Name[cs]=Afghanistán Name[da]=Afghanistan Name[de]=Afghanistan @@ -13,6 +14,7 @@ Name[ga]=An Afganastáin Name[hu]=Afganisztán Name[it]=Afghanistan +Name[ja]=アフガニスタン Name[kk]=Ауғанстан Name[nb]=Afghanistan Name[nds]=Afghanistan diff -Nru calligra-2.4.0/flow/stencils/Flags/albania.desktop calligra-2.4.3/flow/stencils/Flags/albania.desktop --- calligra-2.4.0/flow/stencils/Flags/albania.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/albania.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Albania Name[bg]=Албания Name[ca]=Albània +Name[ca@valencia]=Albània Name[cs]=Albánie Name[da]=Albanien Name[de]=Albanien @@ -13,6 +14,7 @@ Name[ga]=An Albáin Name[hu]=Albánia Name[it]=Albania +Name[ja]=アルバニア Name[kk]=Албания Name[nb]=Albania Name[nds]=Albanien diff -Nru calligra-2.4.0/flow/stencils/Flags/algeria.desktop calligra-2.4.3/flow/stencils/Flags/algeria.desktop --- calligra-2.4.0/flow/stencils/Flags/algeria.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/algeria.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Algeria Name[bg]=Алжир Name[ca]=Algèria +Name[ca@valencia]=Algèria Name[cs]=Alžírsko Name[da]=Algeriet Name[de]=Algerien @@ -13,6 +14,7 @@ Name[ga]=An Ailgéir Name[hu]=Algéria Name[it]=Algeria +Name[ja]=アルジェリア Name[kk]=Алжир Name[nb]=Algerie Name[nds]=Algerien diff -Nru calligra-2.4.0/flow/stencils/Flags/andorra.desktop calligra-2.4.3/flow/stencils/Flags/andorra.desktop --- calligra-2.4.0/flow/stencils/Flags/andorra.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/andorra.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Andorra Name[bg]=Андора Name[ca]=Andorra +Name[ca@valencia]=Andorra Name[cs]=Andorra Name[da]=Andorra Name[de]=Andorra @@ -13,6 +14,7 @@ Name[ga]=Andóra Name[hu]=Andorra Name[it]=Andorra +Name[ja]=アンドラ Name[kk]=Андорра Name[nb]=Andorra Name[nds]=Andorra diff -Nru calligra-2.4.0/flow/stencils/Flags/angola.desktop calligra-2.4.3/flow/stencils/Flags/angola.desktop --- calligra-2.4.0/flow/stencils/Flags/angola.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/angola.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Angola Name[bg]=Ангола Name[ca]=Angola +Name[ca@valencia]=Angola Name[cs]=Angola Name[da]=Angola Name[de]=Angola @@ -13,6 +14,7 @@ Name[ga]=Angóla Name[hu]=Angola Name[it]=Angola +Name[ja]=アンゴラ Name[kk]=Ангола Name[nb]=Angola Name[nds]=Angola diff -Nru calligra-2.4.0/flow/stencils/Flags/antarctica.desktop calligra-2.4.3/flow/stencils/Flags/antarctica.desktop --- calligra-2.4.0/flow/stencils/Flags/antarctica.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/antarctica.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Antarctica Name[bg]=Антарктика Name[ca]=Antàrtica +Name[ca@valencia]=Antàrtica Name[cs]=Antarktida Name[da]=Antarktis Name[de]=Antarktis diff -Nru calligra-2.4.0/flow/stencils/Flags/antigua_and_barbuda.desktop calligra-2.4.3/flow/stencils/Flags/antigua_and_barbuda.desktop --- calligra-2.4.0/flow/stencils/Flags/antigua_and_barbuda.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/antigua_and_barbuda.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Antigua And Barbuda Name[bg]=Антигуа и Барбадос Name[ca]=Antigua i Barbuda +Name[ca@valencia]=Antigua i Barbuda Name[cs]=Antigua a Barbuda Name[da]=Antigua og Barbuda Name[de]=Antigua und Barbuda diff -Nru calligra-2.4.0/flow/stencils/Flags/argentina.desktop calligra-2.4.3/flow/stencils/Flags/argentina.desktop --- calligra-2.4.0/flow/stencils/Flags/argentina.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/argentina.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Argentina Name[bg]=Аржентина Name[ca]=Argentina +Name[ca@valencia]=Argentina Name[cs]=Argentina Name[da]=Argentina Name[de]=Argentinien @@ -13,6 +14,7 @@ Name[ga]=An Airgintín Name[hu]=Argentína Name[it]=Argentina +Name[ja]=アルゼンチン Name[kk]=Аргентина Name[nb]=Argentina Name[nds]=Argentinien diff -Nru calligra-2.4.0/flow/stencils/Flags/armenia.desktop calligra-2.4.3/flow/stencils/Flags/armenia.desktop --- calligra-2.4.0/flow/stencils/Flags/armenia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/armenia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Armenia Name[bg]=Армения Name[ca]=Armènia +Name[ca@valencia]=Armènia Name[cs]=Arménie Name[da]=Armenien Name[de]=Armenien @@ -13,6 +14,7 @@ Name[ga]=An Airméin Name[hu]=Örményország Name[it]=Armenia +Name[ja]=アルメニア Name[kk]=Армения Name[nb]=Armenia Name[nds]=Armenien diff -Nru calligra-2.4.0/flow/stencils/Flags/australia.desktop calligra-2.4.3/flow/stencils/Flags/australia.desktop --- calligra-2.4.0/flow/stencils/Flags/australia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/australia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Australia Name[bg]=Австралия Name[ca]=Austràlia +Name[ca@valencia]=Austràlia Name[cs]=Austrálie Name[da]=Australien Name[de]=Australien @@ -13,6 +14,7 @@ Name[ga]=An Astráil Name[hu]=Ausztrália Name[it]=Australia +Name[ja]=オーストラリア Name[kk]=Аустралия Name[nb]=Australia Name[nds]=Australien diff -Nru calligra-2.4.0/flow/stencils/Flags/austria.desktop calligra-2.4.3/flow/stencils/Flags/austria.desktop --- calligra-2.4.0/flow/stencils/Flags/austria.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/austria.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Austria Name[bg]=Австрия Name[ca]=Àustria +Name[ca@valencia]=Àustria Name[cs]=Rakousko Name[da]=Østrig Name[de]=Österreich @@ -12,6 +13,7 @@ Name[fr]=Autriche Name[hu]=Ausztria Name[it]=Austria +Name[ja]=アーストリア Name[kk]=Аустрия Name[nb]=Østerrike Name[nds]=Österriek diff -Nru calligra-2.4.0/flow/stencils/Flags/azerbaijan.desktop calligra-2.4.3/flow/stencils/Flags/azerbaijan.desktop --- calligra-2.4.0/flow/stencils/Flags/azerbaijan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/azerbaijan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Azerbaijan Name[bg]=Азербайджан Name[ca]=Azerbaitjan +Name[ca@valencia]=Azerbaitjan Name[cs]=Ázerbájdžán Name[da]=Azerbajdjan Name[de]=Aserbaidschan diff -Nru calligra-2.4.0/flow/stencils/Flags/bahamas.desktop calligra-2.4.3/flow/stencils/Flags/bahamas.desktop --- calligra-2.4.0/flow/stencils/Flags/bahamas.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/bahamas.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bahamas Name[bg]=Бахамски острови Name[ca]=Bahames +Name[ca@valencia]=Bahames Name[cs]=Bahamy Name[da]=Bahamas Name[de]=Bahamas @@ -11,8 +12,9 @@ Name[fi]=Bahama Name[fr]=Bahamas Name[ga]=Na Bahámaí -Name[hu]=Bahamák +Name[hu]=Bahama-szigetek Name[it]=Bahamas +Name[ja]=バハマ Name[kk]=Багам ар-ы Name[nb]=Bahamas Name[nds]=Bahamas diff -Nru calligra-2.4.0/flow/stencils/Flags/bahrain.desktop calligra-2.4.3/flow/stencils/Flags/bahrain.desktop --- calligra-2.4.0/flow/stencils/Flags/bahrain.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/bahrain.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bahrain Name[bg]=Бахрейн Name[ca]=Bahrain +Name[ca@valencia]=Bahrain Name[cs]=Bahrajn Name[da]=Bahrain Name[de]=Bahrain diff -Nru calligra-2.4.0/flow/stencils/Flags/bangladesh.desktop calligra-2.4.3/flow/stencils/Flags/bangladesh.desktop --- calligra-2.4.0/flow/stencils/Flags/bangladesh.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/bangladesh.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bangladesh Name[bg]=Бангладеш Name[ca]=Bangladesh +Name[ca@valencia]=Bangladesh Name[cs]=Bangladéš Name[da]=Bangladesh Name[de]=Bangladesch @@ -13,6 +14,7 @@ Name[ga]=An Bhanglaidéis Name[hu]=Banglades Name[it]=Bangladesh +Name[ja]=バングラデッシュ Name[kk]=Бангладеш стандартты уақыты Name[nb]=Bangladesh Name[nds]=Bangladesch diff -Nru calligra-2.4.0/flow/stencils/Flags/barbados.desktop calligra-2.4.3/flow/stencils/Flags/barbados.desktop --- calligra-2.4.0/flow/stencils/Flags/barbados.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/barbados.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Barbados Name[bg]=Барбадос Name[ca]=Barbados +Name[ca@valencia]=Barbados Name[cs]=Barbados Name[da]=Barbados Name[de]=Barbados diff -Nru calligra-2.4.0/flow/stencils/Flags/belarus.desktop calligra-2.4.3/flow/stencils/Flags/belarus.desktop --- calligra-2.4.0/flow/stencils/Flags/belarus.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/belarus.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Belarus Name[bg]=Беларус Name[ca]=Bielorússia +Name[ca@valencia]=Bielorússia Name[cs]=Bělorusko Name[da]=Hviderusland Name[de]=Weißrussland diff -Nru calligra-2.4.0/flow/stencils/Flags/belgium.desktop calligra-2.4.3/flow/stencils/Flags/belgium.desktop --- calligra-2.4.0/flow/stencils/Flags/belgium.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/belgium.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Belgium Name[bg]=Белгия Name[ca]=Bèlgica +Name[ca@valencia]=Bèlgica Name[cs]=Belgie Name[da]=Belgien Name[de]=Belgien @@ -13,6 +14,7 @@ Name[ga]=An Bheilg Name[hu]=Belgium Name[it]=Belgio +Name[ja]=ベルギー Name[kk]=Бельгия Name[nb]=Belgia Name[nds]=Belgien diff -Nru calligra-2.4.0/flow/stencils/Flags/belize.desktop calligra-2.4.3/flow/stencils/Flags/belize.desktop --- calligra-2.4.0/flow/stencils/Flags/belize.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/belize.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Belize Name[bg]=Белиз Name[ca]=Belize +Name[ca@valencia]=Belize Name[cs]=Belize Name[da]=Belize Name[de]=Belize diff -Nru calligra-2.4.0/flow/stencils/Flags/benin.desktop calligra-2.4.3/flow/stencils/Flags/benin.desktop --- calligra-2.4.0/flow/stencils/Flags/benin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/benin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Benin Name[bg]=Бенин Name[ca]=Benín +Name[ca@valencia]=Benín Name[cs]=Benin Name[da]=Benin Name[de]=Benin @@ -12,6 +13,7 @@ Name[fr]=Bénin Name[hu]=Benin Name[it]=Benin +Name[ja]=ベニン Name[kk]=Бенин Name[nb]=Benin Name[nds]=Benin diff -Nru calligra-2.4.0/flow/stencils/Flags/bhutan.desktop calligra-2.4.3/flow/stencils/Flags/bhutan.desktop --- calligra-2.4.0/flow/stencils/Flags/bhutan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/bhutan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bhutan Name[bg]=Бутан Name[ca]=Bhutan +Name[ca@valencia]=Bhutan Name[cs]=Bhútán Name[da]=Bhutan Name[de]=Bhutan @@ -13,6 +14,7 @@ Name[ga]=An Bhútáin Name[hu]=Bután Name[it]=Bhutan +Name[ja]=ブータン Name[kk]=Бутан Name[nb]=Bhutan Name[nds]=Bhutan diff -Nru calligra-2.4.0/flow/stencils/Flags/bolivia.desktop calligra-2.4.3/flow/stencils/Flags/bolivia.desktop --- calligra-2.4.0/flow/stencils/Flags/bolivia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/bolivia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bolivia Name[bg]=Боливия Name[ca]=Bolívia +Name[ca@valencia]=BolÍvia Name[cs]=Bolívie Name[da]=Bolivia Name[de]=Bolivien @@ -13,6 +14,7 @@ Name[ga]=An Bholaiv Name[hu]=Bolívia Name[it]=Bolivia +Name[ja]=ボリビア Name[kk]=Боливия Name[nb]=Bolivia Name[nds]=Bolivien diff -Nru calligra-2.4.0/flow/stencils/Flags/bosnia_and_herzegovina.desktop calligra-2.4.3/flow/stencils/Flags/bosnia_and_herzegovina.desktop --- calligra-2.4.0/flow/stencils/Flags/bosnia_and_herzegovina.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/bosnia_and_herzegovina.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bosnia And Herzegovina Name[bg]=Босна и Херцеговина Name[ca]=Bòsnia i Hercegovina +Name[ca@valencia]=Bòsnia i Hercegovina Name[cs]=Bosna a Hercegovina Name[da]=Bosnien-Hercegovina Name[de]=Bosnien und Herzegowina diff -Nru calligra-2.4.0/flow/stencils/Flags/botswana.desktop calligra-2.4.3/flow/stencils/Flags/botswana.desktop --- calligra-2.4.0/flow/stencils/Flags/botswana.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/botswana.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Botswana Name[bg]=Ботсвана Name[ca]=Botswana +Name[ca@valencia]=Botswana Name[cs]=Botswana Name[da]=Botswana Name[de]=Botsuana @@ -13,6 +14,7 @@ Name[ga]=An Bhotsuáin Name[hu]=Botswana Name[it]=Botswana +Name[ja]=ボツナワ Name[kk]=Ботсвана Name[nb]=Botswana Name[nds]=Botswana diff -Nru calligra-2.4.0/flow/stencils/Flags/brazil.desktop calligra-2.4.3/flow/stencils/Flags/brazil.desktop --- calligra-2.4.0/flow/stencils/Flags/brazil.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/brazil.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Brazil Name[bg]=Бразилия Name[ca]=Brasil +Name[ca@valencia]=Brasil Name[cs]=Brazílie Name[da]=Brasilien Name[de]=Brasilien @@ -13,6 +14,7 @@ Name[ga]=An Bhrasaíl Name[hu]=Brazília Name[it]=Brasile +Name[ja]=ブラジル Name[kk]=Бразилия Name[nb]=Brasil Name[nds]=Brasilien diff -Nru calligra-2.4.0/flow/stencils/Flags/brunei_darussalam.desktop calligra-2.4.3/flow/stencils/Flags/brunei_darussalam.desktop --- calligra-2.4.0/flow/stencils/Flags/brunei_darussalam.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/brunei_darussalam.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Brunei Darussalam Name[bg]=Бруней Даруссалам Name[ca]=Brunei +Name[ca@valencia]=Brunei Name[cs]=Sultanát Brunej Name[da]=Brunei Name[de]=Brunei Darussalam diff -Nru calligra-2.4.0/flow/stencils/Flags/bulgaria.desktop calligra-2.4.3/flow/stencils/Flags/bulgaria.desktop --- calligra-2.4.0/flow/stencils/Flags/bulgaria.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/bulgaria.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bulgaria Name[bg]=България Name[ca]=Bulgària +Name[ca@valencia]=Bulgària Name[cs]=Bulharsko Name[da]=Bulgarien Name[de]=Bulgarien @@ -12,6 +13,7 @@ Name[fr]=Bulgarie Name[hu]=Bulgária Name[it]=Bulgaria +Name[ja]=ブルガリア Name[kk]=Болгария Name[nb]=Bulgaria Name[nds]=Bulgarien diff -Nru calligra-2.4.0/flow/stencils/Flags/burkina_faso.desktop calligra-2.4.3/flow/stencils/Flags/burkina_faso.desktop --- calligra-2.4.0/flow/stencils/Flags/burkina_faso.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/burkina_faso.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Burkina Faso Name[bg]=Буркина Фасо Name[ca]=Burkina Faso +Name[ca@valencia]=Burkina Faso Name[cs]=Burkina Faso Name[da]=Burkina Faso Name[de]=Burkina Faso @@ -13,6 +14,7 @@ Name[ga]=Buircíne Fasó Name[hu]=Burkina Faso Name[it]=Burkina Faso +Name[ja]=ブルキナファソ Name[kk]=Буркина-Фасо Name[nb]=Burkina Faso Name[nds]=Burkina Faso diff -Nru calligra-2.4.0/flow/stencils/Flags/burundi.desktop calligra-2.4.3/flow/stencils/Flags/burundi.desktop --- calligra-2.4.0/flow/stencils/Flags/burundi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/burundi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Burundi Name[bg]=Бурунди Name[ca]=Burundi +Name[ca@valencia]=Burundi Name[cs]=Burundi Name[da]=Burundi Name[de]=Burundi diff -Nru calligra-2.4.0/flow/stencils/Flags/cambodia.desktop calligra-2.4.3/flow/stencils/Flags/cambodia.desktop --- calligra-2.4.0/flow/stencils/Flags/cambodia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/cambodia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cambodia Name[bg]=Камбоджа Name[ca]=Cambodja +Name[ca@valencia]=Cambodja Name[cs]=Kambodža Name[da]=Cambodia Name[de]=Kambodscha @@ -13,6 +14,7 @@ Name[ga]=An Chambóid Name[hu]=Kambodzsa Name[it]=Cambogia +Name[ja]=カンボジア Name[kk]=Камбоджа Name[nb]=Kambodsja Name[nds]=Kambodscha diff -Nru calligra-2.4.0/flow/stencils/Flags/cameroon.desktop calligra-2.4.3/flow/stencils/Flags/cameroon.desktop --- calligra-2.4.0/flow/stencils/Flags/cameroon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/cameroon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cameroon Name[bg]=Камерун Name[ca]=Camerun +Name[ca@valencia]=Camerun Name[cs]=Kamerun Name[da]=Cameroun Name[de]=Kamerun @@ -13,6 +14,7 @@ Name[ga]=Camarún Name[hu]=Kamerun Name[it]=Camerun +Name[ja]=カメルーン Name[kk]=Камерун Name[nb]=Kamerun Name[nds]=Kamerun diff -Nru calligra-2.4.0/flow/stencils/Flags/canada.desktop calligra-2.4.3/flow/stencils/Flags/canada.desktop --- calligra-2.4.0/flow/stencils/Flags/canada.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/canada.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Canada Name[bg]=Канада Name[ca]=Canadà +Name[ca@valencia]=Canadà Name[cs]=Kanada Name[da]=Canada Name[de]=Kanada @@ -13,6 +14,7 @@ Name[ga]=Ceanada Name[hu]=Kanada Name[it]=Canada +Name[ja]=カナダ Name[kk]=Канада Ньюфаундленд уақыты Name[nb]=Canada Name[nds]=Kanada diff -Nru calligra-2.4.0/flow/stencils/Flags/cape_verde.desktop calligra-2.4.3/flow/stencils/Flags/cape_verde.desktop --- calligra-2.4.0/flow/stencils/Flags/cape_verde.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/cape_verde.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cape Verde Name[bg]=Кабо Верде Name[ca]=Cap Verd +Name[ca@valencia]=Cap Verd Name[cs]=Kapverdy Name[da]=Kapverdiske øer Name[de]=Kap Verde diff -Nru calligra-2.4.0/flow/stencils/Flags/central_african_republic.desktop calligra-2.4.3/flow/stencils/Flags/central_african_republic.desktop --- calligra-2.4.0/flow/stencils/Flags/central_african_republic.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/central_african_republic.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Central African Republic Name[bg]=Централноафриканска република Name[ca]=República Central Africana +Name[ca@valencia]=Reública Central Africana Name[cs]=Středoafrická republika Name[da]=Central-afrikanske Republik Name[de]=Zentralafrikanische Republik diff -Nru calligra-2.4.0/flow/stencils/Flags/chad.desktop calligra-2.4.3/flow/stencils/Flags/chad.desktop --- calligra-2.4.0/flow/stencils/Flags/chad.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/chad.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Chad Name[bg]=Чад Name[ca]=Txad +Name[ca@valencia]=Txad Name[cs]=Čad Name[da]=Tchad Name[de]=Tschad @@ -12,6 +13,7 @@ Name[fr]=Tchad Name[hu]=Csád Name[it]=Chad +Name[ja]=チャド Name[kk]=Чад Name[nb]=Tsjad Name[nds]=Tschad diff -Nru calligra-2.4.0/flow/stencils/Flags/chile.desktop calligra-2.4.3/flow/stencils/Flags/chile.desktop --- calligra-2.4.0/flow/stencils/Flags/chile.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/chile.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Chile Name[bg]=Чили Name[ca]=Xile +Name[ca@valencia]=Xile Name[cs]=Chile Name[da]=Chile Name[de]=Chile @@ -12,6 +13,7 @@ Name[fr]=Chili Name[hu]=Chile Name[it]=Cile +Name[ja]=チリ Name[kk]=Чили Name[nb]=Chile Name[nds]=Chile diff -Nru calligra-2.4.0/flow/stencils/Flags/china_hong_kong.desktop calligra-2.4.3/flow/stencils/Flags/china_hong_kong.desktop --- calligra-2.4.0/flow/stencils/Flags/china_hong_kong.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/china_hong_kong.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=China Hong Kong Name[ca]=Xina Hong Kong +Name[ca@valencia]=Xina Hong Kong Name[cs]=Čína - Hong Kong Name[da]=Hongkong Name[de]=Hongkong (chinesische Sonderverwaltungszone) @@ -17,6 +18,7 @@ Name[pt]=Hong Kong (China) Name[pt_BR]=Hong Kong (China) Name[ru]=Гонконг (Китай) +Name[sk]=Hong Kong (Čína) Name[sv]=Kina Hongkong Name[uk]=Гонконг (Китай) Name[x-test]=xxChina Hong Kongxx diff -Nru calligra-2.4.0/flow/stencils/Flags/china_macao.desktop calligra-2.4.3/flow/stencils/Flags/china_macao.desktop --- calligra-2.4.0/flow/stencils/Flags/china_macao.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/china_macao.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=China Macao Name[ca]=Xina Macau +Name[ca@valencia]=Xina Macau Name[cs]=Čína - Macao Name[da]=Kina Name[de]=Macao (chinesische Sonderverwaltungszone) @@ -17,6 +18,7 @@ Name[pt]=Macau (China) Name[pt_BR]=Macau (China) Name[ru]=Макао (Китай) +Name[sk]=Čína Macao Name[sv]=Kina Macao Name[uk]=Макао (Китай) Name[x-test]=xxChina Macaoxx diff -Nru calligra-2.4.0/flow/stencils/Flags/china_prc.desktop calligra-2.4.3/flow/stencils/Flags/china_prc.desktop --- calligra-2.4.0/flow/stencils/Flags/china_prc.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/china_prc.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=China (PRC) Name[ca]=Xina (RPC) +Name[ca@valencia]=Xina (RPC) Name[cs]=Čína (ČLR) Name[da]=Kina (PRC) Name[de]=Volksrepublik China @@ -17,6 +18,7 @@ Name[pt]=China (RPC) Name[pt_BR]=China (RPC) Name[ru]=Китай (КНР) +Name[sk]=Čína (PRC) Name[sv]=Folkrepubliken Kina Name[uk]=Китай (КНР) Name[x-test]=xxChina (PRC)xx diff -Nru calligra-2.4.0/flow/stencils/Flags/china_roc.desktop calligra-2.4.3/flow/stencils/Flags/china_roc.desktop --- calligra-2.4.0/flow/stencils/Flags/china_roc.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/china_roc.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=China (ROC) Name[ca]=Xina (ROC) +Name[ca@valencia]=Xina (ROC) Name[da]=Kina (ROC) Name[de]=Republik China (Taiwan) Name[el]=Κίνα (Δημοκρατία) @@ -16,6 +17,7 @@ Name[pt]=China (ROC) Name[pt_BR]=China (ROC) Name[ru]=Китай (Тайвань) +Name[sk]=Čína (ROC) Name[sv]=Republiken Kina Name[uk]=Китай (Тайвань) Name[x-test]=xxChina (ROC)xx diff -Nru calligra-2.4.0/flow/stencils/Flags/collection.desktop calligra-2.4.3/flow/stencils/Flags/collection.desktop --- calligra-2.4.0/flow/stencils/Flags/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Flags Name[bg]=Знамена Name[ca]=Banderes +Name[ca@valencia]=Banderes Name[cs]=Vlajky Name[da]=Flag Name[de]=Flaggen @@ -13,6 +14,7 @@ Name[fr]=Drapeaux Name[hu]=Zászlók Name[it]=Bandiere +Name[ja]=旗 Name[kk]=Жалаулар Name[nb]=Flagg Name[nds]=Flaggen diff -Nru calligra-2.4.0/flow/stencils/Flags/colombia.desktop calligra-2.4.3/flow/stencils/Flags/colombia.desktop --- calligra-2.4.0/flow/stencils/Flags/colombia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/colombia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Colombia Name[bg]=Колумбия Name[ca]=Colòmbia +Name[ca@valencia]=Colòmbia Name[cs]=Kolumbie Name[da]=Colombia Name[de]=Kolumbien @@ -13,6 +14,7 @@ Name[ga]=An Cholóim Name[hu]=Kolumbia Name[it]=Colombia +Name[ja]=コロンビア Name[kk]=Колумбия Name[nb]=Colombia Name[nds]=Kolumbien diff -Nru calligra-2.4.0/flow/stencils/Flags/comoros.desktop calligra-2.4.3/flow/stencils/Flags/comoros.desktop --- calligra-2.4.0/flow/stencils/Flags/comoros.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/comoros.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Comoros Name[bg]=Коморски острови Name[ca]=Comores +Name[ca@valencia]=Comores Name[cs]=Komory Name[da]=Comorerne Name[de]=Komoren diff -Nru calligra-2.4.0/flow/stencils/Flags/congo_brazzaville.desktop calligra-2.4.3/flow/stencils/Flags/congo_brazzaville.desktop --- calligra-2.4.0/flow/stencils/Flags/congo_brazzaville.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/congo_brazzaville.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Congo Brazzaville Name[ca]=Congo Brazzaville +Name[ca@valencia]=Congo Brazzaville Name[cs]=Kongo - Brazzaville Name[da]=Brazzaville Name[de]=Kongo Brazzaville diff -Nru calligra-2.4.0/flow/stencils/Flags/congo_kinshasa.desktop calligra-2.4.3/flow/stencils/Flags/congo_kinshasa.desktop --- calligra-2.4.0/flow/stencils/Flags/congo_kinshasa.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/congo_kinshasa.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Congo Kinshasa Name[ca]=Congo Kinshasa +Name[ca@valencia]=Congo Kinshasa Name[cs]=Kongo - Kinshasa Name[da]=Kinshasa Name[de]=Kongo Kinshasa diff -Nru calligra-2.4.0/flow/stencils/Flags/costa_rica.desktop calligra-2.4.3/flow/stencils/Flags/costa_rica.desktop --- calligra-2.4.0/flow/stencils/Flags/costa_rica.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/costa_rica.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Costa Rica Name[bg]=Коста Рика Name[ca]=Costa Rica +Name[ca@valencia]=Costa Rica Name[cs]=Kostarika Name[da]=Costa Rica Name[de]=Costa Rica @@ -13,6 +14,7 @@ Name[ga]=Cósta Ríce Name[hu]=Costa Rica Name[it]=Costa Rica +Name[ja]=コスタリカ Name[kk]=Коста-Рика Name[nb]=Costa Rica Name[nds]=Costa Rica diff -Nru calligra-2.4.0/flow/stencils/Flags/cote_divoire.desktop calligra-2.4.3/flow/stencils/Flags/cote_divoire.desktop --- calligra-2.4.0/flow/stencils/Flags/cote_divoire.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/cote_divoire.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cote d'Ivoire Name[bg]=Кот д'Ивоар Name[ca]=Costa d'Ivori +Name[ca@valencia]=Costa d'Ivori Name[cs]=Pobřeží slonoviny Name[da]=Elfenbenskysten Name[de]=Côte d'Ivoire diff -Nru calligra-2.4.0/flow/stencils/Flags/croatia.desktop calligra-2.4.3/flow/stencils/Flags/croatia.desktop --- calligra-2.4.0/flow/stencils/Flags/croatia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/croatia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Croatia Name[bg]=Хърватска Name[ca]=Croàcia +Name[ca@valencia]=Croàcia Name[cs]=Chorvatsko Name[da]=Kroatien Name[de]=Kroatien diff -Nru calligra-2.4.0/flow/stencils/Flags/cuba.desktop calligra-2.4.3/flow/stencils/Flags/cuba.desktop --- calligra-2.4.0/flow/stencils/Flags/cuba.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/cuba.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cuba Name[bg]=Куба Name[ca]=Cuba +Name[ca@valencia]=Cuba Name[cs]=Kuba Name[da]=Cuba Name[de]=Kuba @@ -13,6 +14,7 @@ Name[ga]=Cúba Name[hu]=Kuba Name[it]=Cuba +Name[ja]=キューバ Name[kk]=Куба Name[nb]=Cuba Name[nds]=Kuba diff -Nru calligra-2.4.0/flow/stencils/Flags/cyprus.desktop calligra-2.4.3/flow/stencils/Flags/cyprus.desktop --- calligra-2.4.0/flow/stencils/Flags/cyprus.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/cyprus.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cyprus Name[bg]=Кипър Name[ca]=Xipre +Name[ca@valencia]=Xipre Name[cs]=Kypr Name[da]=Cypern Name[de]=Zypern @@ -13,6 +14,7 @@ Name[ga]=An Chipir Name[hu]=Ciprus Name[it]=Cipro +Name[ja]=キプロス Name[kk]=Кипр Name[nb]=Kypros Name[nds]=Zypern diff -Nru calligra-2.4.0/flow/stencils/Flags/czech_republic.desktop calligra-2.4.3/flow/stencils/Flags/czech_republic.desktop --- calligra-2.4.0/flow/stencils/Flags/czech_republic.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/czech_republic.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Czech Republic Name[bg]=Чешка република Name[ca]=República Txeca +Name[ca@valencia]=República Txeca Name[cs]=Česká republika Name[da]=Tjekkiet Name[de]=Tschechische Republik diff -Nru calligra-2.4.0/flow/stencils/Flags/denmark.desktop calligra-2.4.3/flow/stencils/Flags/denmark.desktop --- calligra-2.4.0/flow/stencils/Flags/denmark.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/denmark.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Denmark Name[bg]=Дания Name[ca]=Dinamarca +Name[ca@valencia]=Dinamarca Name[cs]=Dánsko Name[da]=Danmark Name[de]=Dänemark @@ -12,6 +13,7 @@ Name[fr]=Danemark Name[hu]=Dánia Name[it]=Danimarca +Name[ja]=デンマーク Name[kk]=Дания Name[nb]=Danmark Name[nds]=Dänmark diff -Nru calligra-2.4.0/flow/stencils/Flags/djibouti.desktop calligra-2.4.3/flow/stencils/Flags/djibouti.desktop --- calligra-2.4.0/flow/stencils/Flags/djibouti.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/djibouti.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Djibouti Name[bg]=Джибути Name[ca]=Djibouti +Name[ca@valencia]=Djibouti Name[cs]=Džibuti Name[da]=Djibouti Name[de]=Dschibuti @@ -13,6 +14,7 @@ Name[ga]=Djibouti Name[hu]=Dzsibuti Name[it]=Gibuti +Name[ja]=ジブチ Name[kk]=Джибути Name[nb]=Djibouti Name[nds]=Dschibuti diff -Nru calligra-2.4.0/flow/stencils/Flags/dominica.desktop calligra-2.4.3/flow/stencils/Flags/dominica.desktop --- calligra-2.4.0/flow/stencils/Flags/dominica.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/dominica.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Dominica Name[bg]=Доминика Name[ca]=Dominica +Name[ca@valencia]=Dominica Name[cs]=Dominika Name[da]=Dominica Name[de]=Dominica diff -Nru calligra-2.4.0/flow/stencils/Flags/dominican_republic.desktop calligra-2.4.3/flow/stencils/Flags/dominican_republic.desktop --- calligra-2.4.0/flow/stencils/Flags/dominican_republic.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/dominican_republic.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Dominican Republic Name[bg]=Доминиканска република Name[ca]=República Dominicana +Name[ca@valencia]=República Dominicana Name[cs]=Dominikánská republika Name[da]=Dominikanske Republik Name[de]=Dominikanische Republik diff -Nru calligra-2.4.0/flow/stencils/Flags/ecuador.desktop calligra-2.4.3/flow/stencils/Flags/ecuador.desktop --- calligra-2.4.0/flow/stencils/Flags/ecuador.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/ecuador.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Ecuador Name[bg]=Еквадор Name[ca]=Ecuador +Name[ca@valencia]=Ecuador Name[cs]=Ekvádor Name[da]=Ecuador Name[de]=Ecuador @@ -12,6 +13,7 @@ Name[ga]=Eacuadór Name[hu]=Ecuador Name[it]=Ecuador +Name[ja]=エクアドル Name[kk]=Эквадор Name[nb]=Ecuador Name[nds]=Ecuador diff -Nru calligra-2.4.0/flow/stencils/Flags/egypt.desktop calligra-2.4.3/flow/stencils/Flags/egypt.desktop --- calligra-2.4.0/flow/stencils/Flags/egypt.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/egypt.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Egypt Name[bg]=Египет Name[ca]=Egipte +Name[ca@valencia]=Egipte Name[cs]=Egypt Name[da]=Egypten Name[de]=Ägypten @@ -12,6 +13,7 @@ Name[fr]=Égypte Name[hu]=Egyiptom Name[it]=Egitto +Name[ja]=エジプト Name[kk]=Мысыр Name[nb]=Egypt Name[nds]=Ägypten diff -Nru calligra-2.4.0/flow/stencils/Flags/el_salvador.desktop calligra-2.4.3/flow/stencils/Flags/el_salvador.desktop --- calligra-2.4.0/flow/stencils/Flags/el_salvador.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/el_salvador.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=El Salvador Name[ca]=El Salvador +Name[ca@valencia]=El Salvador Name[cs]=Salvador Name[da]=El Salvador Name[de]=El Salvador @@ -11,6 +12,7 @@ Name[ga]=An tSalvadóir Name[hu]=Salvador Name[it]=El Salvador +Name[ja]=エルサルバドル Name[kk]=Сальвадор Name[nb]=El Salvador Name[nds]=El Salvador diff -Nru calligra-2.4.0/flow/stencils/Flags/equatorial_guinea.desktop calligra-2.4.3/flow/stencils/Flags/equatorial_guinea.desktop --- calligra-2.4.0/flow/stencils/Flags/equatorial_guinea.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/equatorial_guinea.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Equatorial Guinea Name[bg]=Екваториална Гвинея Name[ca]=Guinea Equatorial +Name[ca@valencia]=Guinea Equatorial Name[cs]=Rovníková Guinea Name[da]=Ækvatorial Guinea Name[de]=Äquatorialguinea diff -Nru calligra-2.4.0/flow/stencils/Flags/eritrea.desktop calligra-2.4.3/flow/stencils/Flags/eritrea.desktop --- calligra-2.4.0/flow/stencils/Flags/eritrea.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/eritrea.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Eritrea Name[bg]=Еритрея Name[ca]=Eritrea +Name[ca@valencia]=Eritrea Name[cs]=Eritrea Name[da]=Eritrea Name[de]=Eritrea diff -Nru calligra-2.4.0/flow/stencils/Flags/estonia.desktop calligra-2.4.3/flow/stencils/Flags/estonia.desktop --- calligra-2.4.0/flow/stencils/Flags/estonia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/estonia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Estonia Name[bg]=Естония Name[ca]=Estònia +Name[ca@valencia]=Estònia Name[cs]=Estonsko Name[da]=Estland Name[de]=Estland diff -Nru calligra-2.4.0/flow/stencils/Flags/ethiopia.desktop calligra-2.4.3/flow/stencils/Flags/ethiopia.desktop --- calligra-2.4.0/flow/stencils/Flags/ethiopia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/ethiopia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Ethiopia Name[bg]=Етиопия Name[ca]=Etiòpia +Name[ca@valencia]=Etiòpia Name[cs]=Etiopie Name[da]=Ethiopien Name[de]=Äthiopien @@ -12,6 +13,7 @@ Name[ga]=An Aetóip Name[hu]=Etiópia Name[it]=Etiopia +Name[ja]=エチオピア Name[kk]=Эфиопия Name[nb]=Etiopia Name[nds]=Äthiopien diff -Nru calligra-2.4.0/flow/stencils/Flags/europeanunion.desktop calligra-2.4.3/flow/stencils/Flags/europeanunion.desktop --- calligra-2.4.0/flow/stencils/Flags/europeanunion.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/europeanunion.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=European Union Name[bg]=Европейски съюз Name[ca]=Unió Europea +Name[ca@valencia]=Unió Europea Name[cs]=Evropská unie Name[da]=Europæiske Union Name[de]=Europäische Union diff -Nru calligra-2.4.0/flow/stencils/Flags/fiji.desktop calligra-2.4.3/flow/stencils/Flags/fiji.desktop --- calligra-2.4.0/flow/stencils/Flags/fiji.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/fiji.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Fiji Name[bg]=Фиджи Name[ca]=Fiji +Name[ca@valencia]=Fiji Name[cs]=Fidži Name[da]=Fiji Name[de]=Fidschi @@ -13,6 +14,7 @@ Name[ga]=Fidsí Name[hu]=Fidzsi Name[it]=Fiji +Name[ja]=フィジー Name[kk]=Фиджи Name[nb]=Fiji Name[nds]=Fidschi diff -Nru calligra-2.4.0/flow/stencils/Flags/finland.desktop calligra-2.4.3/flow/stencils/Flags/finland.desktop --- calligra-2.4.0/flow/stencils/Flags/finland.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/finland.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Finland Name[bg]=Финландия Name[ca]=Finlàndia +Name[ca@valencia]=Filàndia Name[cs]=Finsko Name[da]=Finland Name[de]=Finnland @@ -13,6 +14,7 @@ Name[ga]=An Fhionlainn Name[hu]=Finnország Name[it]=Finlandia +Name[ja]=フィンランド Name[kk]=Финляндия Name[nb]=Finland Name[nds]=Finnland diff -Nru calligra-2.4.0/flow/stencils/Flags/france.desktop calligra-2.4.3/flow/stencils/Flags/france.desktop --- calligra-2.4.0/flow/stencils/Flags/france.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/france.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=France Name[bg]=Франция Name[ca]=França +Name[ca@valencia]=França Name[cs]=Francie Name[da]=Frankrig Name[de]=Frankreich @@ -12,6 +13,7 @@ Name[fr]=France Name[hu]=Franciaország Name[it]=Francia +Name[ja]=フランス Name[kk]=Франция Name[nb]=Frankrike Name[nds]=Frankriek diff -Nru calligra-2.4.0/flow/stencils/Flags/gabon.desktop calligra-2.4.3/flow/stencils/Flags/gabon.desktop --- calligra-2.4.0/flow/stencils/Flags/gabon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/gabon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Gabon Name[bg]=Габон Name[ca]=Gabon +Name[ca@valencia]=Gabon Name[cs]=Gabon Name[da]=Gabon Name[de]=Gabun @@ -12,6 +13,7 @@ Name[fr]=Gabon Name[hu]=Gabon Name[it]=Gabon +Name[ja]=ガボン Name[kk]=Габон Name[nb]=Gabon Name[nds]=Gabun diff -Nru calligra-2.4.0/flow/stencils/Flags/gambia.desktop calligra-2.4.3/flow/stencils/Flags/gambia.desktop --- calligra-2.4.0/flow/stencils/Flags/gambia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/gambia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Gambia Name[bg]=Гамбия Name[ca]=Gàmbia +Name[ca@valencia]=Gàmbia Name[cs]=Gambie Name[da]=Gambia Name[de]=Gambia diff -Nru calligra-2.4.0/flow/stencils/Flags/georgia.desktop calligra-2.4.3/flow/stencils/Flags/georgia.desktop --- calligra-2.4.0/flow/stencils/Flags/georgia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/georgia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Georgia Name[bg]=Грузия Name[ca]=Geòrgia +Name[ca@valencia]=Geògia Name[cs]=Gruzie Name[da]=Georgien Name[de]=Georgien @@ -12,6 +13,7 @@ Name[ga]=An tSeoirsia Name[hu]=Grúzia Name[it]=Georgia +Name[ja]=グルジア Name[kk]=Гүржістан Name[nb]=Georgia Name[nds]=Georgien diff -Nru calligra-2.4.0/flow/stencils/Flags/germany.desktop calligra-2.4.3/flow/stencils/Flags/germany.desktop --- calligra-2.4.0/flow/stencils/Flags/germany.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/germany.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Germany Name[bg]=Германия Name[ca]=Alemanya +Name[ca@valencia]=Alemanya Name[cs]=Německo Name[da]=Tyskland Name[de]=Deutschland @@ -12,6 +13,7 @@ Name[ga]=An Ghearmáin Name[hu]=Németország Name[it]=Germania +Name[ja]=ドイツ Name[kk]=Германия Name[nb]=Tyskland Name[nds]=Düütschland diff -Nru calligra-2.4.0/flow/stencils/Flags/ghana.desktop calligra-2.4.3/flow/stencils/Flags/ghana.desktop --- calligra-2.4.0/flow/stencils/Flags/ghana.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/ghana.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Ghana Name[bg]=Гана Name[ca]=Ghana +Name[ca@valencia]=Ghana Name[cs]=Ghana Name[da]=Ghana Name[de]=Ghana @@ -13,6 +14,7 @@ Name[ga]=Gána Name[hu]=Ghána Name[it]=Gana +Name[ja]=ガーナ Name[kk]=Гана Name[nb]=Ghana Name[nds]=Ghana diff -Nru calligra-2.4.0/flow/stencils/Flags/greece.desktop calligra-2.4.3/flow/stencils/Flags/greece.desktop --- calligra-2.4.0/flow/stencils/Flags/greece.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/greece.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Greece Name[bg]=Гърция Name[ca]=Grècia +Name[ca@valencia]=Grècia Name[cs]=Řecko Name[da]=Grækenland Name[de]=Griechenland @@ -12,6 +13,7 @@ Name[ga]=An Ghréig Name[hu]=Görögország Name[it]=Grecia +Name[ja]=ギリシャ Name[kk]=Грекия Name[nb]=Hellas Name[nds]=Grekenland diff -Nru calligra-2.4.0/flow/stencils/Flags/grenada.desktop calligra-2.4.3/flow/stencils/Flags/grenada.desktop --- calligra-2.4.0/flow/stencils/Flags/grenada.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/grenada.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Grenada Name[bg]=Гренада Name[ca]=Grenada +Name[ca@valencia]=Grenada Name[cs]=Grenada Name[da]=Grenada Name[de]=Grenada @@ -12,6 +13,7 @@ Name[fr]=Grenade Name[hu]=Grenada Name[it]=Grenada +Name[ja]=グラナダ Name[kk]=Гренада Name[nb]=Grenada Name[nds]=Grenada diff -Nru calligra-2.4.0/flow/stencils/Flags/guatemala.desktop calligra-2.4.3/flow/stencils/Flags/guatemala.desktop --- calligra-2.4.0/flow/stencils/Flags/guatemala.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/guatemala.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Guatemala Name[bg]=Гватемала Name[ca]=Guatemala +Name[ca@valencia]=Guatemala Name[cs]=Guatemala Name[da]=Guatemala Name[de]=Guatemala @@ -13,6 +14,7 @@ Name[ga]=Guatamala Name[hu]=Guatemala Name[it]=Guatemala +Name[ja]=ガテマラ Name[kk]=Гватемала Name[nb]=Guatemala Name[nds]=Guatemala diff -Nru calligra-2.4.0/flow/stencils/Flags/guinea.desktop calligra-2.4.3/flow/stencils/Flags/guinea.desktop --- calligra-2.4.0/flow/stencils/Flags/guinea.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/guinea.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Guinea Name[bg]=Гвинея Name[ca]=Guinea +Name[ca@valencia]=Guinea Name[cs]=Guinea Name[da]=Guinea Name[de]=Guinea diff -Nru calligra-2.4.0/flow/stencils/Flags/guyana.desktop calligra-2.4.3/flow/stencils/Flags/guyana.desktop --- calligra-2.4.0/flow/stencils/Flags/guyana.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/guyana.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Guyana Name[ca]=Guaiana +Name[ca@valencia]=Guaiana Name[cs]=Guyana Name[da]=Guyana Name[de]=Guyana diff -Nru calligra-2.4.0/flow/stencils/Flags/haiti.desktop calligra-2.4.3/flow/stencils/Flags/haiti.desktop --- calligra-2.4.0/flow/stencils/Flags/haiti.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/haiti.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Haiti Name[bg]=Хаити Name[ca]=Haití +Name[ca@valencia]=Haití Name[cs]=Haiti Name[da]=Haiti Name[de]=Haiti diff -Nru calligra-2.4.0/flow/stencils/Flags/honduras.desktop calligra-2.4.3/flow/stencils/Flags/honduras.desktop --- calligra-2.4.0/flow/stencils/Flags/honduras.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/honduras.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Honduras Name[bg]=Хондурас Name[ca]=Honduras +Name[ca@valencia]=Honduras Name[cs]=Honduras Name[da]=Honduras Name[de]=Honduras @@ -13,6 +14,7 @@ Name[ga]=Hondúras Name[hu]=Honduras Name[it]=Honduras +Name[ja]=ホンジュラス Name[kk]=Гондурас Name[nb]=Honduras Name[nds]=Honduras diff -Nru calligra-2.4.0/flow/stencils/Flags/hungary.desktop calligra-2.4.3/flow/stencils/Flags/hungary.desktop --- calligra-2.4.0/flow/stencils/Flags/hungary.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/hungary.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Hungary Name[bg]=Унгария Name[ca]=Hongria +Name[ca@valencia]=Hungria Name[cs]=Maďarsko Name[da]=Ungarn Name[de]=Ungarn @@ -12,6 +13,7 @@ Name[fr]=Hongrie Name[hu]=Magyarország Name[it]=Ungheria +Name[ja]=ハンガリー Name[kk]=Венгрия Name[nb]=Ungarn Name[nds]=Ungarn diff -Nru calligra-2.4.0/flow/stencils/Flags/iceland.desktop calligra-2.4.3/flow/stencils/Flags/iceland.desktop --- calligra-2.4.0/flow/stencils/Flags/iceland.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/iceland.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Iceland Name[bg]=Исландия Name[ca]=Islàndia +Name[ca@valencia]=Islàndia Name[cs]=Island Name[da]=Island Name[de]=Island @@ -12,6 +13,7 @@ Name[ga]=An Íoslainn Name[hu]=Izland Name[it]=Islanda +Name[ja]=アイスランド Name[kk]=Исландия Name[nb]=Island Name[nl]=IJsland diff -Nru calligra-2.4.0/flow/stencils/Flags/india.desktop calligra-2.4.3/flow/stencils/Flags/india.desktop --- calligra-2.4.0/flow/stencils/Flags/india.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/india.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=India Name[bg]=Индия Name[ca]=Índia +Name[ca@valencia]=Índia Name[cs]=Indie Name[da]=Indien Name[de]=Indien @@ -12,6 +13,7 @@ Name[fr]=Inde Name[hu]=India Name[it]=India +Name[ja]=インド Name[kk]=Үндістан Name[nb]=India Name[nds]=Indien diff -Nru calligra-2.4.0/flow/stencils/Flags/indonesia.desktop calligra-2.4.3/flow/stencils/Flags/indonesia.desktop --- calligra-2.4.0/flow/stencils/Flags/indonesia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/indonesia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Indonesia Name[bg]=Индонезия Name[ca]=Indonèsia +Name[ca@valencia]=Indonèsia Name[cs]=Indonésie Name[da]=Indonesien Name[de]=Indonesien @@ -12,6 +13,7 @@ Name[ga]=An Indinéis Name[hu]=Indonézia Name[it]=Indonesia +Name[ja]=インドネシア Name[kk]=Индонезия Name[nb]=Indonesia Name[nds]=Indonesien diff -Nru calligra-2.4.0/flow/stencils/Flags/iran.desktop calligra-2.4.3/flow/stencils/Flags/iran.desktop --- calligra-2.4.0/flow/stencils/Flags/iran.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/iran.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Iran Name[bg]=Иран Name[ca]=Iran +Name[ca@valencia]=Iran Name[cs]=Írán Name[da]=Iran Name[de]=Iran @@ -12,6 +13,7 @@ Name[fr]=Iran Name[hu]=Irán Name[it]=Iran +Name[ja]=イラン Name[kk]=Иран Name[nb]=Iran Name[nds]=Iran diff -Nru calligra-2.4.0/flow/stencils/Flags/iraq.desktop calligra-2.4.3/flow/stencils/Flags/iraq.desktop --- calligra-2.4.0/flow/stencils/Flags/iraq.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/iraq.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Iraq Name[bg]=Ирак Name[ca]=Iraq +Name[ca@valencia]=Iraq Name[cs]=Irák Name[da]=Irak Name[de]=Iraq @@ -13,6 +14,7 @@ Name[ga]=An Iaráic Name[hu]=Irak Name[it]=Iraq +Name[ja]=イラク Name[kk]=Ирак Name[nb]=Irak Name[nds]=Irak diff -Nru calligra-2.4.0/flow/stencils/Flags/ireland.desktop calligra-2.4.3/flow/stencils/Flags/ireland.desktop --- calligra-2.4.0/flow/stencils/Flags/ireland.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/ireland.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Ireland Name[bg]=Ирландия Name[ca]=Irlanda +Name[ca@valencia]=Irlanda Name[cs]=Irsko Name[da]=Irland Name[de]=Irland @@ -12,6 +13,7 @@ Name[fr]=Irlande Name[hu]=Írország Name[it]=Irlanda +Name[ja]=アイルランド Name[kk]=Ирландия Name[nb]=Irland Name[nds]=Irland diff -Nru calligra-2.4.0/flow/stencils/Flags/israel.desktop calligra-2.4.3/flow/stencils/Flags/israel.desktop --- calligra-2.4.0/flow/stencils/Flags/israel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/israel.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Israel Name[bg]=Израел Name[ca]=Israel +Name[ca@valencia]=Israel Name[cs]=Izrael Name[da]=Israel Name[de]=Israel @@ -12,6 +13,7 @@ Name[ga]=Iosrael Name[hu]=Izrael Name[it]=Israele +Name[ja]=イスラエル Name[kk]=Израиль Name[nb]=Israel Name[nds]=Israel diff -Nru calligra-2.4.0/flow/stencils/Flags/italy.desktop calligra-2.4.3/flow/stencils/Flags/italy.desktop --- calligra-2.4.0/flow/stencils/Flags/italy.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/italy.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Italy Name[bg]=Италия Name[ca]=Itàlia +Name[ca@valencia]=Itàlia Name[cs]=Itálie Name[da]=Italien Name[de]=Italien diff -Nru calligra-2.4.0/flow/stencils/Flags/jamaica.desktop calligra-2.4.3/flow/stencils/Flags/jamaica.desktop --- calligra-2.4.0/flow/stencils/Flags/jamaica.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/jamaica.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Jamaica Name[bg]=Ямайка Name[ca]=Jamaica +Name[ca@valencia]=Jamaica Name[cs]=Jamajka Name[da]=Jamaica Name[de]=Jamaika diff -Nru calligra-2.4.0/flow/stencils/Flags/japan.desktop calligra-2.4.3/flow/stencils/Flags/japan.desktop --- calligra-2.4.0/flow/stencils/Flags/japan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/japan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Japan Name[bg]=Япония Name[ca]=Japó +Name[ca@valencia]=Japó Name[cs]=Japonsko Name[da]=Japan Name[de]=Japan @@ -13,6 +14,7 @@ Name[ga]=An tSeapáin Name[hu]=Japán Name[it]=Giappone +Name[ja]=日本 Name[kk]=Жапон стандартты уақыты Name[nb]=Japan Name[nds]=Japan diff -Nru calligra-2.4.0/flow/stencils/Flags/jordan.desktop calligra-2.4.3/flow/stencils/Flags/jordan.desktop --- calligra-2.4.0/flow/stencils/Flags/jordan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/jordan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Jordan Name[bg]=Йордания Name[ca]=Jordània +Name[ca@valencia]=Jordània Name[cs]=Jordánsko Name[da]=Jordan Name[de]=Jordanien @@ -12,6 +13,7 @@ Name[ga]=An Iordáin Name[hu]=Jordánia Name[it]=Giordania +Name[ja]=ヨルダン Name[kk]=Иордания Name[nb]=Jordan Name[nl]=Jordanië diff -Nru calligra-2.4.0/flow/stencils/Flags/kazakhstan.desktop calligra-2.4.3/flow/stencils/Flags/kazakhstan.desktop --- calligra-2.4.0/flow/stencils/Flags/kazakhstan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/kazakhstan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Kazakhstan Name[bg]=Казахстан Name[ca]=Kazakhstan +Name[ca@valencia]=Kazakhstan Name[cs]=Kazachstán Name[da]=Kasakhstan Name[de]=Kasachstan diff -Nru calligra-2.4.0/flow/stencils/Flags/kenya.desktop calligra-2.4.3/flow/stencils/Flags/kenya.desktop --- calligra-2.4.0/flow/stencils/Flags/kenya.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/kenya.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Kenya Name[bg]=Кения Name[ca]=Kenya +Name[ca@valencia]=Kenya Name[cs]=Keňa Name[da]=Kenya Name[de]=Kenia @@ -13,6 +14,7 @@ Name[ga]=An Chéinia Name[hu]=Kenya Name[it]=Kenia +Name[ja]=ケニヤ Name[kk]=Кения Name[nb]=Kenya Name[nds]=Kenia diff -Nru calligra-2.4.0/flow/stencils/Flags/kiribati.desktop calligra-2.4.3/flow/stencils/Flags/kiribati.desktop --- calligra-2.4.0/flow/stencils/Flags/kiribati.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/kiribati.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Kiribati Name[bg]=Кирибати Name[ca]=Kiribati +Name[ca@valencia]=Kiribati Name[cs]=Kiribati Name[da]=Kiribati Name[de]=Kiribati diff -Nru calligra-2.4.0/flow/stencils/Flags/kuwait.desktop calligra-2.4.3/flow/stencils/Flags/kuwait.desktop --- calligra-2.4.0/flow/stencils/Flags/kuwait.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/kuwait.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Kuwait Name[bg]=Кувейт Name[ca]=Kuwait +Name[ca@valencia]=Kuwait Name[cs]=Kuvajt Name[da]=Kuwait Name[de]=Kuwait diff -Nru calligra-2.4.0/flow/stencils/Flags/kyrgyzstan.desktop calligra-2.4.3/flow/stencils/Flags/kyrgyzstan.desktop --- calligra-2.4.0/flow/stencils/Flags/kyrgyzstan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/kyrgyzstan.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Kyrgyzstan Name[bg]=Киргизстан Name[ca]=Kirguizistan +Name[ca@valencia]=Kirguizistan Name[cs]=Kyrgyzstán Name[da]=Kirgizistan Name[de]=Kirgisistan diff -Nru calligra-2.4.0/flow/stencils/Flags/laos.desktop calligra-2.4.3/flow/stencils/Flags/laos.desktop --- calligra-2.4.0/flow/stencils/Flags/laos.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/laos.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Laos Name[bg]=Лаос Name[ca]=Laos +Name[ca@valencia]=Laos Name[cs]=Laos Name[da]=Laos Name[de]=Laos @@ -13,6 +14,7 @@ Name[ga]=Laos Name[hu]=Laosz Name[it]=Laos +Name[ja]=ラオス Name[kk]=Лаос Name[nb]=Laos Name[nds]=Laos diff -Nru calligra-2.4.0/flow/stencils/Flags/latvia.desktop calligra-2.4.3/flow/stencils/Flags/latvia.desktop --- calligra-2.4.0/flow/stencils/Flags/latvia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/latvia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Latvia Name[bg]=Латвия Name[ca]=Letònia +Name[ca@valencia]=Letònia Name[cs]=Lotyšsko Name[da]=Letland Name[de]=Lettland diff -Nru calligra-2.4.0/flow/stencils/Flags/lebanon.desktop calligra-2.4.3/flow/stencils/Flags/lebanon.desktop --- calligra-2.4.0/flow/stencils/Flags/lebanon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/lebanon.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Lebanon Name[bg]=Ливан Name[ca]=Líban +Name[ca@valencia]=Líban Name[cs]=Libanon Name[da]=Libanon Name[de]=Libanon @@ -12,6 +13,7 @@ Name[ga]=An Liobáin Name[hu]=Libanon Name[it]=Libano +Name[ja]=レバノン Name[kk]=Ливан Name[nb]=Libanon Name[nds]=Libanon diff -Nru calligra-2.4.0/flow/stencils/Flags/lesotho.desktop calligra-2.4.3/flow/stencils/Flags/lesotho.desktop --- calligra-2.4.0/flow/stencils/Flags/lesotho.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/lesotho.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Lesotho Name[bg]=Лесото Name[ca]=Lesotho +Name[ca@valencia]=Lesotho Name[cs]=Lesotho Name[da]=Lesotho Name[de]=Lesotho diff -Nru calligra-2.4.0/flow/stencils/Flags/liberia.desktop calligra-2.4.3/flow/stencils/Flags/liberia.desktop --- calligra-2.4.0/flow/stencils/Flags/liberia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/liberia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Liberia Name[bg]=Либерия Name[ca]=Libèria +Name[ca@valencia]=Libèria Name[cs]=Libérie Name[da]=Liberia Name[de]=Liberia diff -Nru calligra-2.4.0/flow/stencils/Flags/libyan_arab_jamahiriya.desktop calligra-2.4.3/flow/stencils/Flags/libyan_arab_jamahiriya.desktop --- calligra-2.4.0/flow/stencils/Flags/libyan_arab_jamahiriya.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/libyan_arab_jamahiriya.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Libyan Arab Jamahiriya Name[bg]=Либийска Арабска Джамахирия Name[ca]=Líbia +Name[ca@valencia]=Líbia Name[cs]=Lýbie Name[da]=Libyan Arab Jamahiriya Name[de]=Libysch-Arabische Dschamahirija diff -Nru calligra-2.4.0/flow/stencils/Flags/liechtenstein.desktop calligra-2.4.3/flow/stencils/Flags/liechtenstein.desktop --- calligra-2.4.0/flow/stencils/Flags/liechtenstein.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/liechtenstein.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Liechtenstein Name[bg]=Лихтенщайн Name[ca]=Liechtenstein +Name[ca@valencia]=Liechtenstein Name[cs]=Lichtenštejnsko Name[da]=Liechtenstein Name[de]=Liechtenstein diff -Nru calligra-2.4.0/flow/stencils/Flags/lithuania.desktop calligra-2.4.3/flow/stencils/Flags/lithuania.desktop --- calligra-2.4.0/flow/stencils/Flags/lithuania.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/lithuania.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Lithuania Name[bg]=Литва Name[ca]=Lituània +Name[ca@valencia]=Lituània Name[cs]=Litva Name[da]=Litauen Name[de]=Litauen diff -Nru calligra-2.4.0/flow/stencils/Flags/luxembourg.desktop calligra-2.4.3/flow/stencils/Flags/luxembourg.desktop --- calligra-2.4.0/flow/stencils/Flags/luxembourg.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/luxembourg.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Luxembourg Name[bg]=Люксембург Name[ca]=Luxemburg +Name[ca@valencia]=Luxemburg Name[cs]=Lucembursko Name[da]=Luxembourg Name[de]=Luxemburg diff -Nru calligra-2.4.0/flow/stencils/Flags/macedonia.desktop calligra-2.4.3/flow/stencils/Flags/macedonia.desktop --- calligra-2.4.0/flow/stencils/Flags/macedonia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/macedonia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Macedonia Name[bg]=Македония Name[ca]=Macedònia +Name[ca@valencia]=Macedònia Name[cs]=Makedonie Name[da]=Makedonien Name[de]=Mazedonien @@ -12,6 +13,7 @@ Name[ga]=An Mhacadóin (IPIM) Name[hu]=Macedónia Name[it]=Macedonia +Name[ja]=マセドニア Name[kk]=Македония Name[nb]=Makedonia Name[nds]=Makedonien diff -Nru calligra-2.4.0/flow/stencils/Flags/madagascar.desktop calligra-2.4.3/flow/stencils/Flags/madagascar.desktop --- calligra-2.4.0/flow/stencils/Flags/madagascar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/madagascar.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Madagascar Name[bg]=Мадагаскар Name[ca]=Madagascar +Name[ca@valencia]=Madagascar Name[cs]=Madagaskar Name[da]=Madagascar Name[de]=Madagaskar diff -Nru calligra-2.4.0/flow/stencils/Flags/malawi.desktop calligra-2.4.3/flow/stencils/Flags/malawi.desktop --- calligra-2.4.0/flow/stencils/Flags/malawi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/malawi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Malawi Name[bg]=Малави Name[ca]=Malawi +Name[ca@valencia]=Malawi Name[cs]=Malawi Name[da]=Malawi Name[de]=Malawi diff -Nru calligra-2.4.0/flow/stencils/Flags/malaysia.desktop calligra-2.4.3/flow/stencils/Flags/malaysia.desktop --- calligra-2.4.0/flow/stencils/Flags/malaysia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/malaysia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Malaysia Name[bg]=Малайзия Name[ca]=Malàisia +Name[ca@valencia]=Malàisia Name[cs]=Malajsie Name[da]=Malaysia Name[de]=Malaysia @@ -13,6 +14,7 @@ Name[ga]=An Mhalaeisia Name[hu]=Malajzia Name[it]=Malesia +Name[ja]=マレーシア Name[kk]=Малайзия Name[nb]=Malaysia Name[nds]=Malaysia diff -Nru calligra-2.4.0/flow/stencils/Flags/maldives.desktop calligra-2.4.3/flow/stencils/Flags/maldives.desktop --- calligra-2.4.0/flow/stencils/Flags/maldives.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/maldives.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Maldives Name[bg]=Малдиви Name[ca]=Maldives +Name[ca@valencia]=Maldives Name[cs]=Maledivy Name[da]=Maldiverne Name[de]=Malediven diff -Nru calligra-2.4.0/flow/stencils/Flags/mali.desktop calligra-2.4.3/flow/stencils/Flags/mali.desktop --- calligra-2.4.0/flow/stencils/Flags/mali.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/mali.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Mali Name[bg]=Мали Name[ca]=Mali +Name[ca@valencia]=Mali Name[cs]=Mali Name[da]=Mali Name[de]=Mali diff -Nru calligra-2.4.0/flow/stencils/Flags/malta.desktop calligra-2.4.3/flow/stencils/Flags/malta.desktop --- calligra-2.4.0/flow/stencils/Flags/malta.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/malta.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Malta Name[bg]=Малта Name[ca]=Malta +Name[ca@valencia]=Malta Name[cs]=Malta Name[da]=Malta Name[de]=Malta diff -Nru calligra-2.4.0/flow/stencils/Flags/marshall_islands.desktop calligra-2.4.3/flow/stencils/Flags/marshall_islands.desktop --- calligra-2.4.0/flow/stencils/Flags/marshall_islands.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/marshall_islands.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Marshall Islands Name[bg]=Маршалски острови Name[ca]=Illes Marshall +Name[ca@valencia]=Illes Marshall Name[cs]=Marshallovy ostrovy Name[da]=Marshall-øerne Name[de]=Marshallinseln diff -Nru calligra-2.4.0/flow/stencils/Flags/mauritania.desktop calligra-2.4.3/flow/stencils/Flags/mauritania.desktop --- calligra-2.4.0/flow/stencils/Flags/mauritania.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/mauritania.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Mauritania Name[bg]=Мавритания Name[ca]=Mauritània +Name[ca@valencia]=Mauritània Name[cs]=Mauretánie Name[da]=Mauretanien Name[de]=Mauretanien diff -Nru calligra-2.4.0/flow/stencils/Flags/mauritius.desktop calligra-2.4.3/flow/stencils/Flags/mauritius.desktop --- calligra-2.4.0/flow/stencils/Flags/mauritius.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/mauritius.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Mauritius Name[bg]=Мавриций Name[ca]=Maurici +Name[ca@valencia]=Maurici Name[cs]=Mauricius Name[da]=Mauritius Name[de]=Mauritius diff -Nru calligra-2.4.0/flow/stencils/Flags/mexico.desktop calligra-2.4.3/flow/stencils/Flags/mexico.desktop --- calligra-2.4.0/flow/stencils/Flags/mexico.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/mexico.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Mexico Name[bg]=Мексико Name[ca]=Mèxic +Name[ca@valencia]=Mèxic Name[cs]=Mexiko Name[da]=Mexico Name[de]=Mexiko @@ -12,6 +13,7 @@ Name[fr]=Mexique Name[hu]=Mexikó Name[it]=Messico +Name[ja]=メキシコ Name[kk]=Мексика Name[nb]=Mexico Name[nds]=Mexiko diff -Nru calligra-2.4.0/flow/stencils/Flags/micronesia.desktop calligra-2.4.3/flow/stencils/Flags/micronesia.desktop --- calligra-2.4.0/flow/stencils/Flags/micronesia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/micronesia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Micronesia Name[bg]=Микронезия Name[ca]=Micronèsia +Name[ca@valencia]=Micronèsia Name[cs]=Mikronésie Name[da]=Mikronesien Name[de]=Mikronesien diff -Nru calligra-2.4.0/flow/stencils/Flags/moldova.desktop calligra-2.4.3/flow/stencils/Flags/moldova.desktop --- calligra-2.4.0/flow/stencils/Flags/moldova.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/moldova.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Moldova Name[bg]=Молдова Name[ca]=Moldàvia +Name[ca@valencia]=Moldàvia Name[cs]=Moldávie Name[da]=Moldova Name[de]=Moldawien diff -Nru calligra-2.4.0/flow/stencils/Flags/monaco.desktop calligra-2.4.3/flow/stencils/Flags/monaco.desktop --- calligra-2.4.0/flow/stencils/Flags/monaco.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/monaco.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Monaco Name[bg]=Монако Name[ca]=Mònaco +Name[ca@valencia]=Mònaco Name[cs]=Monako Name[da]=Monaco Name[de]=Monaco @@ -12,6 +13,7 @@ Name[fr]=Monaco Name[hu]=Monaco Name[it]=Monaco +Name[ja]=モナコ Name[kk]=Монако Name[nb]=Monaco Name[nds]=Monaco diff -Nru calligra-2.4.0/flow/stencils/Flags/mongolia.desktop calligra-2.4.3/flow/stencils/Flags/mongolia.desktop --- calligra-2.4.0/flow/stencils/Flags/mongolia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/mongolia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Mongolia Name[bg]=Монголия Name[ca]=Mongòlia +Name[ca@valencia]=Mongòlia Name[cs]=Mongolsko Name[da]=Mongoliet Name[de]=Mongolei @@ -13,6 +14,7 @@ Name[ga]=An Mhongóil Name[hu]=Mongólia Name[it]=Mongolia +Name[ja]=モンゴル Name[kk]=Монғолия Name[nb]=Mongolia Name[nds]=Mongolei diff -Nru calligra-2.4.0/flow/stencils/Flags/montenegro.desktop calligra-2.4.3/flow/stencils/Flags/montenegro.desktop --- calligra-2.4.0/flow/stencils/Flags/montenegro.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/montenegro.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Montenegro Name[bg]=Черна гора Name[ca]=Montenegro +Name[ca@valencia]=Montenegro Name[cs]=Černá hora Name[da]=Montenegro Name[de]=Montenegro diff -Nru calligra-2.4.0/flow/stencils/Flags/morocco.desktop calligra-2.4.3/flow/stencils/Flags/morocco.desktop --- calligra-2.4.0/flow/stencils/Flags/morocco.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/morocco.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Morocco Name[bg]=Мароко Name[ca]=Marroc +Name[ca@valencia]=Marroc Name[cs]=Maroko Name[da]=Marokko Name[de]=Marokko @@ -12,6 +13,7 @@ Name[ga]=Maracó Name[hu]=Marokkó Name[it]=Marocco +Name[ja]=モロッコ Name[kk]=Марокко Name[nb]=Marokko Name[nds]=Marokko diff -Nru calligra-2.4.0/flow/stencils/Flags/mozambique.desktop calligra-2.4.3/flow/stencils/Flags/mozambique.desktop --- calligra-2.4.0/flow/stencils/Flags/mozambique.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/mozambique.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Mozambique Name[bg]=Мозамбик Name[ca]=Moçambic +Name[ca@valencia]=Moçambic Name[cs]=Mozambik Name[da]=Mozambique Name[de]=Mosambik diff -Nru calligra-2.4.0/flow/stencils/Flags/myanmar.desktop calligra-2.4.3/flow/stencils/Flags/myanmar.desktop --- calligra-2.4.0/flow/stencils/Flags/myanmar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/myanmar.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Myanmar Name[bg]=Мианмар Name[ca]=Myanmar +Name[ca@valencia]=Myanmar Name[cs]=Myanmar Name[da]=Burma Name[de]=Myanmar @@ -13,6 +14,7 @@ Name[ga]=Maenmar Name[hu]=Mianmar Name[it]=Myanmar +Name[ja]=ミャンマー Name[kk]=Мьянма Name[nb]=Myanmar Name[nds]=Myanmar diff -Nru calligra-2.4.0/flow/stencils/Flags/namibia.desktop calligra-2.4.3/flow/stencils/Flags/namibia.desktop --- calligra-2.4.0/flow/stencils/Flags/namibia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/namibia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Namibia Name[bg]=Намибия Name[ca]=Namíbia +Name[ca@valencia]=Namíbia Name[cs]=Namíbie Name[da]=Namibia Name[de]=Namibia diff -Nru calligra-2.4.0/flow/stencils/Flags/nauru.desktop calligra-2.4.3/flow/stencils/Flags/nauru.desktop --- calligra-2.4.0/flow/stencils/Flags/nauru.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/nauru.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Nauru Name[bg]=Науру Name[ca]=Nauru +Name[ca@valencia]=Nauru Name[cs]=Nauru Name[da]=Nauru Name[de]=Nauru diff -Nru calligra-2.4.0/flow/stencils/Flags/nepal.desktop calligra-2.4.3/flow/stencils/Flags/nepal.desktop --- calligra-2.4.0/flow/stencils/Flags/nepal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/nepal.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Nepal Name[bg]=Непал Name[ca]=Nepal +Name[ca@valencia]=Nepal Name[cs]=Nepál Name[da]=Nepal Name[de]=Nepal @@ -12,6 +13,7 @@ Name[ga]=Neipeal Name[hu]=Nepál Name[it]=Nepal +Name[ja]=ネパール Name[kk]=Непал Name[nb]=Nepal Name[nds]=Nepal diff -Nru calligra-2.4.0/flow/stencils/Flags/netherlands_antilles.desktop calligra-2.4.3/flow/stencils/Flags/netherlands_antilles.desktop --- calligra-2.4.0/flow/stencils/Flags/netherlands_antilles.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/netherlands_antilles.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Netherlands Antilles Name[bg]=Холандски Антили Name[ca]=Antilles Holandeses +Name[ca@valencia]=Antilles Holandeses Name[cs]=Nizozemské Antily Name[da]=Nederlandske antiller Name[de]=Niederländische Antillen diff -Nru calligra-2.4.0/flow/stencils/Flags/netherlands.desktop calligra-2.4.3/flow/stencils/Flags/netherlands.desktop --- calligra-2.4.0/flow/stencils/Flags/netherlands.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/netherlands.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Netherlands Name[bg]=Холандия Name[ca]=Països Baixos +Name[ca@valencia]=Països Baixos Name[cs]=Nizozemí Name[da]=Holland Name[de]=Niederlande @@ -12,6 +13,7 @@ Name[ga]=An Ísiltír Name[hu]=Hollandia Name[it]=Paesi Bassi +Name[ja]=オランダ Name[kk]=Нидерландияның Антиль ар-ы Name[nb]=Nederland Name[nds]=Nedderlannen diff -Nru calligra-2.4.0/flow/stencils/Flags/newzealand.desktop calligra-2.4.3/flow/stencils/Flags/newzealand.desktop --- calligra-2.4.0/flow/stencils/Flags/newzealand.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/newzealand.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,13 +1,20 @@ [Desktop Entry] Name=New Zealand +Name[ca]=Nova Zelanda Name[cs]=Nový Zéland +Name[el]=Νέα Ζηλανδία +Name[es]=Nueva Zelanda +Name[et]=Uus-Meremaa Name[it]=Nuova Zelanda +Name[ja]=ニュージーランド Name[kk]=Жаңа Зеландия Name[nl]=Nieuw-Zeeland Name[nn]=New Zealand +Name[pl]=Nowa Zelandia Name[pt]=Nova Zelândia Name[pt_BR]=Nova Zelândia Name[se]=Ođđa Zealánda +Name[sk]=Nový Zéland Name[sv]=Nya Zeeland Name[uk]=Нова Зеландія Name[x-test]=xxNew Zealandxx diff -Nru calligra-2.4.0/flow/stencils/Flags/nicaragua.desktop calligra-2.4.3/flow/stencils/Flags/nicaragua.desktop --- calligra-2.4.0/flow/stencils/Flags/nicaragua.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/nicaragua.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Nicaragua Name[bg]=Никарагуа Name[ca]=Nicaragua +Name[ca@valencia]=Nicaragua Name[cs]=Nikaragua Name[da]=Nicaragua Name[de]=Nicaragua @@ -13,6 +14,7 @@ Name[ga]=Nicearagua Name[hu]=Nicaragua Name[it]=Nicaragua +Name[ja]=ニカラグア Name[kk]=Никарагуа Name[nb]=Nicaragua Name[nds]=Nicaragua diff -Nru calligra-2.4.0/flow/stencils/Flags/niger.desktop calligra-2.4.3/flow/stencils/Flags/niger.desktop --- calligra-2.4.0/flow/stencils/Flags/niger.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/niger.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Niger Name[bg]=Нигер Name[ca]=Níger +Name[ca@valencia]=Níger Name[cs]=Niger Name[da]=Niger Name[de]=Niger diff -Nru calligra-2.4.0/flow/stencils/Flags/nigeria.desktop calligra-2.4.3/flow/stencils/Flags/nigeria.desktop --- calligra-2.4.0/flow/stencils/Flags/nigeria.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/nigeria.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Nigeria Name[bg]=Нигерия Name[ca]=Nigèria +Name[ca@valencia]=Nigèria Name[cs]=Nigérie Name[da]=Nigeria Name[de]=Nigeria @@ -13,6 +14,7 @@ Name[ga]=An Nigéir Name[hu]=Nigéria Name[it]=Nigeria +Name[ja]=ナイジェリア Name[kk]=Нигерия Name[nb]=Nigeria Name[nds]=Nigeria diff -Nru calligra-2.4.0/flow/stencils/Flags/north_korea.desktop calligra-2.4.3/flow/stencils/Flags/north_korea.desktop --- calligra-2.4.0/flow/stencils/Flags/north_korea.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/north_korea.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=North Korea Name[bg]=Северна Корея Name[ca]=Corea del Nord +Name[ca@valencia]=Corea del Nord Name[cs]=Severní Korea Name[da]=Nordkorea Name[de]=Nordkorea @@ -12,6 +13,7 @@ Name[ga]=An Chóiré Thuaidh Name[hu]=Észak-Korea Name[it]=Corea del Nord +Name[ja]=北朝鮮 Name[kk]=Солтүстік Корея Name[nb]=Nord-Korea Name[nds]=Noordkorea diff -Nru calligra-2.4.0/flow/stencils/Flags/norway.desktop calligra-2.4.3/flow/stencils/Flags/norway.desktop --- calligra-2.4.0/flow/stencils/Flags/norway.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/norway.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Norway Name[bg]=Норвегия Name[ca]=Noruega +Name[ca@valencia]=Noruega Name[cs]=Norsko Name[da]=Norge Name[de]=Norwegen @@ -12,6 +13,7 @@ Name[ga]=An Iorua Name[hu]=Norvégia Name[it]=Norvegia +Name[ja]=ノルウェー Name[kk]=Норвегия Name[nb]=Norge Name[nds]=Norwegen diff -Nru calligra-2.4.0/flow/stencils/Flags/olympic.desktop calligra-2.4.3/flow/stencils/Flags/olympic.desktop --- calligra-2.4.0/flow/stencils/Flags/olympic.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/olympic.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Olympic Name[ca]=Olímpica +Name[ca@valencia]=Olímpica Name[da]=Olympisk Name[de]=Olympisch Name[el]=Ολυμπιακή Name[es]=Olímpica Name[et]=Olümpia +Name[gl]=Olímpico Name[it]=Olimpica Name[kk]=Олимпиалық жалау Name[nb]=Olympisk @@ -14,6 +16,7 @@ Name[pt]=Olímpica Name[pt_BR]=Olímpica Name[ru]=Олимпийский +Name[sk]=Olympijský Name[sv]=Olympiska flaggan Name[uk]=Олімпійський прапор Name[x-test]=xxOlympicxx diff -Nru calligra-2.4.0/flow/stencils/Flags/oman.desktop calligra-2.4.3/flow/stencils/Flags/oman.desktop --- calligra-2.4.0/flow/stencils/Flags/oman.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/oman.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Oman Name[bg]=Оман Name[ca]=Oman +Name[ca@valencia]=Oman Name[cs]=Omán Name[da]=Oman Name[de]=Oman diff -Nru calligra-2.4.0/flow/stencils/Flags/pakistan.desktop calligra-2.4.3/flow/stencils/Flags/pakistan.desktop --- calligra-2.4.0/flow/stencils/Flags/pakistan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/pakistan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Pakistan Name[bg]=Пакистан Name[ca]=Pakistan +Name[ca@valencia]=Pakistan Name[cs]=Pákistán Name[da]=Pakistan Name[de]=Pakistan @@ -12,6 +13,7 @@ Name[fr]=Pakistan Name[hu]=Pakisztán Name[it]=Pakistan +Name[ja]=パキスタン Name[kk]=Пәкістан Name[nb]=Pakistan Name[nds]=Pakistan diff -Nru calligra-2.4.0/flow/stencils/Flags/palau.desktop calligra-2.4.3/flow/stencils/Flags/palau.desktop --- calligra-2.4.0/flow/stencils/Flags/palau.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/palau.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Palau Name[bg]=Палау Name[ca]=Palau +Name[ca@valencia]=Palau Name[cs]=Palau Name[da]=Palau Name[de]=Palau @@ -12,6 +13,7 @@ Name[fr]=Palau Name[hu]=Palau Name[it]=Palau +Name[ja]=パラオ Name[kk]=Палау Name[nb]=Palau Name[nds]=Palau diff -Nru calligra-2.4.0/flow/stencils/Flags/palestine.desktop calligra-2.4.3/flow/stencils/Flags/palestine.desktop --- calligra-2.4.0/flow/stencils/Flags/palestine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/palestine.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Palestine Name[bg]=Палестина Name[ca]=Palestina +Name[ca@valencia]=Palestina Name[cs]=Palestina Name[da]=Palæstina Name[de]=Palästina diff -Nru calligra-2.4.0/flow/stencils/Flags/panama.desktop calligra-2.4.3/flow/stencils/Flags/panama.desktop --- calligra-2.4.0/flow/stencils/Flags/panama.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/panama.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Panama Name[bg]=Панама Name[ca]=Panamà +Name[ca@valencia]=Panamà Name[cs]=Panama Name[da]=Panama Name[de]=Panama @@ -12,6 +13,7 @@ Name[fr]=Panama Name[hu]=Panama Name[it]=Panama +Name[ja]=パナマ Name[kk]=Панама Name[nb]=Panama Name[nds]=Panama diff -Nru calligra-2.4.0/flow/stencils/Flags/papua_new_guinea.desktop calligra-2.4.3/flow/stencils/Flags/papua_new_guinea.desktop --- calligra-2.4.0/flow/stencils/Flags/papua_new_guinea.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/papua_new_guinea.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Papua New Guinea Name[bg]=Папуа Нова Гвинея Name[ca]=Papua Nova Guinea +Name[ca@valencia]=Papua Nova Guinea Name[cs]=Papua - Nová Guinea Name[da]=Papua Ny Guinea Name[de]=Papua-Neuguinea @@ -12,6 +13,7 @@ Name[ga]=Nua-Ghuine Phapua Name[hu]=Pápua Új-Guinea Name[it]=Papua Nuova Guinea +Name[ja]=パプアニューギニア Name[kk]=Папуа - Жаңа Гвинея Name[nb]=Papua Ny-Guinea Name[nds]=Papua-Niegguinea diff -Nru calligra-2.4.0/flow/stencils/Flags/paraguay.desktop calligra-2.4.3/flow/stencils/Flags/paraguay.desktop --- calligra-2.4.0/flow/stencils/Flags/paraguay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/paraguay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Paraguay Name[bg]=Парагвай Name[ca]=Paraguai +Name[ca@valencia]=Paraguai Name[cs]=Paraguay Name[da]=Paraguay Name[de]=Paraguay @@ -13,6 +14,7 @@ Name[ga]=Paragua Name[hu]=Paraguay Name[it]=Paraguay +Name[ja]=パラグアイ Name[kk]=Парагвай Name[nb]=Paraguay Name[nds]=Paraguay diff -Nru calligra-2.4.0/flow/stencils/Flags/peru.desktop calligra-2.4.3/flow/stencils/Flags/peru.desktop --- calligra-2.4.0/flow/stencils/Flags/peru.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/peru.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Peru Name[bg]=Перу Name[ca]=Perú +Name[ca@valencia]=Perú Name[cs]=Peru Name[da]=Peru Name[de]=Peru @@ -12,6 +13,7 @@ Name[ga]=Peiriú Name[hu]=Peru Name[it]=Peru +Name[ja]=ペルー Name[kk]=Перу Name[nb]=Peru Name[nds]=Peru diff -Nru calligra-2.4.0/flow/stencils/Flags/philippines.desktop calligra-2.4.3/flow/stencils/Flags/philippines.desktop --- calligra-2.4.0/flow/stencils/Flags/philippines.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/philippines.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Philippines Name[bg]=Филипини Name[ca]=Filipines +Name[ca@valencia]=Filipines Name[cs]=Filipíny Name[da]=Filippinerne Name[de]=Philippinen @@ -13,6 +14,7 @@ Name[ga]=Na hOileáin Fhilipíneacha Name[hu]=Fülöp-szigetek Name[it]=Filippine +Name[ja]=フィリピン Name[kk]=Филиппин Name[nb]=Filippinene Name[nds]=Philippinen diff -Nru calligra-2.4.0/flow/stencils/Flags/poland.desktop calligra-2.4.3/flow/stencils/Flags/poland.desktop --- calligra-2.4.0/flow/stencils/Flags/poland.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/poland.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Poland Name[bg]=Полша Name[ca]=Polònia +Name[ca@valencia]=Polònia Name[cs]=Polsko Name[da]=Polen Name[de]=Polen @@ -12,6 +13,7 @@ Name[fr]=Pologne Name[hu]=Lengyelország Name[it]=Polonia +Name[ja]=ポーランド Name[kk]=Польша Name[nb]=Polen Name[nds]=Polen diff -Nru calligra-2.4.0/flow/stencils/Flags/portugal.desktop calligra-2.4.3/flow/stencils/Flags/portugal.desktop --- calligra-2.4.0/flow/stencils/Flags/portugal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/portugal.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Portugal Name[bg]=Португалия Name[ca]=Portugal +Name[ca@valencia]=Portugal Name[cs]=Portugalsko Name[da]=Portugal Name[de]=Portugal @@ -13,6 +14,7 @@ Name[ga]=An Phortaingéil Name[hu]=Portugália Name[it]=Portogallo +Name[ja]=ポルトガル Name[kk]=Португалия Name[nb]=Portugal Name[nds]=Portugal diff -Nru calligra-2.4.0/flow/stencils/Flags/qatar.desktop calligra-2.4.3/flow/stencils/Flags/qatar.desktop --- calligra-2.4.0/flow/stencils/Flags/qatar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/qatar.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Qatar Name[bg]=Катар Name[ca]=Qatar +Name[ca@valencia]=Qatar Name[cs]=Katar Name[da]=Qatar Name[de]=Katar diff -Nru calligra-2.4.0/flow/stencils/Flags/romania.desktop calligra-2.4.3/flow/stencils/Flags/romania.desktop --- calligra-2.4.0/flow/stencils/Flags/romania.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/romania.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Romania Name[bg]=Румъния Name[ca]=Romania +Name[ca@valencia]=Romania Name[cs]=Rumunsko Name[da]=Rumænien Name[de]=Rumänien @@ -12,6 +13,7 @@ Name[ga]=An Rómáin Name[hu]=Románia Name[it]=Romania +Name[ja]=ルーマニア Name[kk]=Румыния Name[nb]=Romania Name[nds]=Rumänien diff -Nru calligra-2.4.0/flow/stencils/Flags/russian_federation.desktop calligra-2.4.3/flow/stencils/Flags/russian_federation.desktop --- calligra-2.4.0/flow/stencils/Flags/russian_federation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/russian_federation.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Russian Federation Name[bg]=Руска федерация Name[ca]=Federació Russa +Name[ca@valencia]=Federació Russa Name[cs]=Ruská federace Name[da]=Russiske Føderation Name[de]=Russische Föderation diff -Nru calligra-2.4.0/flow/stencils/Flags/rwanda.desktop calligra-2.4.3/flow/stencils/Flags/rwanda.desktop --- calligra-2.4.0/flow/stencils/Flags/rwanda.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/rwanda.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rwanda Name[bg]=Руанда Name[ca]=Rwanda +Name[ca@valencia]=Rwanda Name[cs]=Rwanda Name[da]=Rwanda Name[de]=Ruanda @@ -13,6 +14,7 @@ Name[ga]=Ruanda Name[hu]=Ruanda Name[it]=Rwanda +Name[ja]=ルワンダ Name[kk]=Руанда Name[nb]=Rwanda Name[nds]=Ruanda diff -Nru calligra-2.4.0/flow/stencils/Flags/saint_kitts_and_nevis.desktop calligra-2.4.3/flow/stencils/Flags/saint_kitts_and_nevis.desktop --- calligra-2.4.0/flow/stencils/Flags/saint_kitts_and_nevis.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/saint_kitts_and_nevis.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Saint Kitts And Nevis Name[bg]=Сейнт Китс и Невис Name[ca]=Saint Kitts i Nevis +Name[ca@valencia]=Saint Kitts i Nevis Name[cs]=Svatý Kitts a Nevis Name[da]=Saint Kitts og Nevis Name[de]=St. Kitts und Nevis diff -Nru calligra-2.4.0/flow/stencils/Flags/saint_lucia.desktop calligra-2.4.3/flow/stencils/Flags/saint_lucia.desktop --- calligra-2.4.0/flow/stencils/Flags/saint_lucia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/saint_lucia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Saint Lucia Name[ca]=Saint Lucia +Name[ca@valencia]=Saint Lucia Name[cs]=Svatá Lucie Name[da]=Saint Lucia Name[de]=St. Lucia diff -Nru calligra-2.4.0/flow/stencils/Flags/saint_vincent_and_the_grenadines.desktop calligra-2.4.3/flow/stencils/Flags/saint_vincent_and_the_grenadines.desktop --- calligra-2.4.0/flow/stencils/Flags/saint_vincent_and_the_grenadines.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/saint_vincent_and_the_grenadines.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Saint Vincent And The Grenadines Name[bg]=Сейнт Винсент и Гренадини Name[ca]=Saint Vincent i les Grenadines +Name[ca@valencia]=Saint Vincent i les Grenadines Name[cs]=Svatý Vincent a Grenadine Name[da]=Saint Vincent og Grenadinerne Name[de]=St. Vincent und die Grenadinen diff -Nru calligra-2.4.0/flow/stencils/Flags/samoa.desktop calligra-2.4.3/flow/stencils/Flags/samoa.desktop --- calligra-2.4.0/flow/stencils/Flags/samoa.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/samoa.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Samoa Name[bg]=Самоа Name[ca]=Samoa +Name[ca@valencia]=Samoa Name[cs]=Samoa Name[da]=Samoa Name[de]=Samoa @@ -12,6 +13,7 @@ Name[ga]=Samó Name[hu]=Szamoa Name[it]=Samoa +Name[ja]=サモア Name[kk]=Самоа Name[nb]=Samoa Name[nds]=Samoa diff -Nru calligra-2.4.0/flow/stencils/Flags/san_marino.desktop calligra-2.4.3/flow/stencils/Flags/san_marino.desktop --- calligra-2.4.0/flow/stencils/Flags/san_marino.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/san_marino.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=San Marino Name[bg]=Сан Марино Name[ca]=San Marino +Name[ca@valencia]=San Marino Name[cs]=San Marino Name[da]=San Marino Name[de]=San Marino diff -Nru calligra-2.4.0/flow/stencils/Flags/sao_tome_and_principe.desktop calligra-2.4.3/flow/stencils/Flags/sao_tome_and_principe.desktop --- calligra-2.4.0/flow/stencils/Flags/sao_tome_and_principe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/sao_tome_and_principe.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sao Tome And Principe Name[bg]=Сан Томе и Принципи Name[ca]=São Tomé i Príncipe +Name[ca@valencia]=São 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.4.0/flow/stencils/Flags/saudi_arabia.desktop calligra-2.4.3/flow/stencils/Flags/saudi_arabia.desktop --- calligra-2.4.0/flow/stencils/Flags/saudi_arabia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/saudi_arabia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Saudi Arabia Name[bg]=Саудитска Арабия Name[ca]=Aràbia Saudita +Name[ca@valencia]=Aràbia Saudí Name[cs]=Saúdská Arábie Name[da]=Saudi Arabien Name[de]=Saudi-Arabien @@ -12,6 +13,7 @@ Name[ga]=An Araib Shádach Name[hu]=Szaúd-Arábia Name[it]=Arabia Saudita +Name[ja]=サウジアラビア Name[kk]=Сауд Арабиясы Name[nb]=Saudi-Arabia Name[nds]=Saudi-Arabien diff -Nru calligra-2.4.0/flow/stencils/Flags/senegal.desktop calligra-2.4.3/flow/stencils/Flags/senegal.desktop --- calligra-2.4.0/flow/stencils/Flags/senegal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/senegal.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Senegal Name[bg]=Сенегал Name[ca]=Senegal +Name[ca@valencia]=Senegal Name[cs]=Senegal Name[da]=Senegal Name[de]=Senegal @@ -12,6 +13,7 @@ Name[fr]=Sénégal Name[hu]=Szenegál Name[it]=Senegal +Name[ja]=セネガル Name[kk]=Сенегал Name[nb]=Senegal Name[nds]=Senegal diff -Nru calligra-2.4.0/flow/stencils/Flags/serbia.desktop calligra-2.4.3/flow/stencils/Flags/serbia.desktop --- calligra-2.4.0/flow/stencils/Flags/serbia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/serbia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Serbia Name[bg]=Сърбия Name[ca]=Sèrbia +Name[ca@valencia]=Sèrbia Name[cs]=Srbsko Name[da]=Serbien Name[de]=Serbien diff -Nru calligra-2.4.0/flow/stencils/Flags/seychelles.desktop calligra-2.4.3/flow/stencils/Flags/seychelles.desktop --- calligra-2.4.0/flow/stencils/Flags/seychelles.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/seychelles.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Seychelles Name[bg]=Сейшели Name[ca]=Seychelles +Name[ca@valencia]=Seychelles Name[cs]=Seychelské ostrovy Name[da]=Seychellerne Name[de]=Seychellen diff -Nru calligra-2.4.0/flow/stencils/Flags/sierra_leone.desktop calligra-2.4.3/flow/stencils/Flags/sierra_leone.desktop --- calligra-2.4.0/flow/stencils/Flags/sierra_leone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/sierra_leone.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sierra Leone Name[bg]=Сиера Леоне Name[ca]=Sierra Leone +Name[ca@valencia]=Sierra Leone Name[cs]=Sierra Leone Name[da]=Sierra Leone Name[de]=Sierra Leone diff -Nru calligra-2.4.0/flow/stencils/Flags/singapore.desktop calligra-2.4.3/flow/stencils/Flags/singapore.desktop --- calligra-2.4.0/flow/stencils/Flags/singapore.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/singapore.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Singapore Name[bg]=Сингапур Name[ca]=Singapur +Name[ca@valencia]=Singapur Name[cs]=Singapur Name[da]=Singapore Name[de]=Singapur @@ -12,6 +13,7 @@ Name[ga]=Singeapór Name[hu]=Szingapúr Name[it]=Singapore +Name[ja]=シンガポール Name[kk]=Сингапур Name[nb]=Singapore Name[nds]=Singapur diff -Nru calligra-2.4.0/flow/stencils/Flags/slovakia.desktop calligra-2.4.3/flow/stencils/Flags/slovakia.desktop --- calligra-2.4.0/flow/stencils/Flags/slovakia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/slovakia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Slovakia Name[bg]=Словакия Name[ca]=Eslovàquia +Name[ca@valencia]=Eslovàquia Name[cs]=Slovensko Name[da]=Slovakiet Name[de]=Slowakei diff -Nru calligra-2.4.0/flow/stencils/Flags/slovenia.desktop calligra-2.4.3/flow/stencils/Flags/slovenia.desktop --- calligra-2.4.0/flow/stencils/Flags/slovenia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/slovenia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Slovenia Name[bg]=Словения Name[ca]=Eslovènia +Name[ca@valencia]=Eslovènia Name[cs]=Slovinsko Name[da]=Slovenien Name[de]=Slowenien diff -Nru calligra-2.4.0/flow/stencils/Flags/solomonislands.desktop calligra-2.4.3/flow/stencils/Flags/solomonislands.desktop --- calligra-2.4.0/flow/stencils/Flags/solomonislands.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/solomonislands.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,13 +1,19 @@ [Desktop Entry] Name=Solomon Islands +Name[ca]=Illes Salomó Name[cs]=Šalamounovy ostrovy +Name[el]=Νήσοι Σολομώντος +Name[es]=Islas Salomón +Name[et]=Saalomoni saared Name[it]=Isole Salomone Name[kk]=Соломон а-ры Name[nl]=Solomoneilanden Name[nn]=Salomonøyane +Name[pl]=Wyspy Salomona Name[pt]=Ilhas Salomão Name[pt_BR]=Ilhas Salomão Name[se]=Salomonsullot +Name[sk]=Šalamúnove ostrovy Name[sv]=Salomonöarna Name[uk]=Соломонові Острови Name[x-test]=xxSolomon Islandsxx diff -Nru calligra-2.4.0/flow/stencils/Flags/somalia.desktop calligra-2.4.3/flow/stencils/Flags/somalia.desktop --- calligra-2.4.0/flow/stencils/Flags/somalia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/somalia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Somalia Name[bg]=Сомалия Name[ca]=Somàlia +Name[ca@valencia]=Somàlia Name[cs]=Somálsko Name[da]=Somalia Name[de]=Somalia @@ -13,6 +14,7 @@ Name[ga]=An tSomáil Name[hu]=Szomália Name[it]=Somalia +Name[ja]=ソマリア Name[kk]=Сомали Name[nb]=Somalia Name[nds]=Somalien diff -Nru calligra-2.4.0/flow/stencils/Flags/south_africa.desktop calligra-2.4.3/flow/stencils/Flags/south_africa.desktop --- calligra-2.4.0/flow/stencils/Flags/south_africa.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/south_africa.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=South Africa Name[bg]=Южна Африка Name[ca]=Sud-àfrica +Name[ca@valencia]=Sudàfrica Name[cs]=Jižní Afrika Name[da]=Sydafrika Name[de]=Südafrika @@ -12,6 +13,7 @@ Name[ga]=An Afraic Theas Name[hu]=Dél-Afrika Name[it]=Sud Africa +Name[ja]=南アフリカ Name[kk]=Оңтүстік Африка Name[nb]=Sør-Afrika Name[nds]=Söödafrika diff -Nru calligra-2.4.0/flow/stencils/Flags/south_korea.desktop calligra-2.4.3/flow/stencils/Flags/south_korea.desktop --- calligra-2.4.0/flow/stencils/Flags/south_korea.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/south_korea.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=South Korea Name[bg]=Южна Корея Name[ca]=Corea del Sud +Name[ca@valencia]=Corea del Sud Name[cs]=Jižní Korea Name[da]=Sydkorea Name[de]=Südkorea @@ -12,6 +13,7 @@ Name[ga]=An Chóiré Theas Name[hu]=Dél-Korea Name[it]=Corea del Sud +Name[ja]=韓国 Name[kk]=Корей Республикасы Name[nb]=Sør-Korea Name[nds]=Söödkorea diff -Nru calligra-2.4.0/flow/stencils/Flags/spain.desktop calligra-2.4.3/flow/stencils/Flags/spain.desktop --- calligra-2.4.0/flow/stencils/Flags/spain.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/spain.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Spain Name[bg]=Испания Name[ca]=Espanya +Name[ca@valencia]=Espanya Name[cs]=Španělsko Name[da]=Spanien Name[de]=Spanien @@ -12,6 +13,7 @@ Name[fr]=Espagne Name[hu]=Spanyolország Name[it]=Spagna +Name[ja]=スペイン Name[kk]=Испания Name[nb]=Spania Name[nds]=Spanien diff -Nru calligra-2.4.0/flow/stencils/Flags/sri_lanka.desktop calligra-2.4.3/flow/stencils/Flags/sri_lanka.desktop --- calligra-2.4.0/flow/stencils/Flags/sri_lanka.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/sri_lanka.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sri Lanka Name[bg]=Шри Ланка Name[ca]=Sri Lanka +Name[ca@valencia]=Sri Lanka Name[cs]=Srí Lanka Name[da]=Sri Lanka Name[de]=Sri Lanka @@ -13,6 +14,7 @@ Name[ga]=Srí Lanca Name[hu]=Sri Lanka Name[it]=Sri Lanka +Name[ja]=スリランカ Name[kk]=Шри-Ланка Name[nb]=Sri Lanka Name[nds]=Sri Lanka diff -Nru calligra-2.4.0/flow/stencils/Flags/sudan.desktop calligra-2.4.3/flow/stencils/Flags/sudan.desktop --- calligra-2.4.0/flow/stencils/Flags/sudan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/sudan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sudan Name[bg]=Судан Name[ca]=Sudan +Name[ca@valencia]=Sudan Name[cs]=Sudán Name[da]=Sudan Name[de]=Sudan @@ -12,6 +13,7 @@ Name[fr]=Soudan Name[hu]=Szudán Name[it]=Sudan +Name[ja]=スーダン Name[kk]=Судан Name[nb]=Sudan Name[nds]=Sudan diff -Nru calligra-2.4.0/flow/stencils/Flags/suisse.desktop calligra-2.4.3/flow/stencils/Flags/suisse.desktop --- calligra-2.4.0/flow/stencils/Flags/suisse.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/suisse.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,13 +1,20 @@ [Desktop Entry] Name=Switzerland +Name[ca]=Suïssa Name[cs]=Švýcarsko +Name[el]=Ελβετία +Name[es]=Suiza +Name[et]=Šveits Name[it]=Svizzera +Name[ja]=スイス Name[kk]=Свазиленд Name[nl]=Zwitserland Name[nn]=Sveits +Name[pl]=Szwajcaria Name[pt]=Suíça Name[pt_BR]=Suíça Name[se]=Šveica +Name[sk]=Švajčiarsko Name[sv]=Schweiz Name[uk]=Швейцарія Name[x-test]=xxSwitzerlandxx diff -Nru calligra-2.4.0/flow/stencils/Flags/suriname.desktop calligra-2.4.3/flow/stencils/Flags/suriname.desktop --- calligra-2.4.0/flow/stencils/Flags/suriname.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/suriname.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Suriname Name[bg]=Суринам Name[ca]=Surinam +Name[ca@valencia]=Surinam Name[cs]=Surinam Name[da]=Surinam Name[de]=Suriname diff -Nru calligra-2.4.0/flow/stencils/Flags/swaziland.desktop calligra-2.4.3/flow/stencils/Flags/swaziland.desktop --- calligra-2.4.0/flow/stencils/Flags/swaziland.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/swaziland.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Swaziland Name[bg]=Свазиленд Name[ca]=Swazilàndia +Name[ca@valencia]=Swazilàndia Name[cs]=Swaziland Name[da]=Swaziland Name[de]=Swasiland diff -Nru calligra-2.4.0/flow/stencils/Flags/sweden.desktop calligra-2.4.3/flow/stencils/Flags/sweden.desktop --- calligra-2.4.0/flow/stencils/Flags/sweden.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/sweden.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sweden Name[bg]=Швеция Name[ca]=Suècia +Name[ca@valencia]=Suècia Name[cs]=Švédsko Name[da]=Sverige Name[de]=Schweden @@ -12,6 +13,7 @@ Name[fr]=Suède Name[hu]=Svédország Name[it]=Svezia +Name[ja]=スウェーデン Name[kk]=Швеция Name[nb]=Sverige Name[nds]=Sweden diff -Nru calligra-2.4.0/flow/stencils/Flags/syrian_arab_republic.desktop calligra-2.4.3/flow/stencils/Flags/syrian_arab_republic.desktop --- calligra-2.4.0/flow/stencils/Flags/syrian_arab_republic.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/syrian_arab_republic.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Syrian Arab Republic Name[bg]=Сирийска Арабска Република Name[ca]=República Àrab Síria +Name[ca@valencia]=República Àrab Síria Name[cs]=Syrská arabská republika Name[da]=Syrien Name[de]=Arabische Republik Syrien diff -Nru calligra-2.4.0/flow/stencils/Flags/tajikistan.desktop calligra-2.4.3/flow/stencils/Flags/tajikistan.desktop --- calligra-2.4.0/flow/stencils/Flags/tajikistan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/tajikistan.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Tajikistan Name[bg]=Таджикистан Name[ca]=Tadjikistan +Name[ca@valencia]=Tadjikistan Name[cs]=Tádžikistán Name[da]=Tajikistan Name[de]=Tadschikistan diff -Nru calligra-2.4.0/flow/stencils/Flags/tanzania.desktop calligra-2.4.3/flow/stencils/Flags/tanzania.desktop --- calligra-2.4.0/flow/stencils/Flags/tanzania.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/tanzania.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Tanzania Name[bg]=Танзания Name[ca]=Tanzània +Name[ca@valencia]=Tanzània Name[cs]=Tanzanie Name[da]=Tanzania Name[de]=Tansania @@ -12,6 +13,7 @@ Name[fr]=Tanzanie Name[hu]=Tanzánia Name[it]=Tanzania +Name[ja]=タンザニア Name[kk]=Танзания Name[nb]=Tanzania Name[nds]=Tansania diff -Nru calligra-2.4.0/flow/stencils/Flags/thailand.desktop calligra-2.4.3/flow/stencils/Flags/thailand.desktop --- calligra-2.4.0/flow/stencils/Flags/thailand.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/thailand.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Thailand Name[bg]=Тайланд Name[ca]=Tailàndia +Name[ca@valencia]=Tailàndia Name[cs]=Thajsko Name[da]=Thailand Name[de]=Thailand @@ -13,6 +14,7 @@ Name[ga]=An Téalainn Name[hu]=Thaiföld Name[it]=Tailandia +Name[ja]=タイ Name[kk]=Тайланд Name[nb]=Thailand Name[nds]=Thailand diff -Nru calligra-2.4.0/flow/stencils/Flags/timor_leste.desktop calligra-2.4.3/flow/stencils/Flags/timor_leste.desktop --- calligra-2.4.0/flow/stencils/Flags/timor_leste.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/timor_leste.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,12 +1,18 @@ [Desktop Entry] Name=Timor-Leste +Name[ca]=Timor Oriental Name[cs]=Timor-Leste +Name[el]=Τιμόρ-Λέστε +Name[es]=Timor Oriental +Name[et]=Ida-Timor Name[it]=Timor Est Name[kk]=Тимор-Лесте Name[nl]=Oost-Timor Name[nn]=Aust-Timor +Name[pl]=Timor Wschodni Name[pt]=Timor-Leste Name[pt_BR]=Timor-Leste +Name[sk]=Východný Timor Name[sv]=Östtimor Name[uk]=Східний Тимор Name[x-test]=xxTimor-Lestexx diff -Nru calligra-2.4.0/flow/stencils/Flags/togo.desktop calligra-2.4.3/flow/stencils/Flags/togo.desktop --- calligra-2.4.0/flow/stencils/Flags/togo.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/togo.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Togo Name[bg]=Того Name[ca]=Togo +Name[ca@valencia]=Togo Name[cs]=Togo Name[da]=Togo Name[de]=Togo diff -Nru calligra-2.4.0/flow/stencils/Flags/tonga.desktop calligra-2.4.3/flow/stencils/Flags/tonga.desktop --- calligra-2.4.0/flow/stencils/Flags/tonga.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/tonga.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Tonga Name[bg]=Тонга Name[ca]=Tonga +Name[ca@valencia]=Tonga Name[cs]=Tonga Name[da]=Tonga Name[de]=Tonga @@ -12,6 +13,7 @@ Name[fr]=Tonga Name[hu]=Tonga Name[it]=Tonga +Name[ja]=トンガ Name[kk]=Тонга Name[nb]=Tonga Name[nds]=Tonga diff -Nru calligra-2.4.0/flow/stencils/Flags/trinidad_and_tobago.desktop calligra-2.4.3/flow/stencils/Flags/trinidad_and_tobago.desktop --- calligra-2.4.0/flow/stencils/Flags/trinidad_and_tobago.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/trinidad_and_tobago.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Trinidad And Tobago Name[bg]=Тринидат и Тобаго Name[ca]=Trinitat i Tobago +Name[ca@valencia]=Trinitat i Tobago Name[cs]=Trinidad a Tobago Name[da]=Trinidad og Tobago Name[de]=Trinidad und Tobago diff -Nru calligra-2.4.0/flow/stencils/Flags/tunisia.desktop calligra-2.4.3/flow/stencils/Flags/tunisia.desktop --- calligra-2.4.0/flow/stencils/Flags/tunisia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/tunisia.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Tunisia Name[bg]=Тунис Name[ca]=Tunísia +Name[ca@valencia]=Tunísia Name[cs]=Tunisko Name[da]=Tunesien Name[de]=Tunesien @@ -13,6 +14,7 @@ Name[ga]=An Túinéis Name[hu]=Tunézia Name[it]=Tunisia +Name[ja]=チュニジア Name[kk]=Тунис Name[nb]=Tunisia Name[nds]=Tunesien diff -Nru calligra-2.4.0/flow/stencils/Flags/turkey.desktop calligra-2.4.3/flow/stencils/Flags/turkey.desktop --- calligra-2.4.0/flow/stencils/Flags/turkey.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/turkey.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Turkey Name[bg]=Турция Name[ca]=Turquia +Name[ca@valencia]=Turquia Name[cs]=Turecko Name[da]=Tyrkiet Name[de]=Türkei @@ -12,6 +13,7 @@ Name[fr]=Turquie Name[hu]=Törökország Name[it]=Turchia +Name[ja]=トルコ Name[kk]=Түркия Name[nb]=Tyrkia Name[nds]=Törkei diff -Nru calligra-2.4.0/flow/stencils/Flags/turkmenistan.desktop calligra-2.4.3/flow/stencils/Flags/turkmenistan.desktop --- calligra-2.4.0/flow/stencils/Flags/turkmenistan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/turkmenistan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Turkmenistan Name[bg]=Туркменистан Name[ca]=Turkmenistan +Name[ca@valencia]=Turkmenistan Name[cs]=Turkmenistán Name[da]=Turkmenistan Name[de]=Turkmenistan diff -Nru calligra-2.4.0/flow/stencils/Flags/tuvalu.desktop calligra-2.4.3/flow/stencils/Flags/tuvalu.desktop --- calligra-2.4.0/flow/stencils/Flags/tuvalu.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/tuvalu.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Tuvalu Name[bg]=Тувалу Name[ca]=Tuvalu +Name[ca@valencia]=Tuvalu Name[cs]=Tuvalu Name[da]=Tuvalu Name[de]=Tuvalu @@ -12,6 +13,7 @@ Name[fr]=Tuvalu Name[hu]=Tuvalu Name[it]=Tuvalu +Name[ja]=ツバル Name[kk]=Тувалу Name[nb]=Tuvalu Name[nds]=Tuvalu diff -Nru calligra-2.4.0/flow/stencils/Flags/uganda.desktop calligra-2.4.3/flow/stencils/Flags/uganda.desktop --- calligra-2.4.0/flow/stencils/Flags/uganda.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/uganda.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Uganda Name[bg]=Уганда Name[ca]=Uganda +Name[ca@valencia]=Uganda Name[cs]=Uganda Name[da]=Uganda Name[de]=Uganda @@ -13,6 +14,7 @@ Name[ga]=Uganda Name[hu]=Uganda Name[it]=Uganda +Name[ja]=ウガンダ Name[kk]=Уганда Name[nb]=Uganda Name[nds]=Uganda diff -Nru calligra-2.4.0/flow/stencils/Flags/ukraine.desktop calligra-2.4.3/flow/stencils/Flags/ukraine.desktop --- calligra-2.4.0/flow/stencils/Flags/ukraine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/ukraine.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Ukraine Name[bg]=Украйна Name[ca]=Ucraïna +Name[ca@valencia]=Ucraïna Name[cs]=Ukrajina Name[da]=Ukraine Name[de]=Ukraine @@ -12,6 +13,7 @@ Name[fr]=Ukraine Name[hu]=Ukrajna Name[it]=Ucraina +Name[ja]=ウクライナ Name[kk]=Украина Name[nb]=Ukraina Name[nds]=Ukraine diff -Nru calligra-2.4.0/flow/stencils/Flags/unesco.desktop calligra-2.4.3/flow/stencils/Flags/unesco.desktop --- calligra-2.4.0/flow/stencils/Flags/unesco.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/unesco.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=UNESCO Name[bg]=ЮНЕСКО Name[ca]=UNESCO +Name[ca@valencia]=UNESCO Name[cs]=UNESCO Name[da]=UNESCO Name[de]=UNESCO @@ -10,6 +11,7 @@ Name[et]=UNESCO Name[fi]=UNESCO Name[fr]=UNESCO +Name[gl]=UNESCO Name[hu]=UNESCO Name[it]=UNESCO Name[kk]=UNESCO diff -Nru calligra-2.4.0/flow/stencils/Flags/unicef.desktop calligra-2.4.3/flow/stencils/Flags/unicef.desktop --- calligra-2.4.0/flow/stencils/Flags/unicef.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/unicef.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=UNICEF Name[bg]=УНИЦЕФ Name[ca]=UNICEF +Name[ca@valencia]=UNICEF Name[cs]=UNICEF Name[da]=UNICEF Name[de]=UNICEF @@ -10,6 +11,7 @@ Name[et]=UNICEF Name[fi]=UNICEF Name[fr]=UNICEF +Name[gl]=UNICEF Name[hu]=UNICEF Name[it]=UNICEF Name[kk]=UNICEF diff -Nru calligra-2.4.0/flow/stencils/Flags/united_arab_emirates.desktop calligra-2.4.3/flow/stencils/Flags/united_arab_emirates.desktop --- calligra-2.4.0/flow/stencils/Flags/united_arab_emirates.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/united_arab_emirates.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=United Arab Emirates Name[bg]=Обединени Арабски Емирства Name[ca]=Emirats Àrabs Units +Name[ca@valencia]=Emirats Àrabs Units Name[cs]=Spojené arabské emiráty Name[da]=Forenende Arabiske Emirater Name[de]=Vereinigte Arabische Emirate diff -Nru calligra-2.4.0/flow/stencils/Flags/united_kingdom.desktop calligra-2.4.3/flow/stencils/Flags/united_kingdom.desktop --- calligra-2.4.0/flow/stencils/Flags/united_kingdom.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/united_kingdom.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=United Kingdom Name[bg]=Великобритания Name[ca]=Regne Unit +Name[ca@valencia]=Regne Unit Name[cs]=Spojené království Name[da]=Storbritannien Name[de]=Vereinigtes Königreich @@ -12,6 +13,7 @@ Name[ga]=An Ríocht Aontaithe Name[hu]=Egyesült Királyság Name[it]=Regno Unito +Name[ja]=イギリス Name[kk]=Ұлыбритания Name[nb]=Storbritannia Name[nds]=Grootbritannien diff -Nru calligra-2.4.0/flow/stencils/Flags/unitednations.desktop calligra-2.4.3/flow/stencils/Flags/unitednations.desktop --- calligra-2.4.0/flow/stencils/Flags/unitednations.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/unitednations.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=United Nations Name[bg]=Обединени нации Name[ca]=Nacions Unides +Name[ca@valencia]=Nacions Unides Name[cs]=Spojené národy Name[da]=Forenede Nationer Name[de]=Vereinte Nationen @@ -12,6 +13,7 @@ Name[fr]=Nations unies Name[hu]=ENSZ Name[it]=Nazioni Unite +Name[ja]=国際連合 Name[kk]=Біріккен Ұлттар Name[nb]=Forente Nasjoner Name[nds]=Vereent Natschonen diff -Nru calligra-2.4.0/flow/stencils/Flags/united_states.desktop calligra-2.4.3/flow/stencils/Flags/united_states.desktop --- calligra-2.4.0/flow/stencils/Flags/united_states.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/united_states.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=United States Name[bg]=САЩ Name[ca]=Estats Units +Name[ca@valencia]=Estats Units Name[cs]=Spojené státy Name[da]=USA Name[de]=Vereinigte Staaten @@ -11,6 +12,7 @@ Name[fi]=Yhdysvallat Name[hu]=Egyesült Államok Name[it]=Stati Uniti +Name[ja]=アメリカ合衆国 Name[kk]=Құрама Штаттар Name[nb]=USA Name[nds]=Vereenigte Staten diff -Nru calligra-2.4.0/flow/stencils/Flags/uruguay.desktop calligra-2.4.3/flow/stencils/Flags/uruguay.desktop --- calligra-2.4.0/flow/stencils/Flags/uruguay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/uruguay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Uruguay Name[bg]=Уругвай Name[ca]=Uruguai +Name[ca@valencia]=Uruguai Name[cs]=Uruguay Name[da]=Uruguay Name[de]=Uruguay @@ -13,6 +14,7 @@ Name[ga]=Uragua Name[hu]=Uruguay Name[it]=Uruguay +Name[ja]=ウルグアイ Name[kk]=Уругвай Name[nb]=Uruguay Name[nds]=Uruguay diff -Nru calligra-2.4.0/flow/stencils/Flags/uzbekistan.desktop calligra-2.4.3/flow/stencils/Flags/uzbekistan.desktop --- calligra-2.4.0/flow/stencils/Flags/uzbekistan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/uzbekistan.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Uzbekistan Name[bg]=Узбекистан Name[ca]=Uzbekistan +Name[ca@valencia]=Uzbekistan Name[cs]=Uzbekistán Name[da]=Usbekistan Name[de]=Usbekistan diff -Nru calligra-2.4.0/flow/stencils/Flags/vanuatu.desktop calligra-2.4.3/flow/stencils/Flags/vanuatu.desktop --- calligra-2.4.0/flow/stencils/Flags/vanuatu.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/vanuatu.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vanuatu Name[bg]=Вануату Name[ca]=Vanuatu +Name[ca@valencia]=Vanuatu Name[cs]=Vanuatu Name[da]=Vanuatu Name[de]=Vanuatu @@ -13,6 +14,7 @@ Name[ga]=Vanuatú Name[hu]=Vanuatu Name[it]=Vanuatu +Name[ja]=バヌアツ Name[kk]=Вануату Name[nb]=Vanuatu Name[nds]=Vanuatu diff -Nru calligra-2.4.0/flow/stencils/Flags/vatican.desktop calligra-2.4.3/flow/stencils/Flags/vatican.desktop --- calligra-2.4.0/flow/stencils/Flags/vatican.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/vatican.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vatican Name[bg]=Ватикана Name[ca]=Vaticà +Name[ca@valencia]=Vaticà Name[cs]=Vatikán Name[da]=Vatikanstaten Name[de]=Vatikan @@ -12,6 +13,7 @@ Name[fr]=Vatican Name[hu]=Vatikán Name[it]=Vaticano +Name[ja]=バチカン Name[kk]=Ватикан Name[nb]=Vatikanstaten Name[nds]=Vatikaan diff -Nru calligra-2.4.0/flow/stencils/Flags/venezuela.desktop calligra-2.4.3/flow/stencils/Flags/venezuela.desktop --- calligra-2.4.0/flow/stencils/Flags/venezuela.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/venezuela.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Venezuela Name[bg]=Венецуела Name[ca]=Veneçuela +Name[ca@valencia]=Veneçuela Name[cs]=Venezuela Name[da]=Venezuela Name[de]=Venezuela @@ -12,6 +13,7 @@ Name[ga]=Veiniséala Name[hu]=Venezuela Name[it]=Venezuela +Name[ja]=ベネズエラ Name[kk]=Венесуэла Name[nb]=Venezuela Name[nds]=Venezuela diff -Nru calligra-2.4.0/flow/stencils/Flags/vietnam.desktop calligra-2.4.3/flow/stencils/Flags/vietnam.desktop --- calligra-2.4.0/flow/stencils/Flags/vietnam.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/vietnam.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Vietnam Name[bg]=Виетнам Name[ca]=Vietnam +Name[ca@valencia]=Vietnam Name[cs]=Panenské ostrovy, U.K. Name[da]=Vietnam Name[de]=Vietnam @@ -13,6 +14,7 @@ Name[ga]=Vítneam Name[hu]=Vietnam Name[it]=Vietnam +Name[ja]=ベトナム Name[kk]=Вьетнам Name[nb]=Vietnam Name[nds]=Vietnam diff -Nru calligra-2.4.0/flow/stencils/Flags/wake_island.desktop calligra-2.4.3/flow/stencils/Flags/wake_island.desktop --- calligra-2.4.0/flow/stencils/Flags/wake_island.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/wake_island.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Wake Island Name[bg]=о-в Уейк Name[ca]=Illa Wake +Name[ca@valencia]=Illa Wake Name[cs]=Ostrov Wake Name[da]=Wake-øen Name[de]=Wake Island diff -Nru calligra-2.4.0/flow/stencils/Flags/western_sahara.desktop calligra-2.4.3/flow/stencils/Flags/western_sahara.desktop --- calligra-2.4.0/flow/stencils/Flags/western_sahara.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/western_sahara.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Western Sahara Name[bg]=Западна Сахара Name[ca]=Sàhara Occidental +Name[ca@valencia]=Sàhara Occidental Name[cs]=Západní Sahara Name[da]=Vestsahara Name[de]=Westsahara diff -Nru calligra-2.4.0/flow/stencils/Flags/who.desktop calligra-2.4.3/flow/stencils/Flags/who.desktop --- calligra-2.4.0/flow/stencils/Flags/who.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/who.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=WHO Name[ca]=WHO +Name[ca@valencia]=WHO Name[cs]=WHO Name[da]=WHO Name[de]=WHO @@ -10,6 +11,7 @@ Name[fi]=WHO Name[hu]=WHO Name[it]=WHO +Name[ja]=WHO Name[kk]=ДДСҰ Name[nb]=WHO Name[nds]=WHO @@ -18,6 +20,7 @@ Name[pt]=WHO Name[pt_BR]=WHO Name[ru]=Всемирная организация здравоохранения +Name[sk]=WHO Name[sv]=WHO Name[uk]=ВООЗ Name[x-test]=xxWHOxx diff -Nru calligra-2.4.0/flow/stencils/Flags/yemen.desktop calligra-2.4.3/flow/stencils/Flags/yemen.desktop --- calligra-2.4.0/flow/stencils/Flags/yemen.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/yemen.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Yemen Name[bg]=Йемен Name[ca]=Yemen +Name[ca@valencia]=Yemen Name[cs]=Jemen Name[da]=Yemen Name[de]=Jemen diff -Nru calligra-2.4.0/flow/stencils/Flags/zambia.desktop calligra-2.4.3/flow/stencils/Flags/zambia.desktop --- calligra-2.4.0/flow/stencils/Flags/zambia.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/zambia.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Zambia Name[bg]=Замбия Name[ca]=Zàmbia +Name[ca@valencia]=Zàmbia Name[cs]=Zambie Name[da]=Zambia Name[de]=Sambia diff -Nru calligra-2.4.0/flow/stencils/Flags/zimbabwe.desktop calligra-2.4.3/flow/stencils/Flags/zimbabwe.desktop --- calligra-2.4.0/flow/stencils/Flags/zimbabwe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flags/zimbabwe.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Zimbabwe Name[bg]=Зимбабве Name[ca]=Zimbabwe +Name[ca@valencia]=Zimbabwe Name[cs]=Zimbabwe Name[da]=Zimbabwe Name[de]=Simbabwe @@ -13,6 +14,7 @@ Name[ga]=An tSiombáib Name[hu]=Zimbabwe Name[it]=Zimbabwe +Name[ja]=ジンバブエ Name[kk]=Зимбабве Name[nb]=Zimbabwe Name[nds]=Simbabwe diff -Nru calligra-2.4.0/flow/stencils/Flowchart/collate.desktop calligra-2.4.3/flow/stencils/Flowchart/collate.desktop --- calligra-2.4.0/flow/stencils/Flowchart/collate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/collate.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,8 +2,10 @@ Name=Collate Name[bg]=Залепване Name[ca]=Compara +Name[ca@valencia]=Compara Name[cs]=Uspořádat Name[da]=Sætvis +Name[es]=Cotejar Name[et]=Koostamine Name[it]=Fascicolo Name[kk]=Сұрыптау @@ -13,6 +15,7 @@ Name[pt]=Colecção Name[pt_BR]=Agrupar Name[ru]=Сопоставлять +Name[sk]=Zoradiť Name[sv]=Ordna Name[ug]=بەت ئايرىش Name[uk]=Зіставлення diff -Nru calligra-2.4.0/flow/stencils/Flowchart/collection.desktop calligra-2.4.3/flow/stencils/Flowchart/collection.desktop --- calligra-2.4.0/flow/stencils/Flowchart/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/collection.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Flowchart Name[ca]=Diagrama de flux +Name[ca@valencia]=Diagrama de flux Name[cs]=Diagram Name[da]=Rutediagram Name[de]=Flussdiagramm @@ -9,6 +10,7 @@ Name[et]=Vooskeem Name[fi]=Vuokaavio Name[it]=Diagramma di flusso +Name[ja]=フローチャート Name[kk]=Блок-сұлба Name[nb]=Flytdiagram Name[nl]=Stroomdiagram (flowchart) @@ -16,6 +18,7 @@ Name[pt]=Fluxograma Name[pt_BR]=Fluxograma Name[ru]=Блок-схема +Name[sk]=Vývojový diagram Name[sv]=Flödesdiagram Name[ug]=تەرتىپ دىئاگراممىسى Name[uk]=Діаграма потоків diff -Nru calligra-2.4.0/flow/stencils/Flowchart/datasource.desktop calligra-2.4.3/flow/stencils/Flowchart/datasource.desktop --- calligra-2.4.0/flow/stencils/Flowchart/datasource.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/datasource.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Data Source Name[bg]=Източник на данни Name[ca]=Font de dades +Name[ca@valencia]=Font de dades Name[cs]=Zdroj dat Name[da]=Datakilde Name[de]=Datenquelle @@ -11,6 +12,7 @@ Name[fi]=Tietolähde Name[hu]=Adatforrás Name[it]=Origine dati +Name[ja]=データソース Name[kk]=Дерек көзі Name[nb]=Datakilde Name[nds]=Datenborn @@ -19,6 +21,7 @@ Name[pt]=Fonte de Dados Name[pt_BR]=Fonte de dados Name[ru]=Источник данных +Name[sk]=Dátový zdroj Name[sv]=Datakälla Name[ug]=سانلىق-مەلۇمات مەنبەسى Name[uk]=Джерело даних diff -Nru calligra-2.4.0/flow/stencils/Flowchart/delay.desktop calligra-2.4.3/flow/stencils/Flowchart/delay.desktop --- calligra-2.4.0/flow/stencils/Flowchart/delay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/delay.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=Delay Name[bg]=Изчакване Name[ca]=Retard +Name[ca@valencia]=Retard Name[cs]=Prodleva Name[da]=Forsinkelse Name[el]=Καθυστέρηση Name[es]=Retraso Name[et]=Viivitus Name[fi]=Viive +Name[gl]=Atraso Name[it]=Ritardo Name[kk]=Кідіру Name[nb]=Forsinkelse @@ -16,6 +18,7 @@ Name[pt]=Atraso Name[pt_BR]=Atraso Name[ru]=Задержка +Name[sk]=Oneskorenie Name[sv]=Fördröjning Name[ug]=كېچىكتۈر Name[uk]=Затримка diff -Nru calligra-2.4.0/flow/stencils/Flowchart/display.desktop calligra-2.4.3/flow/stencils/Flowchart/display.desktop --- calligra-2.4.0/flow/stencils/Flowchart/display.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/display.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Display Name[ca]=Mostra +Name[ca@valencia]=Mostra Name[cs]=Zobrazení Name[da]=Vis Name[de]=Bildschirm @@ -9,6 +10,7 @@ Name[et]=Kuvamine Name[fi]=Näyttö Name[fr]=Afficher +Name[gl]=Visualización Name[it]=Schermo Name[kk]=Көрсету Name[nb]=Bildeskjerm @@ -18,6 +20,7 @@ Name[pt]=Ecrã Name[pt_BR]=Tela Name[ru]=Показывать +Name[sk]=Obrazovka Name[sv]=Bildskärm Name[ug]=كۆرسەت Name[uk]=Показати diff -Nru calligra-2.4.0/flow/stencils/Flowchart/document.desktop calligra-2.4.3/flow/stencils/Flowchart/document.desktop --- calligra-2.4.0/flow/stencils/Flowchart/document.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/document.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Document Name[bg]=Документ Name[ca]=Document +Name[ca@valencia]=Document Name[cs]=Dokument Name[da]=Dokument Name[de]=Dokument @@ -10,8 +11,10 @@ Name[et]=Dokument Name[fi]=Asiakirja Name[fr]=Document +Name[gl]=Documento Name[hu]=Dokumentum Name[it]=Documento +Name[ja]=文書 Name[kk]=Құжат Name[nb]=Dokument Name[nds]=Dokment @@ -20,6 +23,7 @@ Name[pt]=Documento Name[pt_BR]=Documento Name[ru]=Документ +Name[sk]=Dokument Name[sv]=Dokument Name[ug]=پۈتۈك Name[uk]=Документ diff -Nru calligra-2.4.0/flow/stencils/Flowchart/extract.desktop calligra-2.4.3/flow/stencils/Flowchart/extract.desktop --- calligra-2.4.0/flow/stencils/Flowchart/extract.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/extract.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Extract Name[ca]=Extreu +Name[ca@valencia]=Extreu Name[cs]=Rozbalit Name[da]=Pak ud Name[el]=Εξαγωγή @@ -15,6 +16,7 @@ Name[pt]=Extracção Name[pt_BR]=Extrair Name[ru]=Извлекать +Name[sk]=Rozbaliť Name[sv]=Extrahera Name[ug]=ئايرىش Name[uk]=Розпакування diff -Nru calligra-2.4.0/flow/stencils/Flowchart/intstorage.desktop calligra-2.4.3/flow/stencils/Flowchart/intstorage.desktop --- calligra-2.4.0/flow/stencils/Flowchart/intstorage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/intstorage.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Internal Storage Name[bg]=Вътрешно хранилище Name[ca]=Emmagatzematge intern +Name[ca@valencia]=Emmagatzement intern Name[cs]=Interní úložiště Name[da]=Intern opbevaring Name[de]=Interner Speicher @@ -10,8 +11,10 @@ Name[et]=Sisemine salvesti Name[fi]=Sisäinen tietovarasto Name[fr]=Stockage interne +Name[gl]=Almacenamento interno Name[hu]=Belső tároló Name[it]=Memorizzazione interna +Name[ja]=内部ストレージ Name[kk]=Ішкі жинақтауыш Name[nb]=Indre lager Name[nds]=Intern Spieker @@ -20,6 +23,7 @@ Name[pt]=Armazenamento Interno Name[pt_BR]=Armazenamento interno Name[ru]=Внутреннее хранилище +Name[sk]=Interné úložisko Name[sv]=Intern lagring Name[uk]=Внутрішня пам'ять Name[x-test]=xxInternal Storagexx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/magdisk.desktop calligra-2.4.3/flow/stencils/Flowchart/magdisk.desktop --- calligra-2.4.0/flow/stencils/Flowchart/magdisk.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/magdisk.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Magnetic Disk Name[bg]=Магнитен диск Name[ca]=Disc magnètic +Name[ca@valencia]=Disc magnètic Name[de]=Magnetplatte Name[el]=Μαγνητικός δίσκος Name[es]=Disco magnético @@ -15,6 +16,7 @@ Name[pt]=Disco Magnético Name[pt_BR]=Disco magnético Name[ru]=Магнитный диск +Name[sk]=Magnetický disk Name[sv]=Magnetisk disk Name[uk]=Магнітний диск Name[x-test]=xxMagnetic Diskxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/magdrum.desktop calligra-2.4.3/flow/stencils/Flowchart/magdrum.desktop --- calligra-2.4.0/flow/stencils/Flowchart/magdrum.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/magdrum.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Magnetic Drum Name[bg]=Магнитен барабан Name[ca]=Tambor magnètic +Name[ca@valencia]=Tambor magnètic Name[de]=Magnettrommel Name[el]=Μαγνητικό τύμπανο Name[es]=Tambor magnético @@ -15,6 +16,7 @@ Name[pt]=Tambor Magnético Name[pt_BR]=Tambor magnético Name[ru]=Магнитный барабан +Name[sk]=Magnetický valec Name[sv]=Magnettrumma Name[uk]=Магнітний барабан Name[x-test]=xxMagnetic Drumxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/magtape.desktop calligra-2.4.3/flow/stencils/Flowchart/magtape.desktop --- calligra-2.4.0/flow/stencils/Flowchart/magtape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/magtape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Magnetic Tape Name[bg]=Магнитна лента Name[ca]=Cinta magnètica +Name[ca@valencia]=Cinta magnètica Name[de]=Magnetband Name[el]=Μαγνητική ταινία Name[es]=Cinta magnética @@ -15,6 +16,7 @@ Name[pt]=Fita Magnética Name[pt_BR]=Fita magnética Name[ru]=Магнитная лента +Name[sk]=Magnetická páska Name[sv]=Magnetisk tape Name[uk]=Магнітна стрічка Name[x-test]=xxMagnetic Tapexx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/manualinput.desktop calligra-2.4.3/flow/stencils/Flowchart/manualinput.desktop --- calligra-2.4.0/flow/stencils/Flowchart/manualinput.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/manualinput.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Manual Input Name[bg]=Ръчно въвеждане Name[ca]=Introducció manual +Name[ca@valencia]=Introducció manual Name[de]=Manuelle Eingabe Name[el]=Χειροκίνητη είσοδος Name[es]=Entrada manual Name[et]=Käsitsisisestus +Name[gl]=Entrada manual Name[it]=Inserimento manuale Name[kk]=Қолмен енгізу Name[nb]=Manuelle inndata @@ -14,6 +16,7 @@ Name[pt]=Entrada Manual Name[pt_BR]=Entrada manual Name[ru]=Ручной ввод +Name[sk]=Ručný vstup Name[sv]=Manuell inmatning Name[uk]=Ручний ввід Name[x-test]=xxManual Inputxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/manualop.desktop calligra-2.4.3/flow/stencils/Flowchart/manualop.desktop --- calligra-2.4.0/flow/stencils/Flowchart/manualop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/manualop.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Manual Operation Name[bg]=Ръчна операция Name[ca]=Operació manual +Name[ca@valencia]=Operació manual Name[de]=Manuelle Operation Name[el]=Χειροκίνητη λειτουργία Name[es]=Operación manual Name[et]=Käsitsi toiming Name[fr]=Opération manuelle +Name[gl]=Operación manual Name[it]=Operazione manuale Name[kk]=Қолмен істейтіні Name[nb]=Manuell operasjon @@ -15,6 +17,7 @@ Name[pt]=Operação Manual Name[pt_BR]=Operação manual Name[ru]=Ручная операция +Name[sk]=Ručná operácia Name[sv]=Manuell åtgärd Name[uk]=Ручна дія Name[x-test]=xxManual Operationxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/merge.desktop calligra-2.4.3/flow/stencils/Flowchart/merge.desktop --- calligra-2.4.0/flow/stencils/Flowchart/merge.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/merge.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Merge Name[bg]=Сливане Name[ca]=Fusiona +Name[ca@valencia]=Fusiona Name[cs]=Sloučit Name[el]=Συγχώνευση Name[es]=Unión diff -Nru calligra-2.4.0/flow/stencils/Flowchart/offlinestore.desktop calligra-2.4.3/flow/stencils/Flowchart/offlinestore.desktop --- calligra-2.4.0/flow/stencils/Flowchart/offlinestore.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/offlinestore.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Offline Storage Name[ca]=Emmagatzemament fora de línia +Name[ca@valencia]=Emmagatzemament fora de línia Name[el]=Αποθήκη εκτός σύνδεσης Name[es]=Almacenamiento secundario Name[et]=Autonoomne salvesti @@ -13,6 +14,7 @@ Name[pt]=Armazenamento Secundário Name[pt_BR]=Armazenamento off-line Name[ru]=Внешний накопитель +Name[sk]=Offline úložisko Name[sv]=Frånkopplad lagring Name[ug]=تورسىز ساقلىغۇچ Name[uk]=Автономне сховище даних diff -Nru calligra-2.4.0/flow/stencils/Flowchart/offpageconn.desktop calligra-2.4.3/flow/stencils/Flowchart/offpageconn.desktop --- calligra-2.4.0/flow/stencils/Flowchart/offpageconn.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/offpageconn.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Off Page Connector Name[ca]=Connector fora de pàgina +Name[ca@valencia]=Connector fora de pàgina Name[es]=Conector fuera de página Name[et]=Jätkumine väljaspool lehte Name[it]=Connettore fuori pagina @@ -11,6 +12,7 @@ Name[pt]=Conector Fora Página Name[pt_BR]=Conector fora da página Name[ru]=Внестраничный соединитель +Name[sk]=Vypnúť konektor strán Name[sv]=Anslutning till annan sida Name[uk]=Позасторінковий з’єднувач Name[x-test]=xxOff Page Connectorxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/or.desktop calligra-2.4.3/flow/stencils/Flowchart/or.desktop --- calligra-2.4.0/flow/stencils/Flowchart/or.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/or.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=Or Name[bg]=Или Name[ca]=O +Name[ca@valencia]=O Name[cs]=Nebo Name[de]=Oder Name[el]=Or Name[es]=O Name[et]=Või Name[fi]=Tai +Name[hu]=Vagy Name[it]=Or Name[kk]=Немесе Name[nb]=Eller diff -Nru calligra-2.4.0/flow/stencils/Flowchart/predefdproc.desktop calligra-2.4.3/flow/stencils/Flowchart/predefdproc.desktop --- calligra-2.4.0/flow/stencils/Flowchart/predefdproc.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/predefdproc.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Predefined Process Name[bg]=Предефиниран процес Name[ca]=Procés predefinit +Name[ca@valencia]=Procéss predefinit Name[de]=Vordefinierter Prozess Name[el]=Προκαθορισμένη διαδικασία Name[es]=Proceso predefinido Name[et]=Eelnevalt määratud protsess +Name[gl]=Proceso predefinido Name[it]=Processo predefinito Name[kk]=Белгілі процесі Name[nb]=Forhåndsdefinert prosess @@ -14,6 +16,7 @@ Name[pt]=Processo Predefinido Name[pt_BR]=Processador pré-definido Name[ru]=Предопределённые процессы +Name[sk]=Preddefinovaný proces Name[sv]=Fördefinierad process Name[uk]=Наперед визначений процес Name[x-test]=xxPredefined Processxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/preparation.desktop calligra-2.4.3/flow/stencils/Flowchart/preparation.desktop --- calligra-2.4.0/flow/stencils/Flowchart/preparation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/preparation.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,15 @@ Name=Preparation Name[bg]=Подготовка Name[ca]=Preparació +Name[ca@valencia]=Preparació Name[cs]=Příprava Name[el]=Προετοιμασία Name[es]=Preparación Name[et]=Ettevalmistus Name[fr]=Préparation +Name[gl]=Preparación Name[it]=Preparazione +Name[ja]=プレゼンテーション Name[kk]=Дайындау Name[nb]=Forberedelse Name[nl]=Voorbereiding @@ -15,6 +18,7 @@ Name[pt]=Preparação Name[pt_BR]=Preparação Name[ru]=Подготовка +Name[sk]=Príprava Name[sv]=Förberedelse Name[ug]=تەييارلىق Name[uk]=Підготовка diff -Nru calligra-2.4.0/flow/stencils/Flowchart/punchedcard.desktop calligra-2.4.3/flow/stencils/Flowchart/punchedcard.desktop --- calligra-2.4.0/flow/stencils/Flowchart/punchedcard.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/punchedcard.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Punched Card Name[bg]=Перфокарта Name[ca]=Targeta perforada +Name[ca@valencia]=Targeta perforada Name[de]=Lochkarte Name[el]=Διάτρητη κάρτα Name[es]=Tarjeta perforada @@ -15,6 +16,7 @@ Name[pt]=Cartão Perfurado Name[pt_BR]=Cartão perfurado Name[ru]=Перфокарта +Name[sk]=Dierna karta Name[sv]=Hålkort Name[uk]=Перфокартка Name[x-test]=xxPunched Cardxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/punchedtape.desktop calligra-2.4.3/flow/stencils/Flowchart/punchedtape.desktop --- calligra-2.4.0/flow/stencils/Flowchart/punchedtape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/punchedtape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,8 +2,10 @@ Name=Punched Tape Name[bg]=Перфолента Name[ca]=Cinta perforada +Name[ca@valencia]=Cinta perforada Name[de]=Lochstreifen Name[el]=Διάτρητη ταινία +Name[es]=Cinta perforada Name[et]=Perfolint Name[fi]=Reikänauha Name[it]=Nastro perforato @@ -14,6 +16,7 @@ Name[pt]=Fita Perfurada Name[pt_BR]=Fita perfurada Name[ru]=Перфолента +Name[sk]=Dierna páska Name[sv]=Hålremsa Name[uk]=Перфострічка Name[x-test]=xxPunched Tapexx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/sort.desktop calligra-2.4.3/flow/stencils/Flowchart/sort.desktop --- calligra-2.4.0/flow/stencils/Flowchart/sort.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/sort.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Sort Name[ca]=Ordena +Name[ca@valencia]=Ordena Name[cs]=Třídit Name[el]=Ταξινόμηση Name[es]=Ordenación diff -Nru calligra-2.4.0/flow/stencils/Flowchart/sumjunction.desktop calligra-2.4.3/flow/stencils/Flowchart/sumjunction.desktop --- calligra-2.4.0/flow/stencils/Flowchart/sumjunction.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/sumjunction.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,8 @@ [Desktop Entry] Name=Summing Junction Name[ca]=Junta de suma +Name[ca@valencia]=Junta de suma +Name[es]=Combinación de salidas Name[et]=Koondamine Name[it]=Giunto di somma Name[kk]=Қосушы түйін @@ -10,6 +12,7 @@ Name[pt]=Junção de Soma Name[pt_BR]=Junção de soma Name[ru]=Суммирующий узел +Name[sk]=Sčítací uzol Name[sv]=Summeringskorsning Name[uk]=Вузол підсумовування Name[x-test]=xxSumming Junctionxx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/terminal.desktop calligra-2.4.3/flow/stencils/Flowchart/terminal.desktop --- calligra-2.4.0/flow/stencils/Flowchart/terminal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/terminal.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Terminal Name[bg]=Терминал Name[ca]=Terminal +Name[ca@valencia]=Terminal Name[cs]=Terminál Name[de]=Terminal Name[el]=Τερματικό @@ -10,6 +11,7 @@ Name[ga]=Teirminéal Name[hu]=Terminál Name[it]=Terminale +Name[ja]=端末 Name[kk]=Терминал Name[nb]=Terminal Name[nl]=Terminal diff -Nru calligra-2.4.0/flow/stencils/Flowchart/transaction.desktop calligra-2.4.3/flow/stencils/Flowchart/transaction.desktop --- calligra-2.4.0/flow/stencils/Flowchart/transaction.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/transaction.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Transaction File Name[ca]=Fitxer de transacció +Name[ca@valencia]=Fitxer de transacció Name[es]=Archivo de transacción Name[et]=Osafail Name[hu]=Tranzakciós fájl @@ -12,6 +13,7 @@ Name[pt]=Ficheiro de Transacção Name[pt_BR]=Arquivo de transação Name[ru]=Файл транзакций +Name[sk]=Tranzakčný súbor Name[sv]=Transaktionsfil Name[uk]=Файл передачі Name[x-test]=xxTransaction Filexx diff -Nru calligra-2.4.0/flow/stencils/Flowchart/transmittape.desktop calligra-2.4.3/flow/stencils/Flowchart/transmittape.desktop --- calligra-2.4.0/flow/stencils/Flowchart/transmittape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Flowchart/transmittape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Transmittal Tape Name[ca]=Cinta transmital +Name[ca@valencia]=Cinta transmital Name[es]=Cinta de transmisión Name[et]=Kontrollkokkuvõte Name[it]=Nastro di trasmissione @@ -11,6 +12,7 @@ Name[pt]=Fita Transmissão Name[pt_BR]=Fita de transmissão Name[ru]=Передаточная лента +Name[sk]=Sprievodná páska Name[sv]=Överföringsband Name[uk]=Передавальна стрічка Name[x-test]=xxTransmittal Tapexx diff -Nru calligra-2.4.0/flow/stencils/Gane_and_Sarson/alt-entity.desktop calligra-2.4.3/flow/stencils/Gane_and_Sarson/alt-entity.desktop --- calligra-2.4.0/flow/stencils/Gane_and_Sarson/alt-entity.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gane_and_Sarson/alt-entity.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Alternative External Entity Name[ca]=Entitat externa alternativa +Name[ca@valencia]=Entitat externa alternativa Name[el]=Εναλλακτική εξωτερική οντότητα Name[es]=Entidad externa alternativa Name[et]=Alternatiivne väline olem @@ -12,6 +13,7 @@ Name[pt]=Entidade Externa Alternativa Name[pt_BR]=Entidade externa alternativa Name[ru]=Другая внешняя сущность +Name[sk]=Alternatívna externá entita Name[sv]=Alternativ extern enhet Name[uk]=Інший зовнішній об’єкт Name[x-test]=xxAlternative External Entityxx diff -Nru calligra-2.4.0/flow/stencils/Gane_and_Sarson/collection.desktop calligra-2.4.3/flow/stencils/Gane_and_Sarson/collection.desktop --- calligra-2.4.0/flow/stencils/Gane_and_Sarson/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gane_and_Sarson/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Gane and Sarson Name[ca]=Gane and Sarson +Name[ca@valencia]=Gane and Sarson Name[el]=Gane and Sarson Name[es]=Gane y Sarson Name[et]=Gane ja Sarson @@ -13,6 +14,7 @@ Name[pt]=Gane e Sarson Name[pt_BR]=Gane e Sarson Name[ru]=Gane и Sarson +Name[sk]=Gane a Sarson Name[sv]=Gane och Sarson Name[uk]=Гейн та Сарсон Name[x-test]=xxGane and Sarsonxx diff -Nru calligra-2.4.0/flow/stencils/Gane_and_Sarson/data_store.desktop calligra-2.4.3/flow/stencils/Gane_and_Sarson/data_store.desktop --- calligra-2.4.0/flow/stencils/Gane_and_Sarson/data_store.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gane_and_Sarson/data_store.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Data Store Name[bg]=Хранилище на данни Name[ca]=Magatzem de dades +Name[ca@valencia]=Magatzem de dades Name[cs]=Datové úložiště Name[de]=Datenspeicher Name[el]=Data Store @@ -16,6 +17,7 @@ Name[pt]=Armazém de Dados Name[pt_BR]=Armazenamento de dados Name[ru]=Хранилище данных +Name[sk]=Úložisko dát Name[sv]=Datalagring Name[uk]=Сховище даних Name[x-test]=xxData Storexx diff -Nru calligra-2.4.0/flow/stencils/Gane_and_Sarson/entity.desktop calligra-2.4.3/flow/stencils/Gane_and_Sarson/entity.desktop --- calligra-2.4.0/flow/stencils/Gane_and_Sarson/entity.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gane_and_Sarson/entity.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=External Entity Name[ca]=Entitat externa +Name[ca@valencia]=Entitat externa Name[el]=Εξωτερική οντότητα Name[es]=Entidad externa Name[et]=Väline olem @@ -12,6 +13,7 @@ Name[pt]=Entidade Externa Name[pt_BR]=Entidade externa Name[ru]=Внешняя сущность +Name[sk]=Externá entita Name[sv]=Extern enhet Name[uk]=Зовнішній об’єкт Name[x-test]=xxExternal Entityxx diff -Nru calligra-2.4.0/flow/stencils/Gane_and_Sarson/process.desktop calligra-2.4.3/flow/stencils/Gane_and_Sarson/process.desktop --- calligra-2.4.0/flow/stencils/Gane_and_Sarson/process.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gane_and_Sarson/process.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,14 +2,18 @@ Name=Process Name[bg]=Процес Name[ca]=Procés +Name[ca@valencia]=Procés Name[cs]=Proces Name[de]=Prozess Name[el]=Διεργασία Name[es]=Proceso Name[et]=Protsess +Name[fi]=Prosessi Name[fr]=Processus +Name[gl]=Proceso Name[hu]=Folyamat Name[it]=Processo +Name[ja]=プロセス Name[kk]=Процесc Name[nb]=Prosess Name[nl]=Proces @@ -17,6 +21,7 @@ Name[pt]=Processo Name[pt_BR]=Processo Name[ru]=Обрабатывать +Name[sk]=Proces Name[sv]=Process Name[ug]=ئىجرا Name[uk]=Обробляти diff -Nru calligra-2.4.0/flow/stencils/Gradient/collection.desktop calligra-2.4.3/flow/stencils/Gradient/collection.desktop --- calligra-2.4.0/flow/stencils/Gradient/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/collection.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Gradient Name[bg]=Преливка Name[ca]=Gradient +Name[ca@valencia]=Gradient Name[cs]=Přechod Name[de]=Farbverlauf Name[el]=Διαβάθμιση Name[es]=Gradiente Name[et]=Üleminekud +Name[fi]=Liukuväri Name[fr]=Gradient Name[hu]=Színátmenet Name[it]=Sfumatura @@ -17,6 +19,7 @@ Name[pt]=Gradiente Name[pt_BR]=Gradiente Name[ru]=Градиент +Name[sk]=Prechod Name[sv]=Toning Name[ug]=گۈل نۇسخىسى Name[uk]=Градієнт diff -Nru calligra-2.4.0/flow/stencils/Gradient/dark_light_horizontal_gradient_box.desktop calligra-2.4.3/flow/stencils/Gradient/dark_light_horizontal_gradient_box.desktop --- calligra-2.4.0/flow/stencils/Gradient/dark_light_horizontal_gradient_box.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/dark_light_horizontal_gradient_box.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Dark-light horizontal gradient box Name[ca]=Caixa de gradient horitzontal fosc-clar +Name[ca@valencia]=Caixa de gradient horitzontal fosc-clar Name[el]=Πλαίσιο οριζόντιας διαβάθμισης σκούρο-φωτεινό Name[es]=Caja de gradiente horizontal oscuro-claro Name[et]=Tume-hele rõhtne üleminek raamis +Name[fi]=Kehystetty vaakasuuntainen liukuväri tummasta vaaleaan Name[it]=Riquadro gradiente orizzontale scuro-chiaro Name[kk]=қою-ашық жатық градиент блок Name[nb]=Mørk-lys vannrett toningsboks @@ -12,6 +14,7 @@ Name[pt]=Caixa gradiente horizontal escuro-claro Name[pt_BR]=Caixa gradiente horizontal escuro-claro Name[ru]=Коробка с горизонтальным градиентом от тёмного к светлому +Name[sk]=Vodorovný prechod tmavý-svetlý Name[sv]=Mörk-ljus horisontellt tonad ruta Name[uk]=Панель з темно-світлим горизонтальним градієнтом Name[x-test]=xxDark-light horizontal gradient boxxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/dark_light_horizontal_gradient.desktop calligra-2.4.3/flow/stencils/Gradient/dark_light_horizontal_gradient.desktop --- calligra-2.4.0/flow/stencils/Gradient/dark_light_horizontal_gradient.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/dark_light_horizontal_gradient.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Dark-light horizontal gradient Name[ca]=gradient horitzontal fosc-clar +Name[ca@valencia]=gradient horitzontal fosc-clar Name[el]=Οριζόντια διαβάθμιση σκούρο-φωτεινό Name[es]=Gradiente horizontal oscuro-claro Name[et]=Tume-hele rõhtne üleminek +Name[fi]=Vaakasuuntainen liukuväri tummasta vaaleaan Name[it]=Gradiente orizzontale scuro-chiaro Name[kk]=қою-ашық жатық градиент Name[nb]=Mørk-lys vannrett toning @@ -12,6 +14,7 @@ Name[pt]=Gradiente horizontal escuro-claro Name[pt_BR]=Gradiente horizontal escuro-claro Name[ru]=Горизонтальный градиент от тёмного к светлому +Name[sk]=Tmavo-svetlý vodorovný prechod Name[sv]=Mörk-ljus horisontell toning Name[uk]=Темно-світлий горизонтальний градієнт Name[x-test]=xxDark-light horizontal gradientxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/dark_light_vertical_gradient_box.desktop calligra-2.4.3/flow/stencils/Gradient/dark_light_vertical_gradient_box.desktop --- calligra-2.4.0/flow/stencils/Gradient/dark_light_vertical_gradient_box.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/dark_light_vertical_gradient_box.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Dark-light vertical gradient box Name[ca]=caixa gradient vertical fosc-clar +Name[ca@valencia]=caixa gradient vertical fosc-clar Name[el]=Πλαίσιο κάθετης διαβάθμισης σκούρο-φωτεινό Name[es]=Caja de gradiente vertical oscuro-claro Name[et]=Tume-hele püstine üleminek raamis +Name[fi]=Kehystetty pystysuuntainen liukuväri tummasta vaaleaan Name[it]=Riquadro gradiente verticale scuro-chiaro Name[kk]=қою-ашық тік градиент блок Name[nb]=Mørk-lys loddrett toningsboks @@ -12,6 +14,7 @@ Name[pt]=Caixa gradiente vertical escuro-claro Name[pt_BR]=Caixa gradiente vertical escuro-claro Name[ru]=Коробка с вертикальным градиентом от тёмного к светлому +Name[sk]=Zvislý prechod tmavý-svetlý Name[sv]=Mörk-ljus vertikalt tonad ruta Name[uk]=Панель з темно-світлим вертикальним градієнтом Name[x-test]=xxDark-light vertical gradient boxxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/dark_light_vertical_gradient.desktop calligra-2.4.3/flow/stencils/Gradient/dark_light_vertical_gradient.desktop --- calligra-2.4.0/flow/stencils/Gradient/dark_light_vertical_gradient.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/dark_light_vertical_gradient.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Dark-light vertical gradient Name[ca]=gradient vertical fosc-clar +Name[ca@valencia]=gradient vertical fosc-clar Name[el]=Κάθετη διαβάθμιση σκούρο-φωτεινό Name[es]=Gradiente vertical oscuro-claro Name[et]=Tume-hele püstine üleminek +Name[fi]=Pystysuuntainen liukuväri tummasta vaaleaan Name[it]=Gradiente verticale scuro-chiaro Name[kk]=қою-ашық тік градиент Name[nb]=Mørk-lys loddrett toning @@ -12,6 +14,7 @@ Name[pt]=Gradiente vertical escuro-claro Name[pt_BR]=Gradiente vertical escuro-claro Name[ru]=Вертикальный градиент от тёмного к светлому +Name[sk]=Tmavo-svetlý zvislý prechod Name[sv]=Mörk-ljus vertikal toning Name[uk]=Темно-світлий вертикальний градієнт Name[x-test]=xxDark-light vertical gradientxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/light_dark_horizontal_gradient_box.desktop calligra-2.4.3/flow/stencils/Gradient/light_dark_horizontal_gradient_box.desktop --- calligra-2.4.0/flow/stencils/Gradient/light_dark_horizontal_gradient_box.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/light_dark_horizontal_gradient_box.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Light-dark horizontal gradient box Name[ca]=caixa gradient horitzontal clar-fosc +Name[ca@valencia]=caixa gradient horitzontal clar-fosc Name[el]=Πλαίσιο οριζόντιας διαβάθμισης φωτεινό-σκούρο Name[es]=Caja de gradiente horizontal claro-oscuro Name[et]=Hele-tume rõhtne üleminek raamis +Name[fi]=Kehystetty vaakasuuntainen liukuväri vaaleasta tummaan Name[it]=Riquadro gradiente orizzontale chiaro-scuro Name[kk]=ашық-қою жатық градиент блок Name[nb]=Lys-mørk vannrett toningsboks @@ -12,6 +14,7 @@ Name[pt]=Caixa gradiente horizontal claro-escuro Name[pt_BR]=Caixa gradiente horizontal claro-escuro Name[ru]=Коробка с горизонтальным градиентом от светлого к тёмному +Name[sk]=Vodorovný prechod svetlý-tmavý Name[sv]=Ljus-mörk horisontellt tonad ruta Name[uk]=Панель зі світло-темним горизонтальним градієнтом Name[x-test]=xxLight-dark horizontal gradient boxxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/light_dark_horizontal_gradient.desktop calligra-2.4.3/flow/stencils/Gradient/light_dark_horizontal_gradient.desktop --- calligra-2.4.0/flow/stencils/Gradient/light_dark_horizontal_gradient.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/light_dark_horizontal_gradient.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Light-dark horizontal gradient Name[ca]=gradient vertical clar-fosc +Name[ca@valencia]=gradient vertical clar-fosc Name[el]=Οριζόντια διαβάθμιση φωτεινό-σκούρο Name[es]=Gradiente horizontal claro-oscuro Name[et]=Hele-tume rõhtne üleminek +Name[fi]=Vaakasuuntainen liukuväri vaaleasta tummaan Name[it]=Gradiente orizzontale chiaro-scuro Name[kk]=ашық-қою жатық градиент Name[nb]=Lys-mørk vannrett toning @@ -12,6 +14,7 @@ Name[pt]=Gradiente horizontal claro-escuro Name[pt_BR]=Gradiente horizontal claro-escuro Name[ru]=Горизонтальный градиент от светлого к тёмному +Name[sk]=Svetlo-tmavý vodorovný prechod Name[sv]=Ljus-mörk horisontell toning Name[uk]=Світло-темний горизонтальний градієнт Name[x-test]=xxLight-dark horizontal gradientxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/light_dark_vertical_gradient_box.desktop calligra-2.4.3/flow/stencils/Gradient/light_dark_vertical_gradient_box.desktop --- calligra-2.4.0/flow/stencils/Gradient/light_dark_vertical_gradient_box.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/light_dark_vertical_gradient_box.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Light-dark vertical gradient box Name[ca]=caixa gradient vertical fosc-clar +Name[ca@valencia]=caixa gradient vertical fosc-clar Name[el]=Πλαίσιο κάθετης διαβάθμισης φωτεινό-σκούρο Name[es]=Caja de gradiente vertical claro-oscuro Name[et]=Hele-tume püstine üleminek raamis +Name[fi]=Kehystetty pystysuuntainen liukuväri vaaleasta tummaan Name[it]=Riquadro gradiente verticale chiaro-scuro Name[kk]=ашық-қою тік градиент блок Name[nb]=Lys-mørk loddrett toningsboks @@ -12,6 +14,7 @@ Name[pt]=Caixa gradiente vertical claro-escuro Name[pt_BR]=Caixa gradiente vertical claro-escuro Name[ru]=Коробка с вертикальным градиентом от светлого к тёмному +Name[sk]=Zvislý prechod svetlý-tmavý Name[sv]=Ljus-mörk vertikalt tonad ruta Name[uk]=Панель зі світло-темним вертикальним градієнтом Name[x-test]=xxLight-dark vertical gradient boxxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/light_dark_vertical_gradient.desktop calligra-2.4.3/flow/stencils/Gradient/light_dark_vertical_gradient.desktop --- calligra-2.4.0/flow/stencils/Gradient/light_dark_vertical_gradient.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/light_dark_vertical_gradient.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Light-dark vertical gradient Name[ca]=gradient vertical clar-fosc +Name[ca@valencia]=gradient vertical clar-fosc Name[el]=Κάθετη διαβάθμιση φωτεινό-σκούρο Name[es]=Gradiente vertical claro-oscuro Name[et]=Hele-tume püstine üleminek +Name[fi]=Pystysuuntainen liukuväri vaaleasta tummaan Name[it]=Gradiente verticale chiaro-scuro Name[kk]=ашық-қою тік градиент Name[nb]=Lys-mørk loddrett toning @@ -12,6 +14,7 @@ Name[pt]=Gradiente vertical claro-escuro Name[pt_BR]=Gradiente vertical claro-escuro Name[ru]=Вертикальный градиент от светлого к тёмному +Name[sk]=Svetlo-tmavý zvislý prechod Name[sv]=Ljus-mörk vertikal toning Name[uk]=Світло-темний вертикальний градієнт Name[x-test]=xxLight-dark vertical gradientxx diff -Nru calligra-2.4.0/flow/stencils/Gradient/white_gray_horizontal.desktop calligra-2.4.3/flow/stencils/Gradient/white_gray_horizontal.desktop --- calligra-2.4.0/flow/stencils/Gradient/white_gray_horizontal.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Gradient/white_gray_horizontal.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=White-Gray (horizontal) Name[ca]=Blanc-gris (horitzontal) +Name[ca@valencia]=Blanc-gris (horitzontal) Name[de]=Weiß-Grau (waagerecht) Name[el]=Λευκό-γκρι (οριζόντια) Name[es]=Blanco-Gris (horizontal) Name[et]=Valge-hall (rõhtne) +Name[fi]=Valkoisesta harmaaseen (vaakasuuntainen) Name[it]=Bianco-grigio (orizzontale) Name[kk]=Ақ-Сұр (жатық) Name[nb]=Hvit-grå (vannrett) @@ -13,6 +15,7 @@ Name[pt]=Branco-Cinzento (horizontal) Name[pt_BR]=Branco-cinza (horizontal) Name[ru]=Бело-серый (горизонтально) +Name[sk]=Bielo-šedá (zvislo) Name[sv]=Vitgrå (horisontell) Name[uk]=Біло-сірий (горизонтально) Name[x-test]=xxWhite-Gray (horizontal)xx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/collection.desktop calligra-2.4.3/flow/stencils/Jigsaw/collection.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Jigsaw Name[bg]=Пъзел Name[ca]=Trencaclosques +Name[ca@valencia]=Trencaclosques Name[cs]=Puzzle Name[el]=Jigsaw Name[es]=Rompecabezas Name[et]=Pusle +Name[fi]=Palapeli Name[it]=Puzzle Name[kk]=Құрастыру- жұмбақ Name[nb]=Puslespill @@ -15,6 +17,7 @@ Name[pt]='Puzzle' Name[pt_BR]=Quebra-cabeça Name[ru]=Пазл +Name[sk]=Jigsaw Name[sv]=Pussel Name[uk]=Складанка Name[x-test]=xxJigsawxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_iiii.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_iiii.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_iiii.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_iiii.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part iiii Name[bg]=част iiii Name[ca]=part iiii +Name[ca@valencia]=part iiii Name[el]=part iiii Name[es]=pieza iiii Name[et]=Tükk iiii +Name[fi]=pala iiii Name[it]=parte iiii Name[kk]=iiii бөлігі Name[nb]=iiii-del @@ -13,6 +15,7 @@ Name[pt]=parte eeee Name[pt_BR]=parte eeee Name[ru]=часть iiii +Name[sk]=časť iii Name[sv]=iiii-del Name[uk]=Частинка iiii Name[x-test]=xxpart iiiixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_iiio.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_iiio.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_iiio.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_iiio.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part iiio Name[bg]=част iiio Name[ca]=part iiio +Name[ca@valencia]=part iiio Name[el]=part iiio Name[es]=pieza iiio Name[et]=Tükk iiio +Name[fi]=pala iiio Name[it]=parte iiio Name[kk]=iiio бөлігі Name[nb]=iiiu-del @@ -13,6 +15,7 @@ Name[pt]=parte eees Name[pt_BR]=parte eees Name[ru]=часть iiio +Name[sk]=časť iiio Name[sv]=iiio-del Name[uk]=Частинка iiio Name[x-test]=xxpart iiioxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_iioi.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_iioi.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_iioi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_iioi.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part iioi Name[bg]=част iioi Name[ca]=part iioi +Name[ca@valencia]=part iioi Name[el]=part iioi Name[es]=pieza iioi Name[et]=Tükk iioi +Name[fi]=pala iioi Name[it]=parte iioi Name[kk]=iioi бөлігі Name[nb]=iiui-del @@ -13,6 +15,7 @@ Name[pt]=parte eese Name[pt_BR]=parte eese Name[ru]=часть iioi +Name[sk]=časť iioi Name[sv]=iiui-del Name[uk]=Частинка iioi Name[x-test]=xxpart iioixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_iioo.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_iioo.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_iioo.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_iioo.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part iioo Name[bg]=част iioo Name[ca]=part iioo +Name[ca@valencia]=part iioo Name[el]=part iioo Name[es]=pieza iioo Name[et]=Tükk iioo +Name[fi]=pala iioo Name[it]=parte iioo Name[kk]=iioo бөлігі Name[nb]=iiuu-del @@ -13,6 +15,7 @@ Name[pt]=parte eess Name[pt_BR]=parte eess Name[ru]=часть iioo +Name[sk]=časť iioo Name[sv]=iiuu-del Name[uk]=Частинка iioo Name[x-test]=xxpart iiooxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_ioii.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_ioii.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_ioii.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_ioii.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part ioii Name[bg]=част ioii Name[ca]=part ioii +Name[ca@valencia]=part ioii Name[el]=part ioii Name[es]=pieza ioii Name[et]=Tükk ioii +Name[fi]=pala ioii Name[it]=parte ioii Name[kk]=ioii бөлігі Name[nb]=iuii-del @@ -13,6 +15,7 @@ Name[pt]=parte esee Name[pt_BR]=parte esee Name[ru]=часть ioii +Name[sk]=časť ioii Name[sv]=iuii-del Name[uk]=Частинка ioii Name[x-test]=xxpart ioiixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_ioio.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_ioio.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_ioio.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_ioio.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part ioio Name[bg]=част ioio Name[ca]=part ioio +Name[ca@valencia]=part ioio Name[el]=part ioio Name[es]=pieza ioio Name[et]=Tükk ioio +Name[fi]=pala ioio Name[it]=parte ioio Name[kk]=ioio бөлігі Name[nb]=ioio-del @@ -13,6 +15,7 @@ Name[pt]=parte eses Name[pt_BR]=parte eses Name[ru]=часть ioio +Name[sk]=časť ioio Name[sv]=iuiu-del Name[uk]=Частинка ioio Name[x-test]=xxpart ioioxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_iooi.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_iooi.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_iooi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_iooi.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part iooi Name[bg]=част iooi Name[ca]=part iooi +Name[ca@valencia]=part iooi Name[el]=part iooi Name[es]=pieza iooi Name[et]=Tükk iooi +Name[fi]=pala iooi Name[it]=parte iooi Name[kk]=iooi бөлігі Name[nb]=iuui-del @@ -13,6 +15,7 @@ Name[pt]=parte esse Name[pt_BR]=parte esse Name[ru]=часть iooi +Name[sk]=časť iooi Name[sv]=iuui-del Name[uk]=Частинка iooi Name[x-test]=xxpart iooixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_iooo.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_iooo.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_iooo.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_iooo.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part iooo Name[bg]=част iooo Name[ca]=part iooo +Name[ca@valencia]=part iooo Name[el]=part iooo Name[es]=pieza iooo Name[et]=Tükk iooo +Name[fi]=pala iooo Name[it]=parte iooo Name[kk]=iooo бөлігі Name[nb]=iuuu-del @@ -13,6 +15,7 @@ Name[pt]=parte esss Name[pt_BR]=parte esss Name[ru]=часть iooo +Name[sk]=časť iooo Name[sv]=iuuu-del Name[uk]=Частинка iooo Name[x-test]=xxpart ioooxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_oiii.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_oiii.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_oiii.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_oiii.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part oiii Name[bg]=част oiii Name[ca]=part oiii +Name[ca@valencia]=part oiii Name[el]=part oiii Name[es]=pieza oiii Name[et]=Tükk oiii +Name[fi]=pala oiii Name[it]=parte oiii Name[kk]=oiii бөлігі Name[nb]=uiii-del @@ -13,6 +15,7 @@ Name[pt]=parte seee Name[pt_BR]=parte seee Name[ru]=часть oiii +Name[sk]=časť oiii Name[sv]=uiii-del Name[uk]=Частинка oiii Name[x-test]=xxpart oiiixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_oiio.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_oiio.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_oiio.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_oiio.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part oiio Name[bg]=част oiio Name[ca]=part oiio +Name[ca@valencia]=part oiio Name[el]=part oiio Name[es]=pieza oiio Name[et]=Tükk oiio +Name[fi]=pala oiio Name[it]=parte oiio Name[kk]=oiio бөлігі Name[nb]=uiiu-del @@ -13,6 +15,7 @@ Name[pt]=parte sees Name[pt_BR]=parte sees Name[ru]=часть oiio +Name[sk]=časť oiio Name[sv]=uiiu-del Name[uk]=Частинка oiio Name[x-test]=xxpart oiioxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_oioi.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_oioi.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_oioi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_oioi.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part oioi Name[bg]=част oioi Name[ca]=part oioi +Name[ca@valencia]=part oioi Name[el]=part oioi Name[es]=pieza oioi Name[et]=Tükk oioi +Name[fi]=pala oioi Name[it]=parte oioi Name[kk]=oioi бөлігі Name[nb]=uiui-del @@ -13,6 +15,7 @@ Name[pt]=parte sese Name[pt_BR]=parte sese Name[ru]=часть oioi +Name[sk]=časť oioi Name[sv]=uiui-del Name[uk]=Частинка oioi Name[x-test]=xxpart oioixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_oioo.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_oioo.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_oioo.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_oioo.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part oioo Name[bg]=част oioo Name[ca]=part oioo +Name[ca@valencia]=part oioo Name[el]=part oioo Name[es]=pieza oioo Name[et]=Tükk oioo +Name[fi]=pala oioo Name[it]=parte oioo Name[kk]=oioo бөлігі Name[nb]=uiuu-del @@ -13,6 +15,7 @@ Name[pt]=parte sess Name[pt_BR]=parte sess Name[ru]=часть oioo +Name[sk]=časť oioo Name[sv]=uiuu-del Name[uk]=Частинка oioo Name[x-test]=xxpart oiooxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_ooii.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_ooii.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_ooii.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_ooii.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part ooii Name[bg]=част ooii Name[ca]=part ooii +Name[ca@valencia]=part ooii Name[el]=part ooii Name[es]=pieza ooii Name[et]=Tükk ooii +Name[fi]=pala ooii Name[it]=parte ooii Name[kk]=ooii бөлігі Name[nb]=uuii-del @@ -13,6 +15,7 @@ Name[pt]=parte ssee Name[pt_BR]=parte ssee Name[ru]=часть ooii +Name[sk]=časť ooii Name[sv]=uuii-del Name[uk]=Частинка ooii Name[x-test]=xxpart ooiixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_ooio.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_ooio.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_ooio.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_ooio.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part ooio Name[bg]=част ooio Name[ca]=part ooio +Name[ca@valencia]=part ooio Name[el]=part ooio Name[es]=pieza ooio Name[et]=Tükk ooio +Name[fi]=pala ooio Name[it]=parte ooio Name[kk]=ooio бөлігі Name[nb]=uuiu-del @@ -13,6 +15,7 @@ Name[pt]=parte sses Name[pt_BR]=paste sses Name[ru]=часть ooio +Name[sk]=časť ooio Name[sv]=uuiu-del Name[uk]=Частинка ooio Name[x-test]=xxpart ooioxx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_oooi.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_oooi.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_oooi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_oooi.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part oooi Name[bg]=част oooi Name[ca]=part oooi +Name[ca@valencia]=part oooi Name[el]=part oooi Name[es]=pieza oooi Name[et]=Tükk oooi +Name[fi]=pala oooi Name[it]=parte oooi Name[kk]=oooi бөлігі Name[nb]=uuui-del @@ -13,6 +15,7 @@ Name[pt]=parte ssse Name[pt_BR]=parte ssse Name[ru]=часть oooi +Name[sk]=časť oooi Name[sv]=uuui-del Name[uk]=Частинка oooi Name[x-test]=xxpart oooixx diff -Nru calligra-2.4.0/flow/stencils/Jigsaw/part_oooo.desktop calligra-2.4.3/flow/stencils/Jigsaw/part_oooo.desktop --- calligra-2.4.0/flow/stencils/Jigsaw/part_oooo.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Jigsaw/part_oooo.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=part oooo Name[bg]=част oooo Name[ca]=part oooo +Name[ca@valencia]=part oooo Name[el]=part oooo Name[es]=pieza oooo Name[et]=Tükk oooo +Name[fi]=pala oooo Name[it]=parte oooo Name[kk]=oooo бөлігі Name[nb]=uuuu-del @@ -13,6 +15,7 @@ Name[pt]=parte ssss Name[pt_BR]=parte ssss Name[ru]=часть oooo +Name[sk]=časť oooo Name[sv]=uuuu-del Name[uk]=Частинка oooo Name[x-test]=xxpart ooooxx diff -Nru calligra-2.4.0/flow/stencils/Lights/ACL.desktop calligra-2.4.3/flow/stencils/Lights/ACL.desktop --- calligra-2.4.0/flow/stencils/Lights/ACL.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/ACL.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=ACL Name[bg]=ACL Name[ca]=ACL +Name[ca@valencia]=ACL Name[cs]=ACL Name[el]=ACL Name[es]=ACL Name[et]=ACL +Name[hu]=ACL Name[it]=ACL Name[kk]=ACL Name[nb]=ACL @@ -14,6 +16,7 @@ Name[pt]=ACL Name[pt_BR]=ACL Name[ru]=Список контроля доступа (ACL) +Name[sk]=ACL Name[sv]=ACL Name[uk]=ACL Name[x-test]=xxACLxx diff -Nru calligra-2.4.0/flow/stencils/Lights/Blacklight.desktop calligra-2.4.3/flow/stencils/Lights/Blacklight.desktop --- calligra-2.4.0/flow/stencils/Lights/Blacklight.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Blacklight.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Blacklight Name[ca]=Blacklight +Name[ca@valencia]=Blacklight Name[de]=Schwarzlichtlampe Name[el]=Blacklight Name[es]=Luz oscura @@ -13,6 +14,7 @@ Name[pt]=Luz Negra Name[pt_BR]=Luz negra Name[ru]=Невидимое излучение +Name[sk]=Čierne svetlo Name[sv]=Svartljus Name[uk]=Ультрафіолетове світло Name[x-test]=xxBlacklightxx diff -Nru calligra-2.4.0/flow/stencils/Lights/Blinders.desktop calligra-2.4.3/flow/stencils/Lights/Blinders.desktop --- calligra-2.4.0/flow/stencils/Lights/Blinders.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Blinders.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Blinders Name[ca]=Aclucalls +Name[ca@valencia]=Aclucalls Name[el]=Blinders Name[es]=Focos blinder Name[et]=Blainder @@ -12,6 +13,7 @@ Name[pt]=Holofotes Name[pt_BR]=Holofotes Name[ru]=Боковые экраны антенны +Name[sk]=Blinders Name[sv]=Bländljus Name[uk]=Прожектори з екрануванням Name[x-test]=xxBlindersxx diff -Nru calligra-2.4.0/flow/stencils/Lights/collection.desktop calligra-2.4.3/flow/stencils/Lights/collection.desktop --- calligra-2.4.0/flow/stencils/Lights/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Lights Name[bg]=Светлини Name[ca]=Lights +Name[ca@valencia]=Lights Name[de]=Beleuchtung Name[el]=Φώτα Name[es]=Luces @@ -15,6 +16,7 @@ Name[pt]=Luzes Name[pt_BR]=Luzes Name[ru]=Источники света +Name[sk]=Svetlá Name[sv]=Ljus Name[uk]=Освітлення Name[x-test]=xxLightsxx diff -Nru calligra-2.4.0/flow/stencils/Lights/ERS.desktop calligra-2.4.3/flow/stencils/Lights/ERS.desktop --- calligra-2.4.0/flow/stencils/Lights/ERS.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/ERS.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=ERS Name[bg]=ERS Name[ca]=ERS +Name[ca@valencia]=ERS Name[el]=ERS Name[es]=ERS Name[et]=Profiilvalgusti +Name[hu]=ERS Name[it]=ERS Name[kk]=Эллипс-рефл-шамы Name[nb]=Profillyskaster diff -Nru calligra-2.4.0/flow/stencils/Lights/Fresnel.desktop calligra-2.4.3/flow/stencils/Lights/Fresnel.desktop --- calligra-2.4.0/flow/stencils/Lights/Fresnel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Fresnel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Fresnel Name[ca]=Fresnel +Name[ca@valencia]=Fresnel Name[de]=Fresnel Name[el]=Fresnel Name[es]=Fresnel @@ -15,6 +16,7 @@ Name[pt]=Fresnel Name[pt_BR]=Fresnel Name[ru]=Френель +Name[sk]=Fresnel Name[sv]=Fresnel Name[uk]=Освітлювач Френеля Name[x-test]=xxFresnelxx diff -Nru calligra-2.4.0/flow/stencils/Lights/Moving_head.desktop calligra-2.4.3/flow/stencils/Lights/Moving_head.desktop --- calligra-2.4.0/flow/stencils/Lights/Moving_head.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Moving_head.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Moving head Name[ca]=Cap en moviment +Name[ca@valencia]=Cap en moviment Name[el]=Κινούμενη κεφαλή Name[es]=Cabeza móvil Name[et]=Liikuvpea @@ -12,6 +13,7 @@ Name[pt]=Foco movimento Name[pt_BR]=Movendo a cabeça Name[ru]=Движение вперёд +Name[sk]=Pohyblivá hlava Name[sv]=Rörligt ljus Name[uk]=Рухома голівка Name[x-test]=xxMoving headxx diff -Nru calligra-2.4.0/flow/stencils/Lights/PAR.desktop calligra-2.4.3/flow/stencils/Lights/PAR.desktop --- calligra-2.4.0/flow/stencils/Lights/PAR.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/PAR.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=PAR Name[bg]=PAR Name[ca]=PAR +Name[ca@valencia]=PAR Name[cs]=PAR Name[el]=PAR Name[es]=PAR Name[et]=PAR +Name[hu]=PAR Name[it]=PAR Name[kk]=PAR прожекторы Name[nb]=PAR @@ -14,6 +16,7 @@ Name[pt]=PAR Name[pt_BR]=PAR Name[ru]=РЛС +Name[sk]=PAR Name[sv]=PAR Name[uk]=PAR-прожектор Name[x-test]=xxPARxx diff -Nru calligra-2.4.0/flow/stencils/Lights/PAR_floor.desktop calligra-2.4.3/flow/stencils/Lights/PAR_floor.desktop --- calligra-2.4.0/flow/stencils/Lights/PAR_floor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/PAR_floor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=PAR floor Name[ca]=PAR floor +Name[ca@valencia]=PAR floor Name[el]=PAR floor Name[es]=PAR de suelo Name[et]=Põranda-PAR @@ -12,6 +13,7 @@ Name[pt]=Chão PAR Name[pt_BR]=Chão PAR Name[ru]=Пол РЛС +Name[sk]=PAR floor Name[sv]=PAR golv Name[uk]=PAR-прожектор на підставці Name[x-test]=xxPAR floorxx diff -Nru calligra-2.4.0/flow/stencils/Lights/PC.desktop calligra-2.4.3/flow/stencils/Lights/PC.desktop --- calligra-2.4.0/flow/stencils/Lights/PC.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/PC.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Pebble Convex lantern Name[ca]=Pebble Convex lantern +Name[ca@valencia]=Pebble Convex lantern Name[el]=Pebble Convex lantern Name[es]=Linterna de lente convexa Name[et]=PC latern @@ -12,6 +13,7 @@ Name[pt]=Lanterna convexa Pebble Name[pt_BR]=Lanterna convexa Pebble Name[ru]=Каркас Pebble Convex +Name[sk]=Konvexná lampa Pebble Name[sv]=PC-strålkastare Name[uk]=Освітлювач з опуклою лінзою Name[x-test]=xxPebble Convex lanternxx diff -Nru calligra-2.4.0/flow/stencils/Lights/Scanner.desktop calligra-2.4.3/flow/stencils/Lights/Scanner.desktop --- calligra-2.4.0/flow/stencils/Lights/Scanner.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Scanner.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Scanner Name[bg]=Скенер Name[ca]=Escànner +Name[ca@valencia]=Escànner Name[cs]=Skener Name[de]=Scanner Name[el]=Σαρωτής +Name[es]=Escáner Name[et]=Skanner Name[ga]=Scanóir +Name[hu]=Szkenner Name[it]=Scanner Name[kk]=Сканер Name[nb]=Skanner @@ -15,6 +18,7 @@ Name[pt]=Digitalizador Name[pt_BR]=Digitalizador Name[ru]=Сканер +Name[sk]=Skener Name[sv]=Bildläsare Name[ug]=سايلىغۇچ Name[uk]=Сканер diff -Nru calligra-2.4.0/flow/stencils/Lights/Striplight.desktop calligra-2.4.3/flow/stencils/Lights/Striplight.desktop --- calligra-2.4.0/flow/stencils/Lights/Striplight.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Striplight.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Striplight Name[ca]=Striplight +Name[ca@valencia]=Striplight Name[de]=Röhrenlampe Name[el]=Προβολείς Name[es]=Franja de luz @@ -13,6 +14,7 @@ Name[pt]=Luz barra Name[pt_BR]=Luz barra Name[ru]=Узконаправленный свет +Name[sk]=Striplight Name[sv]=Flodljus Name[uk]=Вузькоспрямоване світло Name[x-test]=xxStriplightxx diff -Nru calligra-2.4.0/flow/stencils/Lights/Stroboscope.desktop calligra-2.4.3/flow/stencils/Lights/Stroboscope.desktop --- calligra-2.4.0/flow/stencils/Lights/Stroboscope.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Stroboscope.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Stroboscope light Name[ca]=Llum estroboscòpica +Name[ca@valencia]=Llum estroboscòpica Name[de]=Stroboskoplicht Name[el]=Στροβοσκοπικός φωτισμός Name[es]=Luz de estroboscopio @@ -13,6 +14,7 @@ Name[pt]=Luz de estroboscópio Name[pt_BR]=Luz de estroboscópio Name[ru]=Стробоскопический свет +Name[sk]=Stroboskopové svetlo Name[sv]=Stroboskopljus Name[uk]=Стробоскопічне світло Name[x-test]=xxStroboscope lightxx diff -Nru calligra-2.4.0/flow/stencils/Lights/Structure.desktop calligra-2.4.3/flow/stencils/Lights/Structure.desktop --- calligra-2.4.0/flow/stencils/Lights/Structure.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Lights/Structure.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Structure Name[bg]=Структура Name[ca]=Estructura +Name[ca@valencia]=Estructura Name[cs]=Struktura Name[el]=Δομή Name[es]=Estructura @@ -16,6 +17,7 @@ Name[pt]=Estrutura Name[pt_BR]=Estrutura Name[ru]=Структура +Name[sk]=Štruktúra Name[sv]=Struktur Name[ug]=قۇرۇلما Name[uk]=Конструкція diff -Nru calligra-2.4.0/flow/stencils/Logic/and.desktop calligra-2.4.3/flow/stencils/Logic/and.desktop --- calligra-2.4.0/flow/stencils/Logic/and.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/and.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,14 @@ [Desktop Entry] Name=And Name[ca]=I +Name[ca@valencia]=I Name[cs]=A Name[de]=Und Name[el]=And Name[es]=And Name[et]=Ja +Name[fi]=AND +Name[hu]=És Name[it]=And Name[kk]=Және Name[nb]=Og @@ -14,6 +17,7 @@ Name[pt]=E Name[pt_BR]=E Name[ru]=И +Name[sk]=And Name[sv]=Och Name[ug]=ۋە Name[uk]=ТА diff -Nru calligra-2.4.0/flow/stencils/Logic/buffer.desktop calligra-2.4.3/flow/stencils/Logic/buffer.desktop --- calligra-2.4.0/flow/stencils/Logic/buffer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/buffer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Buffer Name[bg]=Буфер Name[ca]=Memòria intermèdia +Name[ca@valencia]=Memòria intermèdia Name[cs]=Buffer Name[de]=Puffer Name[el]=Ενδιάμεση μνήμη Name[es]=Buffer Name[et]=Puhver +Name[fi]=Puskuri +Name[hu]=Puffer Name[it]=Buffer Name[kk]=Буфер Name[nb]=Buffer @@ -16,6 +19,7 @@ Name[pt]=Tampão Name[pt_BR]=Tampão Name[ru]=Буфер +Name[sk]=Buffer Name[sv]=Buffer Name[ug]=يىغلەك Name[uk]=Буфер diff -Nru calligra-2.4.0/flow/stencils/Logic/collection.desktop calligra-2.4.3/flow/stencils/Logic/collection.desktop --- calligra-2.4.0/flow/stencils/Logic/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Logic Name[bg]=Логика Name[ca]=Lògica +Name[ca@valencia]=Lògica Name[de]=Logik Name[el]=Λογική Name[es]=Lógica Name[et]=Loogika +Name[fi]=Logiikka Name[it]=Logica Name[kk]=Логика Name[nb]=Logikk @@ -14,6 +16,7 @@ Name[pt]=Lógica Name[pt_BR]=Lógica Name[ru]=Логика +Name[sk]=Logika Name[sv]=Logik Name[ug]=لوگىكا Name[uk]=Логіка diff -Nru calligra-2.4.0/flow/stencils/Logic/connector.desktop calligra-2.4.3/flow/stencils/Logic/connector.desktop --- calligra-2.4.0/flow/stencils/Logic/connector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/connector.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Connector Name[ca]=Connector +Name[ca@valencia]=Connector Name[cs]=Konektor Name[el]=Υποδοχή Name[es]=Conector @@ -14,6 +15,7 @@ Name[pt]=Ligação Name[pt_BR]=Conector Name[ru]=Коннектор +Name[sk]=Konektor Name[sv]=Kontakt Name[ug]=ئۇلىغۇچ Name[uk]=З'єднувач diff -Nru calligra-2.4.0/flow/stencils/Logic/inverter.desktop calligra-2.4.3/flow/stencils/Logic/inverter.desktop --- calligra-2.4.0/flow/stencils/Logic/inverter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/inverter.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Inverter Name[bg]=Инвертор Name[ca]=Invertidor +Name[ca@valencia]=Invertidor Name[cs]=Invertor Name[de]=Inverter Name[el]=Αναστροφέας Name[es]=Inversor Name[et]=Inverter +Name[fi]=Invertteri Name[hu]=Inverter Name[it]=Invertitore Name[kk]=Инвертор @@ -16,6 +18,7 @@ Name[pt]=Inversor Name[pt_BR]=Inverter Name[ru]=Инвертор +Name[sk]=Invertor Name[sv]=Inverterare Name[uk]=Інвертор Name[x-test]=xxInverterxx diff -Nru calligra-2.4.0/flow/stencils/Logic/nand.desktop calligra-2.4.3/flow/stencils/Logic/nand.desktop --- calligra-2.4.0/flow/stencils/Logic/nand.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/nand.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Nand Name[bg]=И-не (NAND) Name[ca]=Nand +Name[ca@valencia]=Nand Name[cs]=Nand Name[de]=Nand Name[el]=Nand Name[es]=Nand Name[et]=Mitte-ja +Name[fi]=NAND Name[it]=Nand Name[kk]=Теріс-Және Name[nb]=Nand @@ -15,6 +17,7 @@ Name[pt]=Não-E Name[pt_BR]=Não-E Name[ru]=И-НЕТ +Name[sk]=Nand Name[sv]=Icke och Name[uk]=І-НІ Name[x-test]=xxNandxx diff -Nru calligra-2.4.0/flow/stencils/Logic/nor.desktop calligra-2.4.3/flow/stencils/Logic/nor.desktop --- calligra-2.4.0/flow/stencils/Logic/nor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/nor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Nor Name[bg]=Нито (NOR) Name[ca]=Nor +Name[ca@valencia]=Nor Name[cs]=Nor Name[de]=Nor Name[el]=Nor Name[es]=Nor Name[et]=Mitte-või +Name[fi]=NOR Name[it]=Nor Name[kk]=Теріс-Немесе Name[nb]=Nor @@ -15,6 +17,7 @@ Name[pt]=Não-Ou Name[pt_BR]=Não-Ou Name[ru]=ИЛИ-НЕ +Name[sk]=Nor Name[sv]=Icke eller Name[uk]=Запер. АБО Name[x-test]=xxNorxx diff -Nru calligra-2.4.0/flow/stencils/Logic/not.desktop calligra-2.4.3/flow/stencils/Logic/not.desktop --- calligra-2.4.0/flow/stencils/Logic/not.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/not.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Not Name[ca]=Not +Name[ca@valencia]=Not Name[cs]=Not Name[de]=Not Name[el]=Not Name[es]=Not Name[et]=Ei +Name[fi]=NOT Name[it]=Not Name[kk]=Теріс Name[nb]=ikke @@ -14,6 +16,7 @@ Name[pt]=Não Name[pt_BR]=Não Name[ru]=НЕ +Name[sk]=Not Name[sv]=Icke Name[ug]=Not Name[uk]=НІ diff -Nru calligra-2.4.0/flow/stencils/Logic/or.desktop calligra-2.4.3/flow/stencils/Logic/or.desktop --- calligra-2.4.0/flow/stencils/Logic/or.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/or.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Or Name[bg]=Или Name[ca]=O +Name[ca@valencia]=O Name[cs]=Nebo Name[de]=Oder Name[el]=Or Name[es]=O Name[et]=Või Name[fi]=Tai +Name[hu]=Vagy Name[it]=Or Name[kk]=Немесе Name[nb]=Eller diff -Nru calligra-2.4.0/flow/stencils/Logic/xor.desktop calligra-2.4.3/flow/stencils/Logic/xor.desktop --- calligra-2.4.0/flow/stencils/Logic/xor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Logic/xor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Xor Name[bg]=Изключващо или (XOR) Name[ca]=Xor +Name[ca@valencia]=Xor Name[cs]=Xor Name[de]=Xor Name[el]=Xor Name[es]=Xor Name[et]=Välistav või +Name[fi]=XOR Name[it]=Xor Name[kk]=Сиысп. немесе Name[nb]=Xor @@ -15,6 +17,7 @@ Name[pt]=Ou-Exclusivo Name[pt_BR]=Ou-Exclusivo Name[ru]=ИСКЛ. ИЛИ +Name[sk]=Xor Name[sv]=Exklusiv eller Name[ug]=غەيرىي - ياكى Name[uk]=Викл. АБО diff -Nru calligra-2.4.0/flow/stencils/LST/associator_subsystem.desktop calligra-2.4.3/flow/stencils/LST/associator_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/associator_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/associator_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Associator Name[ca]=Associador +Name[ca@valencia]=Associador Name[el]=Associator Name[es]=Asociador Name[et]=Väljaõpetaja @@ -12,6 +13,7 @@ Name[pt]=Associação Name[pt_BR]=Associação Name[ru]=Ассоциатор +Name[sk]=Asociátor Name[sv]=Associator Name[uk]=Асоціативна підсистема Name[x-test]=xxAssociatorxx diff -Nru calligra-2.4.0/flow/stencils/LST/cn_subsystem.desktop calligra-2.4.3/flow/stencils/LST/cn_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/cn_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/cn_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Channel Network Name[ca]=Xarxa de canals +Name[ca@valencia]=Xarxa de canals Name[el]=Δίκτυο διαύλων Name[es]=Red de canales Name[et]=Kanal ja võrk @@ -12,6 +13,7 @@ Name[pt]=Rede de Canais Name[pt_BR]=Rede de canais Name[ru]=Канальная сеть +Name[sk]=Kanálová sieť Name[sv]=Kanalnätverk Name[uk]=Підсистема канальної мережі Name[x-test]=xxChannel Networkxx diff -Nru calligra-2.4.0/flow/stencils/LST/collection.desktop calligra-2.4.3/flow/stencils/LST/collection.desktop --- calligra-2.4.0/flow/stencils/LST/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=LST Name[bg]=LST Name[ca]=LST +Name[ca@valencia]=LST Name[de]=LST Name[el]=LST Name[es]=LST Name[et]=Elussüsteemid +Name[hu]=LST Name[it]=Teoria dei sistemi viventi Name[kk]=LST Name[nb]=LST diff -Nru calligra-2.4.0/flow/stencils/LST/convert_subsystem.desktop calligra-2.4.3/flow/stencils/LST/convert_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/convert_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/convert_subsystem.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Converter Name[ca]=Convertidor +Name[ca@valencia]=Convertidor Name[cs]=Převodník Name[el]=Μετατροπέας Name[es]=Conversor @@ -14,6 +15,7 @@ Name[pt]=Conversor Name[pt_BR]=Conversor Name[ru]=Конвертер +Name[sk]=Konvertor Name[sv]=Konverterare Name[ug]=ئايلاندۇرغۇچ Name[uk]=Підсистема перетворення diff -Nru calligra-2.4.0/flow/stencils/LST/decider_subsystem.desktop calligra-2.4.3/flow/stencils/LST/decider_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/decider_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/decider_subsystem.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Decider Name[ca]=Decididor +Name[ca@valencia]=Decididor Name[el]=Decider Name[es]=Decisor Name[et]=Otsustaja @@ -12,6 +13,7 @@ Name[pt]=Decisor Name[pt_BR]=Decisor Name[ru]=Решатель +Name[sk]=Rozhodovač Name[sv]=Beslutsfattare Name[uk]=Підсистема прийняття рішень Name[x-test]=xxDeciderxx diff -Nru calligra-2.4.0/flow/stencils/LST/decoder.desktop calligra-2.4.3/flow/stencils/LST/decoder.desktop --- calligra-2.4.0/flow/stencils/LST/decoder.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/decoder.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Decoder Name[ca]=Descodificador +Name[ca@valencia]=Descodificador Name[el]=Αποκωδικοποιητής Name[es]=Decodificador Name[et]=Dekooder @@ -13,6 +14,7 @@ Name[pt]=Descodificador Name[pt_BR]=Decodificador Name[ru]=Декодер +Name[sk]=Dekodér Name[sv]=Avkodare Name[uk]=Декодер Name[x-test]=xxDecoderxx diff -Nru calligra-2.4.0/flow/stencils/LST/decode_subsystem.desktop calligra-2.4.3/flow/stencils/LST/decode_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/decode_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/decode_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Decode Subsystem Name[ca]=Subsistema descodificador +Name[ca@valencia]=Subsistema descodificador Name[el]=Αποκωδικοποίηση υποσυστήματος Name[es]=Subsistema de decodificación Name[et]=Allsüsteemi dekodeerimine @@ -12,6 +13,7 @@ Name[pt]=Sub-sistema Descodificação Name[pt_BR]=Subsistema de decodificação Name[ru]=Подсистема декодирования +Name[sk]=Dekódovať sybsystém Name[sv]=Avkodningsdelsystem Name[uk]=Підсистема декодування Name[x-test]=xxDecode Subsystemxx diff -Nru calligra-2.4.0/flow/stencils/LST/distributor_subsystem.desktop calligra-2.4.3/flow/stencils/LST/distributor_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/distributor_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/distributor_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Distributor Name[ca]=Distribuïdor +Name[ca@valencia]=Distribuïdor Name[cs]=Distributor Name[el]=Κατανεμητής Name[es]=Distribuidor @@ -13,6 +14,7 @@ Name[pt]=Distribuidor Name[pt_BR]=Distribuidor Name[ru]=Дистрибьютор +Name[sk]=Distribútor Name[sv]=Fördelare Name[ug]=تەمىنلىگۈچى Name[uk]=Розповсюджувач diff -Nru calligra-2.4.0/flow/stencils/LST/encoder.desktop calligra-2.4.3/flow/stencils/LST/encoder.desktop --- calligra-2.4.0/flow/stencils/LST/encoder.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/encoder.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Encoder Name[ca]=Codificador +Name[ca@valencia]=Codificador Name[cs]=Kodér Name[el]=Κωδικοποιητής Name[es]=Codificador @@ -13,6 +14,7 @@ Name[pt]=Codificador Name[pt_BR]=Codificador Name[ru]=Кодировщик +Name[sk]=Kódovač Name[sv]=Kodare Name[uk]=Кодувальник Name[x-test]=xxEncoderxx diff -Nru calligra-2.4.0/flow/stencils/LST/encode_subsystem.desktop calligra-2.4.3/flow/stencils/LST/encode_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/encode_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/encode_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Encode Subsystem Name[ca]=Sistema codificador +Name[ca@valencia]=Sistema codificador Name[el]=Κωδικοποίηση υποσυστήματος Name[es]=Subsistema de codificación Name[et]=Allsüsteemi kodeerimine @@ -12,6 +13,7 @@ Name[pt]=Sub-sistema Codificação Name[pt_BR]=Subsistema de codificação Name[ru]=Подсистема кодирования +Name[sk]=Zakódovať subsystém Name[sv]=Kodningsdelsystem Name[uk]=Підсистема кодування Name[x-test]=xxEncode Subsystemxx diff -Nru calligra-2.4.0/flow/stencils/LST/extruder.desktop calligra-2.4.3/flow/stencils/LST/extruder.desktop --- calligra-2.4.0/flow/stencils/LST/extruder.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/extruder.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Extruder Name[ca]=Extrusor +Name[ca@valencia]=Extrusor Name[el]=Εξωθητής Name[es]=Extrusor Name[et]=Väljastaja @@ -12,6 +13,7 @@ Name[pt]=Extrusão Name[pt_BR]=Extrusão Name[ru]=Экструдер +Name[sk]=Extrudér Name[sv]=Extruder Name[uk]=Підсистема видобування Name[x-test]=xxExtruderxx diff -Nru calligra-2.4.0/flow/stencils/LST/ingestor_subsystem.desktop calligra-2.4.3/flow/stencils/LST/ingestor_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/ingestor_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/ingestor_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Ingestor Name[ca]=Ingestor +Name[ca@valencia]=Ingestor Name[el]=Ingestor Name[es]=Ingestor Name[et]=Sissetooja @@ -11,6 +12,7 @@ Name[pl]=Trawienie Name[pt]=Ingestão Name[pt_BR]=Ingestão +Name[sk]=Ingestor Name[sv]=Intag Name[uk]=Підсистема харчування Name[x-test]=xxIngestorxx diff -Nru calligra-2.4.0/flow/stencils/LST/internal_subsystem.desktop calligra-2.4.3/flow/stencils/LST/internal_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/internal_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/internal_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Internal Transducer Name[ca]=Transductor intern +Name[ca@valencia]=Transductor intern Name[el]=Εσωτερικός μετατροπέας Name[es]=Transductor interno Name[et]=Sisemine tõlgendaja @@ -12,6 +13,7 @@ Name[pt]=Transdutor Interno Name[pt_BR]=Transdutor interno Name[ru]=Внутренний преобразователь +Name[sk]=Interný prevodník Name[sv]=Intern omvandlare Name[uk]=Внутрішній перетворювач Name[x-test]=xxInternal Transducerxx diff -Nru calligra-2.4.0/flow/stencils/LST/it_subsystem.desktop calligra-2.4.3/flow/stencils/LST/it_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/it_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/it_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Input Transducer Name[ca]=Introducció de transductor +Name[ca@valencia]=Introducció de transductor Name[el]=Μετατροπέας εισόδου Name[es]=Transductor de entrada Name[et]=Sisendi tõlgendaja @@ -12,6 +13,7 @@ Name[pt]=Transdutor Entrada Name[pt_BR]=Transdutor de entrada Name[ru]=Преобразователь ввода +Name[sk]=Vstupný prevodník Name[sv]=Ingångsomvandlare Name[uk]=Перетворювач входу Name[x-test]=xxInput Transducerxx diff -Nru calligra-2.4.0/flow/stencils/LST/memory_subsystem.desktop calligra-2.4.3/flow/stencils/LST/memory_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/memory_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/memory_subsystem.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Memory Name[bg]=Памет Name[ca]=Memòria +Name[ca@valencia]=Memòria Name[cs]=Paměť Name[de]=Speicher Name[el]=Μνήμη @@ -9,6 +10,7 @@ Name[et]=Mälu Name[hu]=Memória Name[it]=Memoria +Name[ja]=メモリ Name[kk]=Жады Name[nb]=Minne Name[nl]=Geheugen @@ -16,6 +18,7 @@ Name[pt]=Memória Name[pt_BR]=Memória Name[ru]=Память +Name[sk]=Pamäť Name[sv]=Minne Name[ug]=ئەسلەك Name[uk]=Пам'ять diff -Nru calligra-2.4.0/flow/stencils/LST/mestorage.desktop calligra-2.4.3/flow/stencils/LST/mestorage.desktop --- calligra-2.4.0/flow/stencils/LST/mestorage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/mestorage.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ME Storage Name[ca]=Emmagatzematge ME +Name[ca@valencia]=Emmagatzement ME Name[el]=Αποθήκη ME Name[es]=Almacenamiento ME Name[et]=Aine-energiasalvesti @@ -12,6 +13,7 @@ Name[pt]=Armazenamento ME Name[pt_BR]=Armazenamento ME Name[ru]=Хранилище ME +Name[sk]=ME úložisko Name[sv]=ME-lagring Name[uk]=Підсистема зберігання пам’яті Name[x-test]=xxME Storagexx diff -Nru calligra-2.4.0/flow/stencils/LST/motor.desktop calligra-2.4.3/flow/stencils/LST/motor.desktop --- calligra-2.4.0/flow/stencils/LST/motor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/motor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,14 @@ Name=Motor Name[bg]=Двигател Name[ca]=Motor +Name[ca@valencia]=Motor Name[de]=Motor Name[el]=Κινητήρας +Name[es]=Motor Name[et]=Mootor +Name[hu]=Motor Name[it]=Motore +Name[ja]=モーター Name[kk]=Мотор Name[nb]=Motor Name[nds]=Motor @@ -14,6 +18,7 @@ Name[pt]=Motor Name[pt_BR]=Motor Name[ru]=Двигатель +Name[sk]=Motor Name[sv]=Motor Name[uk]=Двигун Name[x-test]=xxMotorxx diff -Nru calligra-2.4.0/flow/stencils/LST/ot_subsystem.desktop calligra-2.4.3/flow/stencils/LST/ot_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/ot_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/ot_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Output Transducer Name[ca]=Sortida del transductor +Name[ca@valencia]=Eixida del transductor Name[el]=Μετατροπέας εξόδου Name[es]=Transductor de salida Name[et]=Väljundi tõlgendaja @@ -12,6 +13,7 @@ Name[pt]=Transdutor Saída Name[pt_BR]=Transdutor de saída Name[ru]=Преобразователь вывода +Name[sk]=Výstupný prevodník Name[sv]=Utgångsomvandlare Name[uk]=Перетворювач виходу Name[x-test]=xxOutput Transducerxx diff -Nru calligra-2.4.0/flow/stencils/LST/producer.desktop calligra-2.4.3/flow/stencils/LST/producer.desktop --- calligra-2.4.0/flow/stencils/LST/producer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/producer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Producer Name[ca]=Productor +Name[ca@valencia]=Productor Name[cs]=Výrobce Name[el]=Παραγωγός Name[es]=Productor @@ -13,6 +14,7 @@ Name[pt]=Produtor Name[pt_BR]=Produtor Name[ru]=Производитель +Name[sk]=Producent Name[sv]=Producent Name[ug]=فىلىم ئىشلىگۈچى Name[uk]=Підсистема створення diff -Nru calligra-2.4.0/flow/stencils/LST/reproducer_subsystem.desktop calligra-2.4.3/flow/stencils/LST/reproducer_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/reproducer_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/reproducer_subsystem.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Reproducer Name[ca]=Reproductor +Name[ca@valencia]=Reproductor Name[el]=Αναπαραγωγός Name[es]=Reproductor Name[et]=Reprodutseerija @@ -12,6 +13,7 @@ Name[pt]=Reprodutor Name[pt_BR]=Reprodutor Name[ru]=Репродуктор +Name[sk]=Reproduktor Name[sv]=Återgivare Name[uk]=Підсистема відтворення Name[x-test]=xxReproducerxx diff -Nru calligra-2.4.0/flow/stencils/LST/supporter_subsystem.desktop calligra-2.4.3/flow/stencils/LST/supporter_subsystem.desktop --- calligra-2.4.0/flow/stencils/LST/supporter_subsystem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/supporter_subsystem.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Supporter Name[ca]=Seguidor +Name[ca@valencia]=Seguidor Name[el]=Υποστηρικτής Name[es]=Soporte Name[et]=Toetaja @@ -12,6 +13,7 @@ Name[pt]=Suporte Name[pt_BR]=Suporte Name[ru]=Поддерживающий +Name[sk]=Nosič Name[sv]=Stödenhet Name[uk]=Підсистема підтримки Name[x-test]=xxSupporterxx diff -Nru calligra-2.4.0/flow/stencils/LST/timer.desktop calligra-2.4.3/flow/stencils/LST/timer.desktop --- calligra-2.4.0/flow/stencils/LST/timer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/LST/timer.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Timer Name[bg]=Хронометър Name[ca]=Temporitzador +Name[ca@valencia]=Temporitzador Name[cs]=Časovač Name[el]=Χρονόμετρο Name[es]=Temporizador @@ -15,6 +16,7 @@ Name[pt]=Cronómetro Name[pt_BR]=Temporizador Name[ru]=Таймер +Name[sk]=Časovač Name[sv]=Tidtagare Name[ug]=ۋاقىت ئۆلچىگۈچ Name[uk]=Таймер diff -Nru calligra-2.4.0/flow/stencils/Map/Block1.desktop calligra-2.4.3/flow/stencils/Map/Block1.desktop --- calligra-2.4.0/flow/stencils/Map/Block1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Block1.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Block1 Name[bg]=Блок1 Name[ca]=Block1 +Name[ca@valencia]=Block1 Name[cs]=Blok1 Name[de]=Quader1 Name[el]=Block1 Name[es]=Bloque1 Name[et]=Plokk1 +Name[fi]=Rakennus 1 Name[hu]=Blokk1 Name[it]=Blocco1 Name[kk]=Блок1 diff -Nru calligra-2.4.0/flow/stencils/Map/Block2.desktop calligra-2.4.3/flow/stencils/Map/Block2.desktop --- calligra-2.4.0/flow/stencils/Map/Block2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Block2.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Block2 Name[bg]=Блок2 Name[ca]=Block2 +Name[ca@valencia]=Block2 Name[cs]=Blok2 Name[de]=Quader2 Name[el]=Block2 Name[es]=Bloque2 Name[et]=Plokk2 +Name[fi]=Rakennus 2 Name[hu]=Blokk2 Name[it]=Blocco2 Name[kk]=Блок2 diff -Nru calligra-2.4.0/flow/stencils/Map/Block3.desktop calligra-2.4.3/flow/stencils/Map/Block3.desktop --- calligra-2.4.0/flow/stencils/Map/Block3.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Block3.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Block3 Name[bg]=Блок3 Name[ca]=Block3 +Name[ca@valencia]=Block3 Name[cs]=Blok3 Name[de]=Quader3 Name[el]=Block3 Name[es]=Bloque3 Name[et]=Plokk3 +Name[fi]=Rakennus 3 Name[hu]=Blokk3 Name[it]=Blocco3 Name[kk]=Блок3 diff -Nru calligra-2.4.0/flow/stencils/Map/Block4.desktop calligra-2.4.3/flow/stencils/Map/Block4.desktop --- calligra-2.4.0/flow/stencils/Map/Block4.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Block4.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Block4 Name[bg]=Блок4 Name[ca]=Block4 +Name[ca@valencia]=Block4 Name[cs]=Blok4 Name[de]=Quader4 Name[el]=Block4 Name[es]=Bloque4 Name[et]=Plokk4 +Name[fi]=Rakennus 4 Name[hu]=Blokk4 Name[it]=Blocco4 Name[kk]=Блок4 diff -Nru calligra-2.4.0/flow/stencils/Map/Block5.desktop calligra-2.4.3/flow/stencils/Map/Block5.desktop --- calligra-2.4.0/flow/stencils/Map/Block5.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Block5.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Block5 Name[bg]=Блок5 Name[ca]=Block5 +Name[ca@valencia]=Block5 Name[cs]=Blok5 Name[de]=Quader5 Name[el]=Block5 Name[es]=Bloque5 Name[et]=Plokk5 +Name[fi]=Rakennus 5 Name[hu]=Blokk5 Name[it]=Blocco5 Name[kk]=Блок5 diff -Nru calligra-2.4.0/flow/stencils/Map/Block6.desktop calligra-2.4.3/flow/stencils/Map/Block6.desktop --- calligra-2.4.0/flow/stencils/Map/Block6.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Block6.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Block6 Name[bg]=Блок6 Name[ca]=Block6 +Name[ca@valencia]=Block6 Name[cs]=Blok6 Name[de]=Quader6 Name[el]=Block6 Name[es]=Bloque6 Name[et]=Plokk6 +Name[fi]=Rakennus 6 Name[hu]=Blokk6 Name[it]=Blocco6 Name[kk]=Блок6 diff -Nru calligra-2.4.0/flow/stencils/Map/Block7.desktop calligra-2.4.3/flow/stencils/Map/Block7.desktop --- calligra-2.4.0/flow/stencils/Map/Block7.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Block7.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Block7 Name[bg]=Блок7 Name[ca]=Block7 +Name[ca@valencia]=Block7 Name[cs]=Blok7 Name[de]=Quader7 Name[el]=Block7 Name[es]=Bloque7 Name[et]=Plokk7 +Name[fi]=Rakennus 7 Name[hu]=Blokk7 Name[it]=Blocco7 Name[kk]=Блок7 diff -Nru calligra-2.4.0/flow/stencils/Map/Car1.desktop calligra-2.4.3/flow/stencils/Map/Car1.desktop --- calligra-2.4.0/flow/stencils/Map/Car1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Car1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Car1 Name[bg]=Кола1 Name[ca]=Cotxe1 +Name[ca@valencia]=Cotxe1 Name[cs]=Auto1 Name[de]=Auto1 Name[el]=Car1 Name[es]=Coche1 Name[et]=Auto1 +Name[fi]=Auto 1 Name[hu]=Autó1 Name[it]=Automobile1 Name[kk]=Автомобиль1 @@ -16,6 +18,7 @@ Name[pt]=Carro1 Name[pt_BR]=Carro1 Name[ru]=Машина1 +Name[sk]=Auto1 Name[sv]=Bil 1 Name[uk]=Автомобіль 1 Name[x-test]=xxCar1xx diff -Nru calligra-2.4.0/flow/stencils/Map/Car2.desktop calligra-2.4.3/flow/stencils/Map/Car2.desktop --- calligra-2.4.0/flow/stencils/Map/Car2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Car2.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Car2 Name[bg]=Кола2 Name[ca]=Cotxe2 +Name[ca@valencia]=Cotxe2 Name[cs]=Auto2 Name[de]=Auto2 Name[el]=Car2 Name[es]=Coche2 Name[et]=Auto2 +Name[fi]=Auto 2 Name[hu]=Autó2 Name[it]=Automobile2 Name[kk]=Автомобиль2 @@ -16,6 +18,7 @@ Name[pt]=Carro2 Name[pt_BR]=Carro2 Name[ru]=Машина2 +Name[sk]=Auto2 Name[sv]=Bil 2 Name[uk]=Автомобіль 2 Name[x-test]=xxCar2xx diff -Nru calligra-2.4.0/flow/stencils/Map/collection.desktop calligra-2.4.3/flow/stencils/Map/collection.desktop --- calligra-2.4.0/flow/stencils/Map/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/collection.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Map Name[bg]=Карта Name[ca]=Mapa +Name[ca@valencia]=Mapa Name[cs]=Mapa Name[de]=Karte Name[el]=Χάρτης Name[es]=Mapa Name[et]=Kaart +Name[fi]=Kartta Name[hu]=Térkép Name[it]=Mappa Name[kk]=Карта @@ -16,6 +18,7 @@ Name[pt]=Mapa Name[pt_BR]=Mapa Name[ru]=Карта +Name[sk]=Mapa Name[sv]=Karta Name[ug]=خەرىتە Name[uk]=Карта diff -Nru calligra-2.4.0/flow/stencils/Map/Corner1.desktop calligra-2.4.3/flow/stencils/Map/Corner1.desktop --- calligra-2.4.0/flow/stencils/Map/Corner1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Corner1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Corner1 Name[bg]=Ъгъл1 Name[ca]=Corner1 +Name[ca@valencia]=Corner1 Name[cs]=Roh1 Name[de]=Ecke 1 Name[el]=Corner1 Name[es]=Esquina1 Name[et]=Nurk1 +Name[fi]=Mutka 1 Name[it]=Curva1 Name[kk]=Бұрыш1 Name[nb]=Hjørne1 @@ -15,6 +17,7 @@ Name[pt]=Esquina1 Name[pt_BR]=Canto1 Name[ru]=Угол1 +Name[sk]=Roh1 Name[sv]=Hörn 1 Name[uk]=Кут 1 Name[x-test]=xxCorner1xx diff -Nru calligra-2.4.0/flow/stencils/Map/Corner2.desktop calligra-2.4.3/flow/stencils/Map/Corner2.desktop --- calligra-2.4.0/flow/stencils/Map/Corner2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Corner2.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Corner2 Name[bg]=Ъгъл2 Name[ca]=Corner2 +Name[ca@valencia]=Corner2 Name[cs]=Roh2 Name[de]=Ecke 2 Name[el]=Corner2 Name[es]=Esquina2 Name[et]=Nurk2 +Name[fi]=Mutka 2 Name[it]=Curva2 Name[kk]=Бұрыш2 Name[nb]=Hjørne2 @@ -15,6 +17,7 @@ Name[pt]=Esquina2 Name[pt_BR]=Canto2 Name[ru]=Угол2 +Name[sk]=Roh2 Name[sv]=Hörn 2 Name[uk]=Кут 2 Name[x-test]=xxCorner2xx diff -Nru calligra-2.4.0/flow/stencils/Map/Crossroads.desktop calligra-2.4.3/flow/stencils/Map/Crossroads.desktop --- calligra-2.4.0/flow/stencils/Map/Crossroads.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Crossroads.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Crossroads Name[ca]=Encreuament +Name[ca@valencia]=Encreuament Name[de]=Kreuzung Name[el]=Crossroads Name[es]=Cruce de caminos Name[et]=Risttee +Name[fi]=Risteys Name[it]=Incroci Name[kk]=Қиылыс Name[nb]=Veikryss @@ -13,6 +15,7 @@ Name[pt]=Cruzamento Name[pt_BR]=Cruzamento Name[ru]=Перекрёсток +Name[sk]=Križovatky Name[sv]=Vägkorsning Name[uk]=Перехрестя Name[x-test]=xxCrossroadsxx diff -Nru calligra-2.4.0/flow/stencils/Map/Elevated.desktop calligra-2.4.3/flow/stencils/Map/Elevated.desktop --- calligra-2.4.0/flow/stencils/Map/Elevated.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Elevated.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Elevated Name[ca]=Elevat +Name[ca@valencia]=Elevat Name[el]=Elevated Name[es]=Elevado Name[et]=Tõstand +Name[fi]=Kohotettu Name[it]=Elevato Name[kk]=Көтерлім Name[nb]=Løftet @@ -12,6 +14,7 @@ Name[pt]=Elevado Name[pt_BR]=Elevado Name[ru]=Железная дорога +Name[sk]=Zvýšený Name[sv]=Upphöjd Name[uk]=Підйом Name[x-test]=xxElevatedxx diff -Nru calligra-2.4.0/flow/stencils/Map/Factory.desktop calligra-2.4.3/flow/stencils/Map/Factory.desktop --- calligra-2.4.0/flow/stencils/Map/Factory.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Factory.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Factory Name[bg]=Фабрика Name[ca]=Fàbrica +Name[ca@valencia]=Fàbrica Name[de]=Fabrik Name[el]=Factory Name[es]=Fábrica Name[et]=Tehas +Name[fi]=Tehdas Name[it]=Fabbrica Name[kk]=Фабрика Name[nb]=Fabrikk @@ -14,6 +16,7 @@ Name[pt]=Fábrica Name[pt_BR]=Fábrica Name[ru]=Фабрика +Name[sk]=Továreň Name[sv]=Fabrik Name[ug]=Factory Name[uk]=Фабрика diff -Nru calligra-2.4.0/flow/stencils/Map/FootBridge.desktop calligra-2.4.3/flow/stencils/Map/FootBridge.desktop --- calligra-2.4.0/flow/stencils/Map/FootBridge.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/FootBridge.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=FootBridge Name[ca]=FootBridge +Name[ca@valencia]=FootBridge Name[de]=Fußgängerbrücke Name[el]=FootBridge Name[es]=Puente peatonal Name[et]=Jalakäijate sild +Name[fi]=Kävelysilta Name[it]=PontePedonale Name[kk]=Жаяу көпір Name[nb]=Fotgjengerbru @@ -13,6 +15,7 @@ Name[pt]=PontePedonal Name[pt_BR]=Ponte pedonal Name[ru]=Пешеходный мост +Name[sk]=FootBridge Name[sv]=Gångbro Name[uk]=Пішохідний міст Name[x-test]=xxFootBridgexx diff -Nru calligra-2.4.0/flow/stencils/Map/OneWay.desktop calligra-2.4.3/flow/stencils/Map/OneWay.desktop --- calligra-2.4.0/flow/stencils/Map/OneWay.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/OneWay.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=OneWay Name[ca]=OneWay +Name[ca@valencia]=OneWay Name[de]=Einbahnstraße Name[el]=OneWay Name[es]=Camino único Name[et]=Ühesuunaline +Name[fi]=Yksisuuntainen Name[it]=Una via Name[kk]=БірБағыты Name[nb]=EnVei @@ -13,6 +15,7 @@ Name[pt]=SentidoÚnico Name[pt_BR]=Sentido único Name[ru]=Одностороннее движение +Name[sk]=Jedna cesta Name[sv]=Enkelriktat Name[uk]=Однобічний шлях Name[x-test]=xxOneWayxx diff -Nru calligra-2.4.0/flow/stencils/Map/RedCar.desktop calligra-2.4.3/flow/stencils/Map/RedCar.desktop --- calligra-2.4.0/flow/stencils/Map/RedCar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/RedCar.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=RedCar Name[ca]=RedCar +Name[ca@valencia]=RedCar Name[de]=Rotes Auto Name[el]=RedCar Name[es]=Coche rojo Name[et]=Punane auto +Name[fi]=Punainen auto Name[it]=Automobile rossa Name[kk]=ҚызылАвто Name[nb]=RødBil @@ -13,6 +15,7 @@ Name[pt]=CarroVermelho Name[pt_BR]=Carro vermelho Name[ru]=Красная машина +Name[sk]=Červené auto Name[sv]=Röd bil Name[uk]=Червоний автомобіль Name[x-test]=xxRedCarxx diff -Nru calligra-2.4.0/flow/stencils/Map/River.desktop calligra-2.4.3/flow/stencils/Map/River.desktop --- calligra-2.4.0/flow/stencils/Map/River.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/River.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=River Name[bg]=Река Name[ca]=Riu +Name[ca@valencia]=Riu Name[cs]=Řeka Name[de]=Fluss Name[el]=River Name[es]=Río Name[et]=Jõgi +Name[fi]=Joki Name[it]=Fiume Name[kk]=Өзең Name[nb]=Elv @@ -15,6 +17,7 @@ Name[pt]=Rio Name[pt_BR]=Rio Name[ru]=Река +Name[sk]=Rieka Name[sv]=Flod Name[ug]=دەريا Name[uk]=Річка diff -Nru calligra-2.4.0/flow/stencils/Map/Road1.desktop calligra-2.4.3/flow/stencils/Map/Road1.desktop --- calligra-2.4.0/flow/stencils/Map/Road1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Road1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Road1 Name[bg]=Път1 Name[ca]=Camí1 +Name[ca@valencia]=Camí1 Name[de]=Straße1 Name[el]=Road1 Name[es]=Carretera1 Name[et]=Tee1 +Name[fi]=Tie 1 Name[it]=Strada1 Name[kk]=Жол1 Name[nb]=Vei1 @@ -14,6 +16,7 @@ Name[pt]=Estrada1 Name[pt_BR]=Estrada1 Name[ru]=Дорога1 +Name[sk]=Cesta1 Name[sv]=Väg 1 Name[uk]=Дорога 1 Name[x-test]=xxRoad1xx diff -Nru calligra-2.4.0/flow/stencils/Map/Roof1.desktop calligra-2.4.3/flow/stencils/Map/Roof1.desktop --- calligra-2.4.0/flow/stencils/Map/Roof1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Roof1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Roof1 Name[bg]=Покрив1 Name[ca]=Sostre1 +Name[ca@valencia]=Sostre1 Name[de]=Dach1 Name[el]=Roof1 Name[es]=Tejado1 Name[et]=katus1 +Name[fi]=Katto 1 Name[it]=Tetto1 Name[kk]=Төбе1 Name[nb]=Tak1 @@ -14,6 +16,7 @@ Name[pt]=Telhado1 Name[pt_BR]=Telhado1 Name[ru]=Крыша1 +Name[sk]=Strecha1 Name[sv]=Tak 1 Name[uk]=Дах 1 Name[x-test]=xxRoof1xx diff -Nru calligra-2.4.0/flow/stencils/Map/StraightRoad1.desktop calligra-2.4.3/flow/stencils/Map/StraightRoad1.desktop --- calligra-2.4.0/flow/stencils/Map/StraightRoad1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/StraightRoad1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=StraightRoad1 Name[ca]=CamíRecte1 +Name[ca@valencia]=Camírecte1 Name[el]=StraightRoad1 Name[es]=Carretera recta 1 Name[et]=Sirge tee 1 +Name[fi]=Suora tie 1 Name[it]=Rettilineo1 Name[kk]=ТікЖол1 Name[nb]=RettVei1 @@ -12,6 +14,7 @@ Name[pt]=EstradaRecta1 Name[pt_BR]=EstradaReta1 Name[ru]=Прямая дорога 1 +Name[sk]=StraightRoad1 Name[sv]=Rak väg 1 Name[uk]=Пряма дорога 1 Name[x-test]=xxStraightRoad1xx diff -Nru calligra-2.4.0/flow/stencils/Map/T-Junction.desktop calligra-2.4.3/flow/stencils/Map/T-Junction.desktop --- calligra-2.4.0/flow/stencils/Map/T-Junction.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/T-Junction.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=T-Junction Name[bg]=Т-образно кръстовище Name[ca]=Junta-T +Name[ca@valencia]=Junta-T Name[de]=T-Kreuzung Name[el]=T-Junction Name[es]=Unión T Name[et]=T-ühendus +Name[fi]=T-risteys Name[it]=Giunzione a T Name[kk]=Т-секілді қиылыс Name[nb]=T-møte @@ -14,6 +16,7 @@ Name[pt]=Junção-T Name[pt_BR]=Entroncamento Name[ru]=Тройник +Name[sk]=T-uzol Name[sv]=T-korsning Name[uk]=«T»-перетин доріг Name[x-test]=xxT-Junctionxx diff -Nru calligra-2.4.0/flow/stencils/Map/Train1.desktop calligra-2.4.3/flow/stencils/Map/Train1.desktop --- calligra-2.4.0/flow/stencils/Map/Train1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Train1.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Train1 Name[bg]=Влак1 Name[ca]=Tren1 +Name[ca@valencia]=Tren1 Name[de]=Zug1 Name[el]=Train1 Name[es]=Tren1 Name[et]=Rong1 +Name[fi]=Juna 1 Name[it]=Treno1 Name[kk]=Пойыз1 Name[nb]=Tog1 @@ -14,6 +16,7 @@ Name[pt]=Comboio1 Name[pt_BR]=Trem1 Name[ru]=Поезд1 +Name[sk]=Vlak1 Name[sv]=Tåg 1 Name[uk]=Потяг 1 Name[x-test]=xxTrain1xx diff -Nru calligra-2.4.0/flow/stencils/Map/Train2.desktop calligra-2.4.3/flow/stencils/Map/Train2.desktop --- calligra-2.4.0/flow/stencils/Map/Train2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Train2.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Train2 Name[bg]=Влак2 Name[ca]=Tren2 +Name[ca@valencia]=Tren2 Name[de]=Zug2 Name[el]=Train2 Name[es]=Tren2 Name[et]=Rong2 +Name[fi]=Juna 2 Name[it]=Treno2 Name[kk]=Пойыз2 Name[nb]=Tog2 @@ -14,6 +16,7 @@ Name[pt]=Comboio2 Name[pt_BR]=Trem2 Name[ru]=Поезд2 +Name[sk]=Vlak2 Name[sv]=Tåg 2 Name[uk]=Потяг 2 Name[x-test]=xxTrain2xx diff -Nru calligra-2.4.0/flow/stencils/Map/Tree1.desktop calligra-2.4.3/flow/stencils/Map/Tree1.desktop --- calligra-2.4.0/flow/stencils/Map/Tree1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Map/Tree1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Tree1 Name[bg]=Дърво1 Name[ca]=Arbre1 +Name[ca@valencia]=Arbre1 Name[cs]=Strom1 Name[de]=Baum1 Name[el]=Tree1 Name[es]=Árbol1 Name[et]=Puu1 +Name[fi]=Puu 1 Name[it]=Albero1 Name[kk]=Ағаш1 Name[nb]=Tre1 @@ -15,6 +17,7 @@ Name[pt]=Árvore1 Name[pt_BR]=Árvore1 Name[ru]=Дерево1 +Name[sk]=Strom1 Name[sv]=Träd 1 Name[ug]=Tree1 Name[uk]=Дерево 1 diff -Nru calligra-2.4.0/flow/stencils/Misc/collection.desktop calligra-2.4.3/flow/stencils/Misc/collection.desktop --- calligra-2.4.0/flow/stencils/Misc/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Misc/collection.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Misc Name[bg]=Разни Name[ca]=Miscel·lània +Name[ca@valencia]=Miscel·lània Name[cs]=Různé Name[de]=Diverses Name[el]=Διάφορα Name[es]=Miscelánea Name[et]=Muu +Name[fi]=Sekalaista 2 Name[ga]=Éagsúil Name[hu]=Egyéb Name[it]=Varie @@ -17,6 +19,7 @@ Name[pt]=Diversos Name[pt_BR]=Diversos Name[ru]=Разное +Name[sk]=Rôzne Name[sv]=Diverse Name[ug]=ئارىلاش Name[uk]=Різне diff -Nru calligra-2.4.0/flow/stencils/Misc/expended-node.desktop calligra-2.4.3/flow/stencils/Misc/expended-node.desktop --- calligra-2.4.0/flow/stencils/Misc/expended-node.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Misc/expended-node.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=expended node Name[ca]=node expandit +Name[ca@valencia]=node expandit Name[el]=expended node Name[es]=Nodo expandido Name[et]=Avatud sõlm @@ -12,6 +13,7 @@ Name[pt]=nó expandido Name[pt_BR]=nó expandido Name[ru]=расширенный узел +Name[sk]=vynaložený uzol Name[sv]=expanderad nod Name[uk]=Розширений вузол Name[x-test]=xxexpended nodexx diff -Nru calligra-2.4.0/flow/stencils/Misc/expensible-node.desktop calligra-2.4.3/flow/stencils/Misc/expensible-node.desktop --- calligra-2.4.0/flow/stencils/Misc/expensible-node.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Misc/expensible-node.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=expansible node Name[ca]=node expansible +Name[ca@valencia]=node expansible Name[el]=επεκτάσιμος κόμβος Name[es]=Nodo expansible Name[et]=Avatav sõlm @@ -12,6 +13,7 @@ Name[pt]=nó expansível Name[pt_BR]=nó expansível Name[ru]=узел большого расширения +Name[sk]=rozpínavý uzol Name[sv]=expanderbar nod Name[uk]=Придатний до розширення вузол Name[x-test]=xxexpansible nodexx diff -Nru calligra-2.4.0/flow/stencils/Misc/file.desktop calligra-2.4.3/flow/stencils/Misc/file.desktop --- calligra-2.4.0/flow/stencils/Misc/file.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Misc/file.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=File Name[bg]=Файл Name[ca]=Fitxer +Name[ca@valencia]=Fitxer Name[cs]=Soubor Name[de]=Datei Name[el]=Αρχείο Name[es]=Archivo Name[et]=Fail +Name[fi]=Tiedosto Name[fr]=Fichier Name[hu]=Fájl Name[it]=File @@ -18,6 +20,7 @@ Name[pt]=Ficheiro Name[pt_BR]=Arquivo Name[ru]=Файл +Name[sk]=Súbor Name[sv]=Fil Name[ug]=ھۆججەت Name[uk]=Файл diff -Nru calligra-2.4.0/flow/stencils/Misc/folder.desktop calligra-2.4.3/flow/stencils/Misc/folder.desktop --- calligra-2.4.0/flow/stencils/Misc/folder.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Misc/folder.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Folder Name[bg]=Папка Name[ca]=Carpeta +Name[ca@valencia]=Carpeta Name[cs]=Složka Name[de]=Ordner Name[el]=Φάκελος Name[es]=Carpeta Name[et]=Kataloog +Name[fi]=Kansio Name[fr]=Répertoire Name[hu]=Mappa Name[it]=Cartella @@ -18,6 +20,7 @@ Name[pt]=Pasta Name[pt_BR]=Pasta Name[ru]=Папка +Name[sk]=Priečinok Name[sv]=Mapp Name[ug]=قىسقۇچ Name[uk]=Тека diff -Nru calligra-2.4.0/flow/stencils/MSE/collection.desktop calligra-2.4.3/flow/stencils/MSE/collection.desktop --- calligra-2.4.0/flow/stencils/MSE/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/MSE/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=MSE Name[bg]=MSE Name[ca]=MSE +Name[ca@valencia]=MSE Name[cs]=MSE Name[de]=MSE Name[el]=MSE Name[es]=MSE Name[et]=MSE +Name[hu]=MSE Name[it]=MSE Name[kk]=MSE Name[nb]=MSE diff -Nru calligra-2.4.0/flow/stencils/MSE/demultiplexer.desktop calligra-2.4.3/flow/stencils/MSE/demultiplexer.desktop --- calligra-2.4.0/flow/stencils/MSE/demultiplexer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/MSE/demultiplexer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Demultiplexer Name[bg]=Демултиплексор Name[ca]=Demultiplexer +Name[ca@valencia]=Demultiplexer Name[de]=Demultiplexer Name[el]=Απο-πολυπλέκτης Name[es]=Demultiplexador @@ -14,6 +15,7 @@ Name[pt]=Desmultiplexador Name[pt_BR]=Desmultiplexador Name[ru]=Демультиплексор +Name[sk]=Demultiplexor Name[sv]=Demultiplexer Name[uk]=Демультиплексор Name[x-test]=xxDemultiplexerxx diff -Nru calligra-2.4.0/flow/stencils/MSE/large_extension_node.desktop calligra-2.4.3/flow/stencils/MSE/large_extension_node.desktop --- calligra-2.4.0/flow/stencils/MSE/large_extension_node.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/MSE/large_extension_node.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Large Extension Node Name[bg]=Голям разширителен възел Name[ca]=Node gran d'extensió +Name[ca@valencia]=Node gran d'extensió Name[de]=Großer Erweiterungsknoten Name[el]=Κόμβος μεγάλης επέκτασης Name[es]=Nodo de gran extensión Name[et]=Suur laiendussõlm +Name[gl]=Nó de engado grande Name[it]=Nodo di estensione grande Name[kk]=Үлкен кеңейтілген түйін Name[nb]=Stor utvidelsesnode @@ -14,6 +16,7 @@ Name[pt]=Nó Extensão Grande Name[pt_BR]=Nó de extensão grande Name[ru]=Узел большого расширения +Name[sk]=Veľký rozširujúci uzol Name[sv]=Stor utökningsnod Name[uk]=Великий розширений вузол Name[x-test]=xxLarge Extension Nodexx diff -Nru calligra-2.4.0/flow/stencils/MSE/multiplexer.desktop calligra-2.4.3/flow/stencils/MSE/multiplexer.desktop --- calligra-2.4.0/flow/stencils/MSE/multiplexer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/MSE/multiplexer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Multiplexer Name[bg]=Мултиплексор Name[ca]=Multiplexor +Name[ca@valencia]=Multiplexador Name[de]=Multiplexer Name[el]=Πολυπλέκτης Name[es]=Multiplexador @@ -14,6 +15,7 @@ Name[pt]=Multiplexador Name[pt_BR]=Multiplexador Name[ru]=Мультиплексор +Name[sk]=Multiplexor Name[sv]=Multiplexor Name[uk]=Мультиплексор Name[x-test]=xxMultiplexerxx diff -Nru calligra-2.4.0/flow/stencils/MSE/node_center.desktop calligra-2.4.3/flow/stencils/MSE/node_center.desktop --- calligra-2.4.0/flow/stencils/MSE/node_center.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/MSE/node_center.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Node Center Name[ca]=Centre de nodes +Name[ca@valencia]=Centre de nodes Name[de]=Knotenzentrum Name[el]=Κέντρο κόμβου Name[es]=Nodo central @@ -13,6 +14,7 @@ Name[pt]=Centro do Nó Name[pt_BR]=Centro Nodal Name[ru]=Центр узлов +Name[sk]=Centrum uzla Name[sv]=Nodcentral Name[uk]=Центр вузла Name[x-test]=xxNode Centerxx diff -Nru calligra-2.4.0/flow/stencils/MSE/small_extension_node.desktop calligra-2.4.3/flow/stencils/MSE/small_extension_node.desktop --- calligra-2.4.0/flow/stencils/MSE/small_extension_node.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/MSE/small_extension_node.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Small Extension Node Name[bg]=Малък разширителен възел Name[ca]=Node petit d'extensió +Name[ca@valencia]=Node petit d'extensió Name[de]=Kleiner Erweiterungsknoten Name[el]=Κόμβος μικρής επέκτασης Name[es]=Nodo de pequeña extensión Name[et]=Väike laiendussõlm +Name[gl]=Nó de engadido pequeno Name[it]=Nodo di estensione piccolo Name[kk]=Шағын кеңейтілген түйін Name[nb]=Liten utvidelsesnode @@ -14,6 +16,7 @@ Name[pt]=Nó Extensão Pequeno Name[pt_BR]=Nó de extensão pequeno Name[ru]=Узел малого расширения +Name[sk]=Malý rozširujúci uzol Name[sv]=Liten utökningsnod Name[uk]=Малий розширений вузол Name[x-test]=xxSmall Extension Nodexx diff -Nru calligra-2.4.0/flow/stencils/MSE/tacsat.desktop calligra-2.4.3/flow/stencils/MSE/tacsat.desktop --- calligra-2.4.0/flow/stencils/MSE/tacsat.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/MSE/tacsat.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Tactical Satellite Communications Terminal Name[bg]=Тактически сателитен комуникационен терминал Name[ca]=Terminal de comunicacions tàctiques per satèl·lit +Name[ca@valencia]=Terminal de comunicacions tàctiques per satèl·lit Name[de]=Kommunikationsterminal eines taktischen Satelliten Name[el]=Τερματικό επικοινωνιών δορυφόρου τακτικής Name[es]=Terminal de comunicaciones tácticas por satélite @@ -14,6 +15,7 @@ Name[pt]=Terminal Comunicações Tácticas Satélite Name[pt_BR]=Terminal comunicações táticas por satélite Name[ru]=Коммуникационный терминал боевого спутника +Name[sk]=Terminál taktickej satelitnej komunikácie Name[sv]=Taktisk satellitkommunikationsterminal Name[uk]=Термінал супутникового зв'язку Name[x-test]=xxTactical Satellite Communications Terminalxx diff -Nru calligra-2.4.0/flow/stencils/Network/antenna.desktop calligra-2.4.3/flow/stencils/Network/antenna.desktop --- calligra-2.4.0/flow/stencils/Network/antenna.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/antenna.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,15 @@ Name=Antenna Name[bg]=Антена Name[ca]=Antenna +Name[ca@valencia]=Antenna Name[de]=Antenne Name[el]=Κεραία Name[es]=Antena Name[et]=Antenn Name[fi]=Antenni +Name[hu]=Antenna Name[it]=Antenna +Name[ja]=アンテナ Name[kk]=Антенна Name[nb]=Antenne Name[nds]=Antenn @@ -16,6 +19,7 @@ Name[pt]=Antena Name[pt_BR]=Antena Name[ru]=Антенна +Name[sk]=Anténa Name[sv]=Antenn Name[uk]=Антенна Name[x-test]=xxAntennaxx diff -Nru calligra-2.4.0/flow/stencils/Network/collection.desktop calligra-2.4.3/flow/stencils/Network/collection.desktop --- calligra-2.4.0/flow/stencils/Network/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/collection.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Network Name[bg]=Мрежа Name[ca]=Xarxa +Name[ca@valencia]=Xarxa Name[cs]=Síť Name[de]=Netzwerk Name[el]=Δίκτυο Name[es]=Red Name[et]=Võrk +Name[fi]=Verkko Name[fr]=Réseau Name[ga]=Líonra Name[hu]=Hálózat diff -Nru calligra-2.4.0/flow/stencils/Network/computer.desktop calligra-2.4.3/flow/stencils/Network/computer.desktop --- calligra-2.4.0/flow/stencils/Network/computer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/computer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=General Computer (Tower) Name[bg]=Обикновен компютър (изправен) Name[ca]=Ordinador general (torre) +Name[ca@valencia]=Ordinador general (torre) Name[de]=Rechner (Tower) Name[el]=Υπολογιστής γενικής χρήσης (πύργος) Name[es]=Equipo general (Torre) @@ -14,6 +15,7 @@ Name[pt]=Computador Geral (Torre) Name[pt_BR]=Computador genérico (Torre) Name[ru]=Компьютер-башня +Name[sk]=Všeobecný počítač (tower) Name[sv]=Allmän dator (torn) Name[uk]=Типовий комп’ютер (корпус «башта») Name[x-test]=xxGeneral Computer (Tower)xx diff -Nru calligra-2.4.0/flow/stencils/Network/dat_external.desktop calligra-2.4.3/flow/stencils/Network/dat_external.desktop --- calligra-2.4.0/flow/stencils/Network/dat_external.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/dat_external.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=An external DAT drive Name[bg]=Външно устройство DAT Name[ca]=Un aparell extern DAT +Name[ca@valencia]=Un aparell extern DAT Name[de]=Externes DAT-Laufwerk Name[el]=Εξωτερικό DAT drive Name[es]=Una unidad DAT externa Name[et]=Väline DAT-seade +Name[fi]=Ulkoinen DAT-asema Name[it]=Un lettore DAT esterno Name[kk]=Сыртқы DAT жетегі Name[nb]=Et ytre DAT-drev @@ -14,6 +16,7 @@ Name[pt]=Unidade DAT externa Name[pt_BR]=Unidade DAT externa Name[ru]=Внешний привод DAT +Name[sk]=Externá DAT mechanika Name[sv]=En extern DAT-enhet Name[uk]=Зовнішній пристрій зчитування DAT Name[x-test]=xxAn external DAT drivexx diff -Nru calligra-2.4.0/flow/stencils/Network/digitizing_board.desktop calligra-2.4.3/flow/stencils/Network/digitizing_board.desktop --- calligra-2.4.0/flow/stencils/Network/digitizing_board.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/digitizing_board.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Digitizing Board Name[bg]=Цифрово табло Name[ca]=Pissarra digital +Name[ca@valencia]=Pissarra digital Name[de]=Digitalisierbrett Name[el]=Ψηφιοποίηση πίνακα Name[es]=Tableta digitalizadora @@ -14,6 +15,7 @@ Name[pt]=Mesa Digitalização Name[pt_BR]=Mesa de digitalização Name[ru]=Плата оцифровки +Name[sk]=Digitalizačná karta Name[sv]=Digitaliseringsbord Name[uk]=Картка оцифровування Name[x-test]=xxDigitizing Boardxx diff -Nru calligra-2.4.0/flow/stencils/Network/disc.desktop calligra-2.4.3/flow/stencils/Network/disc.desktop --- calligra-2.4.0/flow/stencils/Network/disc.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/disc.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Storage Name[bg]=Хранилище Name[ca]=Emmagatzematge +Name[ca@valencia]=Emmagatzement Name[cs]=Úložiště Name[de]=Speicher Name[el]=Αποθήκη @@ -17,6 +18,7 @@ Name[pt]=Armazenamento Name[pt_BR]=Armazenamento Name[ru]=Хранилище +Name[sk]=Úložisko Name[sv]=Lagring Name[ug]=ساقلاش Name[uk]=Сховище даних diff -Nru calligra-2.4.0/flow/stencils/Network/diskette.desktop calligra-2.4.3/flow/stencils/Network/diskette.desktop --- calligra-2.4.0/flow/stencils/Network/diskette.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/diskette.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=A Diskette Name[bg]=Дискета Name[ca]=Un disquet +Name[ca@valencia]=Un disquet Name[de]=Diskette Name[el]=Δισκέτα Name[es]=Un disquete Name[et]=Diskett +Name[fi]=Levyke Name[it]=Un disco floppy Name[kk]=Дискета Name[nb]=En diskett @@ -14,6 +16,7 @@ Name[pt]=Disquete Name[pt_BR]=Disquete Name[ru]=Дискета +Name[sk]=Disketa Name[sv]=En diskett Name[uk]=Дискета Name[x-test]=xxA Diskettexx diff -Nru calligra-2.4.0/flow/stencils/Network/firewall.desktop calligra-2.4.3/flow/stencils/Network/firewall.desktop --- calligra-2.4.0/flow/stencils/Network/firewall.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/firewall.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=Firewall Name[bg]=Защитна стена Name[ca]=Tallafocs +Name[ca@valencia]=Tallafocs Name[de]=Firewall Name[el]=Τείχος προστασίας Name[es]=Cortafuegos Name[et]=Tulemüür +Name[fi]=Palomuuri Name[fr]=Pare-feu +Name[hu]=Tűzfal Name[it]=Firewall Name[kk]=Желіаралық қалқан Name[nb]=Brannmur diff -Nru calligra-2.4.0/flow/stencils/Network/flash.desktop calligra-2.4.3/flow/stencils/Network/flash.desktop --- calligra-2.4.0/flow/stencils/Network/flash.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/flash.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=WAN Connection Name[bg]=Връзка WAN Name[ca]=Connexió WAN +Name[ca@valencia]=Connexió WAN Name[cs]=WAN připojení Name[de]=WAN-Verbindung Name[el]=Σύνδεση WAN Name[es]=Conexión WAN Name[et]=WAN-ühendus +Name[fi]=WAN-yhteys Name[hu]=WAN kapcsolat Name[it]=Connessione WAN Name[kk]=WAN қосылымы @@ -16,6 +18,7 @@ Name[pt]=Ligação WAN Name[pt_BR]=Conexão WAN Name[ru]=WAN-соединение +Name[sk]=WAN pripojenie Name[sv]=Anslutning till fjärrnätverk Name[uk]=З'єднання WAN Name[x-test]=xxWAN Connectionxx diff -Nru calligra-2.4.0/flow/stencils/Network/genmonitor.desktop calligra-2.4.3/flow/stencils/Network/genmonitor.desktop --- calligra-2.4.0/flow/stencils/Network/genmonitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/genmonitor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=General Monitor (With Stand) Name[bg]=Обикновен монитор (със стойка) Name[ca]=Monitor general (amb Stand) +Name[ca@valencia]=Monitor general (amb Stand) Name[de]=Monitor (mit Ständer) Name[el]=Οθόνη γενικής χρήσης (με βάση) Name[es]=Monitor general (con base de apoyo) @@ -14,6 +15,7 @@ Name[pt]=Monitor Geral (com Pé) Name[pt_BR]=Monitor genérico (com pé) Name[ru]=Монитор с подставкой +Name[sk]=Všeobecný monitor (so stojanom) Name[sv]=Allmän bildskärm (med fot) Name[uk]=Типовий монітор (з підставкою) Name[x-test]=xxGeneral Monitor (With Stand)xx diff -Nru calligra-2.4.0/flow/stencils/Network/hub.desktop calligra-2.4.3/flow/stencils/Network/hub.desktop --- calligra-2.4.0/flow/stencils/Network/hub.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/hub.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,16 @@ Name=Hub Name[bg]=Хъб Name[ca]=Concentrador +Name[ca@valencia]=Concentrador Name[cs]=Rozbočovač Name[de]=Hub Name[el]=Κόμβος Name[es]=Concentrador Name[et]=Jaotur +Name[fi]=Hubi +Name[hu]=Hub Name[it]=Hub +Name[ja]=ハブ Name[kk]=Хаб Name[nb]=Nettnav Name[nds]=Nettknütt @@ -16,6 +20,7 @@ Name[pt]=Concentrador Name[pt_BR]=Concentrador Name[ru]=Повторитель +Name[sk]=Rozbočovač Name[sv]=Nätnav Name[uk]=Концентратор Name[x-test]=xxHubxx diff -Nru calligra-2.4.0/flow/stencils/Network/mobile_phone.desktop calligra-2.4.3/flow/stencils/Network/mobile_phone.desktop --- calligra-2.4.0/flow/stencils/Network/mobile_phone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/mobile_phone.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=A Mobile Phone Name[bg]=Мобилен телефон Name[ca]=Un telèfon mòbil +Name[ca@valencia]=Un telèfon mòbil Name[cs]=Mobilní telefon Name[de]=Mobiltelefon Name[el]=Κινητό τηλέφωνο Name[es]=Un teléfono móvil Name[et]=Mobiiltelefon +Name[fi]=Matkapuhelin Name[it]=Un cellulare Name[kk]=Мобайл телефоны Name[nb]=En mobiltelefon @@ -15,6 +17,7 @@ Name[pt]=Telemóvel Name[pt_BR]=Telefone celular Name[ru]=Мобильный телефон +Name[sk]=Mobilný telefón Name[sv]=En mobiltelefon Name[uk]=Мобільний телефон Name[x-test]=xxA Mobile Phonexx diff -Nru calligra-2.4.0/flow/stencils/Network/modem.desktop calligra-2.4.3/flow/stencils/Network/modem.desktop --- calligra-2.4.0/flow/stencils/Network/modem.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/modem.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,12 +2,14 @@ Name=Modem Name[bg]=Модем Name[ca]=Mòdem +Name[ca@valencia]=Mòdem Name[cs]=Modem Name[de]=Modem Name[el]=Modem Name[es]=Módem Name[et]=Modem Name[fi]=Modeemi +Name[gl]=Módem Name[hu]=Modem Name[it]=Modem Name[kk]=Модем diff -Nru calligra-2.4.0/flow/stencils/Network/modularswitch.desktop calligra-2.4.3/flow/stencils/Network/modularswitch.desktop --- calligra-2.4.0/flow/stencils/Network/modularswitch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/modularswitch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Modular Switch Name[bg]=Модулен комутатор Name[ca]=Commutador modular +Name[ca@valencia]=Commutador modular Name[de]=Modularer Switch Name[el]=Αρθρωτός μεταγωγέας Name[es]=Conmutador modular @@ -14,6 +15,7 @@ Name[pt]=Comutador Modular Name[pt_BR]=Comutador modular Name[ru]=Модульный переключатель +Name[sk]=Modulárny prepínač Name[sv]=Modulär växel Name[uk]=Модульний комутатор Name[x-test]=xxModular Switchxx diff -Nru calligra-2.4.0/flow/stencils/Network/monitor.desktop calligra-2.4.3/flow/stencils/Network/monitor.desktop --- calligra-2.4.0/flow/stencils/Network/monitor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/monitor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=A Workstation Monitor Name[bg]=Монитор на работна станция Name[ca]=Un monitor d'estació de treball +Name[ca@valencia]=Un monitor d'estació de treball Name[de]=Workstation-Monitor Name[el]=Οθόνη σταθμού εργασίας Name[es]=Un monitor de estación de trabajo Name[et]=Tööjaama monitor +Name[fi]=Työaseman näyttö Name[it]=Un monitor di workstation Name[kk]=Жұмыс станциясының мониторы Name[nb]=En arbeidsstasjons-skjerm @@ -14,6 +16,7 @@ Name[pt]=Monitor Computador Name[pt_BR]=Monitor de computador Name[ru]=Монитор рабочей станции +Name[sk]=Monitor pracovnej stanice Name[sv]=En arbetsstationsskärm Name[uk]=Монітор робочої станції Name[x-test]=xxA Workstation Monitorxx diff -Nru calligra-2.4.0/flow/stencils/Network/nwcloud.desktop calligra-2.4.3/flow/stencils/Network/nwcloud.desktop --- calligra-2.4.0/flow/stencils/Network/nwcloud.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/nwcloud.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,12 +1,15 @@ [Desktop Entry] Name=Cloud Name[ca]=Núvol +Name[ca@valencia]=Núvol Name[cs]=Cloud Name[el]=Νέφος Name[es]=Nube Name[et]=Pilv +Name[fi]=Pilvi Name[ga]=Cloud Name[it]=Nuvola +Name[ja]=クラウド Name[kk]=Бұлт Name[nb]=Sky Name[nds]=Wulk @@ -15,6 +18,7 @@ Name[pt]=Nuvem Name[pt_BR]=Nuvem Name[ru]=Облако +Name[sk]=Oblak Name[sv]=Moln Name[ug]=بۇلۇت Name[uk]=Хмара diff -Nru calligra-2.4.0/flow/stencils/Network/patch-panel.desktop calligra-2.4.3/flow/stencils/Network/patch-panel.desktop --- calligra-2.4.0/flow/stencils/Network/patch-panel.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/patch-panel.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Patch Panel Name[ca]=Plafó de pedaços +Name[ca@valencia]=Plafó de pedaços Name[de]=Patchfeld Name[el]=Πίνακας διορθώσεων Name[es]=Panel de modificación @@ -13,6 +14,7 @@ Name[pt]=Painel de Modificação Name[pt_BR]=Painel de modificação Name[ru]=Патч-панель +Name[sk]=Patch Panel Name[sv]=Kopplingspanel Name[uk]=Патч-панель Name[x-test]=xxPatch Panelxx diff -Nru calligra-2.4.0/flow/stencils/Network/pc_bigtower.desktop calligra-2.4.3/flow/stencils/Network/pc_bigtower.desktop --- calligra-2.4.0/flow/stencils/Network/pc_bigtower.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/pc_bigtower.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=A Bigtower PC Name[bg]=Компютър в голяма кутия Name[ca]=Una torre gran de PC +Name[ca@valencia]=Una torre gran de PC Name[de]=Bigtower-PC Name[el]=Υπολογιστής πύργος μεγάλου μεγέθους Name[es]=Un PC de gran torre @@ -14,6 +15,7 @@ Name[pt]=PC Torre Grande Name[pt_BR]=PC torre grande Name[ru]=ПК большая башня +Name[sk]=Bigtower PC Name[sv]=En stor stående persondator Name[uk]=ПК з великим корпусом Name[x-test]=xxA Bigtower PCxx diff -Nru calligra-2.4.0/flow/stencils/Network/pc_desktop.desktop calligra-2.4.3/flow/stencils/Network/pc_desktop.desktop --- calligra-2.4.0/flow/stencils/Network/pc_desktop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/pc_desktop.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=A Desktop PC Name[bg]=Настолен компютър Name[ca]=Un escriptori de PC +Name[ca@valencia]=Un escriptori de PC Name[de]=Desktop-PC Name[el]=Επιτραπέζιος υπολογιστής Name[es]=Un PC de escritorio @@ -14,6 +15,7 @@ Name[pt]=PC de Secretária Name[pt_BR]=PC de mesa Name[ru]=Настольный ПК +Name[sk]=Desktop PC Name[sv]=En skrivbordspersondator Name[uk]=Настільний ПК Name[x-test]=xxA Desktop PCxx diff -Nru calligra-2.4.0/flow/stencils/Network/pc_miditower.desktop calligra-2.4.3/flow/stencils/Network/pc_miditower.desktop --- calligra-2.4.0/flow/stencils/Network/pc_miditower.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/pc_miditower.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=A Miditower PC Name[bg]=Компютър в средно голяма кутия Name[ca]=Una torre mitjana de PC +Name[ca@valencia]=Una torre mitjana de PC Name[de]=Minitower-PC Name[el]=Υπολογιστής πύργος μεσαίου μεγέθους Name[es]=Un PC semitorre @@ -14,6 +15,7 @@ Name[pt]=PC Torre Média Name[pt_BR]=PC torre média Name[ru]=ПК средняя башня +Name[sk]=Miditower PC Name[sv]=En medelstor stående persondator Name[uk]=ПК з середнім корпусом Name[x-test]=xxA Miditower PCxx diff -Nru calligra-2.4.0/flow/stencils/Network/pc_minitower.desktop calligra-2.4.3/flow/stencils/Network/pc_minitower.desktop --- calligra-2.4.0/flow/stencils/Network/pc_minitower.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/pc_minitower.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=A Minitower PC Name[bg]=Компютър в малка кутия Name[ca]=Una minitorre de PC +Name[ca@valencia]=Una minitorre de PC Name[de]=Minitower-PC Name[el]=Υπολογιστής πύργος μικρού μεγέθους Name[es]=Un PC minitorre @@ -14,6 +15,7 @@ Name[pt]=PC Mini-Torre Name[pt_BR]=PC mini-torre Name[ru]=ПК минибашня +Name[sk]=Minitower PC Name[sv]=En liten stående persondator Name[uk]=ПК з малим корпусом Name[x-test]=xxA Minitower PCxx diff -Nru calligra-2.4.0/flow/stencils/Network/plotter.desktop calligra-2.4.3/flow/stencils/Network/plotter.desktop --- calligra-2.4.0/flow/stencils/Network/plotter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/plotter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,14 @@ Name=Plotter Name[bg]=Плотер Name[ca]=Traçador +Name[ca@valencia]=Traçador Name[de]=Plotter Name[el]=Σχεδιαστής Name[es]=Plotter Name[et]=Plotter +Name[hu]=Rajzgép Name[it]=Plotter +Name[ja]=プロッタ Name[kk]=Плоттер Name[nb]=Plotter Name[nds]=Bagenschriever @@ -15,6 +18,7 @@ Name[pt]='Plotter' Name[pt_BR]=Plotadora Name[ru]=Плоттер +Name[sk]=Plotter Name[sv]=Kurvritare Name[uk]=Плотер Name[x-test]=xxPlotterxx diff -Nru calligra-2.4.0/flow/stencils/Network/printer.desktop calligra-2.4.3/flow/stencils/Network/printer.desktop --- calligra-2.4.0/flow/stencils/Network/printer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/printer.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=General Printer Name[bg]=Обикновен принтер Name[ca]=Impressora General +Name[ca@valencia]=Impressora General Name[de]=Allgemeiner Drucker Name[el]=Γενικός εκτυπωτής Name[es]=Impresora general @@ -9,6 +10,7 @@ Name[fr]=Imprimante Name[hu]=Általános nyomtató Name[it]=Stampante generica +Name[ja]=一般プリンタ Name[kk]=Жалпы принтер Name[nb]=Generell skriver Name[nl]=Algemene printer @@ -16,6 +18,7 @@ Name[pt]=Impressora Geral Name[pt_BR]=Impressora genérica Name[ru]=Принтер +Name[sk]=Všeobecná tlačiareň Name[sv]=Allmän skrivare Name[uk]=Типовий принтер Name[x-test]=xxGeneral Printerxx diff -Nru calligra-2.4.0/flow/stencils/Network/rj45plug.desktop calligra-2.4.3/flow/stencils/Network/rj45plug.desktop --- calligra-2.4.0/flow/stencils/Network/rj45plug.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/rj45plug.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=RJ45 Wall-Plug Name[bg]=Стенен контакт RJ45 Name[ca]=Endoll de paret RJ45 +Name[ca@valencia]=Endoll de paret RJ45 Name[de]=RJ45-Steckdose Name[el]=Επιτοίχιο βύσμα RJ45 Name[es]=Enchufe de pared RJ45 @@ -14,6 +15,7 @@ Name[pt]=Tomada RJ45 Name[pt_BR]=Tomada RJ45 Name[ru]=Штекер RJ45 +Name[sk]=RJ45 Wall-Plug Name[sv]=RJ45-väggkontakt Name[uk]=Розетка RJ45 Name[x-test]=xxRJ45 Wall-Plugxx diff -Nru calligra-2.4.0/flow/stencils/Network/router-symbol.desktop calligra-2.4.3/flow/stencils/Network/router-symbol.desktop --- calligra-2.4.0/flow/stencils/Network/router-symbol.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/router-symbol.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Router Symbol Name[bg]=Символ за маршрутизатор Name[ca]=Símbol d'encaminador +Name[ca@valencia]=Símbol d'encaminador Name[de]=Router-Symbol Name[el]=Σύμβολο δρομολογητή Name[es]=Símbolo enrutador @@ -14,6 +15,7 @@ Name[pt]=Símbolo Encaminhador Name[pt_BR]=Símbolo de roteador Name[ru]=Символ маршрутизатора +Name[sk]=Symbol routera Name[sv]=Routersymbol Name[uk]=Символ маршрутизатора Name[x-test]=xxRouter Symbolxx diff -Nru calligra-2.4.0/flow/stencils/Network/sceadplug.desktop calligra-2.4.3/flow/stencils/Network/sceadplug.desktop --- calligra-2.4.0/flow/stencils/Network/sceadplug.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/sceadplug.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=scEAD Wall-Plug Name[bg]=Стенен контакт scEAD Name[ca]=Endoll de paret scEAD +Name[ca@valencia]=Endoll de paret scEAD Name[de]=scEAD-Steckdose Name[el]=Επιτοίχιο βύσμα scEAD Name[es]=Enchufe de pared scEAD @@ -14,6 +15,7 @@ Name[pt]=Tomada scEAD Name[pt_BR]=Tomada scEAD Name[ru]=Настенный коннектор для кабельной системы scEAD +Name[sk]=Stenová zásuvka RJ45 Name[sv]=scEAD-väggkontakt Name[uk]=Розетка scEAD Name[x-test]=xxscEAD Wall-Plugxx diff -Nru calligra-2.4.0/flow/stencils/Network/speaker_amp.desktop calligra-2.4.3/flow/stencils/Network/speaker_amp.desktop --- calligra-2.4.0/flow/stencils/Network/speaker_amp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/speaker_amp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=An amplifier speaker Name[bg]=Тонколона с усилвател Name[ca]=Un altaveu amplificador +Name[ca@valencia]=Un altaveu amplificador Name[de]=Verstärkerlautsprecher Name[el]=Ηχείο ενισχυτή Name[es]=Un altavoz amplificador @@ -14,6 +15,7 @@ Name[pt]=Altifalante amplificado Name[pt_BR]=Alto-falante amplificado Name[ru]=Колонки со встроенным усилителем +Name[sk]=Reproduktor zosilňovača Name[sv]=En högtalare till förstärkare Name[uk]=Гучномовець з підсилювачем Name[x-test]=xxAn amplifier speakerxx diff -Nru calligra-2.4.0/flow/stencils/Network/speaker.desktop calligra-2.4.3/flow/stencils/Network/speaker.desktop --- calligra-2.4.0/flow/stencils/Network/speaker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/speaker.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=A speaker Name[bg]=Тонколона Name[ca]=Un altaveu +Name[ca@valencia]=Un altaveu Name[de]=Lautsprecher Name[el]=Ηχείο Name[es]=Un altavoz Name[et]=Kõlar +Name[fi]=Kaiutin Name[it]=Un altoparlante +Name[ja]=スピーカー Name[kk]=Динамик Name[nb]=En høyttaler Name[nl]=Een luidspreker @@ -14,6 +17,7 @@ Name[pt]=Altifalante Name[pt_BR]=Alto-falante Name[ru]=Колонки +Name[sk]=Reproduktor Name[sv]=En högtalare Name[uk]=Гучномовець Name[x-test]=xxA speakerxx diff -Nru calligra-2.4.0/flow/stencils/Network/switch-atm-symbol.desktop calligra-2.4.3/flow/stencils/Network/switch-atm-symbol.desktop --- calligra-2.4.0/flow/stencils/Network/switch-atm-symbol.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/switch-atm-symbol.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Switch ATM Symbol Name[bg]=Символ за комутатор ATM Name[ca]=Símbol de commutador ATM +Name[ca@valencia]=Símbol de commutador ATM Name[de]=Switch-ATM-Symbol Name[el]=Σύμβολο μεταγωγέα ATM Name[es]=Símbolo de conmutador ATM @@ -14,6 +15,7 @@ Name[pt]=Símbolo Comutador ATM Name[pt_BR]=Símbolo de comutador ATM Name[ru]=Символ коммутатора ATM +Name[sk]=Switch ATM Symbol Name[sv]=ATM-växelsymbol Name[uk]=Символ комутатора ATM Name[x-test]=xxSwitch ATM Symbolxx diff -Nru calligra-2.4.0/flow/stencils/Network/switch-symbol.desktop calligra-2.4.3/flow/stencils/Network/switch-symbol.desktop --- calligra-2.4.0/flow/stencils/Network/switch-symbol.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/switch-symbol.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Switch Symbol Name[bg]=Символ за комутатор Name[ca]=Símbol de commutador +Name[ca@valencia]=Símbol de commutador Name[de]=Switch-Symbol Name[el]=Σύμβολο μεταγωγέα Name[es]=Símbolo de conmutador @@ -14,6 +15,7 @@ Name[pt]=Símbolo Comutador Name[pt_BR]=Símbolo de comutador Name[ru]=Символ коммутатора +Name[sk]=Switch Symbol Name[sv]=Växelsymbol Name[uk]=Символ комутатора Name[x-test]=xxSwitch Symbolxx diff -Nru calligra-2.4.0/flow/stencils/Network/telephone.desktop calligra-2.4.3/flow/stencils/Network/telephone.desktop --- calligra-2.4.0/flow/stencils/Network/telephone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/telephone.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,14 @@ Name=A Telephone Name[bg]=Телефон Name[ca]=Un telèfon +Name[ca@valencia]=Un telèfon Name[de]=Telefon Name[el]=Τηλέφωνο Name[es]=Un teléfono Name[et]=Telefon +Name[fi]=Puhelin Name[it]=Un telefono +Name[ja]=電話 Name[kk]=Телефон Name[nb]=En telefon Name[nl]=Een telefoon @@ -14,6 +17,7 @@ Name[pt]=Telefone Name[pt_BR]=Telefone Name[ru]=Телефон +Name[sk]=Telefón Name[sv]=En telefon Name[uk]=Телефон Name[x-test]=xxA Telephonexx diff -Nru calligra-2.4.0/flow/stencils/Network/workstation.desktop calligra-2.4.3/flow/stencils/Network/workstation.desktop --- calligra-2.4.0/flow/stencils/Network/workstation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/workstation.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,13 +2,16 @@ Name=A Workstation Name[bg]=Работна станция Name[ca]=Una estació de treball +Name[ca@valencia]=Una estació de treball Name[cs]=Pracovní stanice Name[de]=Workstation Name[el]=Σταθμός εργασίας Name[es]=Una estación de trabajo Name[et]=Tööjaam +Name[fi]=Työasema Name[hu]=Egy munkaállomás Name[it]=Una workstation +Name[ja]=ワークステーション Name[kk]=Жұмыс станциясы Name[nb]=En arbeidsstasjon Name[nl]=Een werkstation @@ -16,6 +19,7 @@ Name[pt]=Estação Trabalho Name[pt_BR]=Estação Trabalho Name[ru]=Рабочая станция +Name[sk]=Pracovná stanica Name[sv]=En arbetsstation Name[uk]=Робоча станція Name[x-test]=xxA Workstationxx diff -Nru calligra-2.4.0/flow/stencils/Network/zip-disk.desktop calligra-2.4.3/flow/stencils/Network/zip-disk.desktop --- calligra-2.4.0/flow/stencils/Network/zip-disk.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Network/zip-disk.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,14 @@ Name=A ZIP Disk Name[bg]=ZIP-диск Name[ca]=Un disc ZIP +Name[ca@valencia]=Un disc ZIP Name[de]=ZIP-Diskette Name[el]=Δίσκος ZIP Name[es]=Un disco ZIP Name[et]=ZIP-ketas +Name[fi]=ZIP-asema Name[it]=Un disco ZIP +Name[ja]=ZIP ディスク Name[kk]=ZIP дискі Name[nb]=En ZIP-disk Name[nl]=Een zip-schijf @@ -14,6 +17,7 @@ Name[pt]=Disco ZIP Name[pt_BR]=Disco ZIP Name[ru]=ZIP-диск +Name[sk]=ZIP disk Name[sv]=En ZIP-diskett Name[uk]=ZIP-диск Name[x-test]=xxA ZIP Diskxx diff -Nru calligra-2.4.0/flow/stencils/Optics/atten.desktop calligra-2.4.3/flow/stencils/Optics/atten.desktop --- calligra-2.4.0/flow/stencils/Optics/atten.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/atten.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Variable Attenuator Name[ca]=Atenuador variable +Name[ca@valencia]=Atenuador variable Name[el]=Μεταβλητός εξασθενητής Name[es]=Atenuador variable Name[et]=Optiline atenuaator @@ -12,6 +13,7 @@ Name[pt]=Atenuador Variável Name[pt_BR]=Atenuador variável Name[ru]=Переменный аттенюатор +Name[sk]=Premenlivý zoslabovač Name[sv]=Variabel dämpare Name[uk]=Регульований послаблювач Name[x-test]=xxVariable Attenuatorxx diff -Nru calligra-2.4.0/flow/stencils/Optics/beam.desktop calligra-2.4.3/flow/stencils/Optics/beam.desktop --- calligra-2.4.0/flow/stencils/Optics/beam.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/beam.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Beam Name[ca]=Raig +Name[ca@valencia]=Raig Name[cs]=Paprsek Name[el]=Ακτίνα Name[es]=Rayo Name[et]=Kiir Name[it]=Raggio +Name[ja]=ビーム Name[kk]=Сәуле Name[nb]=Stråle Name[nl]=Straal @@ -13,6 +15,7 @@ Name[pt]=Raio Name[pt_BR]=Raio Name[ru]=Луч +Name[sk]=Lúč Name[sv]=Stråle Name[uk]=Промінь Name[x-test]=xxBeamxx diff -Nru calligra-2.4.0/flow/stencils/Optics/circulator.desktop calligra-2.4.3/flow/stencils/Optics/circulator.desktop --- calligra-2.4.0/flow/stencils/Optics/circulator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/circulator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Circulator Name[ca]=Circulador +Name[ca@valencia]=Circulador Name[el]=Κυκλοφορητής Name[es]=Circulador Name[et]=Tsirkulaator @@ -12,6 +13,7 @@ Name[pt]=Circulador Name[pt_BR]=Circulador Name[ru]=Распространитель +Name[sk]=Cirkulátor Name[sv]=Cirkulator Name[uk]=Циркулятор Name[x-test]=xxCirculatorxx diff -Nru calligra-2.4.0/flow/stencils/Optics/collection.desktop calligra-2.4.3/flow/stencils/Optics/collection.desktop --- calligra-2.4.0/flow/stencils/Optics/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Optics Name[ca]=Òptica +Name[ca@valencia]=Òptica Name[de]=Optik Name[el]=Οπτική Name[es]=Óptica Name[et]=Optika +Name[fi]=Optiikka Name[it]=Ottica Name[kk]=Оптика Name[nb]=Optikk @@ -13,6 +15,7 @@ Name[pt]=Óptica Name[pt_BR]=Ótica Name[ru]=Оптика +Name[sk]=Optika Name[sv]=Optik Name[uk]=Оптика Name[x-test]=xxOpticsxx diff -Nru calligra-2.4.0/flow/stencils/Optics/coupler.desktop calligra-2.4.3/flow/stencils/Optics/coupler.desktop --- calligra-2.4.0/flow/stencils/Optics/coupler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/coupler.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Coupler Name[ca]=Acoblador +Name[ca@valencia]=Acoblador Name[de]=Kupplung Name[el]=Συζεύκτης Name[es]=Acoplador @@ -13,6 +14,7 @@ Name[pt]=Acoplador Name[pt_BR]=Acoplador Name[ru]=Муфта +Name[sk]=Násobič Name[sv]=Kopplare Name[uk]=Освітлуювач Name[x-test]=xxCouplerxx diff -Nru calligra-2.4.0/flow/stencils/Optics/coupler_vert.desktop calligra-2.4.3/flow/stencils/Optics/coupler_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/coupler_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/coupler_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Coupler (vertical) Name[ca]=Acoblador (vertical) +Name[ca@valencia]=Acoblador (vertical) Name[de]=Kupplung (senkrecht) Name[el]=Συζεύκτης (κατακόρυφα) Name[es]=Acoplador (vertical) @@ -13,6 +14,7 @@ Name[pt]=Acoplador (vertical) Name[pt_BR]=Acoplador (vertical) Name[ru]=Муфта (вертикальная) +Name[sk]=Násobič (zvislý) Name[sv]=Kopplare (vertikal) Name[uk]=Освітлювач (вертикально) Name[x-test]=xxCoupler (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/detector.desktop calligra-2.4.3/flow/stencils/Optics/detector.desktop --- calligra-2.4.0/flow/stencils/Optics/detector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/detector.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,8 +1,10 @@ [Desktop Entry] Name=Detector Name[ca]=Detector +Name[ca@valencia]=Detector Name[de]=Detektor Name[el]=Ανιχνευτής +Name[es]=Detector Name[et]=Detektor Name[it]=Detector Name[kk]=Сезгіш diff -Nru calligra-2.4.0/flow/stencils/Optics/detector_vert.desktop calligra-2.4.3/flow/stencils/Optics/detector_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/detector_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/detector_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Detector (vertical) Name[ca]=Detector (vertical) +Name[ca@valencia]=Detector (vertical) Name[de]=Detektor (senkrecht) Name[el]=Ανιχνευτής (κάθετα) Name[es]=Detector (vertical) @@ -13,6 +14,7 @@ Name[pt]=Detector (vertical) Name[pt_BR]=Detector (vertical) Name[ru]=Датчик (вертикальный) +Name[sk]=Detektor (zvislý) Name[sv]=Detektor (vertikal) Name[uk]=Детектор (вертикально) Name[x-test]=xxDetector (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/dfb_laser.desktop calligra-2.4.3/flow/stencils/Optics/dfb_laser.desktop --- calligra-2.4.0/flow/stencils/Optics/dfb_laser.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/dfb_laser.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=DFB Laser Name[ca]=Laser DFB +Name[ca@valencia]=Laser DFB Name[de]=DFB-Laser Name[el]=DFB Laser Name[es]=Láser DFB @@ -13,6 +14,7 @@ Name[pt]=Laser DFB Name[pt_BR]=Laser DFB Name[ru]=Лазер DFB +Name[sk]=DFB Laser Name[sv]=DFB-laser Name[uk]=Лазер з розподіленим зворотним зв’язком (горизонтально) Name[x-test]=xxDFB Laserxx diff -Nru calligra-2.4.0/flow/stencils/Optics/dfb_laser_vert.desktop calligra-2.4.3/flow/stencils/Optics/dfb_laser_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/dfb_laser_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/dfb_laser_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=DFB Laser (vertical) Name[ca]=DFB Laser (vertical) +Name[ca@valencia]=DFB Laser (vertical) Name[de]=DFB-Laser (senkrecht) Name[el]=DFB Laser (κάθετα) Name[es]=Laser DFB (vertical) @@ -13,6 +14,7 @@ Name[pt]=Laser DFB (vertical) Name[pt_BR]=Laser DFB (vertical) Name[ru]=Лазер DFB (вертикальный) +Name[sk]=DFB Laser (zvislý) Name[sv]=DFB-laser (vertikal) Name[uk]=Лазер з розподіленим зворотним зв’язком (вертикально) Name[x-test]=xxDFB Laser (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/edfa.desktop calligra-2.4.3/flow/stencils/Optics/edfa.desktop --- calligra-2.4.0/flow/stencils/Optics/edfa.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/edfa.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=EDFA Name[bg]=EDFA Name[ca]=EDFA +Name[ca@valencia]=EDFA Name[de]=EDFA Name[el]=EDFA Name[es]=EDFA diff -Nru calligra-2.4.0/flow/stencils/Optics/edfa_vert.desktop calligra-2.4.3/flow/stencils/Optics/edfa_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/edfa_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/edfa_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=EDFA (vertical) Name[ca]=EDFA (vertical) +Name[ca@valencia]=EDFA (vertical) Name[de]=EDFA (senkrecht) Name[el]=EDFA (κάθετα) Name[es]=EDFA (vertical) @@ -13,6 +14,7 @@ Name[pt]=EDFA (vertical) Name[pt_BR]=EDFA (vertical) Name[ru]=Волоконно-оптический усилитель (вертикальный) +Name[sk]=EDFA (zvislé) Name[sv]=EDFA (vertikal) Name[uk]=EDFA (вертикально) Name[x-test]=xxEDFA (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/fibre.desktop calligra-2.4.3/flow/stencils/Optics/fibre.desktop --- calligra-2.4.0/flow/stencils/Optics/fibre.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/fibre.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Fibre Name[ca]=Fibra +Name[ca@valencia]=Fibra Name[el]=Ίνα Name[es]=Fibra Name[et]=Valguskaabel @@ -12,6 +13,7 @@ Name[pt]=Fibra Name[pt_BR]=Fibra Name[ru]=Волокно +Name[sk]=Vlákno Name[sv]=Fiber Name[uk]=Довге волокно Name[x-test]=xxFibrexx diff -Nru calligra-2.4.0/flow/stencils/Optics/fibre_vert.desktop calligra-2.4.3/flow/stencils/Optics/fibre_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/fibre_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/fibre_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Fibre (vertical) Name[ca]=Fibra (vertical) +Name[ca@valencia]=Fibra (vertical) Name[el]=Ίνα (κάθετα) Name[es]=Fibra (vertical) Name[et]=Vertikaalne valguskaabel @@ -12,6 +13,7 @@ Name[pt]=Fibra (vertical) Name[pt_BR]=Fibra (vertical) Name[ru]=Волокно (вертикальное) +Name[sk]=Vlákno (zvislé) Name[sv]=Fiber (vertikal) Name[uk]=Довге волокно (вертикально) Name[x-test]=xxFibre (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/isolator.desktop calligra-2.4.3/flow/stencils/Optics/isolator.desktop --- calligra-2.4.0/flow/stencils/Optics/isolator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/isolator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Isolator Name[ca]=Aïllador +Name[ca@valencia]=Aïllador Name[de]=Isolator Name[el]=Απομονωτής Name[es]=Aislador diff -Nru calligra-2.4.0/flow/stencils/Optics/isolator_vert.desktop calligra-2.4.3/flow/stencils/Optics/isolator_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/isolator_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/isolator_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Isolator (vertical) Name[ca]=Aïllador (vertical) +Name[ca@valencia]=Aïllador (vertical) Name[de]=Isolator (senkrecht) Name[el]=Απομονωτής (κατακόρυφα) Name[es]=Aislador (vertical) @@ -13,6 +14,7 @@ Name[pt]=Isolador (vertical) Name[pt_BR]=Isolador (vertical) Name[ru]=Изолятор (вертикальный) +Name[sk]=Izolant (zvislý) Name[sv]=Isolator (vertikal) Name[uk]=Ізолятор (вертикально) Name[x-test]=xxIsolator (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/lpg.desktop calligra-2.4.3/flow/stencils/Optics/lpg.desktop --- calligra-2.4.0/flow/stencils/Optics/lpg.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/lpg.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=LPG Name[ca]=LPG +Name[ca@valencia]=LPG Name[de]=LPG Name[el]=LPG Name[es]=LPG Name[et]=LPG +Name[hu]=LPG Name[it]=LPG Name[kk]=LPG Name[nb]=LPG diff -Nru calligra-2.4.0/flow/stencils/Optics/lpg_vert.desktop calligra-2.4.3/flow/stencils/Optics/lpg_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/lpg_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/lpg_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=LPG (vertical) Name[ca]=LPG (vertical) +Name[ca@valencia]=LPG (vertical) Name[de]=LPG (senkrecht) Name[el]=LPG (κάθετα) Name[es]=LPG (vertical) Name[et]=Vertikaalne LPG +Name[hu]=LPG (függőleges) Name[it]=LPG (verticale) Name[kk]=LPG (тік) Name[nb]=LPG (loddrett) @@ -13,6 +15,7 @@ Name[pt]=LPG (vertical) Name[pt_BR]=LPG (vertical) Name[ru]=LPG (вертикальный) +Name[sk]=LPG (zvislé) Name[sv]=LPG (vertikal) Name[uk]=Довгоперіодична дифракційна ґратка (вертикально) Name[x-test]=xxLPG (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/mod.desktop calligra-2.4.3/flow/stencils/Optics/mod.desktop --- calligra-2.4.0/flow/stencils/Optics/mod.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/mod.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=MZ Modulator Name[ca]=Modulador MZ +Name[ca@valencia]=Modulador MZ Name[de]=MZ-Modulator Name[el]=MZ διαμορφωτής Name[es]=Modulador MZ @@ -13,6 +14,7 @@ Name[pt]=Modulador MZ Name[pt_BR]=Modulador MZ Name[ru]=Модулятор MZ +Name[sk]=MZ modulátor Name[sv]=MZ-modulator Name[uk]=Модулятор Маха-Цендера Name[x-test]=xxMZ Modulatorxx diff -Nru calligra-2.4.0/flow/stencils/Optics/mod_vert.desktop calligra-2.4.3/flow/stencils/Optics/mod_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/mod_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/mod_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=MZ Modulator (vertical) Name[ca]=MZ Modulator (vertical) +Name[ca@valencia]=MZ Modulator (vertical) Name[de]=MZ-Modulator (senkrecht) Name[el]=MZ διαμορφωτής (κάθετα) Name[es]=Modulador MZ (vertical) @@ -13,6 +14,7 @@ Name[pt]=Modulador MZ (vertical) Name[pt_BR]=Modulador MZ (vertical) Name[ru]=Модулятор MZ (вертикальный) +Name[sk]=MZ modulátor (zvislý) Name[sv]=MZ-modulator (vertikal) Name[uk]=Модулятор Маха-Цендера (вертикально) Name[x-test]=xxMZ Modulator (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/phasemod.desktop calligra-2.4.3/flow/stencils/Optics/phasemod.desktop --- calligra-2.4.0/flow/stencils/Optics/phasemod.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/phasemod.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Phase Modulator Name[ca]=Modulador de fase +Name[ca@valencia]=Modulador de fase Name[de]=Phasen-Modulator Name[el]=Διαμορφωτής φάσης Name[es]=Modulador Fase @@ -13,6 +14,7 @@ Name[pt]=Modulador Fase Name[pt_BR]=Modulador de fase Name[ru]=Фазовый модулятор +Name[sk]=Fázový modulátor Name[sv]=Fasmodulator Name[uk]=Фазовий модулятор Name[x-test]=xxPhase Modulatorxx diff -Nru calligra-2.4.0/flow/stencils/Optics/phasemod_vert.desktop calligra-2.4.3/flow/stencils/Optics/phasemod_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/phasemod_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/phasemod_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Phase Modulator (vertical) Name[ca]=Modulador de fase (vertical) +Name[ca@valencia]=Modulador de fase (vertical) Name[de]=Phasen-Modulator (senkrecht) Name[el]=Διαμορφωτής φάσης (κάθετα) Name[es]=Modulador Fase (vertical) @@ -13,6 +14,7 @@ Name[pt]=Modulador Fase (vertical) Name[pt_BR]=Modulador de fase (vertical) Name[ru]=Фазовый модулятор (вертикальный) +Name[sk]=Fázový modulátor (zvislý) Name[sv]=Fasmodulator (vertikal) Name[uk]=Фазовий модулятор (вертикально) Name[x-test]=xxPhase Modulator (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/polarisation_control.desktop calligra-2.4.3/flow/stencils/Optics/polarisation_control.desktop --- calligra-2.4.0/flow/stencils/Optics/polarisation_control.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/polarisation_control.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Polarisation Control Name[ca]=Control de polarització +Name[ca@valencia]=Control de polarització Name[el]=Έλεγχος πόλωσης Name[es]=Control de polarización Name[et]=Polarisatsiooni regulaator @@ -12,6 +13,7 @@ Name[pt]=Controlo Polarização Name[pt_BR]=Controle de polarização Name[ru]=Контроль поляризации +Name[sk]=Polarizačný ovládač Name[sv]=Polariseringskontroll Name[uk]=Керування поляризацією Name[x-test]=xxPolarisation Controlxx diff -Nru calligra-2.4.0/flow/stencils/Optics/polarisation_control_vert.desktop calligra-2.4.3/flow/stencils/Optics/polarisation_control_vert.desktop --- calligra-2.4.0/flow/stencils/Optics/polarisation_control_vert.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/polarisation_control_vert.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Polarisation Control (vertical) Name[ca]=Control de polarització (vertical) +Name[ca@valencia]=Control de polarització (vertical) Name[el]=Έλεγχος πόλωσης (κάθετα) Name[es]=Control de polarización (vertical) Name[et]=Vertikaalne polarisatsiooni regulaator) @@ -12,6 +13,7 @@ Name[pt]=Controlo Polarização (vertical) Name[pt_BR]=Controlo de polarização (vertical) Name[ru]=Вертикальный контроль поляризации +Name[sk]=Polarizačný ovládač (zvislý) Name[sv]=Polariseringskontroll (vertikal) Name[uk]=Керування поляризацією (вертикально) Name[x-test]=xxPolarisation Control (vertical)xx diff -Nru calligra-2.4.0/flow/stencils/Optics/scope.desktop calligra-2.4.3/flow/stencils/Optics/scope.desktop --- calligra-2.4.0/flow/stencils/Optics/scope.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/scope.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Oscilloscope Name[bg]=Осцилоскоп Name[ca]=Oscil·loscopi +Name[ca@valencia]=Osciloscopi Name[de]=Oszilloskop Name[el]=Παλμογράφος Name[es]=Osciloscopio Name[et]=Ostsilloskoop Name[fr]=Oscilloscope +Name[hu]=Oszcilloszkóp Name[it]=Oscilloscopio Name[kk]=Осциллограф Name[nb]=Oscilloskop @@ -15,6 +17,7 @@ Name[pt]=Osciloscópio Name[pt_BR]=Osciloscópio Name[ru]=Осциллограф +Name[sk]=Osciloskop Name[sv]=Oscilloskop Name[ug]=Oscilloscope Name[uk]=Осцилоскоп diff -Nru calligra-2.4.0/flow/stencils/Optics/sine.desktop calligra-2.4.3/flow/stencils/Optics/sine.desktop --- calligra-2.4.0/flow/stencils/Optics/sine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/sine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Sine Wave Name[ca]=Ona sinusoïdal +Name[ca@valencia]=Ona sinusoïdal Name[de]=Sinuswelle Name[el]=Ημιτονοειδές κύμα Name[es]=Onda sinusoidal @@ -8,6 +9,7 @@ Name[fi]=Siniaalto Name[hu]=Szinuszhullám Name[it]=Onda sinusoidale +Name[ja]=サイン波 Name[kk]=Синусоидалық толқын Name[nb]=Sinusbølge Name[nds]=Sinus @@ -16,6 +18,7 @@ Name[pt]=Onda Sinusoidal Name[pt_BR]=Onda senoidal Name[ru]=Синусоидальная волна +Name[sk]=Sínusoida Name[sv]=Sinusvåg Name[ug]=سىنۇس ئەگرى سىزىقى Name[uk]=Синусоподібний сигнал diff -Nru calligra-2.4.0/flow/stencils/Optics/spectrum.desktop calligra-2.4.3/flow/stencils/Optics/spectrum.desktop --- calligra-2.4.0/flow/stencils/Optics/spectrum.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/spectrum.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,12 +2,14 @@ Name=Spectrum Name[bg]=Спектър Name[ca]=Espectre +Name[ca@valencia]=Espectre Name[cs]=Spektrum Name[de]=Spektrum Name[el]=Φάσμα Name[es]=Espectro Name[et]=Spekter Name[fr]=Spectre +Name[hu]=Spektrum Name[it]=Spettro Name[kk]=Спектр талдағышы Name[nb]=Spektrum @@ -17,6 +19,7 @@ Name[pt]=Espectro Name[pt_BR]=Espectro Name[ru]=Спектр +Name[sk]=Spektrum Name[sv]=Spektrum Name[uk]=Аналізатор спектра Name[x-test]=xxSpectrumxx diff -Nru calligra-2.4.0/flow/stencils/Optics/square.desktop calligra-2.4.3/flow/stencils/Optics/square.desktop --- calligra-2.4.0/flow/stencils/Optics/square.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/square.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Square Wave Name[ca]=Ona quadrada +Name[ca@valencia]=Ona quadrada Name[cs]=Obdélníková vlna Name[de]=Rechteckwelle Name[el]=Square Wave @@ -16,6 +17,7 @@ Name[pt]=Onda Quadrada Name[pt_BR]=Onda quadrada Name[ru]=Волна в виде меандра +Name[sk]=Štvorcová vlna Name[sv]=Fyrkantsvåg Name[uk]=Квадратний сигнал Name[x-test]=xxSquare Wavexx diff -Nru calligra-2.4.0/flow/stencils/Optics/tuneable.desktop calligra-2.4.3/flow/stencils/Optics/tuneable.desktop --- calligra-2.4.0/flow/stencils/Optics/tuneable.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/tuneable.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Tuneable Coupler Name[ca]=Acoblador sintonitzable +Name[ca@valencia]=Acoblador sintonitzable Name[el]=Συντονίσιμος συζεύκτης Name[es]=Acoplador sintonizable Name[et]=Häälestatav optron @@ -12,6 +13,7 @@ Name[pt]=Acoplador Sintonizável Name[pt_BR]=Acoplador sintonizável Name[ru]=Настраиваемые муфты +Name[sk]=Nastaviteľný násobič Name[sv]=Avstämningsbar kopplare Name[uk]=Освітлювач з можливістю налаштування Name[x-test]=xxTuneable Couplerxx diff -Nru calligra-2.4.0/flow/stencils/Optics/wave.desktop calligra-2.4.3/flow/stencils/Optics/wave.desktop --- calligra-2.4.0/flow/stencils/Optics/wave.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Optics/wave.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Wave Name[bg]=Вълна Name[ca]=Ona +Name[ca@valencia]=Ona Name[cs]=Vlna Name[de]=Welle Name[el]=Κύμα @@ -17,6 +18,7 @@ Name[pt]=Onda Name[pt_BR]=Onda Name[ru]=Волна +Name[sk]=Vlna Name[sv]=Våg Name[ug]=دولقۇنسىمان سىزىق Name[uk]=Хвиля diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/cnx.desktop calligra-2.4.3/flow/stencils/Pneumatic/cnx.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/cnx.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/cnx.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=connpoint Name[bg]=точка на свързване Name[ca]=connpoint +Name[ca@valencia]=connpoint Name[cs]=Access Name[el]=connpoint Name[es]=punto de conexión @@ -14,6 +15,7 @@ Name[pt]=ponto-ligação Name[pt_BR]=ponto de conexão Name[ru]=точка соединения +Name[sk]=connpoint Name[sv]=anslutningspunkt Name[uk]=Точка з’єднання Name[x-test]=xxconnpointxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/collection.desktop calligra-2.4.3/flow/stencils/Pneumatic/collection.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Pneumatic Name[ca]=Pneumàtic +Name[ca@valencia]=Pneumàtic Name[cs]=Pneumatický Name[de]=Pneumatik Name[el]=Pneumatic Name[es]=Neumático Name[et]=Pneumaatika +Name[hu]=Pneumatikus Name[it]=Pneumatico Name[kk]=Пневматика Name[nb]=Trykkluft @@ -14,6 +16,7 @@ Name[pt]=Pneumático Name[pt_BR]=Pneumático Name[ru]=Пневматический +Name[sk]=Pneumatické Name[sv]=Pneumatik Name[uk]=Пневматика Name[x-test]=xxPneumaticxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/comelec1.desktop calligra-2.4.3/flow/stencils/Pneumatic/comelec1.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/comelec1.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/comelec1.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=comelec1 Name[ca]=comelec1 +Name[ca@valencia]=comelec1 Name[el]=comelec1 Name[es]=comelec1 Name[et]=Üks elektromagnet @@ -11,6 +12,7 @@ Name[pl]=comelec1 Name[pt]=comelec1 Name[pt_BR]=comelec1 +Name[sk]=comelec1 Name[sv]=comelec1 Name[uk]=Електрична команда (одинарна котушка) Name[x-test]=xxcomelec1xx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/comelec2.desktop calligra-2.4.3/flow/stencils/Pneumatic/comelec2.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/comelec2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/comelec2.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=comelec2 Name[ca]=comelec2 +Name[ca@valencia]=comelec2 Name[el]=comelec2 Name[es]=comelec2 Name[et]=Kaks elektromagnetit @@ -11,6 +12,7 @@ Name[pl]=comelec2 Name[pt]=comelec2 Name[pt_BR]=comelec2 +Name[sk]=comelec2 Name[sv]=comelec2 Name[uk]=Електрична команда (подвійна котушка) Name[x-test]=xxcomelec2xx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/commusc.desktop calligra-2.4.3/flow/stencils/Pneumatic/commusc.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/commusc.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/commusc.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=commusc Name[ca]=commusc +Name[ca@valencia]=commusc Name[el]=commusc Name[es]=commusc Name[et]=Üldine juhtimine @@ -11,6 +12,7 @@ Name[pl]=commusc Name[pt]=commusc Name[pt_BR]=commusc +Name[sk]=commusc Name[sv]=commusc Name[uk]=Мускульна команда Name[x-test]=xxcommuscxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/compb.desktop calligra-2.4.3/flow/stencils/Pneumatic/compb.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/compb.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/compb.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=compb Name[ca]=compb +Name[ca@valencia]=compb Name[el]=compb Name[es]=compb Name[et]=Surunupp @@ -11,6 +12,7 @@ Name[pl]=compb Name[pt]=compb Name[pt_BR]=compb +Name[sk]=compb Name[sv]=compb Name[uk]=Команда натисканням кнопки Name[x-test]=xxcompbxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/compilh.desktop calligra-2.4.3/flow/stencils/Pneumatic/compilh.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/compilh.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/compilh.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=compilh Name[ca]=compilh +Name[ca@valencia]=compilh Name[el]=compilh Name[es]=compilh Name[et]=Hüdrauliline juhtimine @@ -11,6 +12,7 @@ Name[pl]=compilh Name[pt]=compilh Name[pt_BR]=compilh +Name[sk]=compilh Name[sv]=compilh Name[uk]=Непряма команда від гідравлічного керування Name[x-test]=xxcompilhxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/compilp.desktop calligra-2.4.3/flow/stencils/Pneumatic/compilp.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/compilp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/compilp.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=compilp Name[ca]=compilp +Name[ca@valencia]=compilp Name[el]=compilp Name[es]=compilp Name[et]=Pneumaatiline juhtimine @@ -11,6 +12,7 @@ Name[pl]=compilp Name[pt]=compilp Name[pt_BR]=compilp +Name[sk]=compilp Name[sv]=compilp Name[uk]=Непряма команда від пневматичного керування Name[x-test]=xxcompilpxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/compush.desktop calligra-2.4.3/flow/stencils/Pneumatic/compush.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/compush.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/compush.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=compush Name[ca]=compush +Name[ca@valencia]=compush Name[el]=compush Name[es]=compush Name[et]=Mehaaniline juhtimine @@ -11,6 +12,7 @@ Name[pl]=compush Name[pt]=compush Name[pt_BR]=compush +Name[sk]=compush Name[sv]=compush Name[uk]=Механічна команда (від кулачкового механізму) Name[x-test]=xxcompushxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/comspr.desktop calligra-2.4.3/flow/stencils/Pneumatic/comspr.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/comspr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/comspr.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=comspr Name[ca]=comspr +Name[ca@valencia]=comspr Name[el]=comspr Name[es]=comspr Name[et]=Vedruga juhtimine @@ -11,6 +12,7 @@ Name[pl]=comspr Name[pt]=comspr Name[pt_BR]=comspr +Name[sk]=comspr Name[sv]=comspr Name[uk]=Механічна команда від пружини Name[x-test]=xxcomsprxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/dejack.desktop calligra-2.4.3/flow/stencils/Pneumatic/dejack.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/dejack.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/dejack.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=DEJack Name[ca]=DEJack +Name[ca@valencia]=DEJack Name[de]=DEJack Name[el]=DEJack Name[es]=DEJack diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/dist22.desktop calligra-2.4.3/flow/stencils/Pneumatic/dist22.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/dist22.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/dist22.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=dist22 Name[ca]=dist22 +Name[ca@valencia]=dist22 Name[el]=dist22 Name[es]=dist22 Name[et]=Reguleerimisventiil 22 @@ -11,6 +12,7 @@ Name[pl]=dist22 Name[pt]=dist22 Name[pt_BR]=dist22 +Name[sk]=dist22 Name[sv]=distans 22 Name[uk]=Розподільник 2/2 Name[x-test]=xxdist22xx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/dist32.desktop calligra-2.4.3/flow/stencils/Pneumatic/dist32.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/dist32.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/dist32.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=dist32 Name[ca]=dist32 +Name[ca@valencia]=dist32 Name[el]=dist32 Name[es]=dist32 Name[et]=Reguleerimisventiil 32 @@ -11,6 +12,7 @@ Name[pl]=dist32 Name[pt]=dist32 Name[pt_BR]=dist32 +Name[sk]=dist32 Name[sv]=distans 32 Name[uk]=Розподільник 3/2 Name[x-test]=xxdist32xx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/dist42.desktop calligra-2.4.3/flow/stencils/Pneumatic/dist42.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/dist42.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/dist42.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=dist42 Name[ca]=dist42 +Name[ca@valencia]=dist42 Name[el]=dist42 Name[es]=dist42 Name[et]=Reguleerimisventiil 42 @@ -11,6 +12,7 @@ Name[pl]=dist42 Name[pt]=dist42 Name[pt_BR]=dist42 +Name[sk]=dist42 Name[sv]=distans 42 Name[uk]=Розподільник 4/2 Name[x-test]=xxdist42xx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/dist52.desktop calligra-2.4.3/flow/stencils/Pneumatic/dist52.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/dist52.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/dist52.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=dist52 Name[ca]=dist52 +Name[ca@valencia]=dist52 Name[el]=dist52 Name[es]=dist52 Name[et]=Reguleerimisventiil 52 @@ -11,6 +12,7 @@ Name[pl]=dist52 Name[pt]=dist52 Name[pt_BR]=dist52 +Name[sk]=dist52 Name[sv]=distans 52 Name[uk]=Розподільник 5/2 Name[x-test]=xxdist52xx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/drain.desktop calligra-2.4.3/flow/stencils/Pneumatic/drain.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/drain.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/drain.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=drain Name[ca]=desguàs +Name[ca@valencia]=desguàs Name[el]=drain Name[es]=drenaje Name[et]=Äravool @@ -11,6 +12,7 @@ Name[pl]=dren Name[pt]=dreno Name[pt_BR]=dreno +Name[sk]=drain Name[sv]=avlopp Name[uk]=Вихідний потік повітря Name[x-test]=xxdrainxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/press.desktop calligra-2.4.3/flow/stencils/Pneumatic/press.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/press.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/press.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=press Name[ca]=premsa +Name[ca@valencia]=premsa Name[cs]=stiskněte Name[el]=press Name[es]=presión @@ -12,6 +13,7 @@ Name[pl]=docisk Name[pt]=pressão Name[pt_BR]=pressão +Name[sk]=press Name[sv]=press Name[ug]=باس Name[uk]=Типове джерело тиску diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/presshy.desktop calligra-2.4.3/flow/stencils/Pneumatic/presshy.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/presshy.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/presshy.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=presshy Name[ca]=presshy +Name[ca@valencia]=presshy Name[el]=presshy Name[es]=presión hidráulica Name[et]=Hüdrauliline surve @@ -11,6 +12,7 @@ Name[pl]=presshy Name[pt]=presshid Name[pt_BR]=presshy +Name[sk]=presshy Name[sv]=presshy Name[uk]=Джерело гідравлічного тиску Name[x-test]=xxpresshyxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/presspn.desktop calligra-2.4.3/flow/stencils/Pneumatic/presspn.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/presspn.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/presspn.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=presspn Name[ca]=presspn +Name[ca@valencia]=presspn Name[el]=presspn Name[es]=presión neumática Name[et]=Pneumaatiline surve @@ -11,6 +12,7 @@ Name[pl]=presspn Name[pt]=presspn Name[pt_BR]=presspn +Name[sk]=presspn Name[sv]=presspn Name[uk]=Джерело пневматичного тиску Name[x-test]=xxpresspnxx diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/seijack.desktop calligra-2.4.3/flow/stencils/Pneumatic/seijack.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/seijack.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/seijack.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SEIJack Name[ca]=SEIJack +Name[ca@valencia]=SEIJack Name[de]=SEIJack Name[el]=SEIJack Name[es]=SEIJack diff -Nru calligra-2.4.0/flow/stencils/Pneumatic/seojack.desktop calligra-2.4.3/flow/stencils/Pneumatic/seojack.desktop --- calligra-2.4.0/flow/stencils/Pneumatic/seojack.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Pneumatic/seojack.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SEOJack Name[ca]=SEOJack +Name[ca@valencia]=SEOJack Name[de]=SEOJack Name[el]=SEOJack Name[es]=SEOJack diff -Nru calligra-2.4.0/flow/stencils/Racks/collection.desktop calligra-2.4.3/flow/stencils/Racks/collection.desktop --- calligra-2.4.0/flow/stencils/Racks/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Racks Name[ca]=Racks +Name[ca@valencia]=Racks Name[el]=Οδοντωτές βάσεις Name[es]=Racks Name[et]=Seadmekapid @@ -12,6 +13,7 @@ Name[pt]=Bastidores Name[pt_BR]=Racks Name[ru]=Стойки +Name[sk]=Racky Name[sv]=Ställ Name[uk]=Стійки Name[x-test]=xxRacksxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_10u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_10u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_10u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_10u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 10U Name[ca]=Equipment 10U +Name[ca@valencia]=Equipment 10U Name[el]=Εξοπλισμός 10U Name[es]=Equipo de 10U Name[et]=Kapp 10U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 10U Name[pt_BR]=Equipamento 10U Name[ru]=Оборудование 10U +Name[sk]=Príslušenstvo 10U Name[sv]=Utrustning 10U Name[uk]=Обладнання, 10 одиниць Name[x-test]=xxEquipment 10Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_11u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_11u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_11u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_11u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 11U Name[ca]=Equipment 11U +Name[ca@valencia]=Equipment 11U Name[el]=Εξοπλισμός 11U Name[es]=Equipo de 11U Name[et]=Kapp 11U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 11U Name[pt_BR]=Equipamento 11U Name[ru]=Оборудование 11U +Name[sk]=Príslušenstvo 11U Name[sv]=Utrustning 11U Name[uk]=Обладнання, 11 одиниць Name[x-test]=xxEquipment 11Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_12u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_12u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_12u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_12u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 12U Name[ca]=Equipment 12U +Name[ca@valencia]=Equipment 12U Name[el]=Εξοπλισμός 12U Name[es]=Equipo de 12U Name[et]=Kapp 12U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 12U Name[pt_BR]=Equipamento 12U Name[ru]=Оборудование 12U +Name[sk]=Príslušenstvo 12U Name[sv]=Utrustning 12U Name[uk]=Обладнання, 12 одиниць Name[x-test]=xxEquipment 12Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_1u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_1u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_1u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_1u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 1U Name[ca]=Equipment 1U +Name[ca@valencia]=Equipment 1U Name[el]=Εξοπλισμός 1U Name[es]=Equipo de 1U Name[et]=Kapp 1U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 1U Name[pt_BR]=Equipamento 1U Name[ru]=Оборудование 1U +Name[sk]=Príslušenstvo 1U Name[sv]=Utrustning 1U Name[uk]=Обладнання, 1 одиниця Name[x-test]=xxEquipment 1Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_2u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_2u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_2u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_2u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 2U Name[ca]=Equipment 2U +Name[ca@valencia]=Equipment 2U Name[el]=Εξοπλισμός 2U Name[es]=Equipo de 2U Name[et]=Kapp 2U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 2U Name[pt_BR]=Equipamento 2U Name[ru]=Оборудование 2U +Name[sk]=Príslušenstvo 2U Name[sv]=Utrustning 2U Name[uk]=Обладнання, 2 одиниці Name[x-test]=xxEquipment 2Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_3u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_3u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_3u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_3u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 3U Name[ca]=Equipment 3U +Name[ca@valencia]=Equipment 3U Name[el]=Εξοπλισμός 3U Name[es]=Equipo de 3U Name[et]=Kapp 3U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 3U Name[pt_BR]=Equipamento 3U Name[ru]=Оборудование 3U +Name[sk]=Príslušenstvo 3U Name[sv]=Utrustning 3U Name[uk]=Обладнання, 3 одиниці Name[x-test]=xxEquipment 3Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_4u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_4u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_4u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_4u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 4U Name[ca]=Equipment 4U +Name[ca@valencia]=Equipment 4U Name[el]=Εξοπλισμός 4U Name[es]=Equipo de 4U Name[et]=Kapp 4U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 4U Name[pt_BR]=Equipamento 4U Name[ru]=Оборудование 4U +Name[sk]=Príslušenstvo 4U Name[sv]=Utrustning 4U Name[uk]=Обладнання, 4 одиниці Name[x-test]=xxEquipment 4Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_5u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_5u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_5u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_5u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 5U Name[ca]=Equipment 5U +Name[ca@valencia]=Equipment 5U Name[el]=Εξοπλισμός 5U Name[es]=Equipo de 5U Name[et]=Kapp 5U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 5U Name[pt_BR]=Equipamento 5U Name[ru]=Оборудование 5U +Name[sk]=Príslušenstvo 5U Name[sv]=Utrustning 5U Name[uk]=Обладнання, 5 одиниць Name[x-test]=xxEquipment 5Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_6u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_6u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_6u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_6u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 6U Name[ca]=Equipment 6U +Name[ca@valencia]=Equipment 6U Name[el]=Εξοπλισμός 6U Name[es]=Equipo de 6U Name[et]=Kapp 6U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 6U Name[pt_BR]=Equipamento 6U Name[ru]=Оборудование 6U +Name[sk]=Príslušenstvo 6U Name[sv]=Utrustning 6U Name[uk]=Обладнання, 6 одиниць Name[x-test]=xxEquipment 6Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_7u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_7u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_7u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_7u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 7U Name[ca]=Equipment 7U +Name[ca@valencia]=Equipment 7U Name[el]=Εξοπλισμός 7U Name[es]=Equipo de 7U Name[et]=Kapp 7U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 7U Name[pt_BR]=Equipamento 7U Name[ru]=Оборудование 7U +Name[sk]=Príslušenstvo 7U Name[sv]=Utrustning 7U Name[uk]=Обладнання, 7 одиниць Name[x-test]=xxEquipment 7Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_8u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_8u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_8u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_8u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 8U Name[ca]=Equipment 8U +Name[ca@valencia]=Equipment 8U Name[el]=Εξοπλισμός 8U Name[es]=Equipo de 8U Name[et]=Kapp 8U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 8U Name[pt_BR]=Equipamento 8U Name[ru]=Оборудование 8U +Name[sk]=Príslušenstvo 8U Name[sv]=Utrustning 8U Name[uk]=Обладнання, 8 одиниць Name[x-test]=xxEquipment 8Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/equipment_9u.desktop calligra-2.4.3/flow/stencils/Racks/equipment_9u.desktop --- calligra-2.4.0/flow/stencils/Racks/equipment_9u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/equipment_9u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Equipment 9U Name[ca]=Equipment 9U +Name[ca@valencia]=Equipment 9U Name[el]=Εξοπλισμός 9U Name[es]=Equipo de 9U Name[et]=Kapp 9U @@ -12,6 +13,7 @@ Name[pt]=Equipamento 9U Name[pt_BR]=Equipamento 9U Name[ru]=Оборудование 9U +Name[sk]=Príslušenstvo 9U Name[sv]=Utrustning 9U Name[uk]=Обладнання, 9 одиниць Name[x-test]=xxEquipment 9Uxx diff -Nru calligra-2.4.0/flow/stencils/Racks/power_strip_bs_7.desktop calligra-2.4.3/flow/stencils/Racks/power_strip_bs_7.desktop --- calligra-2.4.0/flow/stencils/Racks/power_strip_bs_7.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/power_strip_bs_7.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Power Strip BS 7 Name[ca]=Power Strip BS 7 +Name[ca@valencia]=Power Strip BS 7 Name[de]=Mehrfachsteckdose BS 7 Name[el]=Πολύπριζο BS 7 Name[es]=Regleta eléctrica BS 7 @@ -12,6 +13,7 @@ Name[pl]=Power Strip BS 7 Name[pt]=Extensão Energia BS 7 Name[pt_BR]=Extensão de energia BS 7 +Name[sk]=Power Strip BS 7 Name[sv]=Grenuttag BS 7 Name[uk]=Подовжувач (британський стандарт), 7 гнізд Name[x-test]=xxPower Strip BS 7xx diff -Nru calligra-2.4.0/flow/stencils/Racks/power_strip_schuko_8.desktop calligra-2.4.3/flow/stencils/Racks/power_strip_schuko_8.desktop --- calligra-2.4.0/flow/stencils/Racks/power_strip_schuko_8.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/power_strip_schuko_8.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Power Strip Schuko 8 Name[ca]=Power Strip Schuko 8 +Name[ca@valencia]=Power Strip Schuko 8 Name[de]=Mehrfachschukosteckdose 8 Name[el]=Πολύπριζο Schuko 8 Name[es]=Regleta eléctrica Schuko 8 @@ -12,6 +13,7 @@ Name[pl]=Power Strip Schuko 8 Name[pt]=Extensão Energia Schuko 8 Name[pt_BR]=Extensão de energia Schuko 8 +Name[sk]=Power Strip Schuko 8 Name[sv]=Grenuttag Schuko 8 Name[uk]=Подовжувач Schuko, 8 гнізд Name[x-test]=xxPower Strip Schuko 8xx diff -Nru calligra-2.4.0/flow/stencils/Racks/power_strip_ute_8.desktop calligra-2.4.3/flow/stencils/Racks/power_strip_ute_8.desktop --- calligra-2.4.0/flow/stencils/Racks/power_strip_ute_8.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/power_strip_ute_8.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Power Strip UTE 8 Name[ca]=Power Strip UTE 8 +Name[ca@valencia]=Power Strip UTE 8 Name[de]=Mehrfachsteckdose UTE 8 Name[el]=Πολύπριζο UTE 8 Name[es]=Regleta eléctrica UTE 8 @@ -12,6 +13,7 @@ Name[pl]=Power Strip UTE 8 Name[pt]=Extensão Energia UTE 8 Name[pt_BR]=Extensão de energia UTE 8 +Name[sk]=Power Strip UTE 8 Name[sv]=Grenuttag UTE 8 Name[uk]=Подовжувач UTE 8 гнізд Name[x-test]=xxPower Strip UTE 8xx diff -Nru calligra-2.4.0/flow/stencils/Racks/rack_12u.desktop calligra-2.4.3/flow/stencils/Racks/rack_12u.desktop --- calligra-2.4.0/flow/stencils/Racks/rack_12u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/rack_12u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack 12U Name[bg]=Шкаф 12U Name[ca]=Rack 12U +Name[ca@valencia]=Rack 12U Name[de]=Rack 12U Name[el]=Οδοντωτή βάση 12U Name[es]=Rack 12U diff -Nru calligra-2.4.0/flow/stencils/Racks/rack_16u.desktop calligra-2.4.3/flow/stencils/Racks/rack_16u.desktop --- calligra-2.4.0/flow/stencils/Racks/rack_16u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/rack_16u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack 16U Name[bg]=Шкаф 16U Name[ca]=Rack 16U +Name[ca@valencia]=Rack 16U Name[de]=Rack 16U Name[el]=Οδοντωτή βάση 16U Name[es]=Rack 16U diff -Nru calligra-2.4.0/flow/stencils/Racks/rack_20u.desktop calligra-2.4.3/flow/stencils/Racks/rack_20u.desktop --- calligra-2.4.0/flow/stencils/Racks/rack_20u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/rack_20u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack 20U Name[bg]=Шкаф 20U Name[ca]=Rack 20U +Name[ca@valencia]=Rack 20U Name[de]=Rack 20U Name[el]=Οδοντωτή βάση 20U Name[es]=Rack 20U diff -Nru calligra-2.4.0/flow/stencils/Racks/rack_38u.desktop calligra-2.4.3/flow/stencils/Racks/rack_38u.desktop --- calligra-2.4.0/flow/stencils/Racks/rack_38u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/rack_38u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack 38U Name[bg]=Шкаф 38U Name[ca]=Rack 38U +Name[ca@valencia]=Rack 38U Name[de]=Rack 38U Name[el]=Οδοντωτή βάση 38U Name[es]=Rack 28U diff -Nru calligra-2.4.0/flow/stencils/Racks/rack_42u.desktop calligra-2.4.3/flow/stencils/Racks/rack_42u.desktop --- calligra-2.4.0/flow/stencils/Racks/rack_42u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/rack_42u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rack 42U Name[bg]=Шкаф 42U Name[ca]=Rack 42U +Name[ca@valencia]=Rack 42U Name[de]=Rack 42U Name[el]=Οδοντωτή βάση 42U Name[es]=Rack42U diff -Nru calligra-2.4.0/flow/stencils/Racks/rack_label_anchors_42u.desktop calligra-2.4.3/flow/stencils/Racks/rack_label_anchors_42u.desktop --- calligra-2.4.0/flow/stencils/Racks/rack_label_anchors_42u.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Racks/rack_label_anchors_42u.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Label Anchors 42U Name[ca]=Label Anchors 42U +Name[ca@valencia]=Label Anchors 42U Name[el]=Label Anchors 42U Name[es]=Anclas de etiqueta 42U Name[et]=Sildikinnitid 42U @@ -12,6 +13,7 @@ Name[pt]=Âncoras Legendas 42U Name[pt_BR]=Âncoras legendas 42U Name[ru]=Якори этикеток 42U +Name[sk]=Label Anchors 42U Name[sv]=Etikettfästen 42U Name[uk]=Фіксатори, 42 одиниці Name[x-test]=xxLabel Anchors 42Uxx diff -Nru calligra-2.4.0/flow/stencils/RDP/collection.desktop calligra-2.4.3/flow/stencils/RDP/collection.desktop --- calligra-2.4.0/flow/stencils/RDP/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/RDP/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=RDP Name[bg]=RDP Name[ca]=RDP +Name[ca@valencia]=RDP Name[cs]=RDP Name[de]=RDP Name[el]=RDP @@ -17,6 +18,7 @@ Name[pt]=RDP Name[pt_BR]=RDP Name[ru]=RDP +Name[sk]=RDP Name[sv]=RDP Name[ug]=RDP Name[uk]=RDP diff -Nru calligra-2.4.0/flow/stencils/RDP/place.desktop calligra-2.4.3/flow/stencils/RDP/place.desktop --- calligra-2.4.0/flow/stencils/RDP/place.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/RDP/place.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=place Name[ca]=lloc +Name[ca@valencia]=lloc Name[el]=τόπος Name[es]=lugar Name[et]=Olek @@ -12,6 +13,7 @@ Name[pt]=local Name[pt_BR]=local Name[ru]=место +Name[sk]=miesto Name[sv]=plats Name[ug]=ئورۇن Name[uk]=Місце diff -Nru calligra-2.4.0/flow/stencils/RDP/place_marquee.desktop calligra-2.4.3/flow/stencils/RDP/place_marquee.desktop --- calligra-2.4.0/flow/stencils/RDP/place_marquee.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/RDP/place_marquee.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=place marquee Name[ca]=placa de marquesina +Name[ca@valencia]=placa de marquesina Name[el]=place marquee Name[es]=lugar de marquesina Name[et]=Märgitud olek @@ -11,6 +12,7 @@ Name[pl]=znacznik miejsca Name[pt]=marcador local Name[pt_BR]=marcador de local +Name[sk]=umiestnenie v rámčeku Name[sv]=markerad plats Name[uk]=Область Name[x-test]=xxplace marqueexx diff -Nru calligra-2.4.0/flow/stencils/RDP/transition.desktop calligra-2.4.3/flow/stencils/RDP/transition.desktop --- calligra-2.4.0/flow/stencils/RDP/transition.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/RDP/transition.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transition Name[ca]=transició +Name[ca@valencia]=transició Name[el]=μετάβαση Name[es]=transición Name[et]=Üleminek @@ -13,6 +14,7 @@ Name[pt]=transição Name[pt_BR]=transição Name[ru]=Переход +Name[sk]=prechod Name[sv]=övergång Name[uk]=Передача Name[x-test]=xxtransitionxx diff -Nru calligra-2.4.0/flow/stencils/RDP/t_transition.desktop calligra-2.4.3/flow/stencils/RDP/t_transition.desktop --- calligra-2.4.0/flow/stencils/RDP/t_transition.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/RDP/t_transition.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=timed transition Name[ca]=transició temporitzada +Name[ca@valencia]=transició temporitzada Name[el]=χρονολογημένη μετάβαση Name[es]=transición temporizada Name[et]=Ajastatud üleminek @@ -12,6 +13,7 @@ Name[pt]=transição temporizada Name[pt_BR]=transição temporizada Name[ru]=Размеренный по времени переход +Name[sk]=časový prechod Name[sv]=tidtagen övergång Name[uk]=Відкладена передача Name[x-test]=xxtimed transitionxx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/collection.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/collection.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/collection.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Renewable Energy Name[bg]=Възобновима енергия Name[ca]=Energia renovable +Name[ca@valencia]=Energia renovable Name[de]=Erneuerbare Energie Name[el]=Ανανεώσιμη ενέργεια Name[es]=Energía renovable @@ -14,6 +15,7 @@ Name[pt]=Energia Renovável Name[pt_BR]=Energia renovável Name[ru]=Возобновляемые источники энергии +Name[sk]=Obnoviteľná energia Name[sv]=Förnyelsebar energi Name[uk]=Відновлювальні джерела енергії Name[x-test]=xxRenewable Energyxx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/cup_anemometer.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/cup_anemometer.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/cup_anemometer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/cup_anemometer.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Cup Anemometer Name[ca]=Anemòmetre de copa +Name[ca@valencia]=Anemòmetre de copa Name[de]=Schalenkreuzwindmesser Name[el]=Ανεμόμετρο κούπα Name[es]=Copa del anemómetro @@ -13,6 +14,7 @@ Name[pt]=Anemómetro Chave Name[pt_BR]=Anemômetro chave Name[ru]=Чашечный анемометр +Name[sk]=Pohárový anemometer Name[sv]=Skålvindmätare Name[uk]=Чашковий анемометр Name[x-test]=xxCup Anemometerxx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/data_logger.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/data_logger.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/data_logger.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/data_logger.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Data Logger Name[ca]=Registrador de dades +Name[ca@valencia]=Registrador de dades Name[el]=Καταγραφέας δεδομένων Name[es]=Registro de datos Name[et]=Andmesalvesti @@ -12,6 +13,7 @@ Name[pt]=Registo Dados Name[pt_BR]=Registro de dados Name[ru]=Элемент, записывающий информацию +Name[sk]=Zaznamenávač dát Name[sv]=Datainsamlare Name[uk]=Пристрій для запису даних Name[x-test]=xxData Loggerxx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/meas_tower.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/meas_tower.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/meas_tower.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/meas_tower.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Wind Measurement Tower Name[bg]=Кула за измерване на вятъра Name[ca]=Torre de mesures de vent +Name[ca@valencia]=Torre de mesures de vent Name[de]=Windmessturm Name[el]=Πύργος μέτρησης ανέμου Name[es]=Torre de medida del viento @@ -14,6 +15,7 @@ Name[pt]=Torre Medida Vento Name[pt_BR]=Torre de medida de vento Name[ru]=Флюгер +Name[sk]=Veterná kontrolná veža Name[sv]=Vindmätningstorn Name[uk]=Башта вимірювання сили вітру Name[x-test]=xxWind Measurement Towerxx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/solar_module.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/solar_module.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/solar_module.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/solar_module.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Solar Module Name[ca]=Mòdul solar +Name[ca@valencia]=Mòdul solar Name[de]=Solar-Modul Name[el]=Ηλιακό άρθρωμα Name[es]=Módulo solar @@ -13,6 +14,7 @@ Name[pt]=Módulo Solar Name[pt_BR]=Módulo solar Name[ru]=Солнечный модуль +Name[sk]=Slnečný modul Name[sv]=Solcellsmodul Name[uk]=Модуль сонячної батареї Name[x-test]=xxSolar Modulexx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/temp_humi_sensor.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/temp_humi_sensor.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/temp_humi_sensor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/temp_humi_sensor.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Temperature and Humidity Sensor Name[ca]=Sensor de temperatura i humitat +Name[ca@valencia]=Sensor de temperatura i humitat Name[de]=Temperatur- und Feuchtigkeitssensor Name[el]=Αισθητήρας θερμοκρασίας και υγρασίας Name[es]=Sensor de temperatura y humedad @@ -13,6 +14,7 @@ Name[pt]=Sensor Temperatura/Humidade Name[pt_BR]=Sensor de temperatura/umidade Name[ru]=Сенсор температуры и влажности +Name[sk]=Senzor teploty a vlhkosti Name[sv]=Temperatur- och fuktighetssensor Name[uk]=Детектор температури і вологості Name[x-test]=xxTemperature and Humidity Sensorxx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/wind_turbine.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/wind_turbine.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/wind_turbine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/wind_turbine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Wind Turbine Name[bg]=Вятърна турбина Name[ca]=Turbina de vent +Name[ca@valencia]=Turbina de vent Name[de]=Windturbine Name[el]=Ανεμογεννήτρια Name[es]=Turbina eólica Name[et]=Tuulegeneraator +Name[hu]=Szélturbina Name[it]=Turbina eolica Name[kk]=Жел турбинасы Name[nb]=Vindturbin @@ -14,6 +16,7 @@ Name[pt]=Turbina Eólica Name[pt_BR]=Turbina eólica Name[ru]=Ветровая турбина +Name[sk]=Veterná turbína Name[sv]=Vindturbin Name[uk]=Вітрова турбіна Name[x-test]=xxWind Turbinexx diff -Nru calligra-2.4.0/flow/stencils/Renewable_Energy/wind_vane.desktop calligra-2.4.3/flow/stencils/Renewable_Energy/wind_vane.desktop --- calligra-2.4.0/flow/stencils/Renewable_Energy/wind_vane.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Renewable_Energy/wind_vane.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Wind Vane Name[ca]=Anemòmetre +Name[ca@valencia]=Anemòmetre Name[de]=Windfahne Name[el]=Ανεμοδείκτης Name[es]=Veleta Name[et]=Tuulelipp +Name[hu]=Szélkakas Name[it]=Segnavento Name[kk]=Флюгер Name[nb]=Vindfløy @@ -13,6 +15,7 @@ Name[pt]=Pá Eólica Name[pt_BR]=Veio eólico Name[ru]=Флюгер +Name[sk]=Veterník Name[sv]=Vindflöjel Name[uk]=Флюгер Name[x-test]=xxWind Vanexx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/appearance.desktop calligra-2.4.3/flow/stencils/Scenegraph/appearance.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/appearance.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/appearance.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=appearance Name[ca]=aparença +Name[ca@valencia]=aparença Name[cs]=vzhled Name[de]=Erscheinungsbild Name[el]=εμφάνιση @@ -16,6 +17,7 @@ Name[pt]=aparência Name[pt_BR]=aparência Name[ru]=Внешний вид +Name[sk]=vzhľad Name[sv]=utseende Name[uk]=Поява Name[x-test]=xxappearancexx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/callback.desktop calligra-2.4.3/flow/stencils/Scenegraph/callback.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/callback.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/callback.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=callback Name[ca]=crida de retorn +Name[ca@valencia]=crida de retorn Name[cs]=zpětné volání Name[el]=επανάκληση Name[es]=devolución de llamada @@ -14,6 +15,7 @@ Name[pt]=retorno Name[pt_BR]=retorno Name[ru]=Возврат +Name[sk]=spätné volanie Name[sv]=återanrop Name[uk]=Повернення Name[x-test]=xxcallbackxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/camera.desktop calligra-2.4.3/flow/stencils/Scenegraph/camera.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/camera.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/camera.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=camera Name[bg]=камера Name[ca]=càmera +Name[ca@valencia]=càmera Name[cs]=kamera Name[de]=Kamera Name[el]=κάμερα Name[es]=cámara Name[et]=Kaamera +Name[hu]=kamera Name[it]=camera Name[kk]=камера Name[nb]=kamera @@ -16,6 +18,7 @@ Name[pt]=câmara Name[pt_BR]=câmera Name[ru]=Камера +Name[sk]=kamera Name[sv]=kamera Name[uk]=Відеокамера Name[x-test]=xxcameraxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/collection.desktop calligra-2.4.3/flow/stencils/Scenegraph/collection.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Scenegraph Name[ca]=Escenògraf +Name[ca@valencia]=Escenògraf Name[el]=Σκηνογράφος Name[es]=Gráfico de escena Name[et]=Stseenigraaf diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/component.desktop calligra-2.4.3/flow/stencils/Scenegraph/component.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/component.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/component.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=component Name[ca]=component +Name[ca@valencia]=component Name[cs]=komponenta Name[da]=komponent Name[de]=Komponente @@ -10,6 +11,7 @@ Name[fr]=Composant Name[hu]=komponens Name[it]=componente +Name[ja]=コンポーネント Name[kk]=компонент Name[nb]=komponent Name[nds]=Komponent @@ -18,6 +20,7 @@ Name[pt]=componente Name[pt_BR]=componente Name[ru]=Компонент +Name[sk]=komponent Name[sv]=komponent Name[uk]=Компонент Name[x-test]=xxcomponentxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/engine.desktop calligra-2.4.3/flow/stencils/Scenegraph/engine.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/engine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/engine.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=engine Name[bg]=двигател Name[ca]=motor +Name[ca@valencia]=motor Name[cs]=motor Name[el]=μηχανή Name[es]=motor @@ -15,6 +16,7 @@ Name[pt]=motor Name[pt_BR]=motor Name[ru]=Движок +Name[sk]=motor Name[sv]=motor Name[uk]=Двигун Name[x-test]=xxenginexx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/field.desktop calligra-2.4.3/flow/stencils/Scenegraph/field.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/field.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/field.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=field Name[bg]=поле Name[ca]=camp +Name[ca@valencia]=camp Name[cs]=pole Name[de]=Feld Name[el]=πεδίο @@ -17,6 +18,7 @@ Name[pt]=campo Name[pt_BR]=campo Name[ru]=Поле +Name[sk]=pole Name[sv]=fält Name[ug]=سۆز بۆلىكى Name[uk]=Поле diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/group.desktop calligra-2.4.3/flow/stencils/Scenegraph/group.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/group.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/group.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=group Name[bg]=група Name[ca]=grup +Name[ca@valencia]=grup Name[cs]=skupina Name[de]=Gruppe Name[el]=ομάδα @@ -9,6 +10,7 @@ Name[et]=Grupp Name[hu]=csoport Name[it]=gruppo +Name[ja]=グループ Name[kk]=топ Name[nb]=gruppe Name[nds]=Koppel @@ -17,6 +19,7 @@ Name[pt]=grupo Name[pt_BR]=grupo Name[ru]=Группа +Name[sk]=skupina Name[sv]=grupp Name[ug]=گۇرۇپپا Name[uk]=Група diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/light.desktop calligra-2.4.3/flow/stencils/Scenegraph/light.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/light.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/light.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=light Name[bg]=светлина Name[ca]=llum +Name[ca@valencia]=llum Name[cs]=světlo Name[el]=ελαφρύ Name[es]=luz @@ -15,6 +16,7 @@ Name[pt]=luz Name[pt_BR]=luz Name[ru]=Свет +Name[sk]=svetlo Name[sv]=ljus Name[ug]=ئىنچىكە Name[uk]=Освітлення diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/manipulator.desktop calligra-2.4.3/flow/stencils/Scenegraph/manipulator.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/manipulator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/manipulator.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=manipulator Name[ca]=manipulador +Name[ca@valencia]=manipulador Name[el]=χειριστής Name[es]=manipulador Name[et]=Käitleja @@ -12,6 +13,7 @@ Name[pt]=manipulador Name[pt_BR]=manipulador Name[ru]=Манипулятор +Name[sk]=manipulátor Name[sv]=manipulator Name[uk]=Маніпулятор Name[x-test]=xxmanipulatorxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/metric.desktop calligra-2.4.3/flow/stencils/Scenegraph/metric.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/metric.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/metric.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=metric Name[ca]=mètrica +Name[ca@valencia]=mètrica Name[el]=μετρικό Name[es]=métrica Name[et]=Meetrika @@ -13,6 +14,7 @@ Name[pt]=métrica Name[pt_BR]=métrica Name[ru]=Метрика +Name[sk]=metrika Name[sv]=mått Name[uk]=Метрика Name[x-test]=xxmetricxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/nodekit.desktop calligra-2.4.3/flow/stencils/Scenegraph/nodekit.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/nodekit.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/nodekit.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=nodekit Name[ca]=kit de node +Name[ca@valencia]=kit de node Name[el]=nodekit Name[es]=conjunto de nodos Name[et]=Sõlmerühm @@ -12,6 +13,7 @@ Name[pt]=kit-nós Name[pt_BR]=kit de nós Name[ru]=Комплект узла +Name[sk]=nodekit Name[sv]=styrsats Name[uk]=Набір вузлів Name[x-test]=xxnodekitxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/property.desktop calligra-2.4.3/flow/stencils/Scenegraph/property.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/property.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/property.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=property Name[bg]=свойство Name[ca]=propietat +Name[ca@valencia]=propietat Name[cs]=vlastnost Name[de]=Eigenschaft Name[el]=ιδιότητα @@ -17,6 +18,7 @@ Name[pt]=propriedade Name[pt_BR]=propriedade Name[ru]=Свойство +Name[sk]=vlastnosť Name[sv]=egenskap Name[uk]=Властивість Name[x-test]=xxpropertyxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/realtimeglobalfield.desktop calligra-2.4.3/flow/stencils/Scenegraph/realtimeglobalfield.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/realtimeglobalfield.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/realtimeglobalfield.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=realtimeglobalfield Name[ca]=camp global en temps real +Name[ca@valencia]=camp global en temps real Name[el]=realtimeglobalfield Name[es]=campo global en tiempo real Name[et]=Globaalne reaalajaväli @@ -12,6 +13,7 @@ Name[pt]=campo-global-tempo-real Name[pt_BR]=campo-global-tempo-real Name[ru]=Глобальное поле реального времени +Name[sk]=realtimeglobalfield Name[sv]=globalt realtidsfält Name[uk]=Загальне поле у режимі реального часу Name[x-test]=xxrealtimeglobalfieldxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/separator.desktop calligra-2.4.3/flow/stencils/Scenegraph/separator.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/separator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/separator.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=separator Name[bg]=разделител Name[ca]=separador +Name[ca@valencia]=separador Name[cs]=oddělovač Name[el]=διαχωριστικό Name[es]=separador @@ -17,6 +18,7 @@ Name[pt]=separador Name[pt_BR]=separador Name[ru]=Разделитель +Name[sk]=oddeľovač Name[sv]=avdelare Name[ug]=ئايرىغۇچ Name[uk]=Роздільник diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/shape.desktop calligra-2.4.3/flow/stencils/Scenegraph/shape.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/shape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/shape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=shape Name[bg]=форма Name[ca]=forma +Name[ca@valencia]=forma Name[cs]=tvar Name[de]=Objekt Name[el]=σχήμα @@ -18,6 +19,7 @@ Name[pt]=forma Name[pt_BR]=forma Name[ru]=Форма +Name[sk]=tvar Name[sv]=form Name[uk]=Форма Name[x-test]=xxshapexx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/soselection.desktop calligra-2.4.3/flow/stencils/Scenegraph/soselection.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/soselection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/soselection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=soselection Name[ca]=soselection +Name[ca@valencia]=soselection Name[el]=soselection Name[es]=selección so Name[et]=SoSelection @@ -11,6 +12,7 @@ Name[pl]=soselection Name[pt]=selecção-so Name[pt_BR]=seleção-so +Name[sk]=soselection Name[sv]=soselection Name[uk]=Вибір сцени Name[x-test]=xxsoselectionxx diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/subgraph.desktop calligra-2.4.3/flow/stencils/Scenegraph/subgraph.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/subgraph.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/subgraph.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=subgraph Name[ca]=subgràfic +Name[ca@valencia]=subgràfic Name[el]=υπο-γράφος Name[es]=subgrafo Name[et]=Alamgraaf diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/switch.desktop calligra-2.4.3/flow/stencils/Scenegraph/switch.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/switch.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/switch.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=switch Name[ca]=commutació +Name[ca@valencia]=commutació Name[cs]=přepínač Name[el]=διακόπτης Name[es]=conmutación @@ -13,6 +14,7 @@ Name[pt]=comutação Name[pt_BR]=comutação Name[ru]=Переключатель +Name[sk]=prepínač Name[sv]=omkopplare Name[ug]=ئالماشتۇر Name[uk]=Перемикач diff -Nru calligra-2.4.0/flow/stencils/Scenegraph/transform.desktop calligra-2.4.3/flow/stencils/Scenegraph/transform.desktop --- calligra-2.4.0/flow/stencils/Scenegraph/transform.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Scenegraph/transform.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=transform Name[ca]=transformació +Name[ca@valencia]=transformació Name[cs]=převést Name[el]=Μετασχηματισμός Name[es]=transformación @@ -14,6 +15,7 @@ Name[pt]=transformação Name[pt_BR]=transformação Name[ru]=Преобразование +Name[sk]=transformovať Name[sv]=transform Name[ug]=ئالماشتۇر Name[uk]=Перетворення diff -Nru calligra-2.4.0/flow/stencils/SDL/block.desktop calligra-2.4.3/flow/stencils/SDL/block.desktop --- calligra-2.4.0/flow/stencils/SDL/block.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/block.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Block Name[ca]=Bloc +Name[ca@valencia]=Bloc Name[cs]=Blok Name[de]=Block Name[el]=Παρεμπόδιση Name[es]=Bloque Name[et]=Plokk +Name[fi]=Lohko Name[ga]=Bloc Name[hu]=Blokkolás Name[it]=Blocco @@ -17,6 +19,7 @@ Name[pt]=Bloco Name[pt_BR]=Bloco Name[ru]=Блок +Name[sk]=Blok Name[sv]=Block Name[ug]=بۆلەك Name[uk]=Блок diff -Nru calligra-2.4.0/flow/stencils/SDL/collection.desktop calligra-2.4.3/flow/stencils/SDL/collection.desktop --- calligra-2.4.0/flow/stencils/SDL/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=SDL Name[bg]=SDL Name[ca]=SDL +Name[ca@valencia]=SDL Name[cs]=SDL Name[de]=SDL Name[el]=SDL Name[es]=SDL Name[et]=SDL +Name[fi]=SDL Name[hu]=SDL Name[it]=SDL Name[kk]=SDL @@ -17,6 +19,7 @@ Name[pt]=SDL Name[pt_BR]=SDL Name[ru]=SDL +Name[sk]=SDL Name[sv]=SDL Name[ug]=SDL Name[uk]=SDL diff -Nru calligra-2.4.0/flow/stencils/SDL/comment.desktop calligra-2.4.3/flow/stencils/SDL/comment.desktop --- calligra-2.4.0/flow/stencils/SDL/comment.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/comment.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Comment Name[bg]=Коментар Name[ca]=Comentari +Name[ca@valencia]=Comentari Name[cs]=Komentář Name[de]=Kommentar Name[el]=Σχόλιο Name[es]=Comentario Name[et]=Kommentaar +Name[fi]=Kommentti Name[hu]=Megjegyzés Name[it]=Commento Name[kk]=Түсініктеме @@ -17,6 +19,7 @@ Name[pt]=Comentário Name[pt_BR]=Comentário Name[ru]=Комментарий +Name[sk]=Komentár Name[sv]=Kommentar Name[ug]=ئىزاھات Name[uk]=Коментар diff -Nru calligra-2.4.0/flow/stencils/SDL/decision.desktop calligra-2.4.3/flow/stencils/SDL/decision.desktop --- calligra-2.4.0/flow/stencils/SDL/decision.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/decision.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,14 @@ Name=Decision Name[bg]=Решение Name[ca]=Decisió +Name[ca@valencia]=Decisió Name[de]=Entscheidung Name[el]=Απόφαση Name[es]=Decisión Name[et]=Otsus +Name[fi]=Päätös +Name[gl]=Decisión +Name[hu]=Döntés Name[it]=Decisione Name[kk]=Шешім Name[nb]=Avgjørelse @@ -15,6 +19,7 @@ Name[pt]=Decisão Name[pt_BR]=Decisão Name[ru]=Решение +Name[sk]=Rozhodnutie Name[sv]=Beslut Name[uk]=Рішення Name[x-test]=xxDecisionxx diff -Nru calligra-2.4.0/flow/stencils/SDL/function.desktop calligra-2.4.3/flow/stencils/SDL/function.desktop --- calligra-2.4.0/flow/stencils/SDL/function.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/function.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Function Name[bg]=Функция Name[ca]=Funció +Name[ca@valencia]=Funció Name[cs]=Funkce Name[de]=Funktion Name[el]=Συνάρτηση @@ -17,6 +18,7 @@ Name[pt]=Função Name[pt_BR]=Função Name[ru]=Функция +Name[sk]=Funkcia Name[sv]=Funktion Name[ug]=فۇنكسىيە Name[uk]=Функція diff -Nru calligra-2.4.0/flow/stencils/SDL/header.desktop calligra-2.4.3/flow/stencils/SDL/header.desktop --- calligra-2.4.0/flow/stencils/SDL/header.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/header.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Function Header Name[bg]=Заглавна част на функция Name[ca]=Funció Capçalera +Name[ca@valencia]=Funció Capçalera Name[de]=Funktionskopfteil Name[el]=Header συνάρτησης Name[es]=Cabecera de función Name[et]=Funktsiooni päis +Name[fi]=Funktio-otsake Name[it]=Intestazione funzione Name[kk]=Функция айдары Name[nb]=Funksjonshode @@ -15,6 +17,7 @@ Name[pt]=Cabeçalho Função Name[pt_BR]=Cabeçalho de função Name[ru]=Заголовок функции +Name[sk]=Hlavička funkcie Name[sv]=Funktionshuvud Name[uk]=Заголовок функції Name[x-test]=xxFunction Headerxx diff -Nru calligra-2.4.0/flow/stencils/SDL/inout.desktop calligra-2.4.3/flow/stencils/SDL/inout.desktop --- calligra-2.4.0/flow/stencils/SDL/inout.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/inout.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=InOut Name[bg]=Вход/изход Name[ca]=InOut +Name[ca@valencia]=InOut Name[el]=InOut Name[es]=Entrada/Salida Name[et]=Sisend-väljund +Name[fi]=Sisään ja ulos Name[it]=InOut Name[kk]=Кіріс-Шығыс Name[nb]=Inn/Ut diff -Nru calligra-2.4.0/flow/stencils/SDL/macro.desktop calligra-2.4.3/flow/stencils/SDL/macro.desktop --- calligra-2.4.0/flow/stencils/SDL/macro.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/macro.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Macro Name[bg]=Макрос Name[ca]=Macro +Name[ca@valencia]=Macro Name[cs]=Makro Name[de]=Makro Name[el]=Μακροεντολή Name[es]=Macro Name[et]=Makro +Name[fi]=Makro Name[fr]=Macro Name[hu]=Makró Name[it]=Macro @@ -18,6 +20,7 @@ Name[pt]=Macro Name[pt_BR]=Macro Name[ru]=Макрос +Name[sk]=Makro Name[sv]=Makro Name[ug]=ماكرو Name[uk]=Макрос diff -Nru calligra-2.4.0/flow/stencils/SDL/note.desktop calligra-2.4.3/flow/stencils/SDL/note.desktop --- calligra-2.4.0/flow/stencils/SDL/note.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/note.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Note Name[bg]=Бележка Name[ca]=Nota +Name[ca@valencia]=Nota Name[cs]=Poznámka Name[el]=Σημείωση Name[es]=Nota Name[et]=Märkus +Name[fi]=Huomautus Name[ga]=Nóta Name[hu]=Megjegyzés Name[it]=Nota @@ -17,6 +19,7 @@ Name[pt]=Nota Name[pt_BR]=Nota Name[ru]=Заметка +Name[sk]=Poznámka Name[sv]=Anteckning Name[ug]=ئىزاھات Name[uk]=Примітка diff -Nru calligra-2.4.0/flow/stencils/SDL/process.desktop calligra-2.4.3/flow/stencils/SDL/process.desktop --- calligra-2.4.0/flow/stencils/SDL/process.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/process.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,14 +2,18 @@ Name=Process Name[bg]=Процес Name[ca]=Procés +Name[ca@valencia]=Procés Name[cs]=Proces Name[de]=Prozess Name[el]=Διεργασία Name[es]=Proceso Name[et]=Protsess +Name[fi]=Prosessi Name[fr]=Processus +Name[gl]=Proceso Name[hu]=Folyamat Name[it]=Processo +Name[ja]=プロセス Name[kk]=Процесc Name[nb]=Prosess Name[nl]=Proces @@ -17,6 +21,7 @@ Name[pt]=Processo Name[pt_BR]=Processo Name[ru]=Обрабатывать +Name[sk]=Proces Name[sv]=Process Name[ug]=ئىجرا Name[uk]=Обробляти diff -Nru calligra-2.4.0/flow/stencils/SDL/receive.desktop calligra-2.4.3/flow/stencils/SDL/receive.desktop --- calligra-2.4.0/flow/stencils/SDL/receive.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/receive.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Receive Name[bg]=Получаване Name[ca]=Rep +Name[ca@valencia]=Rep Name[cs]=Přijmout Name[de]=Empfangen Name[el]=Receive Name[es]=Recibir Name[et]=Vastuvõtmine +Name[fi]=Vastaanota Name[hu]=Fogadás Name[it]=Ricevi Name[kk]=Қабылдау @@ -17,6 +19,7 @@ Name[pt]=Recepção Name[pt_BR]=Recepção Name[ru]=Принять +Name[sk]=Prijať Name[sv]=Mottagning Name[uk]=Отримання Name[x-test]=xxReceivexx diff -Nru calligra-2.4.0/flow/stencils/SDL/return.desktop calligra-2.4.3/flow/stencils/SDL/return.desktop --- calligra-2.4.0/flow/stencils/SDL/return.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/return.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,9 +2,11 @@ Name=Return Name[bg]=Връщане Name[ca]=Retorna +Name[ca@valencia]=Retorna Name[el]=Επιστροφή Name[es]=Volver Name[et]=Tagastus +Name[fi]=Palauta Name[hu]=Return Name[it]=Ritorno Name[kk]=Қайтарылу @@ -14,6 +16,7 @@ Name[pt]=Retorno Name[pt_BR]=Retorno Name[ru]=Возврат +Name[sk]=Vrátiť Name[sv]=Retur Name[ug]=Return Name[uk]=Повернення diff -Nru calligra-2.4.0/flow/stencils/SDL/save.desktop calligra-2.4.3/flow/stencils/SDL/save.desktop --- calligra-2.4.0/flow/stencils/SDL/save.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/save.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Save Name[bg]=Запазване Name[ca]=Desa +Name[ca@valencia]=Alça Name[cs]=Uložit Name[de]=Speichern Name[el]=Αποθήκευση Name[es]=Guardar Name[et]=Salvestamine +Name[fi]=Tallenna Name[fr]=Enregistrer Name[hu]=Mentés Name[it]=Salva @@ -18,6 +20,7 @@ Name[pt]=Gravação Name[pt_BR]=Gravação Name[ru]=Сохранить +Name[sk]=Uložiť Name[sv]=Spara Name[ug]=ساقلا Name[uk]=Збереження diff -Nru calligra-2.4.0/flow/stencils/SDL/send.desktop calligra-2.4.3/flow/stencils/SDL/send.desktop --- calligra-2.4.0/flow/stencils/SDL/send.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/send.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,11 +2,13 @@ Name=Send Name[bg]=Изпращане Name[ca]=Envia +Name[ca@valencia]=Envia Name[cs]=Odeslat Name[de]=Senden Name[el]=Αποστολή Name[es]=Envío Name[et]=Saatmine +Name[fi]=Lähetä Name[fr]=Envoyer Name[hu]=Küldés Name[it]=Invia @@ -18,6 +20,7 @@ Name[pt]=Envio Name[pt_BR]=Envio Name[ru]=Послать +Name[sk]=Poslať Name[sv]=Skicka Name[ug]=ئەۋەتىش Name[uk]=Надсилання diff -Nru calligra-2.4.0/flow/stencils/SDL/service.desktop calligra-2.4.3/flow/stencils/SDL/service.desktop --- calligra-2.4.0/flow/stencils/SDL/service.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/service.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=Service Name[bg]=Услуга Name[ca]=Servei +Name[ca@valencia]=Servei Name[cs]=Služba Name[de]=Dienst Name[el]=Υπηρεσία Name[es]=Servicio Name[et]=Teenus +Name[fi]=Palvelu Name[hu]=Szolgáltatás Name[it]=Servizio Name[kk]=Қызмет @@ -17,6 +19,7 @@ Name[pt]=Serviço Name[pt_BR]=Serviço Name[ru]=Служба +Name[sk]=Služba Name[sv]=Tjänst Name[ug]=مۇلازىمەت Name[uk]=Служба diff -Nru calligra-2.4.0/flow/stencils/SDL/state.desktop calligra-2.4.3/flow/stencils/SDL/state.desktop --- calligra-2.4.0/flow/stencils/SDL/state.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/state.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,11 +2,13 @@ Name=State Name[bg]=Състояние Name[ca]=Estat +Name[ca@valencia]=Estat Name[cs]=Stav Name[de]=Status Name[el]=Κατάσταση Name[es]=Estado Name[et]=Olek +Name[fi]=Tila Name[fr]=État Name[hu]=Állapot Name[it]=Stato @@ -18,6 +20,7 @@ Name[pt]=Estado Name[pt_BR]=Estado Name[ru]=Состояние +Name[sk]=Stav Name[sv]=Tillstånd Name[ug]=ھالەت Name[uk]=Стан diff -Nru calligra-2.4.0/flow/stencils/SDL/stop.desktop calligra-2.4.3/flow/stencils/SDL/stop.desktop --- calligra-2.4.0/flow/stencils/SDL/stop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/stop.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,10 +2,12 @@ Name=Stop Name[bg]=Спиране Name[ca]=Atura +Name[ca@valencia]=Atura Name[cs]=Zastavit Name[el]=Διακοπή Name[es]=Parar Name[et]=Peatamine +Name[fi]=Pysähdy Name[hu]=Leállítás Name[it]=Stop Name[kk]=Тоқтату @@ -16,6 +18,7 @@ Name[pt]=Paragem Name[pt_BR]=Parada Name[ru]=Остановка +Name[sk]=Zastaviť Name[sv]=Stopp Name[ug]=توختا Name[uk]=Стоп diff -Nru calligra-2.4.0/flow/stencils/SDL/task.desktop calligra-2.4.3/flow/stencils/SDL/task.desktop --- calligra-2.4.0/flow/stencils/SDL/task.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/SDL/task.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Task Name[bg]=Задача Name[ca]=Tasca +Name[ca@valencia]=Tasca Name[cs]=Úloha Name[de]=Aufgabe Name[el]=Εργασία @@ -9,6 +10,7 @@ Name[et]=Ülesanne Name[fi]=Tehtävä Name[fr]=Tâche +Name[gl]=Tarefa Name[hu]=Feladat Name[it]=Compito Name[kk]=Тапсырма @@ -19,6 +21,7 @@ Name[pt]=Tarefa Name[pt_BR]=Tarefa Name[ru]=Задача +Name[sk]=Úloha Name[sv]=Uppgift Name[ug]=ۋەزىپە Name[uk]=Задача diff -Nru calligra-2.4.0/flow/stencils/Sybase/client.desktop calligra-2.4.3/flow/stencils/Sybase/client.desktop --- calligra-2.4.0/flow/stencils/Sybase/client.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Sybase/client.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Client Application Name[bg]=Клиентско приложение Name[ca]=Aplicació client +Name[ca@valencia]=Aplicació client Name[de]=Client-Anwendung Name[el]=Εφαρμογή χρήστη Name[es]=Aplicación cliente Name[et]=Klientrakendus +Name[hu]=Kliens alkalmazás Name[it]=Applicazione client Name[kk]=Клиент қолданбасы Name[nb]=Klientprogram @@ -15,6 +17,7 @@ Name[pt]=Aplicação do Cliente Name[pt_BR]=Aplicação cliente Name[ru]=Клиентское приложение +Name[sk]=Klientska aplikácia Name[sv]=Klientprogram Name[uk]=Програма-клієнт Name[x-test]=xxClient Applicationxx diff -Nru calligra-2.4.0/flow/stencils/Sybase/collection.desktop calligra-2.4.3/flow/stencils/Sybase/collection.desktop --- calligra-2.4.0/flow/stencils/Sybase/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Sybase/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sybase Name[bg]=Sybase Name[ca]=Sybase +Name[ca@valencia]=Sybase Name[cs]=Sybase Name[da]=Sybase Name[de]=Sybase diff -Nru calligra-2.4.0/flow/stencils/Sybase/dataserver.desktop calligra-2.4.3/flow/stencils/Sybase/dataserver.desktop --- calligra-2.4.0/flow/stencils/Sybase/dataserver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Sybase/dataserver.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Dataserver Name[bg]=Сървър за данни Name[ca]=Servidor de dades +Name[ca@valencia]=Servidor de dades Name[de]=Datenserver Name[el]=Εξυπηρετητής δεδομένων Name[es]=Servidor de datos @@ -16,6 +17,7 @@ Name[pt]=Servidor de dados Name[pt_BR]=Servidor de dados Name[ru]=Датасервер +Name[sk]=Dátový server Name[sv]=Dataserver Name[uk]=Сервер даних Name[x-test]=xxDataserverxx diff -Nru calligra-2.4.0/flow/stencils/Sybase/ltm.desktop calligra-2.4.3/flow/stencils/Sybase/ltm.desktop --- calligra-2.4.0/flow/stencils/Sybase/ltm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Sybase/ltm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Log Transfer Manager/Rep Agent Name[bg]=Мениджър за пренос на журнали/Агент за копиране Name[ca]=Gestor de transferència de registres/Agent Rep +Name[ca@valencia]=Gestor de transferència de registres/Agent Rep Name[el]=Log Transfer Manager/Rep Agent Name[es]=Registro de gestor de transferencias/agente de réplica Name[et]=Logiedastuse haldur/vastaja @@ -14,6 +15,7 @@ Name[pt]=Gestor Transferências/Agente Replicação Name[pt_BR]=Gerenciador de transferências/Agente de replicação Name[ru]=Менеждер переноса файлов журнала +Name[sk]=Log Transfer Manager/Rep Agent Name[sv]=Loggöverföringshantering/repligeringsagent Name[uk]=Керування перенесенням журналу/Агент реплікації Name[x-test]=xxLog Transfer Manager/Rep Agentxx diff -Nru calligra-2.4.0/flow/stencils/Sybase/repserver.desktop calligra-2.4.3/flow/stencils/Sybase/repserver.desktop --- calligra-2.4.0/flow/stencils/Sybase/repserver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Sybase/repserver.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Replication Server Name[bg]=Репликиращ сървър Name[ca]=Servidor de rèplica +Name[ca@valencia]=Servidor de rèplica Name[de]=Replikations-Server Name[el]=Εξυπηρετητής αντιγράφων Name[es]=Servidor de replica @@ -15,6 +16,7 @@ Name[pt]=Servidor Replicação Name[pt_BR]=Servidor de replicação Name[ru]=Сервер репликаций +Name[sk]=Replikačný server Name[sv]=Replikeringsserver Name[uk]=Сервер реплікації Name[x-test]=xxReplication Serverxx diff -Nru calligra-2.4.0/flow/stencils/Sybase/rsm.desktop calligra-2.4.3/flow/stencils/Sybase/rsm.desktop --- calligra-2.4.0/flow/stencils/Sybase/rsm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Sybase/rsm.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Replication Server Manager Name[bg]=Управление на репликиращ сървър Name[ca]=Gestor del servidor de rèplica +Name[ca@valencia]=Gestor del servidor de rèplica Name[de]=Replikations-Server-Manager Name[el]=Διαχειριστής εξυπηρετητή αντιγράφων Name[es]=Gestor de servidor de replica @@ -15,6 +16,7 @@ Name[pt]=Gestor do Servidor Replicação Name[pt_BR]=Gerenciador de servidor de replicação Name[ru]=Менеджер сервера репликаций +Name[sk]=Správca replikačného servera Name[sv]=Replikeringsserverhantering Name[uk]=Менеджер сервера реплікації Name[x-test]=xxReplication Server Managerxx diff -Nru calligra-2.4.0/flow/stencils/Sybase/stableq.desktop calligra-2.4.3/flow/stencils/Sybase/stableq.desktop --- calligra-2.4.0/flow/stencils/Sybase/stableq.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Sybase/stableq.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,10 +2,12 @@ Name=Stable Queue Name[bg]=Стабилна опашка Name[ca]=Cua estable +Name[ca@valencia]=Cua estable Name[de]=Stable-Queue Name[el]=Σταθερή σειρά αναμονής Name[es]=Cola estable Name[et]=Stabiilne järjekord +Name[hu]=Stabil sor Name[it]=Coda stabile Name[kk]=Тұрақты кезек Name[nb]=Stabil kø @@ -14,6 +16,7 @@ Name[pt]=Fila Estável Name[pt_BR]=Fila estável Name[ru]=Стабильная очередь +Name[sk]=Stabilná fronta Name[sv]=Stabil kö Name[uk]=Постійна черга Name[x-test]=xxStable Queuexx diff -Nru calligra-2.4.0/flow/stencils/Value_Stream_Mapping/collection.desktop calligra-2.4.3/flow/stencils/Value_Stream_Mapping/collection.desktop --- calligra-2.4.0/flow/stencils/Value_Stream_Mapping/collection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Value_Stream_Mapping/collection.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Value Stream Mapping Name[ca]=Correspondència del valor del flux de dades +Name[ca@valencia]=Correspondència del valor del flux de dades Name[el]=Χαρτογράφηση ροής τιμών Name[es]=Asignación de flujo de valores Name[et]=Väärtusvoo analüüs +Name[fi]=Value Stream Mapping Name[it]=Associazione sequenza di valori Name[kk]=Дерек ағынын көрсету Name[nb]=Verdistrøm-mapping @@ -11,6 +13,7 @@ Name[pl]=Mapowanie strumienia wartości Name[pt]=Mapeamento Sequência Valores Name[pt_BR]=Mapeamento de sequência de valores +Name[sk]=Mapovanie prúdu hodnôt Name[sv]=Värdeströmsavbildning Name[uk]=Показ потоків даних Name[x-test]=xxValue Stream Mappingxx diff -Nru calligra-2.4.0/flow/stencils/Value_Stream_Mapping/happy_face.desktop calligra-2.4.3/flow/stencils/Value_Stream_Mapping/happy_face.desktop --- calligra-2.4.0/flow/stencils/Value_Stream_Mapping/happy_face.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/stencils/Value_Stream_Mapping/happy_face.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,9 +1,12 @@ [Desktop Entry] Name=Happy Face Name[ca]=Cara feliç +Name[ca@valencia]=Cara feliç Name[el]=Happy Face Name[es]=Cara feliz Name[et]=Naerunägu +Name[fi]=Hymynaama +Name[hu]=Vidám arc Name[it]=Faccia felice Name[kk]=Бақытты жүз Name[nb]=Smilefjes @@ -12,6 +15,7 @@ Name[pt]=Cara Feliz Name[pt_BR]=Cara feliz Name[ru]=Счастливое лицо +Name[sk]=Veselá tvár Name[sv]=Glatt ansikte Name[uk]=Щасливе обличчя Name[x-test]=xxHappy Facexx diff -Nru calligra-2.4.0/flow/templates/basic/basicflow.desktop calligra-2.4.3/flow/templates/basic/basicflow.desktop --- calligra-2.4.0/flow/templates/basic/basicflow.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/templates/basic/basicflow.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -4,6 +4,7 @@ Icon=template_basicflow Name=Basic Flowcharting Name[ca]=Diagrama de flux bàsic +Name[ca@valencia]=Diagrama de flux bàsic Name[cs]=Základní diagramy Name[cy]=Llifsiartio Sylfaenol Name[da]=Basalt flydediagram @@ -51,6 +52,7 @@ Name[zh_TW]=基本流程圖 Comment=Creates a document with the basic stencils for flowcharting loaded. Comment[ca]=Crea un document amb les plantilles bàsiques carregades per a diagrama de flux. +Comment[ca@valencia]=Crea un document amb les plantilles bàsiques carregades per a diagrama de flux. Comment[cs]=Vytvoří dokument se základními šablonami. Comment[cy]=Creu dogfen efo'r stensiliau sylfaenol ar gyfer llifsiartio wedi'u llwytho. Comment[da]=Laver et dokument med de basale stenciler til flydediagrammer indlæst. @@ -84,6 +86,7 @@ Comment[pt_BR]=Cria um documento com os estêncis 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. Comment[sl]=Ustvari dokument z naloženimi osnovnimi šablonami za diagrame poteka. Comment[sv]=Skapar ett dokument med grundläggande schabloner för flödesscheman laddade. Comment[ta]=பாய்வு நிரல்படம் ஏற்றப்பட்ட அடிப்படைகளுடன் வெற்று ஆவணத்தை உருவாக்குகிறது diff -Nru calligra-2.4.0/flow/templates/basic/.directory calligra-2.4.3/flow/templates/basic/.directory --- calligra-2.4.0/flow/templates/basic/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/templates/basic/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Основни Name[br]=Diazez Name[ca]=Bàsic +Name[ca@valencia]=Bàsic Name[cs]=Základní Name[cy]=Sylfaenol Name[da]=Basal diff -Nru calligra-2.4.0/flow/templates/basic/empty.desktop calligra-2.4.3/flow/templates/basic/empty.desktop --- calligra-2.4.0/flow/templates/basic/empty.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/flow/templates/basic/empty.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Празен документ Name[br]=Teul goullo Name[ca]=Document buit +Name[ca@valencia]=Document buit Name[cs]=Prázdný dokument Name[cy]=Dogfen Wag Name[da]=Tomt dokument @@ -58,6 +59,7 @@ Name[zh_TW]=空白文件 Comment=Creates a document with no stencils loaded. Comment[ca]=Crea un document sense carregar cap plantilla. +Comment[ca@valencia]=Crea un document sense carregar cap plantilla. Comment[cs]=Vytvoří prázdný dokument bez šablon Comment[cy]=Creu dogfen heb stensiliau wedi'u llwytho. Comment[da]=Laver et dokument uden stenciler indlæst. @@ -91,6 +93,7 @@ Comment[pt_BR]=Cria um documento sem qualquer estêncil carregado. Comment[ru]=Создать пустой документ Comment[se]=Ráhkada dokumeantta stensiillaid viežžankeahttá. +Comment[sk]=Vytvorí dokument bez načítaných šablón. Comment[sl]=Ustvari dokument brez naloženih šablon. Comment[sv]=Skapar ett dokument utan att ladda några schabloner. Comment[ta]=பாய்வு நிரல்படம் ஏற்றப்படாத ஆவணத்தை உருவாக்குகிறது diff -Nru calligra-2.4.0/karbon/data/karbon.desktop calligra-2.4.3/karbon/data/karbon.desktop --- calligra-2.4.0/karbon/data/karbon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/data/karbon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,13 +7,17 @@ Name[de]=Karbon Name[el]=Karbon Name[es]=Karbon +Name[et]=Karbon +Name[fi]=Karbon Name[hu]=Karbon Name[it]=Karbon +Name[ja]=Karbon Name[kk]=Karbon Name[nl]=Karbon Name[pl]=Karbon Name[pt]=Karbon Name[pt_BR]=Karbon +Name[sk]=Karbon Name[sv]=Karbon Name[uk]=Karbon Name[x-test]=xxKarbonxx @@ -23,6 +27,7 @@ GenericName[af]=Skaal veranderbare Grafieka GenericName[bg]=Векторна графика GenericName[ca]=Gràfics escalables +GenericName[ca@valencia]=Gràfics escalables GenericName[cs]=Škálovatelná grafika GenericName[cy]=Graffeg Graddadwy GenericName[da]=Skalérbar grafik @@ -33,7 +38,7 @@ GenericName[es]=Gráficos escalables GenericName[et]=Vektorgraafika GenericName[eu]=Grafiko eskalagarriak -GenericName[fi]=Skaalattava grafiikka +GenericName[fi]=Skaalautuva grafiikka GenericName[fr]=Graphiques vectoriels GenericName[fy]=GenericFektorôfbyldings GenericName[ga]=Grafaic Inscálaithe @@ -84,6 +89,7 @@ Comment=Create scalable vector drawings Comment[bg]=Създаване на векторни графики Comment[ca]=Crea dibuixos de vectors escalables +Comment[ca@valencia]=Crea dibuixos de vectors escalables Comment[cs]=Vytvářejte vektorové kresby Comment[da]=Tegn skalerbare vektortegninger Comment[de]=Skalierbare Vektorzeichungen erstellen @@ -91,7 +97,7 @@ Comment[en_GB]=Create scalable vector drawings Comment[es]=Crear dibujos vectoriales escalables Comment[et]=Skaleeritavate vektrojoonistuste loomine -Comment[fi]=Tee skaalattavaa vektorigrafiikkaa +Comment[fi]=Tee vektorigrafiikkaa Comment[fr]=Créer des tracés vectorisés Comment[fy]=Te skalen fektor ôfbyldings oanmeitsje Comment[ga]=Cruthaigh líníochtaí veicteoireacha inscálaithe diff -Nru calligra-2.4.0/karbon/data/karbon_module.desktop calligra-2.4.3/karbon/data/karbon_module.desktop --- calligra-2.4.0/karbon/data/karbon_module.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/data/karbon_module.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Core functionality module for Karbon Comment[bg]=Модул с основната функционалност на Karbon Comment[ca]=Mòdul de funcionalitat principal per a Karbon +Comment[ca@valencia]=Mòdul de funcionalitat principal per a Karbon Comment[cs]=Modul hlavní funkčnosti aplikace Karbon Comment[cy]=Modiwl swyddogaeth craidd ar gyfer Karbon Comment[da]=Kernefunktionalitetsmodul for Karbon diff -Nru calligra-2.4.0/karbon/data/karbonpart.desktop calligra-2.4.3/karbon/data/karbonpart.desktop --- calligra-2.4.0/karbon/data/karbonpart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/data/karbonpart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,14 +2,18 @@ Name=Calligra Scalable Graphics Component Name[bg]=Компонент за векторна графика в Calligra Name[ca]=Component de gràfics escalables del Calligra +Name[ca@valencia]=Component de gràfics escalables del Calligra Name[cs]=SVG komponenta pro Calligra Office Name[da]=Calligra-komponent til skalérbar grafik Name[de]=Calligra-Komponente für Vektorgrafiken Name[el]=Συστατικό διανυσματικών γραφικών του Calligra Name[es]=Componente de gráficos escalables de Calligra Name[et]=Calligra vektorgraafika komponent +Name[fi]=Calligran vektorigrafiikkakomponentti Name[fr]=Composant graphiques vectoriels de Calligra +Name[gl]=Compoñente de imaxes escalábeis de Calligra Name[it]=Componente per grafica vettoriale di Calligra +Name[ja]=Calligra スケーラブルグラフィックス コンポーネント Name[kk]=Calligra-ның масштабтайтын графика бағдарламасы Name[nb]=Skalerbar grafikk-komponent for Calligra Name[nds]=Calligra-Komponent för Vektorgrafiken @@ -18,6 +22,7 @@ Name[pt]=Componente de Imagens Escaláveis do Calligra Name[pt_BR]=Componente de imagens vetoriais do Calligra Name[ru]=Компонент векторных рисунков Calligra +Name[sk]=Komponent škálovateľnej grafiky Calligra Name[sv]=Calligra skalbar grafikkomponent Name[uk]=Компонент векторної графіки Calligra Name[x-test]=xxCalligra Scalable Graphics Componentxx @@ -36,6 +41,7 @@ GenericName[af]=Skaal veranderbare Grafieka GenericName[bg]=Векторна графика GenericName[ca]=Gràfics escalables +GenericName[ca@valencia]=Gràfics escalables GenericName[cs]=Škálovatelná grafika GenericName[cy]=Graffeg Graddadwy GenericName[da]=Skalérbar grafik @@ -46,7 +52,7 @@ GenericName[es]=Gráficos escalables GenericName[et]=Vektorgraafika GenericName[eu]=Grafiko eskalagarriak -GenericName[fi]=Skaalattava grafiikka +GenericName[fi]=Skaalautuva grafiikka GenericName[fr]=Graphiques vectoriels GenericName[fy]=GenericFektorôfbyldings GenericName[ga]=Grafaic Inscálaithe diff -Nru calligra-2.4.0/karbon/plugins/dockers/karbondockersplugin.desktop calligra-2.4.3/karbon/plugins/dockers/karbondockersplugin.desktop --- calligra-2.4.0/karbon/plugins/dockers/karbondockersplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/plugins/dockers/karbondockersplugin.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Karbon Dockers plugin Name[ca]=Connector de Dockers per al Karbon +Name[ca@valencia]=Connector de Dockers per al Karbon Name[da]=Dokker-plugin til Karbon Name[de]=Karbon Docker-Modul Name[el]=Πρόσθετο προσάρτησης του Karbon @@ -11,7 +12,7 @@ Name[fi]=Karbonin telakointiliitännäinen Name[fr]=Module externe de panneaux pour Karbon Name[fy]=Karbon Dockers plugin -Name[gl]=Extensión Dockers para Karbon +Name[gl]=Engadido Karbon Dockers Name[he]=תוסף Dockers של Karbon Name[hi]=कारबन डॉकर्स प्लगइन Name[hne]=कारबन डाकर प्लगइन diff -Nru calligra-2.4.0/karbon/plugins/filtereffects/karbonfiltereffects.desktop calligra-2.4.3/karbon/plugins/filtereffects/karbonfiltereffects.desktop --- calligra-2.4.0/karbon/plugins/filtereffects/karbonfiltereffects.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/plugins/filtereffects/karbonfiltereffects.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Icon= Name=Filter Effects Name[ca]=Efectes de filtre +Name[ca@valencia]=Efectes de filtre Name[cs]=Filtrovat efekty Name[da]=Filtrér effekter Name[de]=Filtereffekte diff -Nru calligra-2.4.0/karbon/plugins/tools/karbontools.desktop calligra-2.4.3/karbon/plugins/tools/karbontools.desktop --- calligra-2.4.0/karbon/plugins/tools/karbontools.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/plugins/tools/karbontools.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Karbon Tools Name[ca]=Eines del Karbon +Name[ca@valencia]=Eines del Karbon Name[cs]=Nástroje Karbonu Name[da]=Karbon-værktøjer Name[de]=Karbon-Werkzeuge diff -Nru calligra-2.4.0/karbon/templates/basic/.directory calligra-2.4.3/karbon/templates/basic/.directory --- calligra-2.4.0/karbon/templates/basic/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/templates/basic/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Основни Name[br]=Diazez Name[ca]=Bàsic +Name[ca@valencia]=Bàsic Name[cs]=Základní Name[cy]=Sylfaenol Name[da]=Basal diff -Nru calligra-2.4.0/karbon/templates/basic/empty.desktop calligra-2.4.3/karbon/templates/basic/empty.desktop --- calligra-2.4.0/karbon/templates/basic/empty.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/templates/basic/empty.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Празен документ Name[br]=Teul goullo Name[ca]=Document buit +Name[ca@valencia]=Document buit Name[cs]=Prázdný dokument Name[cy]=Dogfen Wag Name[da]=Tomt dokument @@ -60,6 +61,7 @@ Comment[bg]=Създаване на празен документ Comment[br]=Krouiñ un teul goullo Comment[ca]=Crea un document buit +Comment[ca@valencia]=Crea un document buit Comment[cs]=Vytvoří prázdný dokument Comment[cy]=Creuir dogfen wag Comment[da]=Opretter et tomt dokument diff -Nru calligra-2.4.0/karbon/ui/KarbonView.cpp calligra-2.4.3/karbon/ui/KarbonView.cpp --- calligra-2.4.0/karbon/ui/KarbonView.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/karbon/ui/KarbonView.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -327,6 +327,7 @@ // layout: QGridLayout *layout = new QGridLayout(); layout->setMargin(0); + layout->addWidget(d->horizRuler->tabChooser(), 0, 0); layout->addWidget(d->horizRuler, 0, 1); layout->addWidget(d->vertRuler, 1, 0); layout->addWidget(canvasController, 1, 1); diff -Nru calligra-2.4.0/kexi/core/kexiprojectdata.cpp calligra-2.4.3/kexi/core/kexiprojectdata.cpp --- calligra-2.4.0/kexi/core/kexiprojectdata.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/core/kexiprojectdata.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of the KDE project Copyright (C) 2003 Lucijan Busch - Copyright (C) 2003-2011 Jarosław Staniek + Copyright (C) 2003-2012 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 @@ -99,7 +99,7 @@ { setObjectName("KexiProjectData"); d->connData = cdata; - setDatabaseName(dbname); + setDatabaseName(cdata.dbFileName().isEmpty() ? dbname : cdata.dbFileName()); setCaption(caption); } diff -Nru calligra-2.4.0/kexi/core/kexiprojectdata.h calligra-2.4.3/kexi/core/kexiprojectdata.h --- calligra-2.4.0/kexi/core/kexiprojectdata.h 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/core/kexiprojectdata.h 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of the KDE project Copyright (C) 2003 Lucijan Busch - Copyright (C) 2003-2011 Jarosław Staniek + Copyright (C) 2003-2012 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 @@ -64,6 +64,11 @@ KexiProjectData(); + /*! Creates project data out of connection data @a cdata. + @a dbname can be provided for server-based connections; it is ignored + for file-based onces because in this case name is equal to database's filename + (cdata.dbFileName()). + @a caption is for setting project's caption. */ KexiProjectData(const KexiDB::ConnectionData &cdata, const QString& dbname = QString(), const QString& caption = QString()); diff -Nru calligra-2.4.0/kexi/data/kexihandler.desktop calligra-2.4.3/kexi/data/kexihandler.desktop --- calligra-2.4.0/kexi/data/kexihandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/data/kexihandler.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ X-KDE-ServiceType=Kexi/Handler Comment=Kexi Project Handlers Comment[ca]=Gestors de projectes del Kexi +Comment[ca@valencia]=Gestors de projectes del Kexi Comment[cs]=Ovladač projektů Kexi Comment[cy]=Trinyddion Prosiect Kexi Comment[da]=Kexi projekthåndtering diff -Nru calligra-2.4.0/kexi/doc/dev/CHANGELOG-Kexi-js calligra-2.4.3/kexi/doc/dev/CHANGELOG-Kexi-js --- calligra-2.4.0/kexi/doc/dev/CHANGELOG-Kexi-js 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/doc/dev/CHANGELOG-Kexi-js 2012-06-26 04:21:31.000000000 +0000 @@ -146,11 +146,75 @@ ~~~~~~~~~~~~~~~~ 2.5 Alpha 1 (2.4.71) ~~~~~~~~~~~~~~~~ +TODO: +Table Designer +*Changing Length property does not trigger data removal +BUG:301262 + +TODO: +KexiDB +*MySQL Driver +**add config option for the length limit + +2012-06-07 +KexiDB +*Added maxLengthIsDefault property of table field for Text types to extended schema +**stores a hint that limit comes from default setting +CCBUG:301277 +*Added DefaultMaxLengthForTextFields config in Tables group +**specifies default maximum length for fields of type Text +**0 (the default) means unlimited or up to engine's limit +CCBUG:301277 +TODO: Port to Predicate + +~~~~~~~~~~~~~~~~ 2.5 Alpha 1 (2.4.91) ~~~~~~~~~~~~~~~~ + 2012-03-03 Main Window *User feedback: added anti-DOS protection when updating feedback ui *User feedback: added checking format of the .list files to avoid erroneous HTTP requests +~~~~~~~~~~~~~~~~ 2.4.3 ~~~~~~~~~~~~~~~~ + +2012-06-09 +KexiDB +*MySQL Driver +*set limit to 255 characters for Text type (VARCHAR) +**call "SET SESSION sql_mode='TRADITIONAL'" on opening database - needed to turn warnings about trimming string values into SQL errors +**practical solution for 'Kexi shows no indication that text is trimmed' bug in case of MySQL: error is displayed eg. "Record inserting on the server failed.Message from server: Data too long for column 'hn' at row 1. SQL statement: INSERT INTO table4 (hn) VALUES ('...................'). Server result: 1406" +**More info on VARCHAR support in databases: http://www.ispirer.com/wiki/sqlways/mysql/data-types/varchar_n +CCBUG:301277 +CCBUG:301136 +REVIEW:105182 + +2012-06-06 +KexiDB +*Remove limits for Text data type, leave as option +**By default there are no limits in Text data type +BUG:301277 +TODO: Port to Predicate +TODO(2.5): Save default hint for max length (strategy) in table metadata, in 2.4 "defined" strategy is always used + +~~~~~~~~~~~~~~~~ 2.4.2 ~~~~~~~~~~~~~~~~ + +KexiDB +*put DESC/ASC after COLLATE section, not before (needed at least for sqlite driver) +*fixed crash because of invalid deletion order of query structures +*fixed crash because of invalid deletion relationship structures +BUG:298197 + +~~~~~~~~~~~~~~~~ 2.4.1 ~~~~~~~~~~~~~~~~ + +Tables +*Fixed bug: Cannot update field name from Property Editor +BUG:278296 + +2012-04-06 +KexiDB +*SQLite Driver +**Fixed error when attempting to compact database opened from Open view +TODO: port to Predicate + ~~~~~~~~~~~~~~~~ 2.4.0 ~~~~~~~~~~~~~~~~ 2012-04-04 @@ -451,12 +515,6 @@ 2011-11-30 Reports *Fix bug: no indication of selected toolbox action for report element -BUG:283888 -*After inserting element, respective toolbox action is deselected - -2011-11-30 -Reports -*Fix bug: no indication of selected toolbox action for report element BUG:285583 *After inserting element, respective toolbox action is deselected @@ -477,8 +535,8 @@ Startup *Remove duplicated entries of recent files at startup so the newest entry for given database is displayed Main Window -BUG:282651 *fix build of search line edit for msvc +BUG:282651 ~~~~~~~~~~~~~~~~ 2.4 Beta 4 (2.3.84) ~~~~~~~~~~~~~~~~ @@ -537,10 +595,6 @@ Main Window *Simplified background below menu to make it flicker less -2011-10-12 -Main Window -*Simplified background below menu to make it flicker less - 2011-10-11 Code *[code] Moved kexi/migration/spreadsheet/ plugin to plugins/kexi/ as it also depends on Tables @@ -599,6 +653,7 @@ **fixed all issues noted in review, cleaned up code using astyle 2011-09-23 +Startup *Fix: properly show server-based items on the Recent Projects list BUG:282651 diff -Nru calligra-2.4.0/kexi/formeditor/factories/kformdesigner_containers.desktop calligra-2.4.3/kexi/formeditor/factories/kformdesigner_containers.desktop --- calligra-2.4.0/kexi/formeditor/factories/kformdesigner_containers.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/formeditor/factories/kformdesigner_containers.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -4,6 +4,7 @@ Name=Container Widgets Name[ca]=Estris contenidors +Name[ca@valencia]=Estris contenidors Name[cs]=Kontejnerové widgety Name[cy]=Celfigion Cynhwysydd Name[da]=Container-kontroller diff -Nru calligra-2.4.0/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop calligra-2.4.3/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop --- calligra-2.4.0/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/formeditor/factories/kformdesigner_stdwidgets.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name=Basic Widgets Name[br]=Widgets Diazez Name[ca]=Estris estàndard +Name[ca@valencia]=Estris estàndard Name[cs]=Základní widgety Name[cy]=Celfigion Sylfaenol Name[da]=Basale kontroller diff -Nru calligra-2.4.0/kexi/formeditor/widgetfactory.desktop calligra-2.4.3/kexi/formeditor/widgetfactory.desktop --- calligra-2.4.0/kexi/formeditor/widgetfactory.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/formeditor/widgetfactory.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ X-KDE-ServiceType=KFormDesigner/WidgetFactory Comment=Widget Factory Base Comment[ca]=Factoria base d'estris +Comment[ca@valencia]=Factoria base d'estris Comment[cy]=Bâs Ffatri Celfigion Comment[da]=Widget Factory Base Comment[de]=Basis für die Erstellung von Bedienelementen diff -Nru calligra-2.4.0/kexi/kexidb/alter.cpp calligra-2.4.3/kexi/kexidb/alter.cpp --- calligra-2.4.0/kexi/kexidb/alter.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/alter.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -129,7 +129,7 @@ I("caption", MainSchemaAlteringRequired); I("description", MainSchemaAlteringRequired); I2("unsigned", PhysicalAlteringRequired, DataConversionRequired); // always? - I2("length", PhysicalAlteringRequired, DataConversionRequired); // always? + I2("maxLength", PhysicalAlteringRequired, DataConversionRequired); // always? I2("precision", PhysicalAlteringRequired, DataConversionRequired); // always? I("width", MainSchemaAlteringRequired); // defaultValue: depends on backend, for mysql it can only by a constant or now()... @@ -455,7 +455,7 @@ TODO: more cases to check */ } - if (m_propertyName == "length") { + if (m_propertyName == "maxLength") { //use "select max( length(o_name) ) from kexi__Objects" } diff -Nru calligra-2.4.0/kexi/kexidb/alter.h calligra-2.4.3/kexi/kexidb/alter.h --- calligra-2.4.0/kexi/kexidb/alter.h 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/alter.h 2012-06-26 04:18:00.000000000 +0000 @@ -286,7 +286,7 @@ /*! Defines an action for changing a single property value of a table field. Supported properties are currently: - "name", "type", "caption", "description", "unsigned", "length", "precision", + "name", "type", "caption", "description", "unsigned", "maxLength", "precision", "width", "defaultValue", "primaryKey", "unique", "notNull", "allowEmpty", "autoIncrement", "indexed", "visibleDecimalPlaces" diff -Nru calligra-2.4.0/kexi/kexidb/connection.cpp calligra-2.4.3/kexi/kexidb/connection.cpp --- calligra-2.4.0/kexi/kexidb/connection.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/connection.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -987,8 +987,24 @@ v += QString::fromLatin1("(%1,%2)").arg(field->precision()).arg(field->scale()); else v += QString::fromLatin1("(%1)").arg(field->precision()); - } else if (field->type() == Field::Text && field->length() > 0) - v += QString::fromLatin1("(%1)").arg(field->length()); + } + else if (field->type() == Field::Text) { + uint realMaxLen; + if (m_driver->beh->TEXT_TYPE_MAX_LENGTH == 0) { + realMaxLen = field->maxLength(); // allow to skip (N) + } + else { // max length specified by driver + if (field->maxLength() == 0) { // as long as possible + realMaxLen = m_driver->beh->TEXT_TYPE_MAX_LENGTH; + } + else { // not longer than specified by driver + realMaxLen = qMin(m_driver->beh->TEXT_TYPE_MAX_LENGTH, field->maxLength()); + } + } + if (realMaxLen > 0) { + v += QString::fromLatin1("(%1)").arg(realMaxLen); + } + } if (autoinc) v += (" " + @@ -1562,6 +1578,14 @@ ); } +static QVariant buildLengthValue(const Field& f) +{ + if (f.isFPNumericType()) { + return f.scale(); + } + return f.maxLength(); +} + //! builds a list of values for field's \a f properties. Used by createTable(). void buildValuesForKexi__Fields(QList& vals, Field* f) { @@ -1570,7 +1594,7 @@ << QVariant(f->table()->id()) << QVariant(f->type()) << QVariant(f->name()) - << QVariant(f->isFPNumericType() ? f->scale() : f->length()) + << buildLengthValue(*f) << QVariant(f->isFPNumericType() ? f->precision() : 0) << QVariant(f->constraints()) << QVariant(f->options()) @@ -2835,9 +2859,15 @@ if (!ok) return 0; Field::Type f_type = (Field::Type)f_int_type; - int f_len = qMax(0, data.at(3).toInt(&ok)); - if (!ok) + int f_len = qMax(0, data.at(3).toInt(&ok)); // defined limit + if (!ok) { return 0; + } + if (f_len < 0) { + f_len = 0; + } +//! @todo load maxLengthStrategy info to see if the maxLength is the default + int f_prec = data.at(4).toInt(&ok); if (!ok) return 0; diff -Nru calligra-2.4.0/kexi/kexidb/driver.cpp calligra-2.4.3/kexi/kexidb/driver.cpp --- calligra-2.4.0/kexi/kexidb/driver.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/driver.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -67,6 +67,7 @@ , USING_DATABASE_REQUIRED_TO_CONNECT(true) , _1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY(false) , SELECT_1_SUBQUERY_SUPPORTED(false) + , TEXT_TYPE_MAX_LENGTH(0) { } diff -Nru calligra-2.4.0/kexi/kexidb/driver_p.h calligra-2.4.3/kexi/kexidb/driver_p.h --- calligra-2.4.0/kexi/kexidb/driver_p.h 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/driver_p.h 2012-06-26 04:18:00.000000000 +0000 @@ -135,6 +135,13 @@ /*! True if "SELECT 1 from (subquery)" is supported. False by default. Used in Connection::resultExists() for optimization. It's set to true for SQLite driver. */ bool SELECT_1_SUBQUERY_SUPPORTED : 1; + + /*! Specifies maximum length for Text type. If 0, there is are limits and length argument is not needed, + e.g. VARCHAR works for the driver this is the case for SQLite and PostgreSQL. + If greater than 0, this value should be used to express maximum value, e.g. VARCHAR(...). + This is the case for MySQL. + The default is 0. */ + uint TEXT_TYPE_MAX_LENGTH; }; /*! Private driver's data members. Available for implementation. */ diff -Nru calligra-2.4.0/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop calligra-2.4.3/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop --- calligra-2.4.0/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/mySQL/kexidb_mysqldriver.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=MySQL Name[br]=MySQL Name[ca]=MySQL +Name[ca@valencia]=MySQL Name[cs]=MySQL Name[cy]=MySQL Name[da]=MySQL @@ -57,6 +58,7 @@ Name[zh_TW]=MySQL Comment=Kexi database driver for accessing MySQL servers 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 diff -Nru calligra-2.4.0/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp calligra-2.4.3/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp --- calligra-2.4.0/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -133,7 +133,14 @@ bool MySqlConnectionInternal::useDatabase(const QString &dbName) { //TODO is here escaping needed? - return executeSQL(QLatin1String("USE ") + escapeIdentifier(dbName)); + if (!executeSQL(QLatin1String("USE ") + escapeIdentifier(dbName))) { + return false; + } + if (!executeSQL("SET SESSION sql_mode='TRADITIONAL'")) { + // needed to turn warnings about trimming string values into SQL errors + return false; + } + return true; } /*! Executes the given SQL statement on the server. diff -Nru calligra-2.4.0/kexi/kexidb/drivers/mySQL/mysqldriver.cpp calligra-2.4.3/kexi/kexidb/drivers/mySQL/mysqldriver.cpp --- calligra-2.4.0/kexi/kexidb/drivers/mySQL/mysqldriver.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/mySQL/mysqldriver.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -67,6 +67,8 @@ beh->_1ST_ROW_READ_AHEAD_REQUIRED_TO_KNOW_IF_THE_RESULT_IS_EMPTY = false; beh->USING_DATABASE_REQUIRED_TO_CONNECT = false; beh->QUOTATION_MARKS_FOR_IDENTIFIER = '`'; + //! @todo add configuration option + beh->TEXT_TYPE_MAX_LENGTH = 255; initDriverSpecificKeywords(keywords); //predefined properties diff -Nru calligra-2.4.0/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop calligra-2.4.3/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop --- calligra-2.4.0/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/odbc/kexidb_odbcdriver.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=ODBC Name[br]=ODBC Name[ca]=ODBC +Name[ca@valencia]=ODBC Name[cs]=ODBC Name[cy]=ODBC Name[da]=ODBC @@ -60,6 +61,7 @@ Name[zh_TW]=ODBC Comment=Kexi Open Database Connectivity Driver Comment[ca]=Controlador ODBC per al Kexi +Comment[ca@valencia]=Controlador ODBC per al Kexi Comment[cs]=Ovladač Kexi Open Database Connectivity Comment[cy]=Gyrrydd Cysylltedd Cronfa Ddata Agored Kexi Comment[da]=Kexi-driver for åben databaseforbindelse diff -Nru calligra-2.4.0/kexi/kexidb/drivers/oracle/kexidb_oracledriver.desktop calligra-2.4.3/kexi/kexidb/drivers/oracle/kexidb_oracledriver.desktop --- calligra-2.4.0/kexi/kexidb/drivers/oracle/kexidb_oracledriver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/oracle/kexidb_oracledriver.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -4,6 +4,7 @@ Name[ast]=Oracle Name[bg]=Oracle Name[ca]=Oracle +Name[ca@valencia]=Oracle Name[cs]=Oracle Name[da]=Oracle Name[de]=Oracle @@ -42,6 +43,7 @@ Name[zh_TW]=Oracle Comment=Kexi database driver for accessing Oracle servers Comment[ca]=Controlador de bases de dades Kexi per a accedir a servidors Oracle +Comment[ca@valencia]=Controlador de bases de dades Kexi per a accedir a servidors Oracle Comment[da]=Databasedriver til at tilgå Oracle-servere til Kexi Comment[de]=Kexi-Datenbanktreiber für Zugriff auf Oracle-Server Comment[el]=Οδηγός βάσης δεδομένων του Kexi για πρόσβαση σε εξυπηρετητές Oracle diff -Nru calligra-2.4.0/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop calligra-2.4.3/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop --- calligra-2.4.0/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/pqxx/kexidb_pqxxsqldriver.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=PostgreSQL Name[br]=PostgreSQL Name[ca]=PostgreSQL +Name[ca@valencia]=PostgreSQL Name[cs]=PostgreSQL Name[cy]=PostgreSQL Name[da]=PostgreSQL @@ -56,6 +57,7 @@ Name[zh_TW]=PostgreSQL Comment=Kexi database driver for accessing PostgreSQL servers 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 diff -Nru calligra-2.4.0/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop calligra-2.4.3/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop --- calligra-2.4.0/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/sqlite/kexidb_sqlite3driver.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=SQLite3 Name[br]=SQLite3 Name[ca]=SQLite3 +Name[ca@valencia]=SQLite3 Name[cs]=SQLite3 Name[cy]=SQLite3 Name[da]=SQLite3 @@ -54,6 +55,7 @@ Name[zh_TW]=SQLite3 Comment=SQLite is default Kexi embedded SQL engine Comment[ca]=SQLite és el motor SQL encastat i per defecte del Kexi +Comment[ca@valencia]=SQLite és el motor SQL encastat i per defecte del Kexi Comment[cs]=SQLite je standardní embedded SQL systém Kexi Comment[cy]=Y peiriant SQL mewnadeiledig rhagosod Kexi yw SQLite Comment[da]=SQLite er en standard Kexi-indlejret SQL-motor diff -Nru calligra-2.4.0/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp calligra-2.4.3/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp --- calligra-2.4.0/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -447,7 +447,7 @@ d->setExtensionsLoadingEnabled(false); } if (!ok) { - kWarning() << "Could not load SQLite extension" << path; + kWarning() << "Could not load SQLite extension" << path << ":" << d->errmsg_p; } return ok; } diff -Nru calligra-2.4.0/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop calligra-2.4.3/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop --- calligra-2.4.0/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/sybase/kexidb_sybasedriver.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sybase Name[bg]=Sybase Name[ca]=Sybase +Name[ca@valencia]=Sybase Name[cs]=Sybase Name[da]=Sybase Name[de]=Sybase @@ -44,6 +45,7 @@ Name[zh_TW]=Sybase Comment=Kexi database driver for accessing Sybase servers 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 diff -Nru calligra-2.4.0/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop calligra-2.4.3/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop --- calligra-2.4.0/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/xbase/kexidb_xbasedriver.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=xBase Name[bg]=xBase Name[ca]=xBase +Name[ca@valencia]=xBase Name[cs]=xBase Name[da]=xBase Name[de]=xBase @@ -10,11 +11,13 @@ Name[eo]=xBase Name[es]=xBase Name[et]=xBase +Name[fi]=xBase Name[fr]=xBase Name[ga]=xBase Name[gl]=xBase Name[he]=xBase Name[hne]=एक्सबेस +Name[hu]=xBase Name[it]=xBase Name[ja]=xBase Name[kk]=xBase @@ -39,6 +42,7 @@ Name[zh_TW]=xBase Comment=Kexi database driver for accessing xBase database files 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 diff -Nru calligra-2.4.0/kexi/kexidb/drivers/xbase/xbaseexport.cpp calligra-2.4.3/kexi/kexidb/drivers/xbase/xbaseexport.cpp --- calligra-2.4.0/kexi/kexidb/drivers/xbase/xbaseexport.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/drivers/xbase/xbaseexport.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -154,7 +154,7 @@ int xBaseExportPrivate::fieldLength(KexiDB::Field* f ) { if ( f->type() == KexiDB::Field::Text ) { - return f->length(); + return f->maxLength(); } // return the max possible (string)length of the types // see http://linux.techass.com/projects/xdb/xbasedocs/xbase_c3.html diff -Nru calligra-2.4.0/kexi/kexidb/expression.cpp calligra-2.4.3/kexi/kexidb/expression.cpp --- calligra-2.4.0/kexi/kexidb/expression.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/expression.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -522,8 +522,11 @@ return Field::BigInteger; } else if (m_token == CHARACTER_STRING_LITERAL) { //TODO: Field::defaultTextLength() is hardcoded now! - if (value.toString().length() > (int)Field::defaultTextLength()) + if (Field::defaultMaxLength() > 0 + && uint(value.toString().length()) > Field::defaultMaxLength()) + { return Field::LongText; + } else return Field::Text; } else if (m_token == REAL_CONST) diff -Nru calligra-2.4.0/kexi/kexidb/field.cpp calligra-2.4.3/kexi/kexidb/field.cpp --- calligra-2.4.0/kexi/kexidb/field.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/field.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,7 @@ /* This file is part of the KDE project Copyright (C) 2002 Lucijan Busch Copyright (C) 2002 Joseph Wenninger - Copyright (C) 2003-2007 Jarosław Staniek + Copyright (C) 2003-2012 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 @@ -40,6 +40,9 @@ Field::FieldTypeNames Field::m_typeNames; Field::FieldTypeGroupNames Field::m_typeGroupNames; +//! @todo make this configurable +static uint m_defaultMaxLength = 0; // unlimited + Field::Field() { init(); @@ -66,12 +69,11 @@ } Field::Field(const QString& name, Type ctype, - uint cconst, uint options, uint length, uint precision, + uint cconst, uint options, uint maxLength, uint precision, QVariant defaultValue, const QString& caption, const QString& description, uint width) : m_parent(0) , m_name(name.toLower()) - , m_length(length) , m_precision(precision) , m_visibleDecimalPlaces(-1) , m_options(options) @@ -84,11 +86,8 @@ , m_customProperties(0) , m_type(ctype) { + setMaxLength(maxLength); setConstraints(cconst); - if (m_length == 0) {//0 means default length: - if (m_type == Field::Text) - m_length = defaultTextLength(); - } } /*! Copy constructor. */ @@ -123,7 +122,6 @@ m_parent = 0; m_name = ""; m_type = InvalidType; - m_length = 0; m_precision = 0; m_visibleDecimalPlaces = -1; m_options = NoOptions; @@ -132,6 +130,8 @@ m_width = 0; m_expr = 0; m_customProperties = 0; + setMaxLength(0); // do not move this line up! + setMaxLengthStrategy(DefinedMaxLength); // do not move this line up! } Field::Type Field::type() const @@ -361,12 +361,36 @@ } } +uint Field::defaultMaxLength() +{ + return m_defaultMaxLength; +} + +void Field::setDefaultMaxLength(uint maxLength) +{ + m_defaultMaxLength = maxLength; +} + +Field::MaxLengthStrategy Field::maxLengthStrategy() const +{ + return m_maxLengthStrategy; +} + +void Field::setMaxLengthStrategy(MaxLengthStrategy strategy) +{ + m_maxLengthStrategy = strategy; +} + +uint Field::maxLength() const +{ + return m_maxLength; +} + void -Field::setLength(uint l) +Field::setMaxLength(uint maxLength) { - if (type() != Field::Text) - return; - m_length = l; + m_maxLength = maxLength; + m_maxLengthStrategy = DefinedMaxLength; } void @@ -382,7 +406,7 @@ { if (!isFPNumericType()) return; - m_length = s; + m_maxLength = s; } void @@ -504,7 +528,7 @@ break; } case Text: { - if (def.isNull() || (def.length() > 255)) + if (def.isNull() || (uint(def.length()) > maxLength())) m_defaultValue = QVariant(); else m_defaultValue = QVariant((QString)def); @@ -613,8 +637,8 @@ dbg += QString::fromLatin1("(%1,%2)").arg(m_precision).arg(scale()); else dbg += QString::fromLatin1("(%1)").arg(m_precision); - } else if (m_type == Field::Text && m_length > 0) - dbg += QString::fromLatin1("(%1)").arg(m_length); + } else if (m_type == Field::Text && m_maxLength > 0) + dbg += QString::fromLatin1("(%1)").arg(m_maxLength); if (m_constraints & Field::AutoInc) dbg += " AUTOINC"; if (m_constraints & Field::Unique) diff -Nru calligra-2.4.0/kexi/kexidb/field.h calligra-2.4.3/kexi/kexidb/field.h --- calligra-2.4.0/kexi/kexidb/field.h 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/field.h 2012-06-26 04:18:00.000000000 +0000 @@ -1,7 +1,7 @@ /* This file is part of the KDE project Copyright (C) 2002 Lucijan Busch Copyright (C) 2002 Joseph Wenninger - Copyright (C) 2003-2007 Jarosław Staniek + Copyright (C) 2003-2012 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 @@ -48,7 +48,8 @@ - type - database constraints - additional options - - length (make sense mostly for string types) + - maxLength (makes sense mostly for string types) + - maxLengthStrategy (makes sense mostly for string types) - precision (for floating-point type) - defaultValue - caption (user readable name that can be e.g. translated) @@ -97,8 +98,8 @@ Time = 8, /*!< */ Float = 9, /*!< 4 bytes */ Double = 10, /*!< 8 bytes */ - Text = 11, /*!< Other name: Varchar; no more than 200 bytes, for efficiency */ - LongText = 12, /*!< Other name: Memo. More than 200 bytes*/ + Text = 11, /*!< Other name: Varchar */ + LongText = 12, /*!< Other name: Memo */ BLOB = 13, /*!< Large binary object */ LastType = 13, /*!< This line should be at the end of the list of types! */ @@ -113,11 +114,6 @@ Map = 130 /*!< Mapping from string to string list (more generic than Enum */ }; -//TODO: make this configurable - static uint defaultTextLength() { - return 200; - } - /*! Type groups for fields. */ enum TypeGroup { InvalidGroup = 0, @@ -149,19 +145,22 @@ Unsigned = 1 }; - /*! Creates a database field as a child of \a tableSchema table + /*! Creates a database field as a child of \a tableSchema table. + maxLength property is set to 0 (unlimited length). No other properties are set (even the name), so these should be set later. */ Field(TableSchema *tableSchema); - /*! Creates a database field without any properties set. - These should be set later. */ + /*! Creates a database field. + maxLength property is set to 0 (unlimited length). + No other properties are set (even the name), so these should be set later. */ Field(); - /*! Creates a database field with specified properties. */ + /*! Creates a database field with specified properties. + For meaning of @a maxLength argument please refer to setMaxLength(). */ Field(const QString& name, Type ctype, uint cconst = NoConstraints, uint options = NoOptions, - uint length = 0, uint precision = 0, + uint maxLength = 0, uint precision = 0, QVariant defaultValue = QVariant(), const QString& caption = QString(), const QString& description = QString(), @@ -383,11 +382,54 @@ return m_defaultValue; } - /*! \return length of text, only meaningful if the field type is text. - 0 means "default length". */ - inline uint length() const { - return m_length; - } + /*! @return default maximum length of text. + Default is 0, i.e unlimited length (if the engine supports it). */ + static uint defaultMaxLength(); + + /*! Sets default maximum length of text. 0 means unlimited length, + greater than 0 means specific maximum length. */ + static void setDefaultMaxLength(uint maxLength); + + /*! Strategy for defining maximum length of text for this field. + Only makes sense if the field type is of Text type. + Default strategy is DefinedMaxLength. + */ + enum MaxLengthStrategy { + DefaultMaxLength, //!< Default maximum text length defined globally by the application. + //!< @see defaultMaxLength() + DefinedMaxLength //!< Used if setMaxLength() was called to set specific maximum value + //!< or to unlimited (0). + }; + + /*! \return a hint that indicates if the maximum length of text for this field is based on default setting + (defaultMaxLength()) or was explicitly set. + Only makes sense if the field type is Text. */ + MaxLengthStrategy maxLengthStrategy() const; + + /*! Sets strategy for defining maximum length of text for this field. + Only makes sense if the field type is Text. + Default strategy is DefinedMaxLength. + Changing this value does not affect maxLength property. + + Fields with DefaultMaxLength strategy does not follow changes made by calling setDefaultMaxLength() + so to update the default maximum lengths in fields, the app has to iterate over all fields of type Text, + and reset to the new default as explained in setMaxLength() documentation. + See documentation for setMaxLength() for information how to reset maxLength to default value. + + @see maxLengthStrategy(), setMaxLength() */ + void setMaxLengthStrategy(MaxLengthStrategy strategy); + + /*! \return maximum length of text allowed for this field. Only meaningful if the type is Text. + @see setMaxLength() */ + uint maxLength() const; + + /*! Sets maximum length for this field. Only works for Text type. + It can be specific maximum value or 0 for unlimited length (which will work if engine supports). + Resets maxLengthStrategy property to DefinedMaxLength. + To reset to default maximum length, call setMaxLength(defaultMaxLength()) and then + to indicate this is based on default setting, call setMaxLengthStrategy(DefaultMaxLength). + @see maxLength(), maxLengthStrategy() */ + void setMaxLength(uint maxLength); /*! \return precision for numeric and other fields that have both length (scale) and precision (floating point types). */ @@ -403,7 +445,7 @@ to both sides of the decimal point. So the number 23.5141 has a precision of 6 and a scale of 4. Integers can be considered to have a scale of zero. */ inline uint scale() const { - return m_length; + return m_maxLength; } //! @todo should we keep extended properties here or move them to a QVariant dictionary? @@ -496,10 +538,6 @@ enforced as well (see setIndexed()). */ void setConstraints(uint c); - /*! Sets length for this field. Only works for Text Type (even not LongText!). - 0 means "default length". @see length() */ - void setLength(uint l); - /*! Sets scale for this field. Only works for floating-point types. @see scale() */ void setScale(uint s); @@ -681,7 +719,8 @@ QString m_name; QString m_subType; uint m_constraints; - uint m_length; //!< also used for storing scale for floating point types + MaxLengthStrategy m_maxLengthStrategy; + uint m_maxLength; //!< also used for storing scale for floating point types uint m_precision; int m_visibleDecimalPlaces; //!< used in visibleDecimalPlaces() uint m_options; diff -Nru calligra-2.4.0/kexi/kexidb/kexidb_driver.desktop calligra-2.4.3/kexi/kexidb/kexidb_driver.desktop --- calligra-2.4.0/kexi/kexidb/kexidb_driver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/kexidb_driver.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Kexi SQL-Driver plugin Comment[br]=Lugent SQL-Driver evit Kexi Comment[ca]=Connector del controlador SQL del Kexi +Comment[ca@valencia]=Connector del controlador SQL del Kexi Comment[cs]=Modul ovladače SQL pro Kexi Comment[cy]=Ategyn Gyrrydd-SQL Kexi Comment[da]=Kexi SQL-driver-plugin diff -Nru calligra-2.4.0/kexi/kexidb/queryschema.cpp calligra-2.4.3/kexi/kexidb/queryschema.cpp --- calligra-2.4.0/kexi/kexidb/queryschema.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/queryschema.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -129,15 +129,6 @@ } } ~QuerySchemaPrivate() { - if (fieldsExpanded) - qDeleteAll(*fieldsExpanded); - delete fieldsExpanded; - if (internalFields) { - qDeleteAll(*internalFields); - delete internalFields; - } - delete fieldsExpandedWithInternalAndRowID; - delete fieldsExpandedWithInternal; delete orderByColumnList; delete autoincFields; delete columnsOrder; @@ -148,6 +139,15 @@ delete fakeRowIDCol; delete fakeRowIDField; delete ownedVisibleColumns; + if (fieldsExpanded) + qDeleteAll(*fieldsExpanded); + delete fieldsExpanded; + if (internalFields) { + qDeleteAll(*internalFields); + delete internalFields; + } + delete fieldsExpandedWithInternalAndRowID; + delete fieldsExpandedWithInternal; } void clear() { @@ -171,14 +171,6 @@ orderByColumnList->clear(); } if (fieldsExpanded) { - qDeleteAll(*fieldsExpanded); - delete fieldsExpanded; - fieldsExpanded = 0; - if (internalFields) { - qDeleteAll(*internalFields); - delete internalFields; - internalFields = 0; - } delete columnsOrder; columnsOrder = 0; delete columnsOrderWithoutAsterisks; @@ -192,6 +184,14 @@ columnInfosByName.clear(); delete ownedVisibleColumns; ownedVisibleColumns = 0; + qDeleteAll(*fieldsExpanded); + delete fieldsExpanded; + fieldsExpanded = 0; + if (internalFields) { + qDeleteAll(*internalFields); + delete internalFields; + internalFields = 0; + } } } @@ -414,6 +414,7 @@ OrderByColumn* OrderByColumn::copy(QuerySchema* fromQuery, QuerySchema* toQuery) const { + //kDebug() << "this=" << this << debugString() << "m_column=" << m_column; if (m_field) { return new OrderByColumn(*m_field, m_ascending); } @@ -436,11 +437,13 @@ } return new OrderByColumn(*columnInfo, m_ascending, m_pos); } + Q_ASSERT(m_field || m_column); return 0; } OrderByColumn::~OrderByColumn() { + //kDebug() << this << debugString(); } QString OrderByColumn::debugString() const @@ -459,6 +462,7 @@ QString OrderByColumn::toSQLString(bool includeTableName, const Driver *drv, int identifierEscaping) const { + //kDebug() << this << debugString(); const QString orderString(m_ascending ? "" : " DESC"); QString fieldName, tableName, collationString; if (m_column) { @@ -485,7 +489,7 @@ collationString = drv->collationSQL(); } } - return tableName + fieldName + orderString + collationString; + return tableName + fieldName + collationString + orderString; } //======================================= diff -Nru calligra-2.4.0/kexi/kexidb/relationship.h calligra-2.4.3/kexi/kexidb/relationship.h --- calligra-2.4.0/kexi/kexidb/relationship.h 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/relationship.h 2012-06-26 04:18:00.000000000 +0000 @@ -78,7 +78,7 @@ class KEXI_DB_EXPORT Relationship { public: - typedef KexiUtils::AutodeletedList List; + typedef QList List; typedef QList::ConstIterator ListIterator; /*! Creates uninitialized Relationship object. diff -Nru calligra-2.4.0/kexi/kexidb/utils.cpp calligra-2.4.3/kexi/kexidb/utils.cpp --- calligra-2.4.0/kexi/kexidb/utils.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/kexidb/utils.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -667,7 +667,7 @@ ADD("name"); ADD("caption"); ADD("description"); - ADD("length"); + ADD("maxLength"); ADD("precision"); ADD("defaultValue"); ADD("width"); @@ -732,8 +732,8 @@ field.setCaption((*it).toString()); if ((it = values.find("description")) != values.constEnd()) field.setDescription((*it).toString()); - if ((it = values.find("length")) != values.constEnd()) - field.setLength((*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok)); + if ((it = values.find("maxLength")) != values.constEnd()) + field.setMaxLength((*it).isNull() ? 0/*default*/ : (*it).toUInt(&ok)); if (!ok) return false; if ((it = values.find("precision")) != values.constEnd()) @@ -870,8 +870,8 @@ field.setDescription(value.toString()); return true; } - if ("length" == propertyName) - GET_INT(setLength); + if ("maxLength" == propertyName) + GET_INT(setMaxLength); if ("precision" == propertyName) GET_INT(setPrecision); if ("defaultValue" == propertyName) { diff -Nru calligra-2.4.0/kexi/kexi.desktop calligra-2.4.3/kexi/kexi.desktop --- calligra-2.4.0/kexi/kexi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/kexi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Kexi Name[br]=Kexi Name[ca]=Kexi +Name[ca@valencia]=Kexi Name[cs]=Kexi Name[cy]=Kexi Name[da]=Kexi @@ -62,6 +63,7 @@ GenericName[bg]=Създаване на бази от данни GenericName[br]=Aozer ar stlennvon GenericName[ca]=Creador de bases de dades +GenericName[ca@valencia]=Creador de bases de dades GenericName[cs]=Tvůrce databází GenericName[cy]=Creuydd Cronfa Ddata GenericName[da]=Opretter af databaser @@ -73,11 +75,11 @@ GenericName[et]=Andmebaaside imelihtne loomine GenericName[eu]=Datu-base sortzailea GenericName[fa]=ایجادکننده دادگان -GenericName[fi]=Tietokannan luoja +GenericName[fi]=Tietokantojen luonti GenericName[fr]=Créateur de base de données GenericName[fy]=Databank oanmeitsje GenericName[ga]=Cruthaitheoir Bunachar Sonraí -GenericName[gl]=Criación de Bases de Datos +GenericName[gl]=Creación de Bases de Datos GenericName[he]=יוצר מסדי נתונים GenericName[hi]=डाटाबेस सृजक GenericName[hne]=डाटाबेस सृजक @@ -113,6 +115,7 @@ GenericName[zh_TW]=資料庫建立程式 Comment=Develop desktop database applications 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é desktopové aplikace Comment[da]=Udvikl databaseprogrammer for desktoppen Comment[de]=Desktop-Datenbankanwendungen entwickeln diff -Nru calligra-2.4.0/kexi/main/KexiMainWindow.cpp calligra-2.4.3/kexi/main/KexiMainWindow.cpp --- calligra-2.4.0/kexi/main/KexiMainWindow.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/main/KexiMainWindow.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -2635,7 +2635,7 @@ return false; //opening requested - projectData = new KexiProjectData(cdata, aFileName); + projectData = new KexiProjectData(cdata); deleteAfterOpen = true; } if (!projectData) @@ -3941,7 +3941,7 @@ QDir::convertSeparators(cdata.fileName()))); return; } - data = new KexiProjectData(cdata, cdata.fileName()); + data = new KexiProjectData(cdata); } else { //sanity if (!(d->prj && d->prj->dbConnection() diff -Nru calligra-2.4.0/kexi/migration/keximigration_driver.desktop calligra-2.4.3/kexi/migration/keximigration_driver.desktop --- calligra-2.4.0/kexi/migration/keximigration_driver.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/migration/keximigration_driver.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ X-KDE-ServiceType=Kexi/MigrationDriver Comment=Kexi Data Migration Driver Comment[ca]=Controlador de migració de dades del Kexi +Comment[ca@valencia]=Controlador de migració de dades del Kexi Comment[cs]=Ovládač Kexi pro migraci dat Comment[cy]=Gyrrydd Mudo Data Kexi Comment[da]=Kexi datamigrationsdriver diff -Nru calligra-2.4.0/kexi/migration/mdb/src/keximdb/keximigrate_mdb.desktop calligra-2.4.3/kexi/migration/mdb/src/keximdb/keximigrate_mdb.desktop --- calligra-2.4.0/kexi/migration/mdb/src/keximdb/keximigrate_mdb.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/migration/mdb/src/keximdb/keximigrate_mdb.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=MS Access Name[bg]=MS Access Name[ca]=MS Access +Name[ca@valencia]=MS Access Name[cs]=MS Access Name[da]=MS Access Name[de]=MS Access @@ -16,6 +17,7 @@ Name[gl]=MS Access Name[he]=MS Access Name[hne]=एमएस एक्सेस +Name[hu]=MS Access Name[it]=MS Access Name[ja]=MS Access Name[kk]=MS Access @@ -42,12 +44,15 @@ Name[zh_TW]=MS Access Comment=MS Access (MDB) Import Plugin for Kexi Comment[ca]=Connector d'importació de MS Access (MDB) per al Kexi +Comment[ca@valencia]=Connector d'importació de MS Access (MDB) per al Kexi Comment[cs]=Modul Kexi pro import MS Access (MDB) Comment[de]=MS-Access (MDB) Importmodul für Kexi Comment[el]=Πρόσθετο εισαγωγής MS Access (MDB) για το Kexi Comment[es]=Complemento de importación de MS Access (MDB) de Kexi Comment[et]=Kexi MS Accessi (MDB) impordiplugin +Comment[fi]=MS Access (MDB) -tuontiliitännäinen Kexille Comment[it]=Estensione in importazione MS Access (MDB) per Kexi +Comment[ja]=Kexi のための MS Access (MDB) インポートプラグリン Comment[kk]=MS Access-тен (MDB) Kexi-ге ауысу драйвер Comment[nb]=MS Access (MDB) import-programtillegg for Kexi Comment[nl]=MS Access (MDB)-importplug-in voor Kexi @@ -55,6 +60,7 @@ Comment[pt]=Controlador de Importação do MS Access (MDB) para o Kexi Comment[pt_BR]=Plugin de Importação do MS Access (MDB) para o Kexi Comment[ru]=Драйвер миграции MS Access (MDB) для Kexi +Comment[sk]=MS Access (MDB) importný plugin pre Kexi Comment[sv]=MS Access (MDB) importinsticksprogram för Kexi Comment[uk]=Додаток імпортування даних з MS Access (MDB) для Kexi Comment[x-test]=xxMS Access (MDB) Import Plugin for Kexixx diff -Nru calligra-2.4.0/kexi/migration/mysql/keximigrate_mysql.desktop calligra-2.4.3/kexi/migration/mysql/keximigrate_mysql.desktop --- calligra-2.4.0/kexi/migration/mysql/keximigrate_mysql.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/migration/mysql/keximigrate_mysql.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=MySQL Name[br]=MySQL Name[ca]=MySQL +Name[ca@valencia]=MySQL Name[cs]=MySQL Name[cy]=MySQL Name[da]=MySQL @@ -57,12 +58,15 @@ Name[zh_TW]=MySQL Comment=MySQL Import Plugin for Kexi Comment[ca]=Connector d'importació de MySQL per al Kexi +Comment[ca@valencia]=Connector d'importació de MySQL per al Kexi Comment[cs]=Modul Kexi pro import MySQL Comment[de]=MySQL-Importmodul für Kexi Comment[el]=Πρόσθετο εισαγωγής MySQL για το Kexi Comment[es]=Complemento de importación de MySQL de Kexi Comment[et]=Kexi MySQL-i impordiplugin +Comment[fi]=MySQL-tuontiliitännäinen Kexille Comment[it]=Estensione di importazione MySQL per Kexi +Comment[ja]=Kexi のための MySQL インポートプラグイン Comment[kk]=MySQL-ден Kexi-ге импорттау плагині Comment[nb]=MySQL import-programtillegg for Kexi Comment[nl]=MySQL-importplugin voor Kexi @@ -70,6 +74,7 @@ Comment[pt]='Plugin' de Importação de MySQL para o Kexi Comment[pt_BR]=Plugin de Importação do MySQL para o Kexi Comment[ru]=Драйвер миграции MySQL для Kexi +Comment[sk]=MySQL importný plugin pre Kexi Comment[sv]=MySQL importinsticksprogram för Kexi Comment[uk]=Додаток імпортування даних з MySQL для Kexi Comment[x-test]=xxMySQL Import Plugin for Kexixx diff -Nru calligra-2.4.0/kexi/migration/pqxx/keximigrate_pqxx.desktop calligra-2.4.3/kexi/migration/pqxx/keximigrate_pqxx.desktop --- calligra-2.4.0/kexi/migration/pqxx/keximigrate_pqxx.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/migration/pqxx/keximigrate_pqxx.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=PostgreSQL Name[br]=PostgreSQL Name[ca]=PostgreSQL +Name[ca@valencia]=PostgreSQL Name[cs]=PostgreSQL Name[cy]=PostgreSQL Name[da]=PostgreSQL @@ -56,11 +57,14 @@ Name[zh_TW]=PostgreSQL Comment=PostgreSQL Import Plugin for Kexi Comment[ca]=Connector d'importació de PostgreSQL per al Kexi +Comment[ca@valencia]=Connector d'importació de PostgreSQL per al Kexi Comment[de]=PostgreSQL-Importmodul für Kexi Comment[el]=Πρόσθετο εισαγωγής PostgreSQL για το Kexi Comment[es]=Complemento de importación de PostgreSQL de Kexi Comment[et]=Kexi PostgreSQL-i impordiplugin +Comment[fi]=PostgreSQL-tuontiliitännäinen Kexille Comment[it]=Estensione di importazione PostgreSQL per Kexi +Comment[ja]=Kexi のための PostgreSQL インポートプラグイン Comment[kk]=PostgreSQL-ден Kexi-ге импорттау плагині Comment[nb]=PostgreSQL import-programtillegg for Kexi Comment[nl]=PostgreSQL-importplugin voor Kexi @@ -68,6 +72,7 @@ Comment[pt]='Plugin' de Importação de PostgreSQL para o Kexi Comment[pt_BR]=Plugin de Importação do PostgreSQL para o Kexi Comment[ru]=Драйвер миграции PostrgeSQL для Kexi +Comment[sk]=PostgreSQL importný plugin pre Kexi Comment[sv]=PostgreSQL importinsticksprogram för Kexi Comment[uk]=Додаток імпортування даних з PostgreSQL для Kexi Comment[x-test]=xxPostgreSQL Import Plugin for Kexixx diff -Nru calligra-2.4.0/kexi/migration/sybase/keximigrate_sybase.desktop calligra-2.4.3/kexi/migration/sybase/keximigrate_sybase.desktop --- calligra-2.4.0/kexi/migration/sybase/keximigrate_sybase.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/migration/sybase/keximigrate_sybase.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sybase Name[bg]=Sybase Name[ca]=Sybase +Name[ca@valencia]=Sybase Name[cs]=Sybase Name[da]=Sybase Name[de]=Sybase @@ -44,11 +45,14 @@ Name[zh_TW]=Sybase Comment=Sybase Import Plugin for Kexi Comment[ca]=Connector d'importació de Sybase per al Kexi +Comment[ca@valencia]=Connector d'importació de Sybase per al Kexi Comment[de]=Sybase-Importmodul für Kexi Comment[el]=Πρόσθετο εισαγωγής Sybase για το Kexi Comment[es]=Complemento de importación de Sybase de Kexi Comment[et]=Kexi Sybase'i impordiplugin +Comment[fi]=Sybase-tuontiliitännäinen Kexille Comment[it]=Estensione di importazione Sybase per Kexi +Comment[ja]=Kexi のための Sybase インポートプラグイン Comment[kk]=Sybase-ден Kexi-ге импорттау плагині Comment[nb]=Sybase import-programtillegg for Kexi Comment[nl]=Sybase-importplugin voor Kexi @@ -56,6 +60,7 @@ Comment[pt]='Plugin' de Importação de Sybase para o Kexi Comment[pt_BR]=Plugin de Importação do Sybase para o Kexi Comment[ru]=Драйвер миграции Sybase для Kexi +Comment[sk]=Sybase importný plugin pre Kexi Comment[sv]=Sybase importinsticksprogram för Kexi Comment[uk]=Додаток імпортування даних з Sybase для Kexi Comment[x-test]=xxSybase Import Plugin for Kexixx diff -Nru calligra-2.4.0/kexi/migration/txt/keximigrate_txt.desktop calligra-2.4.3/kexi/migration/txt/keximigrate_txt.desktop --- calligra-2.4.0/kexi/migration/txt/keximigrate_txt.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/migration/txt/keximigrate_txt.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Text Name[ca]=Text +Name[ca@valencia]=Text Name[cs]=Text Name[da]=Tekst Name[de]=Text @@ -35,12 +36,15 @@ Name[zh_TW]=文字 Comment=Text Import Plugin for Kexi Comment[ca]=Connector d'importació de text per al Kexi +Comment[ca@valencia]=Connector d'importació de text per al Kexi Comment[cs]=Modul Kexi pro import textu Comment[de]=Text-Importmodul für Kexi Comment[el]=Πρόσθετο εισαγωγής κειμένου για το Kexi Comment[es]=Complemento de importación de texto de Kexi Comment[et]=Kexi teksti impordiplugin +Comment[fi]=Tekstin tuontiliitännäinen Kexille Comment[it]=Estensione di importazione da testo per Kexi +Comment[ja]=Kexi のためのテキストインポートプラグイン Comment[kk]=Мәтіннен Kexi-ге импорттау плагині Comment[nb]=Tekst import-programtillegg for Kexi Comment[nl]=Tekstimportplugin voor Kexi @@ -48,6 +52,7 @@ Comment[pt]='Plugin' de Importação de Texto para o Kexi Comment[pt_BR]=Plugin de Importação de Texto para o Kexi Comment[ru]=Драйвер миграции с текстовых файлов для Kexi +Comment[sk]=Textový importný plugin pre Kexi Comment[sv]=Importinsticksprogram av text för Kexi Comment[uk]=Додаток імпортування текстових даних для Kexi Comment[x-test]=xxText Import Plugin for Kexixx diff -Nru calligra-2.4.0/kexi/migration/xbase/keximigrate_xbase.desktop calligra-2.4.3/kexi/migration/xbase/keximigrate_xbase.desktop --- calligra-2.4.0/kexi/migration/xbase/keximigrate_xbase.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/migration/xbase/keximigrate_xbase.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -2,6 +2,7 @@ Name=xBase Name[bg]=xBase Name[ca]=xBase +Name[ca@valencia]=xBase Name[cs]=xBase Name[da]=xBase Name[de]=xBase @@ -10,11 +11,13 @@ Name[eo]=xBase Name[es]=xBase Name[et]=xBase +Name[fi]=xBase Name[fr]=xBase Name[ga]=xBase Name[gl]=xBase Name[he]=xBase Name[hne]=एक्सबेस +Name[hu]=xBase Name[it]=xBase Name[ja]=xBase Name[kk]=xBase @@ -39,11 +42,14 @@ Name[zh_TW]=xBase Comment=xBase Import Plugin for Kexi Comment[ca]=Connector d'importació xBase per al Kexi +Comment[ca@valencia]=Connector d'importació xBase per al Kexi Comment[de]=xBase-Importmodul für Kexi Comment[el]=Πρόσθετο εισαγωγής xBase για το Kexi Comment[es]=Complemento de importación de xBase de Kexi Comment[et]=Kexi xBase'i impordiplugin +Comment[fi]=xBase-tuontiliitännäinen Kexille Comment[it]=Estensione di importazione xBase per Kexi +Comment[ja]=Kexi のための xBase インポートプラグイン Comment[kk]=xBas-ден Kexi-ге импорттау плагині Comment[nb]=xBase import-programtillegg for Kexi Comment[nl]=xBase-importplugin voor Kexi @@ -51,6 +57,7 @@ Comment[pt]='Plugin' de Importação de xBase para o Kexi Comment[pt_BR]=Plugin de Importação do xBase para o Kexi Comment[ru]=Драйвер миграции xBase для Kexi +Comment[sk]=xBase importný plugin pre Kexi Comment[sv]=xBase importinsticksprogram för Kexi Comment[uk]=Додаток імпортування даних з xBase для Kexi Comment[x-test]=xxxBase Import Plugin for Kexixx diff -Nru calligra-2.4.0/kexi/migration/xbase/xbasemigrate.cpp calligra-2.4.3/kexi/migration/xbase/xbasemigrate.cpp --- calligra-2.4.0/kexi/migration/xbase/xbasemigrate.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/migration/xbase/xbasemigrate.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -163,7 +163,10 @@ new KexiDB::Field( fldID, type( tableDbf->GetFieldType( i ) ) ); if ( fld->type() == KexiDB::Field::Text ) { - fld->setLength( tableDbf->GetFieldLen(i) ); + uint len = tableDbf->GetFieldLen(i); + if (len < 255) { // limit for small lengths only + fld->setMaxLength(len); + } } if ( fld->isFPNumericType() ) { diff -Nru calligra-2.4.0/kexi/plugins/autoforms/kexiautoformhandler.desktop calligra-2.4.3/kexi/plugins/autoforms/kexiautoformhandler.desktop --- calligra-2.4.0/kexi/plugins/autoforms/kexiautoformhandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/autoforms/kexiautoformhandler.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -3,6 +3,7 @@ ServiceTypes=Kexi/Handler GenericName=AutoForm GenericName[ca]=AutoForm +GenericName[ca@valencia]=AutoForm GenericName[da]=AutoFormular GenericName[el]=AutoForm GenericName[es]=Formulario automático @@ -16,12 +17,14 @@ GenericName[pt]=Formulário Automático GenericName[pt_BR]=Formulário automático GenericName[ru]=Автоформа +GenericName[sk]=AutoForm GenericName[sv]=Automatisk form GenericName[uk]=Автоформа GenericName[x-test]=xxAutoFormxx GenericName[zh_TW]=自動表單 Name=AutoForm Name[ca]=AutoForm +Name[ca@valencia]=AutoForm Name[da]=AutoFormular Name[el]=AutoForm Name[es]=Formulario automático @@ -35,6 +38,7 @@ Name[pt]=Formulário Automático Name[pt_BR]=Formulário automático Name[ru]=Автоформа +Name[sk]=AutoForm Name[sv]=Automatisk form Name[uk]=Автоформа Name[x-test]=xxAutoFormxx diff -Nru calligra-2.4.0/kexi/plugins/forms/kexiformhandler.desktop calligra-2.4.3/kexi/plugins/forms/kexiformhandler.desktop --- calligra-2.4.0/kexi/plugins/forms/kexiformhandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/forms/kexiformhandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ GenericName=Forms GenericName[br]=Paperennoù-reol GenericName[ca]=Formularis +GenericName[ca@valencia]=Formularis GenericName[cs]=Formuláře GenericName[cy]=Ffurflenni GenericName[da]=Formularer @@ -60,15 +61,18 @@ GenericName[zh_TW]=表單 Name=Form Name[ca]=Formulari +Name[ca@valencia]=Formulari Name[cs]=Formulář Name[da]=Formular Name[de]=Formular Name[el]=Φόρμα Name[es]=Formulario Name[et]=Vorm +Name[fi]=Lomake Name[fr]=Formulaire Name[hu]=Űrlap Name[it]=Modulo +Name[ja]=フォーム Name[kk]=Пішін Name[nb]=Skjema Name[nl]=Formulier @@ -76,6 +80,7 @@ Name[pt]=Formulário Name[pt_BR]=Formulário Name[ru]=Форма +Name[sk]=Formulár Name[sv]=Formulär Name[ug]=كۆزنەك Name[uk]=Форма diff -Nru calligra-2.4.0/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop calligra-2.4.3/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop --- calligra-2.4.0/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/forms/kformdesigner_kexidbfactory.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -4,6 +4,7 @@ Name=Widgets Plugin for Kexi Forms Name[ca]=Connector d'estris per a formularis del Kexi +Name[ca@valencia]=Connector d'estris per a formularis del Kexi Name[de]=Bedienelement-Modul für Kexi-Formulare Name[el]=Πρόσθετο γραφικών συστατικών για φόρμες Kexi Name[es]=Complemento de elementos gráficos para los formularios de Kexi @@ -14,8 +15,9 @@ Name[nl]=Widgetsplugin voor Kexi Forms Name[pl]=Wtyczka elementu interfejsu dla formularzy Kexi Name[pt]='Plugin' de Elementos para os Formulários do Kexi -Name[pt_BR]=Plugin de Widgets para formulários do Kexi +Name[pt_BR]=Plugin de elementos para formulários do Kexi Name[ru]=Модуль виджетов для форм Kexi +Name[sk]=Plugin widgetov pre Kexi formuláre Name[sv]=Insticksprogram med grafiska komponent för Kexi-formulär Name[uk]=Додаток віджетів для форм Kexi Name[x-test]=xxWidgets Plugin for Kexi Formsxx diff -Nru calligra-2.4.0/kexi/plugins/forms/widgets/kexidbform.cpp calligra-2.4.3/kexi/plugins/forms/widgets/kexidbform.cpp --- calligra-2.4.0/kexi/plugins/forms/widgets/kexidbform.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/forms/widgets/kexidbform.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -351,17 +351,6 @@ //generate a new list foreach (KFormDesigner::ObjectTreeItem* titem, *form->tabStops()) { if (titem->widget()->focusPolicy() & Qt::TabFocus) { - //this widget has tab focus: - titem->widget()->installEventFilter(this); - //also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors) - QList children(titem->widget()->findChildren()); - foreach(QWidget* widget, children) { - kDebug() << "also adding '" - << widget->metaObject()->className() - << " " << widget->objectName() - << "' child to filtered widgets"; - widget->installEventFilter(this); - } if (fromWidget) { kDebug() << "tab order: " << fromWidget->objectName() @@ -371,6 +360,16 @@ d->orderedFocusWidgets.append(titem->widget()); } + titem->widget()->installEventFilter(this); + //also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors) + QList children(titem->widget()->findChildren()); + foreach(QWidget* widget, children) { + kDebug() << "also adding '" + << widget->metaObject()->className() + << " " << widget->objectName() + << "' child to filtered widgets"; + widget->installEventFilter(this); + } KexiFormDataItemInterface* dataItem = dynamic_cast(titem->widget()); if (dataItem && !dataItem->dataSource().isEmpty()) { @@ -620,7 +619,7 @@ return true; } } - } else if (e->type() == QEvent::FocusIn) { + } else if (e->type() == QEvent::FocusIn || (e->type() == QEvent::MouseButtonPress && static_cast(e)->button() == Qt::LeftButton)) { bool focusDataWidget = preview(); if (static_cast(e)->reason() == Qt::PopupFocusReason) { kDebug() << "->>> focus IN, popup"; diff -Nru calligra-2.4.0/kexi/plugins/forms/widgets/kexidblineedit.cpp calligra-2.4.3/kexi/plugins/forms/widgets/kexidblineedit.cpp --- calligra-2.4.0/kexi/plugins/forms/widgets/kexidblineedit.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/forms/widgets/kexidblineedit.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -290,8 +290,11 @@ KexiDBTextWidgetInterface::setColumnInfo(cinfo, this); if (cinfo->field->isTextType()) { - if (!designMode()) - setMaxLength(cinfo->field->length()); + if (!designMode()) { + if (cinfo->field->maxLength() > 0) { + setMaxLength(cinfo->field->maxLength()); + } + } } } diff -Nru calligra-2.4.0/kexi/plugins/forms/widgets/kexidbtextedit.cpp calligra-2.4.3/kexi/plugins/forms/widgets/kexidbtextedit.cpp --- calligra-2.4.0/kexi/plugins/forms/widgets/kexidbtextedit.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/forms/widgets/kexidbtextedit.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -204,8 +204,11 @@ } if (cinfo->field->isTextType()) { - if (!designMode()) - m_length = cinfo->field->length(); + if (!designMode()) { + if (cinfo->field->maxLength() > 0) { + m_length = cinfo->field->maxLength(); + } + } } KexiDBTextWidgetInterface::setColumnInfo(m_columnInfo, this); diff -Nru calligra-2.4.0/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop calligra-2.4.3/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop --- calligra-2.4.0/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/forms/widgets/mapbrowser/kformdesigner_mapbrowser.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=Map Browser Plugin for Kexi Forms Name[ca]=Connector de navegador de mapes per a formularis del Kexi +Name[ca@valencia]=Connector de navegador de mapes per a formularis del Kexi Name[de]=Kartenbrowser-Modul für Kexi-Formulare Name[el]=Πρόσθετο περιηγητή χάρτη για φόρμες Kexi Name[es]=Complemento de navegador de mapas para los formularos de Kexi @@ -16,6 +17,7 @@ Name[pt]='Plugin' de Navegação por Mapas para os Formulários do Kexi Name[pt_BR]=Plugin de navegação em mapa para formulários do Kexi Name[ru]=Модуль просмотра карт для форм Kexi +Name[sk]=Mapovať plugin browsera pre Kexi formuláre Name[sv]=Insticksprogram med kartbläddring för Kexi-formulär Name[uk]=Додаток перегляду карти для форм Kexi Name[x-test]=xxMap Browser Plugin for Kexi Formsxx diff -Nru calligra-2.4.0/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop calligra-2.4.3/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop --- calligra-2.4.0/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/forms/widgets/webbrowser/kformdesigner_webbrowser.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -6,6 +6,7 @@ Name=Web Browser Plugin for Kexi Forms Name[ca]=Connector de navegador web per a formularis del Kexi +Name[ca@valencia]=Connector de navegador web per a formularis del Kexi Name[de]=Webbrowser-Modul für Kexi-Formulare Name[el]=Πρόσθετο περιηγητή ιστού για φόρμες Kexi Name[es]=Complemento de navegador web para los formularios de Kexi @@ -18,6 +19,7 @@ Name[pt]='Plugin' de Navegação Web para os Formulários do Kexi Name[pt_BR]=Plugin de navegador Web para formulários do Kexi Name[ru]=Модуль веб-браузера для форм Kexi +Name[sk]=Plugin web browsera pre Kexi formuláre Name[sv]=Insticksprogram med webbläsare för Kexi-formulär Name[uk]=Додаток перегляду сторінок інтернету для форм Kexi Name[x-test]=xxWeb Browser Plugin for Kexi Formsxx diff -Nru calligra-2.4.0/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp calligra-2.4.3/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp --- calligra-2.4.0/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -132,6 +132,11 @@ } } +static bool shouldSaveRow(int row, bool firstRowForFieldNames) +{ + return row > (firstRowForFieldNames ? 1 : 0); +} + KexiCSVImportDialog::KexiCSVImportDialog(Mode mode, QWidget * parent) : KDialog(parent), m_cancelled(false), @@ -872,7 +877,7 @@ lastCharDelimiter = false; if (nextRow) { - if (!inGUI && row == 1 && m_1stRowForFieldNames->isChecked()) { + if (!inGUI && !shouldSaveRow(row - m_startline, m_1stRowForFieldNames->isChecked())) { // do not save to the database 1st row if it contains column names m_importingStatement->clearArguments(); } else if (!saveRow(inGUI)) @@ -1125,7 +1130,7 @@ void KexiCSVImportDialog::setText(int row, int col, const QString& text, bool inGUI) { if (!inGUI) { - if (row == 1 && m_1stRowForFieldNames->isChecked()) + if (!shouldSaveRow(row, m_1stRowForFieldNames->isChecked())) return; // do not care about this value if it contains column names (these were already used) //save text directly to database buffer diff -Nru calligra-2.4.0/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop calligra-2.4.3/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop --- calligra-2.4.0/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/importexport/csv/kexicsv_importexporthandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=Kexi CSV Data Import/Export Plugin 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[da]=Kexi CSV data-import/eksport plugin Name[de]=Kexi-CSV-Daten-Import/Export-Modul diff -Nru calligra-2.4.0/kexi/plugins/migration/keximigrationhandler.desktop calligra-2.4.3/kexi/plugins/migration/keximigrationhandler.desktop --- calligra-2.4.0/kexi/plugins/migration/keximigrationhandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/migration/keximigrationhandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ GenericName=Migration Plugin GenericName[be]=Міграцыя GenericName[ca]=Connector de migració +GenericName[ca@valencia]=Connector de migració GenericName[cs]=Modul pro migraci GenericName[cy]=Ategyn Mudo GenericName[da]=Migrationsplugin @@ -54,6 +55,7 @@ Name=Migration Plugin Name[be]=Утулка міграцыі Name[ca]=Connector de migració +Name[ca@valencia]=Connector de migració Name[cs]=Modul pro migraci Name[cy]=Ategyn Mudo Name[da]=Migrationsplugin diff -Nru calligra-2.4.0/kexi/plugins/queries/kexiquerydesignerguieditor.cpp calligra-2.4.3/kexi/plugins/queries/kexiquerydesignerguieditor.cpp --- calligra-2.4.0/kexi/plugins/queries/kexiquerydesignerguieditor.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/queries/kexiquerydesignerguieditor.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -57,6 +57,7 @@ #include #include #include "kexiquerypart.h" +#include "kexiqueryview.h" #include #include #include @@ -380,6 +381,10 @@ //build query schema KexiQueryPart::TempData * temp = tempData(); if (temp->query()) { + KexiView *queryDataView = window()->viewForMode(Kexi::DataViewMode); + if (queryDataView) { + dynamic_cast(queryDataView)->setData(0); + } temp->clearQuery(); } else { temp->setQuery(new KexiDB::QuerySchema()); @@ -946,7 +951,7 @@ //4. show ORDER BY information d->data->clearRowEditBuffer(); - const KexiDB::OrderByColumnList orderByColumns(query->orderByColumnList()); + KexiDB::OrderByColumnList& orderByColumns = query->orderByColumnList(); QHash columnsOrder( query->columnsOrder(KexiDB::QuerySchema::UnexpandedListWithoutAsterisks)); for (KexiDB::OrderByColumn::ListConstIterator orderByColumnIt(orderByColumns.constBegin()); diff -Nru calligra-2.4.0/kexi/plugins/queries/kexiqueryhandler.desktop calligra-2.4.3/kexi/plugins/queries/kexiqueryhandler.desktop --- calligra-2.4.0/kexi/plugins/queries/kexiqueryhandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/queries/kexiqueryhandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ GenericName[be]=Запыты GenericName[bg]=Заявки GenericName[ca]=Consultes +GenericName[ca@valencia]=Consultes GenericName[cs]=Dotazy GenericName[cy]=Ymholiadau GenericName[da]=Forespørgsler @@ -61,15 +62,18 @@ Name=Query Name[bg]=Заявка Name[ca]=Consulta +Name[ca@valencia]=Consulta Name[cs]=Dotaz Name[da]=Forespørgsel Name[de]=Abfrage Name[el]=Ερώτηση Name[es]=Consulta Name[et]=Päring +Name[fi]=Kysely Name[fr]=Requête Name[hu]=Lekérdezés Name[it]=Interrogazione +Name[ja]=クエリ Name[kk]=Сұраныс Name[nb]=Spørring Name[nds]=Affraag @@ -78,6 +82,7 @@ Name[pt]=Procura Name[pt_BR]=Consulta Name[ru]=Запрос +Name[sk]=Otázka Name[sv]=Förfrågning Name[ug]=سۈرۈشتۈر Name[uk]=Запит diff -Nru calligra-2.4.0/kexi/plugins/relations/kexirelationhandler.desktop calligra-2.4.3/kexi/plugins/relations/kexirelationhandler.desktop --- calligra-2.4.0/kexi/plugins/relations/kexirelationhandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/relations/kexirelationhandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ GenericName=Relationships GenericName[be]=Сувязі GenericName[ca]=Relacions +GenericName[ca@valencia]=Relacions GenericName[cs]=Vztahy GenericName[cy]=Perthnasau GenericName[da]=Relationships @@ -58,6 +59,7 @@ Name=Relationships Name[be]=Узаемасувязі Name[ca]=Relacions +Name[ca@valencia]=Relacions Name[cs]=Vztahy Name[cy]=Perthnasau Name[da]=Relationships diff -Nru calligra-2.4.0/kexi/plugins/reports/kexireporthandler.desktop calligra-2.4.3/kexi/plugins/reports/kexireporthandler.desktop --- calligra-2.4.0/kexi/plugins/reports/kexireporthandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/reports/kexireporthandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ GenericName[be]=Справаздачы GenericName[bg]=Доклади GenericName[ca]=Informes +GenericName[ca@valencia]=Informes GenericName[cs]=Hlášení GenericName[cy]=Adroddiadau GenericName[da]=Rapporter @@ -60,15 +61,18 @@ Name=Report Name[bg]=Доклад Name[ca]=Informe +Name[ca@valencia]=Informe Name[cs]=Hlášení Name[da]=Rapport Name[de]=Bericht Name[el]=Αναφορά Name[es]=Informe Name[et]=Aruanne +Name[fi]=Raportti Name[fr]=Rapport Name[hu]=Jelentés Name[it]=Rapporto +Name[ja]=レポート Name[kk]=Баянат Name[nb]=Rapport Name[nl]=Rapport @@ -76,6 +80,7 @@ Name[pt]=Relatório Name[pt_BR]=Relatório Name[ru]=Отчёт +Name[sk]=Výkaz Name[sv]=Rapport Name[ug]=دوكلات Name[uk]=Звіт diff -Nru calligra-2.4.0/kexi/plugins/scripting/kexidb/kexidbfield.cpp calligra-2.4.3/kexi/plugins/scripting/kexidb/kexidbfield.cpp --- calligra-2.4.0/kexi/plugins/scripting/kexidb/kexidbfield.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/scripting/kexidb/kexidbfield.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -164,11 +164,12 @@ uint KexiDBField::length() { - return m_field->length(); + return m_field->maxLength(); } + void KexiDBField::setLength(uint length) { - m_field->setLength(length); + m_field->setMaxLength(length); } uint KexiDBField::precision() diff -Nru calligra-2.4.0/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop calligra-2.4.3/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop --- calligra-2.4.0/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/scripting/kexiscripting/kexiscripthandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -7,6 +7,7 @@ GenericName[bg]=Скриптове GenericName[br]=Urzhiaouegoù GenericName[ca]=Scripts +GenericName[ca@valencia]=Scripts GenericName[cs]=Skripty GenericName[cy]=Sgriptiau GenericName[da]=Scripter @@ -22,7 +23,7 @@ GenericName[fr]=Scripts GenericName[fy]=Skripts GenericName[ga]=Scripteanna -GenericName[gl]=Programas +GenericName[gl]=Scripts GenericName[he]=תסריטים GenericName[hi]=स्क्रिप्ट्स GenericName[hne]=स्क्रिप्ट्स @@ -61,15 +62,18 @@ Name=Script Name[bg]=Скрипт Name[ca]=Script +Name[ca@valencia]=Script Name[cs]=Skript Name[da]=Script Name[de]=Skript Name[el]=Σενάριο Name[es]=Guión Name[et]=Skript +Name[fi]=Komentojono Name[fr]=Script Name[hu]=Szkript Name[it]=Script +Name[ja]=スクリプト Name[kk]=Скрипт Name[nb]=Skript Name[nl]=Script @@ -77,6 +81,7 @@ Name[pt]=Programa Name[pt_BR]=Programa Name[ru]=Сценарий +Name[sk]=Skript Name[sv]=Skript Name[ug]=قوليازما Name[uk]=Скрипт diff -Nru calligra-2.4.0/kexi/plugins/shapes/relationdesign/kexirelationdesignshape.desktop calligra-2.4.3/kexi/plugins/shapes/relationdesign/kexirelationdesignshape.desktop --- calligra-2.4.0/kexi/plugins/shapes/relationdesign/kexirelationdesignshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/shapes/relationdesign/kexirelationdesignshape.desktop 2012-06-26 04:18:00.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Kexi Relation Design Shape Name[ca]=Forma de disseny de relació del Kexi +Name[ca@valencia]=Forma de disseny de relació del Kexi Name[da]=Kexi form til relationsdesign Name[de]=Kexi-Beziehungsentwurf-Objekt Name[el]=Σχήμα σχεδιασμού σχέσεων Kexi diff -Nru calligra-2.4.0/kexi/plugins/tables/kexitabledesignerview.cpp calligra-2.4.3/kexi/plugins/tables/kexitabledesignerview.cpp --- calligra-2.4.0/kexi/plugins/tables/kexitabledesignerview.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/tables/kexitabledesignerview.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -398,7 +398,7 @@ = new KoProperty::Property("unsigned", QVariant(field.isUnsigned()), i18n("Unsigned Number"))); set->addProperty(prop - = new KoProperty::Property("length", (int)field.length()/*200?*/, i18n("Length"))); + = new KoProperty::Property("maxLength", (int)field.maxLength()/*200?*/, i18n("Length"))); set->addProperty(prop = new KoProperty::Property("precision", (int)field.precision()/*200?*/, i18n("Precision"))); @@ -696,8 +696,8 @@ //update field caption and name propertySetForRecord->changeProperty("caption", newValue); - propertySetForRecord->changeProperty("name", newValue); // "name" prop. is of custom type Identifier, so this assignment - // will automatically convert newValue to an valid identifier + propertySetForRecord->changeProperty("name", + KexiUtils::string2Identifier(newValue.toString())); //remember this action containing 2 subactions CommandGroup *changeCaptionAndNameCommand = new CommandGroup( diff -Nru calligra-2.4.0/kexi/plugins/tables/kexitabledesignerview_p.cpp calligra-2.4.3/kexi/plugins/tables/kexitabledesignerview_p.cpp --- calligra-2.4.0/kexi/plugins/tables/kexitabledesignerview_p.cpp 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/tables/kexitabledesignerview_p.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -221,13 +221,13 @@ visible = KexiDB::Field::isNumericType(fieldType); setVisibilityIfNeeded(set, prop, visible, changed, commandGroup); - prop = &set["length"]; + prop = &set["maxLength"]; visible = (fieldType == KexiDB::Field::Text); if (prop->isVisible() != visible) { // prop->setVisible( visible ); //update the length when it makes sense - const int lengthToSet = visible ? KexiDB::Field::defaultTextLength() : 0; - setPropertyValueIfNeeded(set, "length", lengthToSet, + const int lengthToSet = visible ? KexiDB::Field::defaultMaxLength() : 0; + setPropertyValueIfNeeded(set, "maxLength", lengthToSet, commandGroup, false, false /*!rememberOldValue*/); // if (lengthToSet != prop->value().toInt()) // prop->setValue( lengthToSet, false ); diff -Nru calligra-2.4.0/kexi/plugins/tables/kexitablehandler.desktop calligra-2.4.3/kexi/plugins/tables/kexitablehandler.desktop --- calligra-2.4.0/kexi/plugins/tables/kexitablehandler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/plugins/tables/kexitablehandler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ GenericName[bg]=Таблици GenericName[br]=Taolennoù GenericName[ca]=Taules +GenericName[ca@valencia]=Taules GenericName[cs]=Tabulky GenericName[cy]=Tablau GenericName[da]=Tabeller @@ -62,15 +63,18 @@ Name=Table Name[bg]=Таблица Name[ca]=Taula +Name[ca@valencia]=Taula Name[cs]=Tabulka Name[da]=Tabel Name[de]=Tabelle Name[el]=Πίνακας Name[es]=Tabla Name[et]=Tabel +Name[fi]=Taulu Name[fr]=Tableau Name[hu]=Táblázat Name[it]=Tabella +Name[ja]=テーブル Name[kk]=Кесте Name[nb]=Tabell Name[nl]=Tabel @@ -78,6 +82,7 @@ Name[pt]=Tabela Name[pt_BR]=Tabela Name[ru]=Таблица +Name[sk]=Tabuľka Name[sv]=Tabell Name[ug]=جەدۋەل Name[uk]=Таблиця diff -Nru calligra-2.4.0/kexi/widget/tableview/kexiinputtableedit.cpp calligra-2.4.3/kexi/widget/tableview/kexiinputtableedit.cpp --- calligra-2.4.0/kexi/widget/tableview/kexiinputtableedit.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kexi/widget/tableview/kexiinputtableedit.cpp 2012-06-26 04:18:00.000000000 +0000 @@ -115,8 +115,9 @@ m_lineedit->setAlignment(Qt::AlignRight); } - if (field()->isTextType()) - m_lineedit->setMaxLength(field()->length()); + if (field()->type() == KexiDB::Field::Text && field()->maxLength() > 0) { + m_lineedit->setMaxLength(field()->maxLength()); + } setViewWidget(m_lineedit); m_calculatedCell = false; diff -Nru calligra-2.4.0/kounavail/kounavail.desktop calligra-2.4.3/kounavail/kounavail.desktop --- calligra-2.4.0/kounavail/kounavail.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/kounavail/kounavail.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Unavailable Calligra Document Name[bg]=Неналичен документ на Calligra Name[ca]=Document Calligra no disponible +Name[ca@valencia]=Document Calligra no disponible Name[cs]=Nedostupný dokument Calligra Name[da]=Utilgængeligt Calligra-dokument Name[de]=Nicht verfügbares Calligra-Dokument @@ -9,7 +10,9 @@ Name[es]=Documento de Calligra no disponible Name[et]=Kättesaamatu Calligra dokument Name[fr]=Document Calligra non disponible +Name[gl]=Documento de Calligra non disponíbel Name[it]=Documento Calligra non disponibile +Name[ja]=利用不可能な Calligra 文書 Name[kk]=Қол жеткізбейтін сск құжаты Name[nb]=Utilgjengelig Calligra-dokument Name[nds]=Nich verföögbor Calligra-Dokment @@ -18,6 +21,7 @@ Name[pt]=Documento do Calligra Indisponível Name[pt_BR]=Documento do Calligra indisponível Name[ru]=Недоступный документ Calligra +Name[sk]=Nedostupný dokument Calligra Name[sv]=Otillgängligt Calligra-dokument Name[uk]=Недоступний документ Calligra Name[x-test]=xxUnavailable Calligra Documentxx diff -Nru calligra-2.4.0/krita/data/images/CMakeLists.txt calligra-2.4.3/krita/data/images/CMakeLists.txt --- calligra-2.4.0/krita/data/images/CMakeLists.txt 2012-04-06 15:37:56.000000000 +0000 +++ calligra-2.4.3/krita/data/images/CMakeLists.txt 2012-06-26 04:18:01.000000000 +0000 @@ -1 +0,0 @@ -install( FILES krita_first_start.kra DESTINATION ${DATA_INSTALL_DIR}/krita/images) Binary files /tmp/X4LFAVLGfb/calligra-2.4.0/krita/data/images/krita_first_start.kra and /tmp/NJDgunogOO/calligra-2.4.3/krita/data/images/krita_first_start.kra differ diff -Nru calligra-2.4.0/krita/data/krita_brush.desktop calligra-2.4.3/krita/data/krita_brush.desktop --- calligra-2.4.0/krita/data/krita_brush.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/krita_brush.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Brush plugin for Krita Comment[bg]=Приставка за четки за Krita Comment[ca]=Connector de pinzell per al Krita +Comment[ca@valencia]=Connector de pinzell per al Krita Comment[cs]=Modul štětců pro Kritu Comment[da]=Penselplugin til Krita Comment[de]=Pinselmodul für Krita @@ -15,7 +16,7 @@ Comment[fr]=Module externe brosses de Krita Comment[fy]=Kwastplugin foar Krita Comment[ga]=Breiseán scuaibe le haghaidh Krita -Comment[gl]=Extensión de pinceis para Krita +Comment[gl]=Engadido de pinceis para Krita Comment[he]=תוסף מברשת של Krita Comment[hi]=केरिता के लिए ब्रश प्लगइन Comment[hne]=केरिता बर ब्रस प्लगइन diff -Nru calligra-2.4.0/krita/data/krita_dock.desktop calligra-2.4.3/krita/data/krita_dock.desktop --- calligra-2.4.0/krita/data/krita_dock.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/krita_dock.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Docker for Krita Comment[bg]=Контейнер за Krita Comment[ca]=Amarrador per al Krita +Comment[ca@valencia]=Amarrador per al Krita Comment[cs]=Dok pro Kritu Comment[da]=Dokker til Krita Comment[de]=Docker für Krita diff -Nru calligra-2.4.0/krita/data/krita_filter.desktop calligra-2.4.3/krita/data/krita_filter.desktop --- calligra-2.4.0/krita/data/krita_filter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/krita_filter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Filter plugin for Krita Comment[bg]=Приставка за филтриране за Krita Comment[ca]=Connector de filtre per al Krita +Comment[ca@valencia]=Connector de filtre per al Krita Comment[cs]=Modul filtrů pro Kritu Comment[da]=Plugin med filter for Krita Comment[de]=Filtermodul für Krita diff -Nru calligra-2.4.0/krita/data/krita_generator.desktop calligra-2.4.3/krita/data/krita_generator.desktop --- calligra-2.4.0/krita/data/krita_generator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/krita_generator.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Layer data Generator plugin for Krita Comment[bg]=Приставка за слоеве за Krita Comment[ca]=Connector de generació de dades de capa per al Krita +Comment[ca@valencia]=Connector de generació de dades de capa per al Krita Comment[da]=Krita-plugin til generering af lagdata Comment[de]=Ebenendatengenerator-Modul für Krita Comment[el]=Πρόσθετο δημιουργίας δεδομένων στρώματος για το Krita @@ -12,7 +13,7 @@ Comment[et]=Krita kihi andmete genereerimise plugin Comment[fr]=Générateur de données de calques pour Krita Comment[fy]=Gegevens laachoanmakker plugin foar Krita -Comment[gl]=Extensión de Xeración de Capas de Krita +Comment[gl]=Extensión de xeración datos de capas para Krita Comment[hne]=केरिता बर लेयर डाटा जनरेटर प्लगइन Comment[it]=Estensione generatrice di dati dei livelli di Krita Comment[ja]=Krita レイヤーデータ生成プラグイン diff -Nru calligra-2.4.0/krita/data/krita_paintop.desktop calligra-2.4.3/krita/data/krita_paintop.desktop --- calligra-2.4.0/krita/data/krita_paintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/krita_paintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Paint operation plugin for Krita Comment[bg]=Приставка за рисуване за Krita Comment[ca]=Connector d'operació de pintura per al Krita +Comment[ca@valencia]=Connector d'operació de pintura per al Krita Comment[da]=Plugin med malehandlinger for Krita Comment[de]=Maloperationsmodul für Krita Comment[el]=Πρόσθετο λειτουργίας ζωγραφικής για το Krita diff -Nru calligra-2.4.0/krita/data/krita_plugin.desktop calligra-2.4.3/krita/data/krita_plugin.desktop --- calligra-2.4.0/krita/data/krita_plugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/krita_plugin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Comment=GUI functionality for Krita Comment[bg]=Графичен интерфейс на Krita Comment[ca]=Funcionalitat d'interfície d'usuari per al Krita +Comment[ca@valencia]=Funcionalitat d'interfície d'usuari per al Krita Comment[cy]=Swyddogaeth GUI ar gyfer Krita Comment[da]=GUI-funktionalitet for Krita Comment[de]=GUI-Funktionalität für Krita diff -Nru calligra-2.4.0/krita/data/krita_tool.desktop calligra-2.4.3/krita/data/krita_tool.desktop --- calligra-2.4.0/krita/data/krita_tool.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/krita_tool.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Tool plugin for Krita Comment[bg]=Приставка за инструменти за Krita Comment[ca]=Connector d'eines per al Krita +Comment[ca@valencia]=Connector d'eines per al Krita Comment[da]=Værktøjsplugin for Krita Comment[de]=Werkzeugmodul für Krita Comment[el]=Πρόσθετο εργαλείων για το Krita diff -Nru calligra-2.4.0/krita/data/templates/cmyk_u8/.directory calligra-2.4.3/krita/data/templates/cmyk_u8/.directory --- calligra-2.4.0/krita/data/templates/cmyk_u8/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/cmyk_u8/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=CMYK Name[br]=CMYK Name[ca]=CMYK +Name[ca@valencia]=CMYK Name[cs]=CMYK Name[cy]=CMYK Name[da]=CMYK diff -Nru calligra-2.4.0/krita/data/templates/cmyk_u8/white_2000x800.desktop calligra-2.4.3/krita/data/templates/cmyk_u8/white_2000x800.desktop --- calligra-2.4.0/krita/data/templates/cmyk_u8/white_2000x800.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/cmyk_u8/white_2000x800.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Бяло 2000x800 Name[br]=Gwenn 2000 x 800 Name[ca]=Blanc 2000 x 800 +Name[ca@valencia]=Blanc 2000 x 800 Name[cs]=Bílý 2000 x 800 Name[cy]=Gwyn 2000 x 800 Name[da]=Hvidt 2000 x 800 @@ -55,6 +56,7 @@ Comment=Creates a white CMYK image of 2000 x 800 pixels. Comment[bg]=Създаване на бяло изображения CMYK с размери 2000x800 точки. Comment[ca]=Crea una imatge blanca CMYK de 2000 x 800 píxels. +Comment[ca@valencia]=Crea una imatge blanca CMYK de 2000 x 800 píxels. Comment[cs]=Vytvočí bílý obrázek CMYK 2000 x 800 pixelů. Comment[cy]=Creu delwedd CMYK wen o 2000 x 800 picsel. Comment[da]=Laver et hvidt CMYK-billede på 2000 x 800 biledpunkter. @@ -68,7 +70,7 @@ Comment[fi]=Luo valkoisen 2000×800 kuvapisteen CMYK-kuvan. Comment[fr]=Crée une image CMYK blanche de 2000 x 800 pixels. Comment[fy]=Makket in witte CMYK-ôfbylding oan fan 2000 x 2000 byldpunten. -Comment[gl]=Cria unha imaxe CMYK branca de 2000 x 800 pixels. +Comment[gl]=Crea unha imaxe CMYK branca de 2000 x 800 pixels. Comment[he]=יצירת תמונת CMYK לבנה בגודל ‎2000 x 800 פיקסלים Comment[hi]=2000 x 800 पिक्सेल का सीएमवायके छवि बनाता है. Comment[hne]=2000 x 800 पिक्सेल के सीएमवायके फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/comics/a4_waffle_grid.desktop calligra-2.4.3/krita/data/templates/comics/a4_waffle_grid.desktop --- calligra-2.4.0/krita/data/templates/comics/a4_waffle_grid.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/comics/a4_waffle_grid.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Icon=template_comics_empty Name=waffle-iron grid Name[ca]=graella de ferro +Name[ca@valencia]=graella de ferro Name[da]=Vaffeljernsgitter Name[de]=Waffeleisengitter Name[el]=waffle-iron κάνναβος @@ -28,6 +29,7 @@ Name[zh_TW]=鐵模式格線 Comment=300 dpi, A4 waffle-iron grid comic page with ink and color layers Comment[ca]=300 dpi, pàgina de còmic amb graella de ferro amb capes de tinta i color +Comment[ca@valencia]=300 dpi, pàgina de còmic amb graella de ferro amb capes de tinta i color Comment[da]=300 dpi, A4 tegneserieside i vaffeljernsgitter med blæk og farvelag Comment[de]=Comicseite mit Waffeleisengitter-Muster, Tinten- und Farbebenen. Format A4, Auflösung 300 dpi. Comment[el]=300 dpi, σελίδα κόμικ A4 με waffle-iron κάνναβο και στρώματα μελάνης και χρώματος diff -Nru calligra-2.4.0/krita/data/templates/comics/BD-EuroTemplate.desktop calligra-2.4.3/krita/data/templates/comics/BD-EuroTemplate.desktop --- calligra-2.4.0/krita/data/templates/comics/BD-EuroTemplate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/comics/BD-EuroTemplate.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Icon=template_comics_empty Name=European BD template Name[ca]=Plantilla europea BD +Name[ca@valencia]=Plantilla europea BD Name[da]=Europæisk BD-skabelon Name[de]=Europäische BD-Vorlage Name[el]=Ευρωπαϊκό BD πρότυπο @@ -28,6 +29,7 @@ Name[zh_TW]=歐式 BD 樣本 Comment=template for European BD-style comics Comment[ca]=plantilla per a còmics d'estil BD europeu +Comment[ca@valencia]=plantilla per a còmics d'estil BD europeu Comment[da]=Skabelon til tegneserier i europæisk BD-stil Comment[de]=Vorlage für Comics im europäischen BD-Stil Comment[el]=πρότυπο για Ευρωπαϊκά BD-style κόμικς diff -Nru calligra-2.4.0/krita/data/templates/comics/Comics-USTemplate.desktop calligra-2.4.3/krita/data/templates/comics/Comics-USTemplate.desktop --- calligra-2.4.0/krita/data/templates/comics/Comics-USTemplate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/comics/Comics-USTemplate.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Icon=template_comics_empty Name=US-style comics template Name[ca]=plantilla de còmics d'estil americà +Name[ca@valencia]=plantilla de còmics d'estil americà Name[da]=Tegneserieskabelon i amerikansk stil Name[de]=US-Design-Comicvorlage Name[el]=Πρότυπο κόμικς US-style @@ -28,6 +29,7 @@ Name[zh_TW]=美式漫畫樣本 Comment=template for US-style comics Comment[ca]=plantilla per a còmics d'estil americà +Comment[ca@valencia]=plantilla per a còmics d'estil americà Comment[da]=skabelon til tegneserier i amerikansk stil Comment[de]=Vorlage für Comics im US-Stil Comment[el]=πρότυπο για US-style κόμικς diff -Nru calligra-2.4.0/krita/data/templates/comics/.directory calligra-2.4.3/krita/data/templates/comics/.directory --- calligra-2.4.0/krita/data/templates/comics/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/comics/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Comic Templates Name[ca]=Plantilles per a còmics +Name[ca@valencia]=Plantilles per a còmics Name[da]=Tegneserieskabeloner Name[de]=Comic-Vorlagen Name[el]=Πρότυπα κόμικ diff -Nru calligra-2.4.0/krita/data/templates/comics/Manga-JpTemplate.desktop calligra-2.4.3/krita/data/templates/comics/Manga-JpTemplate.desktop --- calligra-2.4.0/krita/data/templates/comics/Manga-JpTemplate.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/comics/Manga-JpTemplate.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Icon=template_comics_empty Name=Manga template Name[ca]=Plantilla per a manga +Name[ca@valencia]=Plantilla per a manga Name[cs]=Šablona Mangy Name[da]=Manga-skabelon Name[de]=Manga-Vorlage @@ -29,6 +30,7 @@ Name[zh_TW]=連環漫畫樣本 Comment=template for Japanese Manga-style comics Comment[ca]=plantilla per a còmics d'estil manga japonès +Comment[ca@valencia]=plantilla per a còmics d'estil manga japonés Comment[cs]=šablona pro japonské komiksy ve stylu Manga Comment[da]=skabelon til tegneserier i japansk Manga-stil Comment[de]=Vorlage für Comics im Stil japanischer Mangas diff -Nru calligra-2.4.0/krita/data/templates/gray_u8/.directory calligra-2.4.3/krita/data/templates/gray_u8/.directory --- calligra-2.4.0/krita/data/templates/gray_u8/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/gray_u8/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Степени на сивото Name[br]=SkeulLouet Name[ca]=Escala de grisos +Name[ca@valencia]=Escala de grisos Name[cs]=Odstíny šedé Name[cy]=Graddlwyd Name[da]=Gråskala diff -Nru calligra-2.4.0/krita/data/templates/gray_u8/white_640x480.desktop calligra-2.4.3/krita/data/templates/gray_u8/white_640x480.desktop --- calligra-2.4.0/krita/data/templates/gray_u8/white_640x480.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/gray_u8/white_640x480.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name=White Background, 640 x 480 Name[bg]=Бял фон, 640x480 Name[ca]=Fons blanc, 640 x 480 +Name[ca@valencia]=Fons blanc, 640 x 480 Name[cs]=Bílé pozadí, 640 x 480 Name[cy]=Cefndir Gwyn, 640 x 480 Name[da]=Hvid baggrund, 640 x 480 @@ -55,6 +56,7 @@ Comment=Creates an image of 640 x 480 pixels with a white background. Comment[bg]=Създаване на изображение с размери 640x480 точки и бял фон. Comment[ca]=Crea una imatge de 640 x 480 píxels amb el fons blanc. +Comment[ca@valencia]=Crea una imatge de 640 x 480 píxels amb el fons blanc. Comment[cs]=Vytvoří obrázek 640 x 480 pixelů s bílým pozadím. Comment[cy]=Creu delwedd o 640 x 480 o bicseli efo cefndir gwyn. Comment[da]=Laver et billede på 640 x 480 billedpunkter med en hvid baggrund. @@ -68,7 +70,7 @@ Comment[fi]=Luo 640×480 kuvapisteen valkotaustaisen kuvan. Comment[fr]=Crée une image de 640 x 480 pixels avec un fond blanc. Comment[fy]=Makket in ôfbylding oan fan 640 x 480 byldpunten, mei in witte eftergrûn -Comment[gl]=Cria unha imaxe de 640 x 480 pixels cun fondo branco. +Comment[gl]=Crea unha imaxe de 640 x 480 pixels cun fondo branco. Comment[he]=יצירת תמונת בגודל ‎640 x 480 פיקסלים עם רקע לבן Comment[hi]=640 x 480 पिक्सेल का, सफेद पृष्ठभूमि युक्त एक छवि बनाता है. Comment[hne]=640 x 480 पिक्सेल का, सफेद पिछोत अंगना सहित एक फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/.directory calligra-2.4.3/krita/data/templates/rgb_u8/.directory --- calligra-2.4.0/krita/data/templates/rgb_u8/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=RGB Name[br]=RGB Name[ca]=RGB +Name[ca@valencia]=RGB Name[cs]=RGB Name[cy]=CGwGl (RGB) Name[da]=RGB diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/transparent_1024x768.desktop calligra-2.4.3/krita/data/templates/rgb_u8/transparent_1024x768.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/transparent_1024x768.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/transparent_1024x768.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Прозрачно 1024x768 Name[br]=Treuzwelus 1024 x 768 Name[ca]=Transparent 1024 x 768 +Name[ca@valencia]=Transparent 1024 x 768 Name[cs]=Průhledný 1024 x 768 Name[cy]=Tryloyw 1024 x 768 Name[da]=Gennemsigtig 1024 x 768 @@ -54,6 +55,7 @@ Comment=Creates a transparent image of 1024 x 768 pixels. Comment[bg]=Създаване на прозрачно изображение с размери 1024x768 точки. Comment[ca]=Crea una imatge transparent de 1024 x 768 píxels. +Comment[ca@valencia]=Crea una imatge transparent de 1024 x 768 píxels. Comment[cs]=Vytvoří průhledný obrázek 1024 x 768 pixelů. Comment[cy]=Creu delwedd dryloyw o 1024 x 768 picsel. Comment[da]=Laver et gennemsigtigt billede på 1024 x 768 billedpunkter. @@ -69,7 +71,7 @@ Comment[fr]=Crée une image transparente de 1024 x 768 pixels. Comment[fy]=Makket in trochsichtige ôfbylding oan fan 1024 x 768 byldpunten. Comment[ga]=Cruthaigh íomhá thrédhearcach le 1024×768 picteilín. -Comment[gl]=Cria unha imaxe transparente de 1024 x 768 pixels. +Comment[gl]=Crea unha imaxe transparente de 1024 x 768 pixels. Comment[he]=יצירת תמונה שקופה בגודל ‎1024 x 768 פיקסלים Comment[hi]=1024 x 768 पिक्सेल का पारदर्शी छवि बनाता है. Comment[hne]=1024 x 768 पिक्सेल के पारदर्सी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/transparent_1280x1024.desktop calligra-2.4.3/krita/data/templates/rgb_u8/transparent_1280x1024.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/transparent_1280x1024.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/transparent_1280x1024.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Прозрачно 1280x1204 Name[br]=Treuzwelus 1280 x 1024 Name[ca]=Transparent 1280 x 1024 +Name[ca@valencia]=Transparent 1280 x 1024 Name[cs]=Průhledný 1280 x 1024 Name[cy]=Tryloyw 1280 x 1024 Name[da]=Gennemsigtig 1280 x 1024 @@ -55,6 +56,7 @@ Comment=Creates a transparent image of 1280 x 1024 pixels. Comment[bg]=Създаване на прозрачно изображение с размери 1280x1024 точки. Comment[ca]=Crea una imatge transparent de 1280 x 1024 píxels. +Comment[ca@valencia]=Crea una imatge transparent de 1280 x 1024 píxels. Comment[cs]=Vytvoří průhledný obrázek 1280 x 1024 pixelů. Comment[cy]=Creu delwedd dryloyw o 1280 x 1024 picsel. Comment[da]=Laver et gennemsigtigt billede på 1280 x 1024 billedpunkter. @@ -70,7 +72,7 @@ Comment[fr]=Crée une image transparente de 1280 x 1024 pixels. Comment[fy]=Makket in trochsichtige ôfbylding oan fan 1280 x 1024 byldpunten. Comment[ga]=Cruthaigh íomhá thrédhearcach le 1280×1024 picteilín. -Comment[gl]=Cria unha imaxe transparente de 1280 x 1024 pixels. +Comment[gl]=Crea unha imaxe transparente de 1280 x 1024 pixels. Comment[he]=יצירת תמונה שקופה בגודל ‎1280 x 1024 פיקסלים Comment[hi]=1280 x 1024 पिक्सेल का पारदर्शी छवि बनाता है. Comment[hne]=1280 x 1024 पिक्सेल के पारदर्सी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/transparent_1600x1200.desktop calligra-2.4.3/krita/data/templates/rgb_u8/transparent_1600x1200.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/transparent_1600x1200.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/transparent_1600x1200.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Прозрачно 1600x1200 Name[br]=Treuzwelus 1600 x 1200 Name[ca]=Transparent 1600 x 1200 +Name[ca@valencia]=Transparent 1600 x 1200 Name[cs]=Průhledný 1600 x 1200 Name[cy]=Tryloyw 1600 x 1200 Name[da]=Gennemsigtig 1600 x 1200 @@ -55,6 +56,7 @@ Comment=Creates a transparent image of 1600 x 1200 pixels. Comment[bg]=Създаване на прозрачно изображение с размери 1600x1200 точки. Comment[ca]=Crea una imatge transparent de 1600 x 1200 píxels. +Comment[ca@valencia]=Crea una imatge transparent de 1600 x 1200 píxels. Comment[cs]=Vytvoří průhledný obrázek 1600 x 1200 pixelů. Comment[cy]=Creu delwedd dryloyw o 1600 x 1200 picsel. Comment[da]=Laver et gennemsigtigt billede på 1600 x 1200 billedpunkter. @@ -69,7 +71,7 @@ Comment[fr]=Crée une image transparente de 1600 x 1200 pixels. Comment[fy]=Makket in trochsichtige ôfbylding oan fan 1600 x 1200 byldpunten. Comment[ga]=Cruthaigh íomhá thrédhearcach le 1600×1200 picteilín. -Comment[gl]=Cria unha imaxe transparente de 1600 x 1200 pixels. +Comment[gl]=Crea unha imaxe transparente de 1600 x 1200 pixels. Comment[he]=יצירת תמונה שקופה בגודל ‎1600 x 1200 פיקסלים Comment[hi]=1600 x 1200 पिक्सेल का पारदर्शी छवि बनाता है. Comment[hne]=1600 x 1200 पिक्सेल के पारदर्सी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/transparent_640x480.desktop calligra-2.4.3/krita/data/templates/rgb_u8/transparent_640x480.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/transparent_640x480.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/transparent_640x480.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Прозрачно 640x480 Name[br]=Treuzwelus 640 x 480 Name[ca]=Transparent 640 x 480 +Name[ca@valencia]=Transparent 640 x 480 Name[cs]=Průhledný 640 x 480 Name[cy]=Tryloyw 640 x 480 Name[da]=Gennemsigtig 640 x 480 @@ -55,6 +56,7 @@ Comment=Creates a transparent image of 640 x 480 pixels. Comment[bg]=Създаване на прозрачно изображение с размери 640x480 точки. Comment[ca]=Crea una imatge transparent de 640 x 480 píxels. +Comment[ca@valencia]=Crea una imatge transparent de 640 x 480 píxels. Comment[cs]=Vytvoří průhledný obrázek 640 x 480 pixelů. Comment[cy]=Creu delwedd dryloyw o 640 x 480 picsel. Comment[da]=Laver et gennemsigtigt billede på 640 x 480 billedpunkter. @@ -70,7 +72,7 @@ Comment[fr]=Crée une image transparente de 640 x 480 pixels. Comment[fy]=Makket in trochsichtige ôfbylding oan fan 640 x 480 byldpunten. Comment[ga]=Cruthaigh íomhá thrédhearcach le 640×480 picteilín. -Comment[gl]=Cria unha imaxe transparente de 640 x 480 pixels. +Comment[gl]=Crea unha imaxe transparente de 640 x 480 pixels. Comment[he]=יצירת תמונה שקופה בגודל ‎640 x 480 פיקסלים Comment[hi]=640 x 480 पिक्सेल का पारदर्शी छवि बनाता है. Comment[hne]=640 x 480 पिक्सेल के पारदर्सी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/white_1024x768.desktop calligra-2.4.3/krita/data/templates/rgb_u8/white_1024x768.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/white_1024x768.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/white_1024x768.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Бяло 1024x768 Name[br]=Gwenn 1024 x 768 Name[ca]=Blanc 1024 x 768 +Name[ca@valencia]=Blanc 1024 x 768 Name[cs]=Bílý 1024 x 768 Name[cy]=Gwyn 1024 x 768 Name[da]=Hvidt 1024 x 768 @@ -56,6 +57,7 @@ Comment=Creates a white RGB image of 1024 x 768 pixels. Comment[bg]=Създаване на бяло изображение RGB с размери 1024x768 точки. Comment[ca]=Crea una imatge blanca RGB de 1024 x 768 píxels +Comment[ca@valencia]=Crea una imatge blanca RGB de 1024 x 768 píxels Comment[cs]=Vytvoří bílý RGB obrázek 1024 x 768 pixelů. Comment[cy]=Creu delwedd RGB wen o 1024 x 768 picsel. Comment[da]=Laver et hvidt RGB-billede på 1024 x 768 billedpunkter. @@ -71,7 +73,7 @@ Comment[fr]=Crée une image blanche RVB de 1024 x 768 pixels. Comment[fy]=Makket in witte RGB-ôfbylding oan fan 1024 x 768 byldpunten. Comment[ga]=Cruthaigh íomhá bhán RGB le 1024×768 picteilín. -Comment[gl]=Cria unha imaxe RGB branca de 1024 x 768 pixels. +Comment[gl]=Crea unha imaxe RGB branca de 1024 x 768 pixels. Comment[he]=יצירת תמונת RGB לבנה בגודל ‎1024 x 768 פיקסלים Comment[hi]=1024 x 768 पिक्सेल का आरजीबी छवि बनाता है. Comment[hne]=1024 x 768 पिक्सेल के आरजीबी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/white_1280x1024.desktop calligra-2.4.3/krita/data/templates/rgb_u8/white_1280x1024.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/white_1280x1024.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/white_1280x1024.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Бяло 1280x1024 Name[br]=Gwenn 1280 x 1024 Name[ca]=Blanc 1280 x 1024 +Name[ca@valencia]=Blanc 1280 x 1024 Name[cs]=Bílý 1280 x 1024 Name[cy]=Gwyn 1280 x 1024 Name[da]=Hvidt 1280 x 1024 @@ -55,6 +56,7 @@ Comment=Creates a white RGB image of 1280 x 1024 pixels. Comment[bg]=Създаване на бяло изображение RGB с размери 1280x1024 точки. Comment[ca]=Crea una imatge blanca RGB de 1280 x 1024 píxels. +Comment[ca@valencia]=Crea una imatge blanca RGB de 1280 x 1024 píxels. Comment[cs]=Vytvoří bílý RGB obrázek 1280 x 1024 pixelů. Comment[cy]=Creu delwedd RGB wen o 1280 x 1024 picsel. Comment[da]=Laver et hvidt RGB-billede på 1280 x 1024 billedpunkter. @@ -70,7 +72,7 @@ Comment[fr]=Crée une image blanche RVB de 1280 x 1024 pixels. Comment[fy]=Makket in witte RGB-ôfbylding oan fan 1280 x 1024 byldpunten Comment[ga]=Cruthaigh íomhá bhán RGB le 1280×1024 picteilín. -Comment[gl]=Cria unha imaxe RGB branca de 1280 x 1024 pixels. +Comment[gl]=Crea unha imaxe RGB branca de 1280 x 1024 pixels. Comment[he]=יצירת תמונת RGB לבנה בגודל ‎1280 x 1024 פיקסלים Comment[hi]=1024 x 1024 पिक्सेल का आरजीबी छवि बनाता है. Comment[hne]=1024 x 1024 पिक्सेल के आरजीबी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/white_1600x1200.desktop calligra-2.4.3/krita/data/templates/rgb_u8/white_1600x1200.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/white_1600x1200.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/white_1600x1200.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Бяло 1600x1200 Name[br]=Gwenn 1600 x 1200 Name[ca]=Blanc 1600 x 1200 +Name[ca@valencia]=Blanc 1600 x 1200 Name[cs]=Bílý 1600 x 1200 Name[cy]=Gwyn 1600 x 1200 Name[da]=Hvidt 1600 x 1200 @@ -55,6 +56,7 @@ Comment=Creates a white RGB image of 1600 x 1200 pixels. Comment[bg]=Създаване на бяло изображение RGB с размери 1600x1200 точки. Comment[ca]=Crea una imatge blanca RGB de 1600 x 1200 píxels. +Comment[ca@valencia]=Crea una imatge blanca RGB de 1600 x 1200 píxels. Comment[cs]=Vytvoří bílý RGB obrázek 1600 x 1200 pixelů. Comment[cy]=Creu delwedd RGB wen o 1600 x 1200 picsel. Comment[da]=Laver et hvidt RGB-billede på 1600 x 1200 billedpunkter. @@ -70,7 +72,7 @@ Comment[fr]=Crée une image blanche RVB de 1600 x 1200 pixels. Comment[fy]=Makket in witte RGB-ôfbylding oan fan 1600 x 1200 byldpunten Comment[ga]=Cruthaigh íomhá bhán RGB le 1600×1200 picteilín. -Comment[gl]=Cria unha imaxe RGB branca de 1600 x 1200 pixels. +Comment[gl]=Crea unha imaxe RGB branca de 1600 x 1200 pixels. Comment[he]=יצירת תמונת RGB לבנה בגודל ‎1600 x 1200 פיקסלים Comment[hi]=1600 x 1200 पिक्सेल का आरजीबी छवि बनाता है. Comment[hne]=1600 x 1200 पिक्सेल के आरजीबी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/rgb_u8/white_640x480.desktop calligra-2.4.3/krita/data/templates/rgb_u8/white_640x480.desktop --- calligra-2.4.0/krita/data/templates/rgb_u8/white_640x480.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/rgb_u8/white_640x480.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Бяло 640x480 Name[br]=Gwenn 640x480 Name[ca]=Blanc 640x480 +Name[ca@valencia]=Blanc 640x480 Name[cs]=Bílý 640x480 Name[cy]=Gwyn 640 x 480 Name[da]=Hvidt 640x480 @@ -56,6 +57,7 @@ Comment=Creates a white RGB image of 640 x 480 pixels. Comment[bg]=Създаване на бяло изображение RGB с размери 640x480 точки. Comment[ca]=Crea una imatge blanca RGB de 640 x 480 píxels. +Comment[ca@valencia]=Crea una imatge blanca RGB de 640 x 480 píxels. Comment[cs]=Vytvoří bílý RGB obrázek 640 x 480 pixelů. Comment[cy]=Creu delwedd RGB wen o 640 x 480 picsel. Comment[da]=Laver et hvidt RGB-billede på 640 x 480 billedpunkter. @@ -71,7 +73,7 @@ Comment[fr]=Crée une image blanche RVB de 640 x 480 pixels. Comment[fy]=Makket in witte RGB-ôfbylding oan fan 640 x 480 byldpunten Comment[ga]=Cruthaigh íomhá bhán RGB le 640×480 picteilín. -Comment[gl]=Cria unha imaxe RGB branca de 640 x 480 pixels. +Comment[gl]=Crea unha imaxe RGB branca de 640 x 480 pixels. Comment[he]=יצירת תמונת RGB לבנה בגודל ‎640 x 480 פיקסלים Comment[hi]=640 x 480 पिक्सेल का आरजीबी छवि बनाता है. Comment[hne]=640 x 480 पिक्सेल के आरजीबी फोटू बनाथे . diff -Nru calligra-2.4.0/krita/data/templates/templates/.directory calligra-2.4.3/krita/data/templates/templates/.directory --- calligra-2.4.0/krita/data/templates/templates/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/data/templates/templates/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=CMYK Name[br]=CMYK Name[ca]=CMYK +Name[ca@valencia]=CMYK Name[cs]=CMYK Name[cy]=CMYK Name[da]=CMYK diff -Nru calligra-2.4.0/krita/image/kis_base_node.cpp calligra-2.4.3/krita/image/kis_base_node.cpp --- calligra-2.4.0/krita/image/kis_base_node.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/image/kis_base_node.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -232,7 +232,15 @@ bool KisBaseNode::isEditable() const { - return (visible(true) && !userLocked() && !systemLocked()); + bool editable = (m_d->properties.boolProperty("visible", true) && !userLocked() && !systemLocked()); + + if (editable) { + KisBaseNodeSP parentNode = parentCallback(); + if (parentNode && parentNode != this) { + editable = parentNode->isEditable(); + } + } + return editable; } QUuid KisBaseNode::uuid() const diff -Nru calligra-2.4.0/krita/krita.desktop calligra-2.4.3/krita/krita.desktop --- calligra-2.4.0/krita/krita.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/krita.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita @@ -60,6 +61,7 @@ GenericName=Painting and Image Editing GenericName[bg]=Редактор на графични изображения GenericName[ca]=Programa d'edició d'imatges +GenericName[ca@valencia]=Programa d'edició d'imatges GenericName[da]=Tegning og billedredigering GenericName[de]=Mal- und Bildbearbeitungsprogramm GenericName[el]=Επεξεργασία και ζωγραφική εικόνων @@ -105,6 +107,7 @@ Comment=Edit and paint images Comment[bg]=Редактиране и създаване на изображения Comment[ca]=Edita i pinta imatges +Comment[ca@valencia]=Edita i pinta imatges Comment[da]=Redigér og mal billeder Comment[de]=Bilder zeichnen und bearbeiten Comment[el]=Επεξεργασία και ζωγραφική εικόνων diff -Nru calligra-2.4.0/krita/kritapart.desktop calligra-2.4.3/krita/kritapart.desktop --- calligra-2.4.0/krita/kritapart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/kritapart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Calligra Painting and Image Editor Component Name[bg]=Компонент за рисуване и редактиране на изображения в Calligra Name[ca]=Component de dibuix i manipulació d'imatges del Calligra +Name[ca@valencia]=Component de dibuix i manipulació d'imatges del Calligra Name[cs]=Komponenta Calligra pro malování a úpravu fotografií Name[da]=Calligra-komponent til tegning og billedredigeringskomponent Name[de]=Calligra-Komponente für Malen und Bildbearbeitung @@ -9,7 +10,9 @@ Name[es]=Componente de pintura y de edición de imágenes de Calligra Name[et]=Calligra joonistamise ja pilditöötluse komponent Name[fr]=Composant manipulation d'images et dessin de Calligra +Name[gl]=Compoñente de debuxo e edición de imaxes de Calligra Name[it]=Componente per il disegno e la manipolazione di immagini di Calligra +Name[ja]=Calligra 描画と画像編集コンポーネント Name[kk]=Calligra-ның кескінін салу және өңдеу бағдарламасы Name[nb]=Calligra-komponent for maling og bildemanipulasjon Name[nds]=Calligra-Komponent för't Malen un Bildbewerken @@ -18,6 +21,7 @@ Name[pt]=Componente de Edição e Pintura de Imagens do Calligra Name[pt_BR]=Componente de Edição e Pintura de Imagens do Calligra Name[ru]=Компонент рисования и редактирования изображений Calligra +Name[sk]=Calligra modul na úpravu a maľovanie obrázkov Name[sv]=Calligra målnings- och bildredigeringskomponent Name[uk]=Компонент Calligra для малювання і редагування зображень Name[x-test]=xxCalligra Painting and Image Editor Componentxx @@ -32,6 +36,7 @@ GenericName[bg]=Графично изображение GenericName[br]=Tra skeudenn GenericName[ca]=Objecte d'imatge +GenericName[ca@valencia]=Objecte d'imatge GenericName[cy]=Gwrthrych Delwedd GenericName[da]=Billedobjekt GenericName[de]=Bildobjekt diff -Nru calligra-2.4.0/krita/plugins/assistants/RulerAssistant/kritarulerassistanttool.desktop calligra-2.4.3/krita/plugins/assistants/RulerAssistant/kritarulerassistanttool.desktop --- calligra-2.4.0/krita/plugins/assistants/RulerAssistant/kritarulerassistanttool.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/assistants/RulerAssistant/kritarulerassistanttool.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=RulerAssistantTool Name[ca]=EinaAssistentRegla +Name[ca@valencia]=EinaAssistentRegla Name[da]=LinealAssistentVærktøj Name[de]=Hilfslineal-Werkzeug Name[el]=Εργαλείο βοηθού κανόνα diff -Nru calligra-2.4.0/krita/plugins/colorspaces/ctlcs/krita_ctlcs_plugin.desktop calligra-2.4.3/krita/plugins/colorspaces/ctlcs/krita_ctlcs_plugin.desktop --- calligra-2.4.0/krita/plugins/colorspaces/ctlcs/krita_ctlcs_plugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/colorspaces/ctlcs/krita_ctlcs_plugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=CTL Color Spaces Name[ca]=Espais de color CTL +Name[ca@valencia]=Espais de color CTL Name[da]=CTL-farverum Name[de]=CTL-Farbraum Name[el]=Χρωματικοί χώροι CTL @@ -29,6 +30,7 @@ Name[zh_TW]=CTL 色彩空間 Comment=Color model written using the Color Transformation Language. Comment[ca]=Model de color escrit usant el Color Transformation Language. +Comment[ca@valencia]=Model de color escrit usant el Color Transformation Language. Comment[da]=Farvemodel skrevet med brug af farvetransformeringssproget (CTL). Comment[de]=Unter Verwendung der „Color Transformation Language“ geschriebenes Farbmodell. Comment[el]=Χρωματικό μοντέλο με χρήση της Color Transformation Language. diff -Nru calligra-2.4.0/krita/plugins/colorspaces/extensions/krita_colorspaces_extensions_plugin.desktop calligra-2.4.3/krita/plugins/colorspaces/extensions/krita_colorspaces_extensions_plugin.desktop --- calligra-2.4.0/krita/plugins/colorspaces/extensions/krita_colorspaces_extensions_plugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/colorspaces/extensions/krita_colorspaces_extensions_plugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Some extensions to color spaces Name[ca]=Algunes extensions per a espais de color +Name[ca@valencia]=Algunes extensions per a espais de color Name[da]=Nogle udvidelser til farverum Name[de]=Einige Erweiterungen zu den Farbräumen Name[el]=Μερικές επεκτάσεις για τους χρωματικούς χώρους @@ -9,7 +10,7 @@ Name[et]=Mõned värviruumide laiendud Name[fi]=Laajennuksia väriavaruuksiin Name[fr]=Quelques extensions pour les espaces de couleur -Name[gl]=Algunhas extensións para os espazos de cor +Name[gl]=Alguns engadidos para os espazos de cor Name[hi]=रंग स्पेसेस के लिए कुछ एक्सटेंशन Name[hne]=रंग स्पेसेस बर कुछ एक्सटेंसन Name[it]=Alcune estensioni agli spazi di colore @@ -35,6 +36,7 @@ Name[zh_TW]=顏色空間的一些延伸 Comment=Some extensions to color spaces Comment[ca]=Algunes extensions per a espais de color +Comment[ca@valencia]=Algunes extensions per a espais de color Comment[da]=Nogle udvidelser til farverum Comment[de]=Einige Erweiterungen zu den Farbräumen Comment[el]=Μερικές επεκτάσεις για τους χρωματικούς χώρους @@ -43,7 +45,7 @@ Comment[et]=Mõned värviruumide laiendid Comment[fi]=Laajennuksia väriavaruuksiin Comment[fr]=Quelques extensions pour les espaces de couleur -Comment[gl]=Algunhas extensións para colorear espazos +Comment[gl]=Algúns engadidos para colorear espazos Comment[hi]=रंग स्पेसेस के लिए कुछ एक्सटेंशन Comment[hne]=रंग स्पेसेस बर कुछ एक्सटेंसन Comment[it]=Alcune estensioni agli spazi di colore diff -Nru calligra-2.4.0/krita/plugins/colorspaces/lms_f32/krita_lms_f32_plugin.desktop calligra-2.4.3/krita/plugins/colorspaces/lms_f32/krita_lms_f32_plugin.desktop --- calligra-2.4.0/krita/plugins/colorspaces/lms_f32/krita_lms_f32_plugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/colorspaces/lms_f32/krita_lms_f32_plugin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=LMS Color Model (32-bit float) Name[bg]=Цветови модел LMS (32 бита) Name[ca]=Model de color LMS (paleta de 32 bits) +Name[ca@valencia]=Model de color LMS (paleta de 32 bits) Name[cy]=Model Lliw LMS (arnawf 32-did) Name[da]=LMS-farvemodel (32-bit float) Name[de]=LMS-Farbmodell (32-bit Fließkomma) @@ -45,6 +46,7 @@ Comment=Color model for LMS cone space (Long Middle and Short wavelengths) Comment[bg]=Цветови модел за интервали LMS (дълги, средни и къси вълни) Comment[ca]=Model de color per a conus d'espai LMC (amplades d'ona llargs, mitjos i curts) +Comment[ca@valencia]=Model de color per a conus d'espai LMC (amplades d'ona llargs, mitjos i curts) Comment[cy]=Model lliw ar gyfer gofod côn LMS (tonfeddi Hir, Canolig a Byr) Comment[da]=Farvemodel for LMS-keglerum (Lange, mellemliggende og korte bølgelængder) Comment[de]=Farbmodell für LMS cone space (Lange, Mittelere und Kurze Wellenlängen) diff -Nru calligra-2.4.0/krita/plugins/extensions/backgrounds/kritabackgrounds.desktop calligra-2.4.3/krita/plugins/extensions/backgrounds/kritabackgrounds.desktop --- calligra-2.4.0/krita/plugins/extensions/backgrounds/kritabackgrounds.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/backgrounds/kritabackgrounds.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Image Background Pattern Selector Name[ca]=Selector de patrons d'imatges de fons +Name[ca@valencia]=Selector de patrons d'imatges de fons Name[da]=Mønstervælger til billedbaggrund Name[de]=Auswahl des Bildhintergrundmusters Name[el]=Επιλογέας μοτίβου φόντου εικόνας diff -Nru calligra-2.4.0/krita/plugins/extensions/bigbrother/kritabigbrother.desktop calligra-2.4.3/krita/plugins/extensions/bigbrother/kritabigbrother.desktop --- calligra-2.4.0/krita/plugins/extensions/bigbrother/kritabigbrother.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/bigbrother/kritabigbrother.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=bigbrother Name[ca]=grangermà +Name[ca@valencia]=grangermà Name[da]=bigbrother Name[de]=Bigbrother Name[el]=μεγάλος αδερφός @@ -34,6 +35,7 @@ Name[zh_TW]=bigbrother Comment=bigbrother Comment[ca]=grangermà +Comment[ca@valencia]=grangermà Comment[da]=bigbrother Comment[de]=Bigbrother Comment[el]=μεγάλος αδερφός diff -Nru calligra-2.4.0/krita/plugins/extensions/bracketing2hdr/kritabracketing2hdr.desktop calligra-2.4.3/krita/plugins/extensions/bracketing2hdr/kritabracketing2hdr.desktop --- calligra-2.4.0/krita/plugins/extensions/bracketing2hdr/kritabracketing2hdr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/bracketing2hdr/kritabracketing2hdr.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Bracketing2HDR Name[ca]=Bracketing2HDR +Name[ca@valencia]=Bracketing2HDR Name[da]=Bracketing-til-HDR Name[de]=BelichtungsreiheZuHDR Name[el]=Bracketing2HDR @@ -35,6 +36,7 @@ Name[zh_TW]=Bracketing2HDR Comment=Bracketing2HDR Comment[ca]=Bracketing2HDR +Comment[ca@valencia]=Bracketing2HDR Comment[da]=Bracketing-til-HDR Comment[de]=BelichtungsreiheZuHDR Comment[el]=Εγκιβωτισμός σε HDR diff -Nru calligra-2.4.0/krita/plugins/extensions/CMakeLists.txt calligra-2.4.3/krita/plugins/extensions/CMakeLists.txt --- calligra-2.4.0/krita/plugins/extensions/CMakeLists.txt 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/CMakeLists.txt 2012-06-26 04:21:31.000000000 +0000 @@ -1,5 +1,5 @@ add_subdirectory( bigbrother ) -add_subdirectory( backgrounds ) +#add_subdirectory( backgrounds ) add_subdirectory( imagesplit ) #add_subdirectory( bracketing2hdr ) add_subdirectory( colorrange ) diff -Nru calligra-2.4.0/krita/plugins/extensions/colorrange/kritacolorrange.desktop calligra-2.4.3/krita/plugins/extensions/colorrange/kritacolorrange.desktop --- calligra-2.4.0/krita/plugins/extensions/colorrange/kritacolorrange.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/colorrange/kritacolorrange.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Colorrange Name[bg]=Цветови обхват Name[ca]=Interval de color +Name[ca@valencia]=Interval de color Name[da]=Farveområde Name[de]=Farbbereich Name[el]=Χρωματικό εύρος diff -Nru calligra-2.4.0/krita/plugins/extensions/colorspaceconversion/kritacolorspaceconversion.desktop calligra-2.4.3/krita/plugins/extensions/colorspaceconversion/kritacolorspaceconversion.desktop --- calligra-2.4.0/krita/plugins/extensions/colorspaceconversion/kritacolorspaceconversion.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/colorspaceconversion/kritacolorspaceconversion.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Colorspace Conversion Name[bg]=Цветово обръщане Name[ca]=Conversió d'espai de color +Name[ca@valencia]=Conversió d'espai de color Name[cs]=Převod prostoru barev Name[da]=Farverumskonvertering Name[de]=Farbraumumwandlung diff -Nru calligra-2.4.0/krita/plugins/extensions/compose/kritalayercompose.desktop calligra-2.4.3/krita/plugins/extensions/compose/kritalayercompose.desktop --- calligra-2.4.0/krita/plugins/extensions/compose/kritalayercompose.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/compose/kritalayercompose.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Compose Layer plugin Name[bg]=Приставка за създаване на слоеве Name[ca]=Connector de composició de capa +Name[ca@valencia]=Connector de composició de capa Name[da]=Plugin til komponering af lag Name[de]=Ebenenerstellungs-Modul Name[el]=Πρόσθετο σύνθεσης στρώματος diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/advancedcolorselector/krita_colorselectorng.desktop calligra-2.4.3/krita/plugins/extensions/dockers/advancedcolorselector/krita_colorselectorng.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/advancedcolorselector/krita_colorselectorng.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/advancedcolorselector/krita_colorselectorng.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=ColorSelectorNG Name[ca]=SelectorColorNG +Name[ca@valencia]=SelectorColorNG Name[da]=ColorSelectorNG Name[el]=ColorSelectorNG Name[en_GB]=ColourSelectorNG diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/artisticcolorselector/krita_artisticcolorselector.desktop calligra-2.4.3/krita/plugins/extensions/dockers/artisticcolorselector/krita_artisticcolorselector.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/artisticcolorselector/krita_artisticcolorselector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/artisticcolorselector/krita_artisticcolorselector.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Artistic color selector Name[ca]=Selector artístic de color +Name[ca@valencia]=Selector artístic de color Name[da]=Kunstnerisk farvevælger Name[el]=Καλλιτεχνικός χρωματικός επιλογέας Name[es]=Selector de color artístico @@ -14,6 +15,7 @@ Name[pt]=Selector de cores artísticas Name[pt_BR]=Seletor de cores artísticas Name[ru]=Художественный выбор цвета +Name[sk]=Umelecký výber farby Name[sv]=Artistisk färgväljare Name[uk]=Художній вибір кольору Name[x-test]=xxArtistic color selectorxx diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/channeldocker/krita_channeldocker.desktop calligra-2.4.3/krita/plugins/extensions/dockers/channeldocker/krita_channeldocker.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/channeldocker/krita_channeldocker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/channeldocker/krita_channeldocker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Channel Docker Name[bg]=Контейнер за канали Name[ca]=Amarrador de canal +Name[ca@valencia]=Amarrador de canal Name[cs]=Dok kanálů Name[da]=Kanal-dokker Name[el]=Εργαλείο ροσάρτησης καναλιού @@ -16,6 +17,7 @@ Name[pt]=Área de Canais Name[pt_BR]=Área de canais Name[ru]=Панель каналов +Name[sk]=Kanálový docker Name[sv]=Kanaldockningsfönster Name[uk]=Панель швартування каналів Name[x-test]=xxChannel Dockerxx diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/defaultdockers/kritadefaultdockers.desktop calligra-2.4.3/krita/plugins/extensions/dockers/defaultdockers/kritadefaultdockers.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/defaultdockers/kritadefaultdockers.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/defaultdockers/kritadefaultdockers.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Default Dockers Name[bg]=Канали по подразбиране Name[ca]=Amarradors per defecte +Name[ca@valencia]=Amarradors per defecte Name[cs]=Výchozí doky Name[da]=Standard-dokkere Name[de]=Standarddocker diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/digitalmixer/digitalmixer_dock.cc calligra-2.4.3/krita/plugins/extensions/dockers/digitalmixer/digitalmixer_dock.cc --- calligra-2.4.0/krita/plugins/extensions/dockers/digitalmixer/digitalmixer_dock.cc 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/digitalmixer/digitalmixer_dock.cc 2012-06-26 04:18:01.000000000 +0000 @@ -51,7 +51,7 @@ // Current Color m_currentColorPatch = new KoColorPatch(this); m_currentColorPatch->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - m_currentColorPatch->setMinimumWidth(12); + m_currentColorPatch->setMinimumWidth(48); layout->addWidget(m_currentColorPatch, 0, 0,3,1); // Create the sliders @@ -69,13 +69,17 @@ { Mixer mixer; mixer.targetColor = new DigitalMixerPatch(this); + mixer.targetColor->setFixedSize(32, 22); layout->addWidget(mixer.targetColor, 0, i + 1); mixer.targetSlider = new KoColorSlider(Qt::Vertical, this); + mixer.targetSlider->setFixedWidth(22); + mixer.targetSlider->setMinimumHeight(66); layout->addWidget(mixer.targetSlider, 1, i + 1); QToolButton* colorSelector = new QToolButton( this ); mixer.actionColor = new KoColorPopupAction(this); mixer.actionColor->setCurrentColor(initColors[i]); colorSelector->setDefaultAction(mixer.actionColor); + colorSelector->setFixedSize(colorSelector->sizeHint()); layout->addWidget(colorSelector, 2, i + 1); m_mixers.push_back(mixer); diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/digitalmixer/krita_digitalmixer.desktop calligra-2.4.3/krita/plugins/extensions/dockers/digitalmixer/krita_digitalmixer.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/digitalmixer/krita_digitalmixer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/digitalmixer/krita_digitalmixer.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=DigitalMixer Name[ca]=DigitalMixer +Name[ca@valencia]=DigitalMixer Name[da]=DigitalMixer Name[de]=Digitaler Mixer Name[el]=DigitalMixer @@ -28,6 +29,7 @@ Name[zh_TW]=數位混合器 Comment=DigitalMixer Comment[ca]=DigitalMixer +Comment[ca@valencia]=DigitalMixer Comment[da]=DigitalMixer Comment[de]=Digitaler Mixer Comment[el]=Ψηφιακός μείκτης diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/dockerplugintemplate/krita_presetdocker.desktop calligra-2.4.3/krita/plugins/extensions/dockers/dockerplugintemplate/krita_presetdocker.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/dockerplugintemplate/krita_presetdocker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/dockerplugintemplate/krita_presetdocker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Preset Docker Name[ca]=Amarrador de prearranjament +Name[ca@valencia]=Amarrador de prearranjament Name[cs]=Dok předvoleb Name[da]=Forudindstilling-dokker Name[el]=Εργαλείο προσάρτησης προρύθμισης @@ -16,12 +17,14 @@ Name[pt]=Área de Predefinições Name[pt_BR]=Área de predefinições Name[ru]=Панель для выбора предустановок +Name[sk]=Panel nastavení Name[sv]=Förinställt dockningsfönster Name[uk]=Панель вибору налаштувань Name[x-test]=xxPreset Dockerxx Name[zh_TW]=預設定嵌入器 Comment=Docker for selecting presets Comment[ca]=Amarrador per prearranjaments seleccionats +Comment[ca@valencia]=Amarrador per prearranjaments seleccionats Comment[da]=Dokker til at vælge forudindstillinger Comment[el]=Εργαλείο προσάρτησης για επιλογή προρυθμίσεων Comment[en_GB]=Docker for selecting presets @@ -35,6 +38,7 @@ Comment[pt]=Área para seleccionar as predefinições Comment[pt_BR]=Área para selecionar predefinições Comment[ru]=Панель для выбора предустановок +Comment[sk]=Docker pre výber predvolieb Comment[sv]=Dockningsfönster för valda förinställningar Comment[uk]=Панель для вибору налаштувань документів Comment[x-test]=xxDocker for selecting presetsxx diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/historydocker/kritahistorydocker.desktop calligra-2.4.3/krita/plugins/extensions/dockers/historydocker/kritahistorydocker.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/historydocker/kritahistorydocker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/historydocker/kritahistorydocker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,11 +1,13 @@ [Desktop Entry] Name=Krita Undo History Docker plugin Name[ca]=Connector amarrador d'històric de desfer del Krita +Name[ca@valencia]=Connector amarrador d'històric de desfer del Krita Name[da]=Dokker-plugin til at fortryde historik til Krita Name[el]=Πρόσθετο προσάρτησης αναίρεσης ιστορικού του Krita Name[en_GB]=Krita Undo History Docker plugin Name[es]=Complemento de acoplable de histórico de cambios deshechos de Krita Name[et]=Krita tagasivõtmise ajaloo doki plugin +Name[gl]=Engadido Undo History Dockers para Krita Name[it]=Estensione di aggancio per l'annullamento della cronologia di Krita Name[kk]=Krita-ның амалдан қайту тарихы докер плагині Name[nb]=Dockers programtillegg for Krita angrehistorie @@ -15,6 +17,7 @@ Name[pt]='Plugin' do Módulo Acoplável do Histórico de Anulações do Krita Name[pt_BR]=Plugin de módulos acopláveis do histórico de anulações do Krita Name[ru]=Модуль панели истории для Krita +Name[sk]=Plugin dockeru undo histórie Krita Name[sv]=Krita insticksprogram för ångringshistorik Name[uk]=Додаток панелі журналу скасування для Krita Name[x-test]=xxKrita Undo History Docker pluginxx diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/imagedocker/kritaimagedocker.desktop calligra-2.4.3/krita/plugins/extensions/dockers/imagedocker/kritaimagedocker.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/imagedocker/kritaimagedocker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/imagedocker/kritaimagedocker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Image Docker Name[ca]=Amarradors d'imatges +Name[ca@valencia]=Amarradors d'imatges Name[cs]=Dok obrázků Name[da]=Billed-dokker Name[el]=Εργαλείο προσάρτησης εικόνων @@ -15,12 +16,14 @@ Name[pt]=Área de Imagens Name[pt_BR]=Acoplador de imagem Name[ru]=Панель для изображений +Name[sk]=Panel obrázku Name[sv]=Bilddockningsfönster Name[uk]=Панель швартування зображень Name[x-test]=xxImage Dockerxx Name[zh_TW]=影像嵌入器 Comment=Docker for reference images Comment[ca]=Amarrador per a imatges de referència +Comment[ca@valencia]=Amarrador per a imatges de referència Comment[cs]=Dok pro referenční obrázky Comment[da]=Dokker til referencebilleder Comment[el]=Προσάρτηση για εικόνες παραπομπής @@ -34,6 +37,7 @@ Comment[pt]=Área das imagens de referência Comment[pt_BR]=Acoplador para imagens de referência Comment[ru]=Панель для изображений для ссылки +Comment[sk]=Docker pre referenčné obrázky Comment[sv]=Dockningsfönster för referensbilder Comment[uk]=Панель для еталонних зображень Comment[x-test]=xxDocker for reference imagesxx diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/presetdocker/krita_presetdocker.desktop calligra-2.4.3/krita/plugins/extensions/dockers/presetdocker/krita_presetdocker.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/presetdocker/krita_presetdocker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/presetdocker/krita_presetdocker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Preset Docker Name[ca]=Amarrador de prearranjament +Name[ca@valencia]=Amarrador de prearranjament Name[cs]=Dok předvoleb Name[da]=Forudindstilling-dokker Name[el]=Εργαλείο προσάρτησης προρύθμισης @@ -16,12 +17,14 @@ Name[pt]=Área de Predefinições Name[pt_BR]=Área de predefinições Name[ru]=Панель для выбора предустановок +Name[sk]=Panel nastavení Name[sv]=Förinställt dockningsfönster Name[uk]=Панель вибору налаштувань Name[x-test]=xxPreset Dockerxx Name[zh_TW]=預設定嵌入器 Comment=Docker for selecting presets Comment[ca]=Amarrador per prearranjaments seleccionats +Comment[ca@valencia]=Amarrador per prearranjaments seleccionats Comment[da]=Dokker til at vælge forudindstillinger Comment[el]=Εργαλείο προσάρτησης για επιλογή προρυθμίσεων Comment[en_GB]=Docker for selecting presets @@ -35,6 +38,7 @@ Comment[pt]=Área para seleccionar as predefinições Comment[pt_BR]=Área para selecionar predefinições Comment[ru]=Панель для выбора предустановок +Comment[sk]=Docker pre výber predvolieb Comment[sv]=Dockningsfönster för valda förinställningar Comment[uk]=Панель для вибору налаштувань документів Comment[x-test]=xxDocker for selecting presetsxx diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/smallcolorselector/krita_smallcolorselector.desktop calligra-2.4.3/krita/plugins/extensions/dockers/smallcolorselector/krita_smallcolorselector.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/smallcolorselector/krita_smallcolorselector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/smallcolorselector/krita_smallcolorselector.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SmallColorSelector Name[ca]=SelectorDeColorPetit +Name[ca@valencia]=SelectorDeColorPetit Name[da]=LilleFarveVælger Name[de]=Kleiner Farbwähler Name[el]=SmallColorSelector @@ -32,6 +33,7 @@ Name[zh_TW]=小型顏色選擇器 Comment=SmallColorSelector Comment[ca]=SelectorDeColorPetit +Comment[ca@valencia]=SelectorDeColorPetit Comment[da]=LilleFarveVælger Comment[de]=Kleiner Farbwähler Comment[el]=SmallColorSelector diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/smallcolorselector/smallcolorselector_dock.cc calligra-2.4.3/krita/plugins/extensions/dockers/smallcolorselector/smallcolorselector_dock.cc --- calligra-2.4.0/krita/plugins/extensions/dockers/smallcolorselector/smallcolorselector_dock.cc 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/smallcolorselector/smallcolorselector_dock.cc 2012-06-26 04:18:01.000000000 +0000 @@ -25,12 +25,19 @@ #include +#include +#include + SmallColorSelectorDock::SmallColorSelectorDock() : QDockWidget() , m_canvas(0) { + QWidget *page = new QWidget(this); + QVBoxLayout *layout = new QVBoxLayout(page); m_smallColorWidget = new KisSmallColorWidget(this); - setWidget(m_smallColorWidget); + layout->addWidget(m_smallColorWidget); + layout->addStretch(1); + setWidget(page); m_smallColorWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); connect(m_smallColorWidget, SIGNAL(colorChanged(const QColor&)), this, SLOT(colorChangedProxy(const QColor&))); diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/specificcolorselector/kis_color_input.cc calligra-2.4.3/krita/plugins/extensions/dockers/specificcolorselector/kis_color_input.cc --- calligra-2.4.0/krita/plugins/extensions/dockers/specificcolorselector/kis_color_input.cc 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/specificcolorselector/kis_color_input.cc 2012-06-26 04:18:01.000000000 +0000 @@ -225,6 +225,7 @@ valueString.remove(QChar('#')); QList channels = m_color->colorSpace()->channels(); + channels = KoChannelInfo::displayOrderSorted(channels); foreach(KoChannelInfo* channel, channels) { if (channel->channelType() == KoChannelInfo::COLOR) { Q_ASSERT(channel->channelValueType() == KoChannelInfo::UINT8); @@ -243,6 +244,7 @@ QString hexString("#"); QList channels = m_color->colorSpace()->channels(); + channels = KoChannelInfo::displayOrderSorted(channels); foreach(KoChannelInfo* channel, channels) { if (channel->channelType() == KoChannelInfo::COLOR) { Q_ASSERT(channel->channelValueType() == KoChannelInfo::UINT8); diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/specificcolorselector/kis_specific_color_selector_widget.cc calligra-2.4.3/krita/plugins/extensions/dockers/specificcolorselector/kis_specific_color_selector_widget.cc --- calligra-2.4.0/krita/plugins/extensions/dockers/specificcolorselector/kis_specific_color_selector_widget.cc 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/specificcolorselector/kis_specific_color_selector_widget.cc 2012-06-26 04:21:31.000000000 +0000 @@ -97,12 +97,12 @@ } } bool allChannels8Bit = true; - foreach(KoChannelInfo* channel, channels) { + foreach (KoChannelInfo* channel, channels) { if (channel->channelType() == KoChannelInfo::COLOR && channel->channelValueType() != KoChannelInfo::UINT8) { allChannels8Bit = false; } } - if(allChannels8Bit) { + if (allChannels8Bit) { KisColorInput* input = new KisHexColorInput(this, &m_color); m_inputs.append(input); m_layout->addWidget(input); diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/specificcolorselector/krita_specificcolorselector.desktop calligra-2.4.3/krita/plugins/extensions/dockers/specificcolorselector/krita_specificcolorselector.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/specificcolorselector/krita_specificcolorselector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/specificcolorselector/krita_specificcolorselector.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=SpecificColorSelector Name[ca]=SelectorDeColorEspecific +Name[ca@valencia]=SelectorDeColorEspecific Name[da]=SpecifikFarveVælger Name[de]=Spezifischer Farbwähler Name[el]=SpecificColorSelector @@ -32,6 +33,7 @@ Name[zh_TW]=指定顏色選擇器 Comment=SpecificColorSelector Comment[ca]=SelectorDeColorEspecific +Comment[ca@valencia]=SelectorDeColorEspecific Comment[da]=SpecifikFarveVælger Comment[de]=Spezifischer Farbwähler Comment[el]=SpecificColorSelector diff -Nru calligra-2.4.0/krita/plugins/extensions/dockers/tasksetdocker/krita_tasksetdocker.desktop calligra-2.4.3/krita/plugins/extensions/dockers/tasksetdocker/krita_tasksetdocker.desktop --- calligra-2.4.0/krita/plugins/extensions/dockers/tasksetdocker/krita_tasksetdocker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dockers/tasksetdocker/krita_tasksetdocker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Taskset Docker Name[ca]=Amarrador Taskset +Name[ca@valencia]=Amarrador Taskset Name[da]=Taskset-dokker Name[el]=Εργαλείο προσάρτησης συνόλου εργασιών Name[es]=Acoplable de conjunto de tareas @@ -13,6 +14,7 @@ Name[pt]=Área dos Conjuntos de Tarefas Name[pt_BR]=Área dos conjuntos de tarefas Name[ru]=Панель для задач +Name[sk]=Docker sady úloh Name[sv]=Dockningsfönster för aktivitetsuppsättning Name[uk]=Панель набору завдань Name[x-test]=xxTaskset Dockerxx diff -Nru calligra-2.4.0/krita/plugins/extensions/dropshadow/kritadropshadow.desktop calligra-2.4.3/krita/plugins/extensions/dropshadow/kritadropshadow.desktop --- calligra-2.4.0/krita/plugins/extensions/dropshadow/kritadropshadow.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/dropshadow/kritadropshadow.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Dropshadow Name[bg]=Сянка Name[ca]=Gota d'ombra +Name[ca@valencia]=Gota d'ombra Name[cs]=Vrhat stín Name[da]=Faldskygge Name[de]=Schattenwurf diff -Nru calligra-2.4.0/krita/plugins/extensions/extensionsmanager/kritaextensionsmanager.desktop calligra-2.4.3/krita/plugins/extensions/extensionsmanager/kritaextensionsmanager.desktop --- calligra-2.4.0/krita/plugins/extensions/extensionsmanager/kritaextensionsmanager.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/extensionsmanager/kritaextensionsmanager.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=ExtensionsManager Name[bg]=Управление на разширенията Name[ca]=GestorExtensions +Name[ca@valencia]=GestorExtensions Name[da]=Håndtering af udvidelser Name[de]=Erweiterungsverwaltung Name[el]=ExtensionsManager @@ -32,6 +33,7 @@ Comment=ExtensionsManager Comment[bg]=Управление на разширенията Comment[ca]=GestorExtensions +Comment[ca@valencia]=GestorExtensions Comment[da]=Håndtering af udvidelser Comment[de]=Erweiterungsverwaltung Comment[el]=Διαχειριστής επεκτάσεων diff -Nru calligra-2.4.0/krita/plugins/extensions/histogram/kritahistogram.desktop calligra-2.4.3/krita/plugins/extensions/histogram/kritahistogram.desktop --- calligra-2.4.0/krita/plugins/extensions/histogram/kritahistogram.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/histogram/kritahistogram.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Histogram Plugin Name[bg]=Приставка за хистограма Name[ca]=Connector d'histograma +Name[ca@valencia]=Connector d'histograma Name[cs]=Modul histogramu Name[da]=Plugin med histogram Name[de]=Histogramm-Modul diff -Nru calligra-2.4.0/krita/plugins/extensions/imagesize/kritaimagesize.desktop calligra-2.4.3/krita/plugins/extensions/imagesize/kritaimagesize.desktop --- calligra-2.4.0/krita/plugins/extensions/imagesize/kritaimagesize.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/imagesize/kritaimagesize.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Image Resize and Scale Plugin Name[bg]=Приставка за преоразмеряване и мащабиране Name[ca]=Connector de redimensionament i escalat d'imatge +Name[ca@valencia]=Connector de redimensionament i escalat d'imatge Name[da]=Plugin for størrelsesændring og skalering Name[de]=Bildgrößenänderungs- und Skalierungsmodul Name[el]=Πρόσθετο αλλαγής μεγέθους και κλιμάκωσης εικόνας diff -Nru calligra-2.4.0/krita/plugins/extensions/imagesplit/kritaimagesplit.desktop calligra-2.4.3/krita/plugins/extensions/imagesplit/kritaimagesplit.desktop --- calligra-2.4.0/krita/plugins/extensions/imagesplit/kritaimagesplit.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/imagesplit/kritaimagesplit.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Image Splitter Name[ca]=Separador d'imatges +Name[ca@valencia]=Separador d'imatges Name[da]=Billedopdeler Name[el]=Διαχωριστής εικόνας Name[es]=Divisor de imágenes @@ -13,6 +14,7 @@ Name[pt]=Divisor de Imagens Name[pt_BR]=Divisão da imagem Name[ru]=Разделитель изображений +Name[sk]=Rozdeľovač obrázkov Name[sv]=Bilddelning Name[uk]=Поділ зображень Name[x-test]=xxImage Splitterxx diff -Nru calligra-2.4.0/krita/plugins/extensions/metadataeditor/kritametadataeditor.desktop calligra-2.4.3/krita/plugins/extensions/metadataeditor/kritametadataeditor.desktop --- calligra-2.4.0/krita/plugins/extensions/metadataeditor/kritametadataeditor.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/metadataeditor/kritametadataeditor.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=metadataeditor Name[bg]=редактор на метаданни Name[ca]=metadataeditor +Name[ca@valencia]=metadataeditor Name[cs]=Editor metadat Name[da]=metadataredigering Name[de]=Metadateneditor @@ -38,6 +39,7 @@ Comment=metadataeditor Comment[bg]=редактор на метаданни Comment[ca]=metadataeditor +Comment[ca@valencia]=metadataeditor Comment[cs]=Editor metadat Comment[da]=metadataredigering Comment[de]=Metadateneditor diff -Nru calligra-2.4.0/krita/plugins/extensions/modify_selection/kritamodifyselection.desktop calligra-2.4.3/krita/plugins/extensions/modify_selection/kritamodifyselection.desktop --- calligra-2.4.0/krita/plugins/extensions/modify_selection/kritamodifyselection.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/modify_selection/kritamodifyselection.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Промяна на избраното Name[br]=Kemmañ an dibab Name[ca]=Selecció de modificació +Name[ca@valencia]=Selecció de modificació Name[da]=Ændr markering Name[de]=Auswahl verändern Name[el]=Τροποποίηση επιλογής diff -Nru calligra-2.4.0/krita/plugins/extensions/painterlyframework/kritakscolorspacesplugin.desktop calligra-2.4.3/krita/plugins/extensions/painterlyframework/kritakscolorspacesplugin.desktop --- calligra-2.4.0/krita/plugins/extensions/painterlyframework/kritakscolorspacesplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/painterlyframework/kritakscolorspacesplugin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Painterly Color Spaces (LC and QP conversions, 32- and 16- Bits Float channels) Name[ca]=Espais de color pictòric (conversions LC i QP, canals reals de 32 i 16 bits) +Name[ca@valencia]=Espais de color pictòric (conversions LC i QP, canals reals de 32 i 16 bits) Name[da]=Maleragtige farverum (LC- og QP-konverteringer, 32- og 16-bit float kanaler) Name[de]=Malerische Farbräume (LC- und QP-Umwandlungen, 32- und 16-bit Fließkommakanäle) Name[el]=Χώροι χρωμάτων ζωγραφικής (μετατροπές LC και QP, 32- και 16- Bit δεκαδικούς στα κανάλια) diff -Nru calligra-2.4.0/krita/plugins/extensions/painterlyframework/kritapainterlymixer.desktop calligra-2.4.3/krita/plugins/extensions/painterlyframework/kritapainterlymixer.desktop --- calligra-2.4.0/krita/plugins/extensions/painterlyframework/kritapainterlymixer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/painterlyframework/kritapainterlymixer.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Painterly Mixer Name[ca]=Mesclador de pintor +Name[ca@valencia]=Mesclador de pintor Name[da]=Maleragtig blandingsmaskine Name[de]=Malerischer Farbmischer Name[el]=Μείκτης ζωγραφικής diff -Nru calligra-2.4.0/krita/plugins/extensions/rotateimage/kritarotateimage.desktop calligra-2.4.3/krita/plugins/extensions/rotateimage/kritarotateimage.desktop --- calligra-2.4.0/krita/plugins/extensions/rotateimage/kritarotateimage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/rotateimage/kritarotateimage.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Rotate Image Plugin Name[bg]=Приставка за въртене на изображение Name[ca]=Connector de rotació d'imatge +Name[ca@valencia]=Connector de rotació d'imatge Name[da]=Plugin for rotering af billede Name[de]=„Bild rotieren“-Modul Name[el]=Πρόσθετο περιστροφής εικόνας diff -Nru calligra-2.4.0/krita/plugins/extensions/scripting/kritascripting.desktop calligra-2.4.3/krita/plugins/extensions/scripting/kritascripting.desktop --- calligra-2.4.0/krita/plugins/extensions/scripting/kritascripting.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/scripting/kritascripting.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Scripting plugin Name[bg]=Приставка за скриптове Name[ca]=Connector d'scripting +Name[ca@valencia]=Connector d'scripting Name[cs]=Skriptovací modul Name[da]=Scriptplugin Name[de]=Skripting-Modul @@ -15,7 +16,7 @@ Name[fr]=Module de scriptage Name[fy]=Skriptplugin Name[ga]=Breiseán scriptithe -Name[gl]=Plugin de programación +Name[gl]=Engadido de scripting Name[he]=תוסף לתסריטים Name[hi]=स्क्रिप्टिंग प्लगइन Name[hne]=स्क्रिप्टिंग प्लगइन @@ -47,6 +48,7 @@ Comment=Allow execution of scripts Comment[bg]=Изпълнение на скриптове Comment[ca]=Permet l'execució d'scripts +Comment[ca@valencia]=Permet l'execució d'scripts Comment[cs]=Umožní spouštění skriptů Comment[da]=Tillad kørsel af script Comment[de]=Ermöglicht das Ausführen von Skripten @@ -60,7 +62,7 @@ Comment[fr]=Permet d'exécuter des scripts Comment[fy]=It útfieren fan skripts tastean Comment[ga]=Ceadaigh scripteanna a rith -Comment[gl]=Permite executar guións +Comment[gl]=Permite executar engadidos Comment[he]=אפשרות להרצת תסריטים Comment[hi]=स्क्रिप्ट को चलाने की अनुमति दें Comment[hne]=स्क्रिप्ट ल चलाय के अनुमति देव diff -Nru calligra-2.4.0/krita/plugins/extensions/separate_channels/kritaseparatechannels.desktop calligra-2.4.3/krita/plugins/extensions/separate_channels/kritaseparatechannels.desktop --- calligra-2.4.0/krita/plugins/extensions/separate_channels/kritaseparatechannels.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/separate_channels/kritaseparatechannels.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Separate Channels Plugin Name[bg]=Приставка за отделни канали Name[ca]=Connector de canals separats +Name[ca@valencia]=Connector de canals separats Name[da]=Plugin for separate kanaler Name[de]=„Kanäle trennen“-Modul Name[el]=Πρόσθετο διαχωρισμού καναλιών diff -Nru calligra-2.4.0/krita/plugins/extensions/shearimage/kritashearimage.desktop calligra-2.4.3/krita/plugins/extensions/shearimage/kritashearimage.desktop --- calligra-2.4.0/krita/plugins/extensions/shearimage/kritashearimage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/shearimage/kritashearimage.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Shear Image Plugin Name[bg]=Приставка за отрязване на изображение Name[ca]=Connector de tall d'imatge +Name[ca@valencia]=Connector de tall d'imatge Name[da]=Plugin til vridning af billeder Name[de]=„Bild neigen“-Modul Name[el]=Πρόσθετο στρέβλωσης εικόνας diff -Nru calligra-2.4.0/krita/plugins/extensions/shiva/kritashivafilters.desktop calligra-2.4.3/krita/plugins/extensions/shiva/kritashivafilters.desktop --- calligra-2.4.0/krita/plugins/extensions/shiva/kritashivafilters.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/shiva/kritashivafilters.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Shiva Kernel Language Support For Filters Name[ca]=Compatibilitat del llenguatge del nucli Shiva per a filtres +Name[ca@valencia]=Compatibilitat del llenguatge del nucli Shiva per a filtres Name[da]=Sprogunderstøttelse af Shiva-kerne til filtre Name[de]=Shiva-Kernel-Sprachunterstützung für Filter Name[el]=Υποστήριξη της γλώσσας πυρήνα Shiva για φίλτρα @@ -26,6 +27,7 @@ Name[zh_TW]=過濾器使用之 Shiva 核心語言支援 Comment=Shiva Kernel Language Support For Filters Comment[ca]=Compatibilitat del llenguatge del nucli Shiva per a filtres +Comment[ca@valencia]=Compatibilitat del llenguatge del nucli Shiva per a filtres Comment[da]=Sprogunderstøttelse af Shiva-kerne til filtre Comment[de]=Shiva-Kernel-Sprachunterstützung für Filter Comment[el]=Υποστήριξη της γλώσσας πυρήνα Shiva για φίλτρα diff -Nru calligra-2.4.0/krita/plugins/extensions/shiva/kritashivagenerators.desktop calligra-2.4.3/krita/plugins/extensions/shiva/kritashivagenerators.desktop --- calligra-2.4.0/krita/plugins/extensions/shiva/kritashivagenerators.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/shiva/kritashivagenerators.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Shiva Kernel Language Support For Generators Name[ca]=Compatibilitat del llenguatge del nucli Shiva per a generadors +Name[ca@valencia]=Compatibilitat del llenguatge del nucli Shiva per a generadors Name[da]=Sprogunderstøttelse af Shiva-kerne til generatorer Name[de]=Shiva-Kernel-Sprachunterstützung für Generatoren Name[el]=Υποστήριξη της γλώσσας πυρήνα Shiva για γεννήτριες @@ -26,6 +27,7 @@ Name[zh_TW]=產生器使用之 Shiva 核心語言支援 Comment=Shiva Kernel Language Support For Generators Comment[ca]=Compatibilitat del llenguatge del nucli Shiva per a generadors +Comment[ca@valencia]=Compatibilitat del llenguatge del nucli Shiva per a generadors Comment[da]=Sprogunderstøttelse af Shiva-kerne til generatorer Comment[de]=Shiva-Kernel-Sprachunterstützung für Generatoren Comment[el]=Υποστήριξη της γλώσσας πυρήνα Shiva για φίλτρα diff -Nru calligra-2.4.0/krita/plugins/extensions/together/kritatogether.desktop calligra-2.4.3/krita/plugins/extensions/together/kritatogether.desktop --- calligra-2.4.0/krita/plugins/extensions/together/kritatogether.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/together/kritatogether.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[be]=Разам Name[bg]=Заедно Name[ca]=Junts +Name[ca@valencia]=Junts Name[da]=Sammen Name[de]=Zusammen Name[el]=Μαζί @@ -40,6 +41,7 @@ Comment[be]=Разам Comment[bg]=Заедно Comment[ca]=Junts +Comment[ca@valencia]=Junts Comment[da]=Sammen Comment[de]=Zusammen Comment[el]=Μαζί diff -Nru calligra-2.4.0/krita/plugins/extensions/tonemapping/kritatonemapping.desktop calligra-2.4.3/krita/plugins/extensions/tonemapping/kritatonemapping.desktop --- calligra-2.4.0/krita/plugins/extensions/tonemapping/kritatonemapping.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/extensions/tonemapping/kritatonemapping.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=tonemapping Name[ca]=mapat de tons +Name[ca@valencia]=mapat de tons Name[da]=tonemapping Name[de]=Dynamikkompression Name[el]=αντιστοίχηση τόνου @@ -31,6 +32,7 @@ Name[zh_TW]=tonemapping Comment=tonemapping Comment[ca]=mapat de tons +Comment[ca@valencia]=mapat de tons Comment[da]=tonemapping Comment[de]=Dynamikkompression Comment[el]=αντιστοίχηση τόνου diff -Nru calligra-2.4.0/krita/plugins/filters/blur/kritablurfilter.desktop calligra-2.4.3/krita/plugins/filters/blur/kritablurfilter.desktop --- calligra-2.4.0/krita/plugins/filters/blur/kritablurfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/blur/kritablurfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name=Convolution Filters (Extension) Name[bg]=Изкривяващи филтри (разширения) Name[ca]=Filtres d'enrotllament (Extensió) +Name[ca@valencia]=Filtres d'enrotllament (Extensió) Name[da]=Foldningsfiltre (Udvidelse) Name[de]=Faltungsfilter (Erweiterung) Name[el]=Φίλτρα περιέλιξης (Επέκταση) @@ -14,7 +15,7 @@ Name[fr]=Filtres de convolution (extension) Name[fy]=Ferdraaiïngsfilters (útwreiding) Name[ga]=Scagairí Conbhlóide (Eisínteacht) -Name[gl]=Filtros de Convolución (Extensións) +Name[gl]=Filtros de convolución (Engadido) Name[hi]=कनवल्शन फ़िल्टर (एक्सटेंशन) Name[hne]=कनवल्सन छनइया (एक्सटेंसन) Name[hu]=Konvolúciószűrők (kiterjesztés) diff -Nru calligra-2.4.0/krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop calligra-2.4.3/krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop --- calligra-2.4.0/krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/bumpmap/kritabumpmapfilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Bumpmap Filter Name[bg]=Филтър Bumpmap Name[ca]=Filtre Bumpmap +Name[ca@valencia]=Filtre Bumpmap Name[cs]=Bumpmap filtr Name[cy]=Hidlen chwyddfap Name[da]=Bumpkortfilter @@ -42,6 +43,7 @@ Comment=Bumpmap filter Comment[bg]=Филтър Bumpmap Comment[ca]=Filtre de Bumpmap +Comment[ca@valencia]=Filtre de Bumpmap Comment[cs]=Bumpmap filtr Comment[cy]=Hidlen chwyddfap Comment[da]=Bumpkortfilter diff -Nru calligra-2.4.0/krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop calligra-2.4.3/krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop --- calligra-2.4.0/krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Color Filters (Extension) Name[bg]=Цветови филтри (разширения) Name[ca]=Filtres de color (Extensió) +Name[ca@valencia]=Filtres de color (Extensió) Name[da]=Farvefiltre (Udvidelse) Name[de]=Farbfilter (Erweiterung) Name[el]=Χρωματικά φίλτρα (Επέκταση) @@ -15,7 +16,7 @@ Name[fr]=Filtres de couleurs (extension) Name[fy]=Kleurfilters (útwreiding) Name[ga]=Scagairí Datha (Eisínteacht) -Name[gl]=Filtros de Cores (Extensións) +Name[gl]=Filtros de cores (Engadido) Name[he]=מסנני צבעים (תוספת) Name[hi]=रंग फ़िल्टर (एक्सटेंशन) Name[hne]=रंग छनइया (एक्सटेंसन) diff -Nru calligra-2.4.0/krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop calligra-2.4.3/krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop --- calligra-2.4.0/krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Цветови филтри Name[br]=Siloù liv Name[ca]=Filtres de color +Name[ca@valencia]=Filtres de color Name[cs]=Barevné filtry Name[cy]=Hidlau lliw Name[da]=Farvefilter @@ -51,6 +52,7 @@ Comment[bg]=Цветови филтри Comment[br]=Siloù liv Comment[ca]=Filtres de color +Comment[ca@valencia]=Filtres de color Comment[cs]=Barevné filtry Comment[cy]=Hidlau lliw Comment[da]=Farvefilter diff -Nru calligra-2.4.0/krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop calligra-2.4.3/krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop --- calligra-2.4.0/krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Convolution Filters Name[bg]=Изкривяващи филтри Name[ca]=Filtres de convolució +Name[ca@valencia]=Filtres de convolució Name[cy]=Hidlau cordeddiadau Name[da]=Foldningsfilter Name[de]=Faltungsfilter @@ -43,6 +44,7 @@ Comment=Convolution filters Comment[bg]=Изкривяващи филтри Comment[ca]=Filtres de Convolution +Comment[ca@valencia]=Filtres de Convolution Comment[cy]=Hidlau cordeddiadau Comment[da]=Foldningsfilter Comment[de]=Faltungsfilter diff -Nru calligra-2.4.0/krita/plugins/filters/cubismfilter/kritacubismfilter.desktop calligra-2.4.3/krita/plugins/filters/cubismfilter/kritacubismfilter.desktop --- calligra-2.4.0/krita/plugins/filters/cubismfilter/kritacubismfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/cubismfilter/kritacubismfilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Cubism Filter Name[bg]=Кубичен филтър Name[ca]=Filtre de Cubisme +Name[ca@valencia]=Filtre de Cubisme Name[cy]=Hidlen Giwbiaeth Name[da]=Kubismefilter Name[de]=Kubismus-Filter @@ -46,6 +47,7 @@ Comment=Cubism filter Comment[bg]=Кубичен филтър Comment[ca]=Filtre Cubisme +Comment[ca@valencia]=Filtre Cubisme Comment[cy]=Hidlen Giwbiaeth Comment[da]=Kubismefilter Comment[de]=Kubismus-Filter diff -Nru calligra-2.4.0/krita/plugins/filters/dodgeburn/kritadodgeburn.desktop calligra-2.4.3/krita/plugins/filters/dodgeburn/kritadodgeburn.desktop --- calligra-2.4.0/krita/plugins/filters/dodgeburn/kritadodgeburn.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/dodgeburn/kritadodgeburn.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Dodge and Burn Filter Name[ca]=Filtre d'aclarit i cremat +Name[ca@valencia]=Filtre d'aclarit i cremat Name[da]=Undvig og brænd-filter Name[de]=Abwedeln-und-Nachbelichten-Filter Name[el]=Φίλτρο dodge and burn @@ -26,6 +27,7 @@ Name[zh_TW]=曝光過濾器 Comment=Dodge and Burn Filter Comment[ca]=Filtre d'aclarit i cremat +Comment[ca@valencia]=Filtre d'aclarit i cremat Comment[da]=Undvig og brænd-filter Comment[de]=Abwedeln-und-Nachbelichten-Filter Comment[el]=Φίλτρο dodge and burn diff -Nru calligra-2.4.0/krita/plugins/filters/embossfilter/kritaembossfilter.desktop calligra-2.4.3/krita/plugins/filters/embossfilter/kritaembossfilter.desktop --- calligra-2.4.0/krita/plugins/filters/embossfilter/kritaembossfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/embossfilter/kritaembossfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Emboss Filter Name[bg]=Релефен филтър Name[ca]=Filtre de relleu +Name[ca@valencia]=Filtre de relleu Name[cy]=Hidlen Foglynnu Name[da]=Relieffilter Name[de]=Relief-Filter @@ -41,6 +42,7 @@ Comment=Emboss filter Comment[bg]=Релефен филтър Comment[ca]=Filtre de relleu +Comment[ca@valencia]=Filtre de relleu Comment[cy]=Hidlen foglynnu Comment[da]=Relieffilter Comment[de]=Relief-Filter diff -Nru calligra-2.4.0/krita/plugins/filters/example/kritaexample.desktop calligra-2.4.3/krita/plugins/filters/example/kritaexample.desktop --- calligra-2.4.0/krita/plugins/filters/example/kritaexample.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/example/kritaexample.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Invert Filter Name[bg]=Инвертиращ филтър Name[ca]=Inverteix filtre +Name[ca@valencia]=Inverteix filtre Name[cy]=Hidlen Wrthdroi Name[da]=Inverteringsfilter Name[de]=Invertierungsfilter @@ -45,6 +46,7 @@ Comment=Invert the colors of an image Comment[bg]=Инвертиране цветовете в изображението Comment[ca]=Inverteix els colors d'una imatge +Comment[ca@valencia]=Inverteix els colors d'una imatge Comment[cy]=Gwrthdroi lliwiau delwedd Comment[da]=Invertér farverne i et billede Comment[de]=Die Farben eines Bildes invertieren diff -Nru calligra-2.4.0/krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop calligra-2.4.3/krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop --- calligra-2.4.0/krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Comment=This plugins allow to transfer color from an image to an other image Comment[bg]=Тази приставка позволява прехвърлянето на цвят от едно в друго изображение Comment[ca]=Aquests endollats permeten de transferir el color d'una imatge a una altra +Comment[ca@valencia]=Estos endollats permeten de transferir el color d'una imatge a una altra Comment[da]=Dette plugin gør det muligt at overføre en farve fra et billede til et andet billede Comment[de]=Diese Module ermöglichen die Farbübertragung von einem Bild zu einem anderen Comment[el]=Αυτό το πρόσθετο επιτρέπει τη μεταφορά χρώματος από μια εικόνα σε κάποια άλλη @@ -12,7 +13,7 @@ Comment[fi]=Tämä liitännäinen mahdollistaa värin siirtämisen kuvasta toiseen Comment[fr]=Ce module permet de transférer une couleur d'une image à une autre Comment[fy]=Mei dizze plugin kinne jo kleur fan in ôfbylding nei in oare omsette -Comment[gl]=Estas extensión permiten transferir cor dunha imaxe a outra +Comment[gl]=Estes engadidos permiten transferir a cor dunha imaxe a outra Comment[hi]=यह प्लगइन एक छवि से दूसरे छवि में रंग को हस्तांतरित करना स्वीकारता है Comment[hne]=ये प्लगइन एक फोटू से दूसरे फोटू मं रंग ल हस्तांतरित करना स्वीकारथे Comment[hu]=Színek átvitele egyik képről a másikra @@ -41,6 +42,7 @@ Name=Color Transfer Filter Name[bg]=Филтър за прехвърляне на цвят Name[ca]=Filtre de transferència de color +Name[ca@valencia]=Filtre de transferència de color Name[da]=Farveoverførselsfilter Name[de]=Farbübertragungsfilter Name[el]=Φίλτρο μεταφοράς χρώματος diff -Nru calligra-2.4.0/krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop calligra-2.4.3/krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop --- calligra-2.4.0/krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Enhancement Filters Name[bg]=Филтри за подобрения Name[ca]=Filtres de millora +Name[ca@valencia]=Filtres de millora Name[cy]=Hidlau Tecáu Name[da]=Forbedringsfilter Name[de]=Verbesserungsfilter @@ -45,6 +46,7 @@ Comment=Enhance the quality of an image Comment[bg]=Подобряване на качеството на изображения Comment[ca]=Millora la qualitat de la imatge +Comment[ca@valencia]=Millora la qualitat de la imatge Comment[cy]=Tecâu ansawdd delwedd Comment[da]=Forbedr kvaliteten af et billede Comment[de]=Die Qualität eines Bildes verbessern diff -Nru calligra-2.4.0/krita/plugins/filters/levelfilter/kritalevelfilter.desktop calligra-2.4.3/krita/plugins/filters/levelfilter/kritalevelfilter.desktop --- calligra-2.4.0/krita/plugins/filters/levelfilter/kritalevelfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/levelfilter/kritalevelfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Нива Name[br]=Liveoù Name[ca]=Nivells +Name[ca@valencia]=Nivells Name[cs]=Úrovně Name[da]=Niveauer Name[de]=Stufen @@ -42,6 +43,7 @@ Comment[bg]=Нива Comment[br]=Liveoù Comment[ca]=Nivells +Comment[ca@valencia]=Nivells Comment[cs]=Úrovně Comment[da]=Niveauer Comment[de]=Stufen diff -Nru calligra-2.4.0/krita/plugins/filters/noisefilter/kritanoisefilter.desktop calligra-2.4.3/krita/plugins/filters/noisefilter/kritanoisefilter.desktop --- calligra-2.4.0/krita/plugins/filters/noisefilter/kritanoisefilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/noisefilter/kritanoisefilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Noise Filter Name[bg]=Филтър за шум Name[ca]=Filtre de soroll +Name[ca@valencia]=Filtre de soroll Name[cs]=Šumový filtr Name[da]=Støjfilter Name[de]=Rauschfilter @@ -46,6 +47,7 @@ Comment=Add noise to an image Comment[bg]=Добавяне на шум към изображение Comment[ca]=Afegeix soroll a una imatge +Comment[ca@valencia]=Afig soroll a una imatge Comment[cs]=Přidat do obrázku šum Comment[da]=Tilføj støj til et billede Comment[de]=Einem Bild Rauschen hinzufügen diff -Nru calligra-2.4.0/krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop calligra-2.4.3/krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop --- calligra-2.4.0/krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Oilpaint Filter Name[bg]=Филтър маслена боя Name[ca]=Filtre de pintura a l'oli +Name[ca@valencia]=Filtre de pintura a l'oli Name[cs]=Filtr olejomalby Name[cy]=Hidlen Baent Olew Name[da]=Oliemalerifilter @@ -46,6 +47,7 @@ Comment=Oilpaint filter Comment[bg]=Филтър маслена боя Comment[ca]=Filtre de pintura a l'oli +Comment[ca@valencia]=Filtre de pintura a l'oli Comment[cs]=Filtr olejomalby Comment[cy]=Hidlen baent olew Comment[da]=Oliemalerifilter diff -Nru calligra-2.4.0/krita/plugins/filters/phongbumpmap/kritaphongbumpmapfilter.desktop calligra-2.4.3/krita/plugins/filters/phongbumpmap/kritaphongbumpmapfilter.desktop --- calligra-2.4.0/krita/plugins/filters/phongbumpmap/kritaphongbumpmapfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/phongbumpmap/kritaphongbumpmapfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,12 +1,14 @@ [Desktop Entry] Name=Phong Bumpmap Filter Name[ca]=Filtre de mapa de relleu Phong +Name[ca@valencia]=Filtre de mapa de relleu Phong Name[da]=Phong Bumpmap-filter Name[de]=Phong-Bumpmap-Filter Name[el]=Φίλτρο Phong Bumpmap Name[en_GB]=Phong Bumpmap Filter Name[es]=Filtro de mapa de colisiones Phong Name[et]=Phongi kühmukaardi filter +Name[hu]=Phong bumpmap szűrő Name[it]=Filtro bumpmap Phong Name[ja]=Phong Bumpmap フィルタ Name[kk]=Фонг бедерлеу сүзгісі @@ -25,12 +27,14 @@ Name[zh_TW]=Phong Bumpmap 過濾器 Comment=Phong Bumpmap filter Comment[ca]=Filtre de mapa de relleu Phong +Comment[ca@valencia]=Filtre de mapa de relleu Phong Comment[da]=Phong Bumpmap-filter Comment[de]=Phong-Bumpmap-Filter Comment[el]=Φίλτρο Phong Bumpmap Comment[en_GB]=Phong Bumpmap filter Comment[es]=Filtro de mapa de colisiones Phong Comment[et]=Phongi kühmukaardi filter +Comment[hu]=Phong bumpmap szűrő Comment[it]=Filtro bumpmap Phong Comment[ja]=Phong Bumpmap フィルタ Comment[kk]=Фонг бойынша бедерлеу сүзгісі diff -Nru calligra-2.4.0/krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop calligra-2.4.3/krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop --- calligra-2.4.0/krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Pixelize Filter Name[bg]=Филтър пикселизиране Name[ca]=Filtre de pixelació +Name[ca@valencia]=Filtre de pixelació Name[cs]=Filtr pixelizace Name[cy]=Hidlen bicseleiddio Name[da]=Billedpunktfilter @@ -47,6 +48,7 @@ Comment=Pixelize filter Comment[bg]=Филтър пикселизиране Comment[ca]=Filtre de pixelació +Comment[ca@valencia]=Filtre de pixelació Comment[cs]=Filtr pixelizace Comment[cy]=Hidlen bicseleiddio Comment[da]=Billedpunktfilter diff -Nru calligra-2.4.0/krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop calligra-2.4.3/krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop --- calligra-2.4.0/krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Raindrops Filter Name[bg]=Филтър за дъждовни капки Name[ca]=Filtre de gotes de pluja +Name[ca@valencia]=Filtre de gotes de pluja Name[cs]=Filtr dešťových kapek Name[cy]=Hidlen Ddiferion Glaw Name[da]=Regndråbefilter @@ -46,6 +47,7 @@ Comment=Raindrops filter Comment[bg]=Филтър за дъждовни капки Comment[ca]=Filtre de gotes de pluja +Comment[ca@valencia]=Filtre de gotes de pluja Comment[cs]=Filtr dešťových kapek Comment[cy]=Hidlen ddiferion glaw Comment[da]=Regndråbefilter diff -Nru calligra-2.4.0/krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop calligra-2.4.3/krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop --- calligra-2.4.0/krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Comment=Random pick to an image Comment[bg]=Случайно избиране на изображение Comment[ca]=Agafa aleatòriament una imatge +Comment[ca@valencia]=Agafa aleatòriament una imatge Comment[da]=Udfør tilfældigt valg i et billede Comment[de]=Zufallsauswahl zu einem Bild Comment[el]=Τυχαία ανύψωση σε μια εικόνα @@ -39,6 +40,7 @@ Name=Random pick Filter Name[bg]=Филтър за случайно избиране Name[ca]=Aplica un filtre aleatòriament +Name[ca@valencia]=Aplica un filtre aleatòriament Name[da]=Tilfældigt udvalgsfilter Name[de]=Zufallsauswahlfilter Name[el]=Φίλτρο τυχαίας ανύψωσης diff -Nru calligra-2.4.0/krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop calligra-2.4.3/krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop --- calligra-2.4.0/krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Round Corners Filter Name[bg]=Филтър за заоблени ъгли Name[ca]=Filtre de cantonades arrodonides +Name[ca@valencia]=Filtre de cantonades arrodonides Name[da]=Filter til afrundede hjørner Name[de]=Runde-Ecken-Filter Name[el]=Φίλτρο στρογγύλευσης γωνιών @@ -9,6 +10,7 @@ Name[es]=Filtro de esquinas redondeadas Name[et]=Ümarate nurkade filter Name[fr]=Filtre avec coins arrondis +Name[hu]=Kerekített sarkok szűrő Name[it]=Filtro per angoli smussati Name[ja]=コーナー丸めフィルタ Name[kk]=Бұрыштарды дөңгелету сүзгісі diff -Nru calligra-2.4.0/krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop calligra-2.4.3/krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop --- calligra-2.4.0/krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Филтър "малки плочки" Name[br]=Sil teoloù bihan Name[ca]=Filtre de petites rajoles +Name[ca@valencia]=Filtre de petites rajoles Name[cy]=Hidlen Deiliau Bychain Name[da]=Småflisefilter Name[de]=Kleine-Quadrate-Filter diff -Nru calligra-2.4.0/krita/plugins/filters/sobelfilter/kritasobelfilter.desktop calligra-2.4.3/krita/plugins/filters/sobelfilter/kritasobelfilter.desktop --- calligra-2.4.0/krita/plugins/filters/sobelfilter/kritasobelfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/sobelfilter/kritasobelfilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Sobel Filter Name[bg]=Филтър Sobel Name[ca]=Filtre Sobel +Name[ca@valencia]=Filtre Sobel Name[cy]=Hidlen Sobel Name[da]=Sobelfilter Name[de]=Sobel-Filter diff -Nru calligra-2.4.0/krita/plugins/filters/unsharp/kritaunsharpfilter.desktop calligra-2.4.3/krita/plugins/filters/unsharp/kritaunsharpfilter.desktop --- calligra-2.4.0/krita/plugins/filters/unsharp/kritaunsharpfilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/unsharp/kritaunsharpfilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Image enhancement Filters (Extension) Name[bg]=Филтри за подобрения (разширения) Name[ca]=Filtres de millora d'imatge (Extensió) +Name[ca@valencia]=Filtres de millora d'imatge (Extensió) Name[da]=Billedforbedringsfiltre (Udvidelse) Name[de]=Verbesserungsfilter (Erweiterung) Name[el]=Φίλτρα βελτίωσης εικόνας (Επέκταση) @@ -13,7 +14,7 @@ Name[fi]=Kuvanparannussuotimet (laajennus) Name[fr]=Filtres d'amélioration d'images (extension) Name[fy]=Ofbyldingsfilters (útwreiding) -Name[gl]=Filtros de Mellora da Imaxe (Extensións) +Name[gl]=Filtros de mellora da imaxe (Engadido) Name[hi]=छवि सुधार फ़िल्टर (एक्सटेंशन) Name[hne]=फोटू सुधार छनइया (एक्सटेंसन) Name[hu]=Képjavító szűrők (kiterjesztés) diff -Nru calligra-2.4.0/krita/plugins/filters/wavefilter/kritawavefilter.desktop calligra-2.4.3/krita/plugins/filters/wavefilter/kritawavefilter.desktop --- calligra-2.4.0/krita/plugins/filters/wavefilter/kritawavefilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/filters/wavefilter/kritawavefilter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Comment=Transform an image in a wave Comment[bg]=Превръщане на изображение във вълна Comment[ca]=Transforma una imatge en una ona +Comment[ca@valencia]=Transforma una imatge en una ona Comment[da]=Tranbsformér et billede med en bølge Comment[de]=Ein Bild in eine Welle transformieren Comment[el]=Μετασχηματισμός μιας εικόνας με κυματομορφή @@ -40,6 +41,7 @@ Name=Wave Filter Name[bg]=Филтър за вълна Name[ca]=Filtre d'ona +Name[ca@valencia]=Filtre d'ona Name[da]=Bølgefilter Name[de]=Wellenfilter Name[el]=Φίλτρο κυματομορφής diff -Nru calligra-2.4.0/krita/plugins/formats/bmp/krita_bmp.desktop calligra-2.4.3/krita/plugins/formats/bmp/krita_bmp.desktop --- calligra-2.4.0/krita/plugins/formats/bmp/krita_bmp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/bmp/krita_bmp.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/bmp/krita_bmp_export.desktop calligra-2.4.3/krita/plugins/formats/bmp/krita_bmp_export.desktop --- calligra-2.4.0/krita/plugins/formats/bmp/krita_bmp_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/bmp/krita_bmp_export.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Krita BMP Export Filter Name[bg]=Филтър за изнасяне от Krita в BMP Name[ca]=Filtre d'exportació BMP per al Krita +Name[ca@valencia]=Filtre d'exportació BMP per al Krita Name[cs]=Exportní filtr do formátu BMP pro Krita Name[da]=BMP-eksportfilter til Krita Name[de]=Krita BMP-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/bmp/krita_bmp_import.desktop calligra-2.4.3/krita/plugins/formats/bmp/krita_bmp_import.desktop --- calligra-2.4.0/krita/plugins/formats/bmp/krita_bmp_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/bmp/krita_bmp_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Krita BMP Import Filter Name[bg]=Филтър за внасяне от BMP в Krita Name[ca]=Filtre d'importació BMP per al Krita +Name[ca@valencia]=Filtre d'importació BMP per al Krita Name[cs]=Exportní filtr do formátu BMP pro Krita Name[da]=BMP-importfilter til Krita Name[de]=Krita BMP-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/eps/krita_eps.desktop calligra-2.4.3/krita/plugins/formats/eps/krita_eps.desktop --- calligra-2.4.0/krita/plugins/formats/eps/krita_eps.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/eps/krita_eps.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/eps/krita_eps_export.desktop calligra-2.4.3/krita/plugins/formats/eps/krita_eps_export.desktop --- calligra-2.4.0/krita/plugins/formats/eps/krita_eps_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/eps/krita_eps_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,9 +2,10 @@ Name=Krita Encapsulated PostScript Export Filter Name[bg]=Филтър за изнасяне от Krita във вграден PostScript Name[ca]=Filtre d'exportació de PostScript encapsulat per al Krita +Name[ca@valencia]=Filtre d'exportació de PostScript encapsulat per al Krita Name[cs]=Exportní filtr do formátu Encapsulated PostScript Name[da]=Encapsulated PostScript-eksportfilter til Krita -Name[de]=Krita Encapsulated-Postscript-Exportfilter +Name[de]=Krita Encapsulated-PostScript-Exportfilter Name[el]=Φίλτρο εξαγωγής Encapsulated PostScript του Krita Name[en_GB]=Krita Encapsulated PostScript Export Filter Name[es]=Filtro de Krita de exportación a Encapsulated PostScript diff -Nru calligra-2.4.0/krita/plugins/formats/eps/krita_eps_import.desktop calligra-2.4.3/krita/plugins/formats/eps/krita_eps_import.desktop --- calligra-2.4.0/krita/plugins/formats/eps/krita_eps_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/eps/krita_eps_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,9 +3,10 @@ Name=Krita Encapsulated PostScript Import Filter Name[bg]=Филтър за внасяне на вграден PostScript в Krita Name[ca]=Filtre d'importació de PostScript encapsulat per al Krita +Name[ca@valencia]=Filtre d'importació de PostScript encapsulat per al Krita Name[cs]=Importní filtr formátu Encapsulated PostScript pro Kritu Name[da]=Encapsulated PostScript-importfilter til Krita -Name[de]=Krita Encapsulated-Postscript-Importfilter +Name[de]=Krita Encapsulated-PostScript-Importfilter Name[el]=Φίλτρο εισαγωγής Encapsulated PostScript του Krita Name[en_GB]=Krita Encapsulated PostScript Import Filter Name[es]=Filtro de Krita de importación de Encapsulated PostScript diff -Nru calligra-2.4.0/krita/plugins/formats/exr/krita_exr.desktop calligra-2.4.3/krita/plugins/formats/exr/krita_exr.desktop --- calligra-2.4.0/krita/plugins/formats/exr/krita_exr.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/exr/krita_exr.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ GenericName=Application for Drawing and Handling of Images GenericName[bg]=Приложение за рисуване и обработка на изображения GenericName[ca]=Aplicació per a dibuix i modificació d'imatges +GenericName[ca@valencia]=Aplicació per a dibuix i modificació d'imatges GenericName[da]=Tegne- og billedbehandlingsprogram GenericName[de]=Programm zum Zeichnen und Bearbeiten von Bildern GenericName[el]=Εφαρμογή για επεξεργασία και χειρισμό εικόνων @@ -52,6 +53,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/exr/krita_exr_export.desktop calligra-2.4.3/krita/plugins/formats/exr/krita_exr_export.desktop --- calligra-2.4.0/krita/plugins/formats/exr/krita_exr_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/exr/krita_exr_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita exr Export Filter Name[bg]=Филтър за изнасяне от Krita в exr Name[ca]=Filtre d'exportació exr per al Krita +Name[ca@valencia]=Filtre d'exportació exr per al Krita Name[cs]=Exportní filtr do formátu exr pro Kritu Name[da]=Exr-eksportfilter til Krita Name[de]=Krita exr-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/exr/krita_exr_import.desktop calligra-2.4.3/krita/plugins/formats/exr/krita_exr_import.desktop --- calligra-2.4.0/krita/plugins/formats/exr/krita_exr_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/exr/krita_exr_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita exr Import Filter Name[bg]=Филтър за внасяне от exr в Krita Name[ca]=Filtre d'importació exr per al Krita +Name[ca@valencia]=Filtre d'importació exr per al Krita Name[cs]=Importní filtr formátu exr pro Kritu Name[da]=Exr-importfilter til Krita Name[de]=Krita exr-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/jp2/krita_jp2.desktop calligra-2.4.3/krita/plugins/formats/jp2/krita_jp2.desktop --- calligra-2.4.0/krita/plugins/formats/jp2/krita_jp2.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/jp2/krita_jp2.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ GenericName=Application for Drawing and Handling of Images GenericName[bg]=Приложение за рисуване и обработка на изображения GenericName[ca]=Aplicació per a dibuix i modificació d'imatges +GenericName[ca@valencia]=Aplicació per a dibuix i modificació d'imatges GenericName[da]=Tegne- og billedbehandlingsprogram GenericName[de]=Programm zum Zeichnen und Bearbeiten von Bildern GenericName[el]=Εφαρμογή για επεξεργασία και χειρισμό εικόνων @@ -52,6 +53,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/jp2/krita_jp2_export.desktop calligra-2.4.3/krita/plugins/formats/jp2/krita_jp2_export.desktop --- calligra-2.4.0/krita/plugins/formats/jp2/krita_jp2_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/jp2/krita_jp2_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita jp2 Export Filter Name[bg]=Филтър за изнасяне от Krita в jp2 Name[ca]=Filtre d'exportació jp2 per al Krita +Name[ca@valencia]=Filtre d'exportació jp2 per al Krita Name[cs]=Exportní filtr do formátu jp2 pro Kritu Name[da]=Jp2-eksportfilter til Krita Name[de]=Krita jp2-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/jp2/krita_jp2_import.desktop calligra-2.4.3/krita/plugins/formats/jp2/krita_jp2_import.desktop --- calligra-2.4.0/krita/plugins/formats/jp2/krita_jp2_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/jp2/krita_jp2_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita jp2 Import Filter Name[bg]=Филтър за внасяне от jp2 в Krita Name[ca]=Filtre d'importació jp2 per al Krita +Name[ca@valencia]=Filtre d'importació jp2 per al Krita Name[cs]=Importní filtr formátu jp2 pro Kritu Name[da]=Jp2-importfilter til Krita Name[de]=Krita jp2-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/jpeg/krita_jpeg.desktop calligra-2.4.3/krita/plugins/formats/jpeg/krita_jpeg.desktop --- calligra-2.4.0/krita/plugins/formats/jpeg/krita_jpeg.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/jpeg/krita_jpeg.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/jpeg/krita_jpeg_export.desktop calligra-2.4.3/krita/plugins/formats/jpeg/krita_jpeg_export.desktop --- calligra-2.4.0/krita/plugins/formats/jpeg/krita_jpeg_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/jpeg/krita_jpeg_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita JPEG Export Filter Name[bg]=Филтър за изнасяне от Krita в JPEG Name[ca]=Filtre d'exportació JPEG per al Krita +Name[ca@valencia]=Filtre d'exportació JPEG per al Krita Name[cs]=Exportní filtr do formátu JPEG pro Krita Name[da]=JPEG-eksportfilter til Krita Name[de]=Krita JPEG-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/jpeg/krita_jpeg_import.desktop calligra-2.4.3/krita/plugins/formats/jpeg/krita_jpeg_import.desktop --- calligra-2.4.0/krita/plugins/formats/jpeg/krita_jpeg_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/jpeg/krita_jpeg_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita JPEG Import Filter Name[bg]=Филтър за внасяне от JPEG в Krita Name[ca]=Filtre d'importació JPEG per al Krita +Name[ca@valencia]=Filtre d'importació JPEG per al Krita Name[cs]=Importní filtr formátu JPEG pro Kritu Name[da]=JPEG-importfilter til Krita Name[de]=Krita JPEG-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/odg/krita_odg.desktop calligra-2.4.3/krita/plugins/formats/odg/krita_odg.desktop --- calligra-2.4.0/krita/plugins/formats/odg/krita_odg.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/odg/krita_odg.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/odg/krita_odg_import.desktop calligra-2.4.3/krita/plugins/formats/odg/krita_odg_import.desktop --- calligra-2.4.0/krita/plugins/formats/odg/krita_odg_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/odg/krita_odg_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita ODG Import Filter Name[bg]=Филтър за внасяне от ODG в Krita Name[ca]=Filtre d'importació ODG per al Krita +Name[ca@valencia]=Filtre d'importació ODG per al Krita Name[cs]=Importní filtr formátu ODG pro Kritu Name[da]=ODG-importfilter til Krita Name[de]=Krita-ODG-Importfilter @@ -12,6 +13,7 @@ Name[et]=Krita ODG impordifilter Name[hu]=Krita ODG importszűrő Name[it]=Filtro di importazione ODG per Krita +Name[ja]=Krita ODG インポートフィルタ Name[kk]=ODG -> Krita импорт сүзгісі Name[nb]=ODG-importfilter for Krita Name[nds]=ODG-Importfilter för Krita @@ -20,6 +22,7 @@ Name[pt]=Filtro de Importação de ODG para o Krita Name[pt_BR]=Filtro de importação de ODG para o Krita Name[ru]=Фильтр импорта файлов ODG в Krita +Name[sk]=Importný filter Krita ODG Name[sv]=Krita ODG-importfilter Name[uk]=Фільтр імпорту ODG для Krita Name[x-test]=xxKrita ODG Import Filterxx diff -Nru calligra-2.4.0/krita/plugins/formats/ora/krita_ora.desktop calligra-2.4.3/krita/plugins/formats/ora/krita_ora.desktop --- calligra-2.4.0/krita/plugins/formats/ora/krita_ora.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/ora/krita_ora.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/ora/krita_ora_export.desktop calligra-2.4.3/krita/plugins/formats/ora/krita_ora_export.desktop --- calligra-2.4.0/krita/plugins/formats/ora/krita_ora_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/ora/krita_ora_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita ora Export Filter Name[bg]=Филтър за изнасяне от Krita в ora Name[ca]=Filtre d'exportació ORA per al Krita +Name[ca@valencia]=Filtre d'exportació ORA per al Krita Name[cs]=Exportní filtr do formátu ora pro KChart Name[da]=Ora-eksportfilter til Krita Name[de]=Krita ora-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/ora/krita_ora_import.desktop calligra-2.4.3/krita/plugins/formats/ora/krita_ora_import.desktop --- calligra-2.4.0/krita/plugins/formats/ora/krita_ora_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/ora/krita_ora_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita ora Import Filter Name[bg]=Филтър за внасяне от ora в Krita Name[ca]=Filtre d'importació ORA per al Krita +Name[ca@valencia]=Filtre d'importació ORA per al Krita Name[cs]=Importní filtr formátu ora pro Kritu Name[da]=Ora-importfilter til Krita Name[de]=Krita ora-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/pdf/kis_pdf_import.cpp calligra-2.4.3/krita/plugins/formats/pdf/kis_pdf_import.cpp --- calligra-2.4.0/krita/plugins/formats/pdf/kis_pdf_import.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/pdf/kis_pdf_import.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -86,7 +86,7 @@ url.setPath(tmpFile); } - Poppler::Document* pdoc = Poppler::Document::load(QFile::encodeName(url.toLocalFile())); + Poppler::Document* pdoc = Poppler::Document::load(url.toLocalFile()); pdoc->setRenderHint(Poppler::Document::Antialiasing, true); pdoc->setRenderHint(Poppler::Document::TextAntialiasing, true); diff -Nru calligra-2.4.0/krita/plugins/formats/pdf/krita_pdf.desktop calligra-2.4.3/krita/plugins/formats/pdf/krita_pdf.desktop --- calligra-2.4.0/krita/plugins/formats/pdf/krita_pdf.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/pdf/krita_pdf.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/pdf/krita_pdf_import.desktop calligra-2.4.3/krita/plugins/formats/pdf/krita_pdf_import.desktop --- calligra-2.4.0/krita/plugins/formats/pdf/krita_pdf_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/pdf/krita_pdf_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Филтър за внасяне от PDF в Krita Name[br]=Sil enporzh PDF evit Krita Name[ca]=Filtre d'importació PDF per al Krita +Name[ca@valencia]=Filtre d'importació PDF per al Krita Name[cs]=Importní filtr formátu PDF pro Kritu Name[da]=Krita PDF-importfilter Name[de]=Krita PDF-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/png/krita_png.desktop calligra-2.4.3/krita/plugins/formats/png/krita_png.desktop --- calligra-2.4.0/krita/plugins/formats/png/krita_png.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/png/krita_png.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/png/krita_png_export.desktop calligra-2.4.3/krita/plugins/formats/png/krita_png_export.desktop --- calligra-2.4.0/krita/plugins/formats/png/krita_png_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/png/krita_png_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Филтър за изнасяне от Krita в PNG Name[br]=Sil ezporzh PNG evit Krita Name[ca]=Filtre d'exportació PNG per al Krita +Name[ca@valencia]=Filtre d'exportació PNG per al Krita Name[cs]=Exportní filtr do formátu PNG pro Kritu Name[da]=Krita PNG-eksportfilter Name[de]=Krita PNG-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/png/krita_png_import.desktop calligra-2.4.3/krita/plugins/formats/png/krita_png_import.desktop --- calligra-2.4.0/krita/plugins/formats/png/krita_png_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/png/krita_png_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от PNG в Krita Name[br]=Sil enporzh PNG evit Krita Name[ca]=Filtre d'importació PNG per al Krita +Name[ca@valencia]=Filtre d'importació PNG per al Krita Name[cs]=Importní filtr formátu PNG pro Kritu Name[da]=Krita PNG-importfilter Name[de]=Krita PNG-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/ppm/krita_ppm.desktop calligra-2.4.3/krita/plugins/formats/ppm/krita_ppm.desktop --- calligra-2.4.0/krita/plugins/formats/ppm/krita_ppm.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/ppm/krita_ppm.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/ppm/krita_ppm_export.desktop calligra-2.4.3/krita/plugins/formats/ppm/krita_ppm_export.desktop --- calligra-2.4.0/krita/plugins/formats/ppm/krita_ppm_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/ppm/krita_ppm_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita PPM Export Filter Name[bg]=Филтър за изнасяне от Krita в PPM Name[ca]=Filtre d'exportació PPM per al Krita +Name[ca@valencia]=Filtre d'exportació PPM per al Krita Name[cs]=Exportní filtr do formátu PPM pro Krita Name[da]=PPM-eksportfilter til Krita Name[de]=Krita PPM-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/ppm/krita_ppm_import.desktop calligra-2.4.3/krita/plugins/formats/ppm/krita_ppm_import.desktop --- calligra-2.4.0/krita/plugins/formats/ppm/krita_ppm_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/ppm/krita_ppm_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita PPM Import Filter Name[bg]=Филтър за внасяне от PPM в Krita Name[ca]=Filtre d'importació PPM per al Krita +Name[ca@valencia]=Filtre d'importació PPM per al Krita Name[cs]=Importní filtr formátu PPM pro Kritu Name[da]=PPM-importfilter til Krita Name[de]=Krita PPM-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/psd/krita_psd.desktop calligra-2.4.3/krita/plugins/formats/psd/krita_psd.desktop --- calligra-2.4.0/krita/plugins/formats/psd/krita_psd.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/psd/krita_psd.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/psd/krita_psd_export.desktop calligra-2.4.3/krita/plugins/formats/psd/krita_psd_export.desktop --- calligra-2.4.0/krita/plugins/formats/psd/krita_psd_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/psd/krita_psd_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita PhotoShop Export Filter Name[bg]=Филтър за изнасяне от Krita в PhotoShop Name[ca]=Filtre d'exportació PhotoShop per al Krita +Name[ca@valencia]=Filtre d'exportació PhotoShop per al Krita Name[cs]=Exportní filtr do PhotoShopu pro Kritu Name[da]=PhotoShop-eksportfilter til Krita Name[de]=Krita PhotoShop-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/psd/krita_psd_import.desktop calligra-2.4.3/krita/plugins/formats/psd/krita_psd_import.desktop --- calligra-2.4.0/krita/plugins/formats/psd/krita_psd_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/psd/krita_psd_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita PhotoShop Import Filter Name[bg]=Филтър за внасяне от PhotoShop в Krita Name[ca]=Filtre d'importació PhotoShop per al Krita +Name[ca@valencia]=Filtre d'importació PhotoShop per al Krita Name[cs]=Importní filtr do PhotoShopu pro Kritu Name[da]=PhotoShop-importfilter til Krita Name[de]=Krita PhotoShop-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/psd/psd_colormode_block.cpp calligra-2.4.3/krita/plugins/formats/psd/psd_colormode_block.cpp --- calligra-2.4.0/krita/plugins/formats/psd/psd_colormode_block.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/psd/psd_colormode_block.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -24,8 +24,8 @@ #include PSDColorModeBlock::PSDColorModeBlock(PSDColorMode colormode) - : blocksize(0) - , colormode(colormode) + : blocksize(0) + , colormode(colormode) { } @@ -52,14 +52,11 @@ if ((quint32)data.size() != blocksize) return false; if (colormode == Indexed) { - - for (int i=0; i<=767;) - { - colormap.append(qRgb(data[i],data[i++],data[i++])); - //qDebug()<pos(); - int width = right - left; + quint64 width = right - left; int channelSize = m_header.channelDepth / 8; int uncompressedLength = width * channelSize; @@ -636,7 +636,7 @@ qDebug() << "top" << top << "bottom" << bottom << "left" << left << "right" << right; quint64 oldPosition = io->pos(); - int width = right - left; + quint64 width = right - left; int channelSize = m_header.channelDepth / 8; int uncompressedLength = width * channelSize; @@ -749,7 +749,7 @@ bool PSDLayerRecord::doLAB(KisPaintDeviceSP dev, QIODevice *io) { quint64 oldPosition = io->pos(); - int width = right - left; + quint64 width = right - left; int channelSize = m_header.channelDepth / 8; int uncompressedLength = width * channelSize; diff -Nru calligra-2.4.0/krita/plugins/formats/psd/psd_loader.cpp calligra-2.4.3/krita/plugins/formats/psd/psd_loader.cpp --- calligra-2.4.0/krita/plugins/formats/psd/psd_loader.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/psd/psd_loader.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -140,6 +140,13 @@ Q_CHECK_PTR(m_image); m_image->lock(); + // set the correct resolution + RESN_INFO_1005 *resInfo = dynamic_cast(resourceSection.resources[PSDResourceSection::RESN_INFO]->resource); + if (resInfo) { + m_image->setResolution(resInfo->hRes, resInfo->vRes); + // let's skip the unit for now; we can only set that on the KoDocument, and krita doesn't use it. + } + // Preserve the duotone colormode block for saving back to psd if (header.colormode == DuoTone) { KisAnnotationSP annotation = new KisAnnotation("DuotoneColormodeBlock", diff -Nru calligra-2.4.0/krita/plugins/formats/psd/psd_resource_block.cpp calligra-2.4.3/krita/plugins/formats/psd/psd_resource_block.cpp --- calligra-2.4.0/krita/plugins/formats/psd/psd_resource_block.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/psd/psd_resource_block.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -18,13 +18,17 @@ #include "psd_resource_block.h" #include +#include +#include #include #include "psd_utils.h" +#include "psd_resource_section.h" PSDResourceBlock::PSDResourceBlock() : identifier(PSDResourceSection::UNKNOWN) + , resource(0) { } @@ -76,6 +80,174 @@ return false; } + switch (identifier) { + case PSDResourceSection::MAC_PRINT_INFO: + resource = new MAC_PRINT_INFO_1001; + break; + case PSDResourceSection::RESN_INFO: + resource = new RESN_INFO_1005; + break; + case PSDResourceSection::ALPHA_NAMES: + resource = new ALPHA_NAMES_1006; + break; + case PSDResourceSection::DISPLAY_INFO: + resource = new DISPLAY_INFO_1007; + break; + case PSDResourceSection::CAPTION: + resource = new CAPTION_1008; + break; + case PSDResourceSection::BORDER_INFO: + resource = new BORDER_INFO_1009; + break; + case PSDResourceSection::BACKGROUND_COL: + resource = new BACKGROUND_COL_1010; + break; + case PSDResourceSection::PRINT_FLAGS: + resource = new PRINT_FLAGS_1011; + break; + case PSDResourceSection::GREY_HALFTONE: + resource = new GREY_HALFTONE_1012; + break; + case PSDResourceSection::COLOR_HALFTONE: + resource = new COLOR_HALFTONE_1013; + break; + case PSDResourceSection::DUOTONE_HALFTONE: + resource = new DUOTONE_HALFTONE_1014; + break; + case PSDResourceSection::GREY_XFER: + resource = new GREY_XFER_1015; + break; + case PSDResourceSection::COLOR_XFER: + resource = new COLOR_XFER_1016; + break; + case PSDResourceSection::DUOTONE_XFER: + resource = new DUOTONE_XFER_1017; + break; + case PSDResourceSection::DUOTONE_INFO: + resource = new DUOTONE_INFO_1018; + break; + case PSDResourceSection::EFFECTIVE_BW: + resource = new EFFECTIVE_BW_1019; + break; + case PSDResourceSection::EPS_OPT: + resource = new EPS_OPT_1021; + break; + case PSDResourceSection::QUICK_MASK: + resource = new QUICK_MASK_1022; + break; + case PSDResourceSection::LAYER_STATE: + resource = new LAYER_STATE_1024; + break; + case PSDResourceSection::WORKING_PATH: + resource = new WORKING_PATH_1025; + break; + case PSDResourceSection::LAYER_GROUP: + resource = new LAYER_GROUP_1026; + break; + case PSDResourceSection::IPTC_NAA_DATA: + resource = new IPTC_NAA_DATA_1028; + break; + case PSDResourceSection::IMAGE_MODE_RAW: + resource = new IMAGE_MODE_RAW_1029; + break; + case PSDResourceSection::JPEG_QUAL: + resource = new JPEG_QUAL_1030; + break; + case PSDResourceSection::GRID_GUIDE: + resource = new GRID_GUIDE_1032; + break; + case PSDResourceSection::THUMB_RES: + resource = new THUMB_RES_1033; + break; + case PSDResourceSection::COPYRIGHT_FLG: + resource = new COPYRIGHT_FLG_1034; + break; + case PSDResourceSection::URL: + resource = new URL_1035; + break; + case PSDResourceSection::THUMB_RES2: + resource = new THUMB_RES2_1036; + break; + case PSDResourceSection::GLOBAL_ANGLE: + resource = new GLOBAL_ANGLE_1037; + break; + case PSDResourceSection::COLOR_SAMPLER: + resource = new COLOR_SAMPLER_1038; + break; + case PSDResourceSection::ICC_PROFILE: + resource = new ICC_PROFILE_1039; + break; + case PSDResourceSection::WATERMARK: + resource = new WATERMARK_1040; + break; + case PSDResourceSection::ICC_UNTAGGED: + resource = new ICC_UNTAGGED_1041; + break; + case PSDResourceSection::EFFECTS_VISIBLE: + resource = new EFFECTS_VISIBLE_1042; + break; + case PSDResourceSection::SPOT_HALFTONE: + resource = new SPOT_HALFTONE_1043; + break; + case PSDResourceSection::DOC_IDS: + resource = new DOC_IDS_1044; + break; + case PSDResourceSection::ALPHA_NAMES_UNI: + resource = new ALPHA_NAMES_UNI_1045; + break; + case PSDResourceSection::IDX_COL_TAB_CNT: + resource = new IDX_COL_TAB_CNT_1046; + break; + case PSDResourceSection::IDX_TRANSPARENT: + resource = new IDX_TRANSPARENT_1047; + break; + case PSDResourceSection::GLOBAL_ALT: + resource = new GLOBAL_ALT_1049; + break; + case PSDResourceSection::SLICES: + resource = new SLICES_1050; + break; + case PSDResourceSection::WORKFLOW_URL_UNI: + resource = new WORKFLOW_URL_UNI_1051; + break; + case PSDResourceSection::JUMP_TO_XPEP: + resource = new JUMP_TO_XPEP_1052; + break; + case PSDResourceSection::ALPHA_ID: + resource = new ALPHA_ID_1053; + break; + case PSDResourceSection::URL_LIST_UNI: + resource = new URL_LIST_UNI_1054; + break; + case PSDResourceSection::VERSION_INFO: + resource = new VERSION_INFO_1057; + break; + case PSDResourceSection::EXIF_DATA: + resource = new EXIF_DATA_1058; + break; + case PSDResourceSection::XMP_DATA: + resource = new XMP_DATA_1060; + break; + case PSDResourceSection::PATH_INFO_FIRST: + resource = new PATH_INFO_FIRST_2000; + break; + case PSDResourceSection::PATH_INFO_LAST: + resource = new PATH_INFO_LAST_2998; + break; + case PSDResourceSection::CLIPPING_PATH: + resource = new CLIPPING_PATH_2999; + break; + case PSDResourceSection::PRINT_FLAGS_2: + resource = new PRINT_FLAGS_2_10000; + break; + default: + ; + } + + if (resource) { + resource->interpretBlock(data); + } + return valid(); } @@ -104,3 +276,26 @@ return true; } +bool RESN_INFO_1005::interpretBlock(QByteArray data) +{ + // the resolution we set on the image should be dpi; we can also set the unit on the KoDocument. + QDataStream ds(data); + ds.setByteOrder(QDataStream::BigEndian); + + ds >> hRes >> hResUnit >> widthUnit >> vRes >> vResUnit >> heightUnit; + + /* Resolution always recorded as pixels / inch in a fixed point implied + decimal int32 with 16 bits before point and 16 after (i.e. cast as + double and divide resolution by 2^16 */ + qDebug() << "hres" << hRes / 65536.0 << "vres" << vRes / 65536.0; + + hRes = hRes / 65536.0; + vRes = vRes / 65536.0; + + return ds.atEnd(); +} + +bool RESN_INFO_1005::valid() +{ + return true; +} diff -Nru calligra-2.4.0/krita/plugins/formats/psd/psd_resource_block.h calligra-2.4.3/krita/plugins/formats/psd/psd_resource_block.h --- calligra-2.4.0/krita/plugins/formats/psd/psd_resource_block.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/psd/psd_resource_block.h 2012-06-26 04:18:01.000000000 +0000 @@ -18,12 +18,24 @@ #ifndef PSD_RESOURCE_BLOCK_H #define PSD_RESOURCE_BLOCK_H -class QIODevice; +struct QIODevice; #include -#include "kis_annotation.h" +#include "psd.h" #include "psd_resource_section.h" +/** + * @brief The PSDResourceInterpreter struct interprets the data in a psd resource block + */ +class PSDInterpretedResource +{ +public: + + virtual ~PSDInterpretedResource() {}; + + virtual bool interpretBlock(QByteArray /*data*/) { return true; } + virtual bool valid() { return true; } +}; /** * Contains the unparsed contents of the image resource blocks @@ -36,6 +48,10 @@ public: PSDResourceBlock(); + ~PSDResourceBlock() + { + delete resource; + } bool read(QIODevice* io); bool write(QIODevice* io); @@ -46,7 +62,387 @@ quint32 dataSize; QByteArray data; + PSDInterpretedResource *resource; + QString error; }; -#endif // PSD_RESOURCE_BLOCK_H + +/* 0x03e9 - Optional - Mac print manager print info record */ +struct MAC_PRINT_INFO_1001 : public PSDInterpretedResource +{ + +}; + +/* 0x03ed - ResolutionInfo structure */ +struct RESN_INFO_1005 : public PSDInterpretedResource +{ + virtual bool interpretBlock(QByteArray data); + bool valid(); + + Fixed hRes; + quint16 hResUnit; + quint16 widthUnit; + Fixed vRes; + quint16 vResUnit; + quint16 heightUnit; + +}; + + +/* 0x03ee - Alpha channel names */ +struct ALPHA_NAMES_1006 : public PSDInterpretedResource +{ + +}; + + +/* 0x03ef - DisplayInfo structure */ +struct DISPLAY_INFO_1007 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f0 - Optional - Caption string */ +struct CAPTION_1008 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f1 - Border info */ +struct BORDER_INFO_1009 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f2 - Background colour */ +struct BACKGROUND_COL_1010 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f3 - Print flags */ +struct PRINT_FLAGS_1011 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f4 - Greyscale and multichannel halftoning info */ +struct GREY_HALFTONE_1012 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f5 - Colour halftoning info */ +struct COLOR_HALFTONE_1013 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f6 - Duotone halftoning info */ +struct DUOTONE_HALFTONE_1014 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f7 - Greyscale and multichannel transfer functions */ +struct GREY_XFER_1015 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f8 - Colour transfer functions */ +struct COLOR_XFER_1016 : public PSDInterpretedResource +{ + +}; + + +/* 0x03f9 - Duotone transfer functions */ +struct DUOTONE_XFER_1017 : public PSDInterpretedResource +{ + +}; + + +/* 0x03fa - Duotone image information */ +struct DUOTONE_INFO_1018 : public PSDInterpretedResource +{ + +}; + + +/* 0x03fb - Effective black & white values for dot range */ +struct EFFECTIVE_BW_1019 : public PSDInterpretedResource +{ + +}; + + +/* 0x03fd - EPS options */ +struct EPS_OPT_1021 : public PSDInterpretedResource +{ + +}; + + +/* 0x03fe - Quick mask info */ +struct QUICK_MASK_1022 : public PSDInterpretedResource +{ + +}; + + +/* 0x0400 - Layer state info */ +struct LAYER_STATE_1024 : public PSDInterpretedResource +{ + +}; + + +/* 0x0401 - Working path (not saved) */ +struct WORKING_PATH_1025 : public PSDInterpretedResource +{ + +}; + + +/* 0x0402 - Layers group info */ +struct LAYER_GROUP_1026 : public PSDInterpretedResource +{ + +}; + + +/* 0x0404 - IPTC-NAA record (IMV4.pdf) */ +struct IPTC_NAA_DATA_1028 : public PSDInterpretedResource +{ + +}; + + +/* 0x0405 - Image mode for raw format files */ +struct IMAGE_MODE_RAW_1029 : public PSDInterpretedResource +{ + +}; + + +/* 0x0406 - JPEG quality */ +struct JPEG_QUAL_1030 : public PSDInterpretedResource +{ + +}; + + +/* 0x0408 - Grid & guide info */ +struct GRID_GUIDE_1032 : public PSDInterpretedResource +{ + +}; + + +/* 0x0409 - Thumbnail resource */ +struct THUMB_RES_1033 : public PSDInterpretedResource +{ + +}; + + +/* 0x040a - Copyright flag */ +struct COPYRIGHT_FLG_1034 : public PSDInterpretedResource +{ + +}; + + +/* 0x040b - URL string */ +struct URL_1035 : public PSDInterpretedResource +{ + +}; + + +/* 0x040c - Thumbnail resource */ +struct THUMB_RES2_1036 : public PSDInterpretedResource +{ + +}; + + +/* 0x040d - Global angle */ +struct GLOBAL_ANGLE_1037 : public PSDInterpretedResource +{ + +}; + + +/* 0x040e - Colour samplers resource */ +struct COLOR_SAMPLER_1038 : public PSDInterpretedResource +{ + +}; + + +/* 0x040f - ICC Profile */ +struct ICC_PROFILE_1039 : public PSDInterpretedResource +{ + +}; + + +/* 0x0410 - Watermark */ +struct WATERMARK_1040 : public PSDInterpretedResource +{ + +}; + + +/* 0x0411 - Do not use ICC profile flag */ +struct ICC_UNTAGGED_1041 : public PSDInterpretedResource +{ + +}; + + +/* 0x0412 - Show / hide all effects layers */ +struct EFFECTS_VISIBLE_1042 : public PSDInterpretedResource +{ + +}; + + +/* 0x0413 - Spot halftone */ +struct SPOT_HALFTONE_1043 : public PSDInterpretedResource +{ + +}; + + +/* 0x0414 - Document specific IDs */ +struct DOC_IDS_1044 : public PSDInterpretedResource +{ + +}; + + +/* 0x0415 - Unicode alpha names */ +struct ALPHA_NAMES_UNI_1045 : public PSDInterpretedResource +{ + +}; + + +/* 0x0416 - Indexed colour table count */ +struct IDX_COL_TAB_CNT_1046 : public PSDInterpretedResource +{ + +}; + + +/* 0x0417 - Index of transparent colour (if any) */ +struct IDX_TRANSPARENT_1047 : public PSDInterpretedResource +{ + +}; + + +/* 0x0419 - Global altitude */ +struct GLOBAL_ALT_1049 : public PSDInterpretedResource +{ + +}; + + +/* 0x041a - Slices */ +struct SLICES_1050 : public PSDInterpretedResource +{ + +}; + + +/* 0x041b - Workflow URL - Unicode string */ +struct WORKFLOW_URL_UNI_1051 : public PSDInterpretedResource +{ + +}; + + +/* 0x041c - Jump to XPEP (?) */ +struct JUMP_TO_XPEP_1052 : public PSDInterpretedResource +{ + +}; + + +/* 0x041d - Alpha IDs */ +struct ALPHA_ID_1053 : public PSDInterpretedResource +{ + +}; + +/* 0x041e - URL list - unicode */ +struct URL_LIST_UNI_1054 : public PSDInterpretedResource +{ + +}; + +/* 0x0421 - Version info */ +struct VERSION_INFO_1057 : public PSDInterpretedResource +{ + +}; + + +/* 0x0422 - Exif data block */ +struct EXIF_DATA_1058 : public PSDInterpretedResource +{ + +}; + + +/* 0x0424 - XMP data block */ +struct XMP_DATA_1060 : public PSDInterpretedResource +{ + +}; + + +/* 0x07d0 - First path info block */ +struct PATH_INFO_FIRST_2000 : public PSDInterpretedResource +{ + +}; + + +/* 0x0bb6 - Last path info block */ +struct PATH_INFO_LAST_2998 : public PSDInterpretedResource +{ + +}; + + +/* 0x0bb7 - Name of clipping path */ +struct CLIPPING_PATH_2999 : public PSDInterpretedResource +{ + +}; + + +/* 0x2710 - Print flags */ +struct PRINT_FLAGS_2_10000 : public PSDInterpretedResource +{ + +}; + + + #endif // PSD_RESOURCE_BLOCK_H diff -Nru calligra-2.4.0/krita/plugins/formats/raw/krita_raw.desktop calligra-2.4.3/krita/plugins/formats/raw/krita_raw.desktop --- calligra-2.4.0/krita/plugins/formats/raw/krita_raw.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/raw/krita_raw.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/raw/krita_raw_import.desktop calligra-2.4.3/krita/plugins/formats/raw/krita_raw_import.desktop --- calligra-2.4.0/krita/plugins/formats/raw/krita_raw_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/raw/krita_raw_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне на RAW в Krita Name[br]=Sil enporzh RAW evit Krita Name[ca]=Filtre d'importació RAW per al Krita +Name[ca@valencia]=Filtre d'importació RAW per al Krita Name[cs]=Importní filtr formátu RAW pro Kritu Name[da]=Krita RAW-importfilter Name[de]=Krita RAW-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/tiff/krita_tiff.desktop calligra-2.4.3/krita/plugins/formats/tiff/krita_tiff.desktop --- calligra-2.4.0/krita/plugins/formats/tiff/krita_tiff.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/tiff/krita_tiff.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/tiff/krita_tiff_export.desktop calligra-2.4.3/krita/plugins/formats/tiff/krita_tiff_export.desktop --- calligra-2.4.0/krita/plugins/formats/tiff/krita_tiff_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/tiff/krita_tiff_export.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за изнасяне от Krita в TIFF Name[br]=Sil ezporzh TIFF evit Krita Name[ca]=Filtre d'exportació TIFF per al Krita +Name[ca@valencia]=Filtre d'exportació TIFF per al Krita Name[cs]=Exportní filtr formátu TIFF pro Kritu Name[da]=Krita TIFF-eksportfilter Name[de]=Krita TIFF-Exportfilter diff -Nru calligra-2.4.0/krita/plugins/formats/tiff/krita_tiff_import.desktop calligra-2.4.3/krita/plugins/formats/tiff/krita_tiff_import.desktop --- calligra-2.4.0/krita/plugins/formats/tiff/krita_tiff_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/tiff/krita_tiff_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Филтър за внасяне от TIFF в Krita Name[br]=Sil enporzh TIFF evit Krita Name[ca]=Filtre d'importació TIFF per al Krita +Name[ca@valencia]=Filtre d'importació TIFF per al Krita Name[cs]=Importní filtr formátu TIFF pro Kritu Name[da]=Krita TIFF-importfilter Name[de]=Krita TIFF-Importfilter diff -Nru calligra-2.4.0/krita/plugins/formats/xcf/kis_xcf_import.cpp calligra-2.4.3/krita/plugins/formats/xcf/kis_xcf_import.cpp --- calligra-2.4.0/krita/plugins/formats/xcf/kis_xcf_import.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/xcf/kis_xcf_import.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -228,7 +228,7 @@ } // Create the layer - KisPaintLayerSP layer = new KisPaintLayer(image, xcflayer.name, xcflayer.opacity, colorSpace); + KisPaintLayerSP layer = new KisPaintLayer(image, QString::fromUtf8(xcflayer.name), xcflayer.opacity, colorSpace); KisTransaction("", layer -> paintDevice()); // Set some properties diff -Nru calligra-2.4.0/krita/plugins/formats/xcf/krita_xcf.desktop calligra-2.4.3/krita/plugins/formats/xcf/krita_xcf.desktop --- calligra-2.4.0/krita/plugins/formats/xcf/krita_xcf.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/xcf/krita_xcf.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -8,6 +8,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/plugins/formats/xcf/krita_xcf_import.desktop calligra-2.4.3/krita/plugins/formats/xcf/krita_xcf_import.desktop --- calligra-2.4.0/krita/plugins/formats/xcf/krita_xcf_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/formats/xcf/krita_xcf_import.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita Gimp Import Filter Name[bg]=Филтър за внасяне от Gimp в Krita Name[ca]=Filtre d'importació Gimp per al Krita +Name[ca@valencia]=Filtre d'importació Gimp per al Krita Name[cs]=Importní filtr do GIMPu pro Kritu Name[da]=GIMP-importfilter til Krita Name[de]=Krita Gimp-Importfilter diff -Nru calligra-2.4.0/krita/plugins/generators/solid/kritacolorgenerator.desktop calligra-2.4.3/krita/plugins/generators/solid/kritacolorgenerator.desktop --- calligra-2.4.0/krita/plugins/generators/solid/kritacolorgenerator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/generators/solid/kritacolorgenerator.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Solid Color Generator Name[bg]=Създаване на плътен цвят Name[ca]=Generador de color sòlid +Name[ca@valencia]=Generador de color sòlid Name[da]=Generering af massiv farve Name[de]=Volltonfarben-Generator Name[el]=Δημιουργός συμπαγών χρωμάτων @@ -34,6 +35,7 @@ Comment=Generates a solid color Comment[bg]=Създаване на плътен цвят Comment[ca]=Genera un color sòlid +Comment[ca@valencia]=Genera un color sòlid Comment[da]=Genererer en massiv farve Comment[de]=Erzeugt eine Volltonfarbe Comment[el]=Δημιουργεί ένα συμπαγές χρώμα diff -Nru calligra-2.4.0/krita/plugins/paintops/chalk/kritachalkpaintop.desktop calligra-2.4.3/krita/plugins/paintops/chalk/kritachalkpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/chalk/kritachalkpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/chalk/kritachalkpaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Chalk brush Name[ca]=Pinzell de guix +Name[ca@valencia]=Pinzell de guix Name[da]=Kridtpensel Name[de]=Kreidepinsel Name[el]=Πινέλο κιμωλίας diff -Nru calligra-2.4.0/krita/plugins/paintops/colorsmudge/kritacolorsmudgepaintop.desktop calligra-2.4.3/krita/plugins/paintops/colorsmudge/kritacolorsmudgepaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/colorsmudge/kritacolorsmudgepaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/colorsmudge/kritacolorsmudgepaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Color Smudge Brush Name[ca]=Pinzell d'esborronat de color +Name[ca@valencia]=Pinzell d'esborronat de color Name[da]=Farveudtværingspensel Name[de]=Farbwischpinsel Name[el]=Έγχρωμο πινέλο αποτύπωσης κηλίδων @@ -14,6 +15,7 @@ Name[pt]=Pincel de Fumo a Cores Name[pt_BR]=Pincel de fumo em cores Name[ru]=Цветная размазывающая кисть +Name[sk]=Farba rozmazania štetca Name[sv]=Färgsmetningspensel Name[uk]=Кольоровий пензель для розмазування Name[x-test]=xxColor Smudge Brushxx diff -Nru calligra-2.4.0/krita/plugins/paintops/complexop/kritacomplexbrush.desktop calligra-2.4.3/krita/plugins/paintops/complexop/kritacomplexbrush.desktop --- calligra-2.4.0/krita/plugins/paintops/complexop/kritacomplexbrush.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/complexop/kritacomplexbrush.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Complex Brush Name[ca]=Pinzell complex +Name[ca@valencia]=Pinzell complex Name[da]=Kompleks pensel Name[de]=Komplexer Pinsel Name[el]=Σύνθετο πινέλο diff -Nru calligra-2.4.0/krita/plugins/paintops/curvebrush/kritacurvepaintop.desktop calligra-2.4.3/krita/plugins/paintops/curvebrush/kritacurvepaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/curvebrush/kritacurvepaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/curvebrush/kritacurvepaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Curve brush Name[ca]=Pinzell de corba +Name[ca@valencia]=Pinzell de corba Name[da]=Kurvepensel Name[de]=Kurvenpinsel Name[el]=Πινέλο καμπύλης diff -Nru calligra-2.4.0/krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop calligra-2.4.3/krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop --- calligra-2.4.0/krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Default Paint Operations Name[bg]=Дайствия за рисуване по подразбиране Name[ca]=Operacions de pintura per defecte +Name[ca@valencia]=Operacions de pintura per defecte Name[cy]=Gweithrediadau Paent Rhagosodol Name[da]=Standard maleoperationer Name[de]=Standard Maloperation @@ -49,6 +50,7 @@ Comment=Default paint operations Comment[bg]=Действия за рисуване по подразбиране Comment[ca]=Operacions de pintura per defecte +Comment[ca@valencia]=Operacions de pintura per defecte Comment[cy]=Gweithrediadau paent rhagosodol Comment[da]=Standard maleoperationer Comment[de]=Standard Maloperation diff -Nru calligra-2.4.0/krita/plugins/paintops/deform/kritadeformpaintop.desktop calligra-2.4.3/krita/plugins/paintops/deform/kritadeformpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/deform/kritadeformpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/deform/kritadeformpaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Deform brush Name[ca]=Pinzell deformat +Name[ca@valencia]=Pinzell deformat Name[da]=Deformationspensel Name[de]=Verzerrungspinsel Name[el]=Πινέλο παραμόρφωσης diff -Nru calligra-2.4.0/krita/plugins/paintops/dynadraw/kritadynapaintop.desktop calligra-2.4.3/krita/plugins/paintops/dynadraw/kritadynapaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/dynadraw/kritadynapaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/dynadraw/kritadynapaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Dyna Name[bg]=Динамична Name[ca]=Dinàmic +Name[ca@valencia]=Dinàmic Name[da]=Dyna Name[de]=Dyna Name[el]=Dyna diff -Nru calligra-2.4.0/krita/plugins/paintops/experiment/kritaexperimentpaintop.desktop calligra-2.4.3/krita/plugins/paintops/experiment/kritaexperimentpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/experiment/kritaexperimentpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/experiment/kritaexperimentpaintop.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Experiment Name[ca]=Experiment +Name[ca@valencia]=Experiment Name[da]=Eksperiment Name[de]=Experiment Name[el]=Πείραμα diff -Nru calligra-2.4.0/krita/plugins/paintops/filterop/kritafilterop.desktop calligra-2.4.3/krita/plugins/paintops/filterop/kritafilterop.desktop --- calligra-2.4.0/krita/plugins/paintops/filterop/kritafilterop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/filterop/kritafilterop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Filter Op Name[ca]=Operador de filtre +Name[ca@valencia]=Operador de filtre Name[da]=Filterop. Name[de]=Filteroperation Name[el]=Ενέργεια φίλτρου @@ -33,6 +34,7 @@ Name[zh_TW]=濾鏡工具 Comment=Filter Op Comment[ca]=Operador de filtre +Comment[ca@valencia]=Operador de filtre Comment[da]=Filterop. Comment[de]=Filteroperation Comment[el]=Ενέργεια φίλτρου diff -Nru calligra-2.4.0/krita/plugins/paintops/gridbrush/kritagridpaintop.desktop calligra-2.4.3/krita/plugins/paintops/gridbrush/kritagridpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/gridbrush/kritagridpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/gridbrush/kritagridpaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Grid Name[bg]=Мрежа Name[ca]=Graella +Name[ca@valencia]=Graella Name[cs]=Mřížka Name[da]=Gitter Name[de]=Gitter diff -Nru calligra-2.4.0/krita/plugins/paintops/hairy/kritahairypaintop.desktop calligra-2.4.3/krita/plugins/paintops/hairy/kritahairypaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/hairy/kritahairypaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/hairy/kritahairypaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Hairy brushes Name[ca]=Pinzells espessos +Name[ca@valencia]=Pinzells espessos Name[cs]=Chlupaté štětce Name[da]=Langhårede pensler Name[de]=Haarpinsel diff -Nru calligra-2.4.0/krita/plugins/paintops/hatching/kritahatchingpaintop.desktop calligra-2.4.3/krita/plugins/paintops/hatching/kritahatchingpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/hatching/kritahatchingpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/hatching/kritahatchingpaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Hatching brush Name[ca]=Pinzell espès +Name[ca@valencia]=Pinzell espès Name[da]=Skraveringspensel Name[de]=Schraffierpinsel Name[el]=Συρμάτινο πινέλο diff -Nru calligra-2.4.0/krita/plugins/paintops/mypaint/kritamypaintpaintop.desktop calligra-2.4.3/krita/plugins/paintops/mypaint/kritamypaintpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/mypaint/kritamypaintpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/mypaint/kritamypaintpaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=MyPaint brush Name[ca]=Pinzell de MyPaint +Name[ca@valencia]=Pinzell de MyPaint Name[da]=MyPaint-pensel Name[de]=MyPaint-Pinsel Name[el]=Πινέλο MyPaint diff -Nru calligra-2.4.0/krita/plugins/paintops/particle/kritaparticlepaintop.desktop calligra-2.4.3/krita/plugins/paintops/particle/kritaparticlepaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/particle/kritaparticlepaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/particle/kritaparticlepaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Particle brush Name[ca]=Pinzell de partícules +Name[ca@valencia]=Pinzell de partícules Name[da]=Partikelpensel Name[de]=Partikelpinsel Name[el]=Πινέλο σωματιδίων diff -Nru calligra-2.4.0/krita/plugins/paintops/sketch/kritasketchpaintop.desktop calligra-2.4.3/krita/plugins/paintops/sketch/kritasketchpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/sketch/kritasketchpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/sketch/kritasketchpaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Sketch brush Name[ca]=Pinzell d'esbós +Name[ca@valencia]=Pinzell d'esbós Name[da]=Skitsepensel Name[de]=Skizzenpinsel Name[el]=Πινέλο σκίτσου diff -Nru calligra-2.4.0/krita/plugins/paintops/spray/kritaspraypaintop.desktop calligra-2.4.3/krita/plugins/paintops/spray/kritaspraypaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/spray/kritaspraypaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/spray/kritaspraypaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Spray Name[bg]=Спрей Name[ca]=Esprai +Name[ca@valencia]=Esprai Name[cs]=Sprej Name[da]=Spray Name[de]=Sprühen diff -Nru calligra-2.4.0/krita/plugins/paintops/waterymixbrush/kritawaterymixpaintop.desktop calligra-2.4.3/krita/plugins/paintops/waterymixbrush/kritawaterymixpaintop.desktop --- calligra-2.4.0/krita/plugins/paintops/waterymixbrush/kritawaterymixpaintop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/paintops/waterymixbrush/kritawaterymixpaintop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Watery Mixbrush Name[ca]=Pinzell de mescla d'aquarel·la +Name[ca@valencia]=Pinzell de mescla d'aquarel·la Name[da]=Udvandet blandingspensel Name[el]=Πινέλο υδατογραφίας Name[en_GB]=Watery Mixbrush diff -Nru calligra-2.4.0/krita/plugins/tools/defaulttools/kritadefaulttools.desktop calligra-2.4.3/krita/plugins/tools/defaulttools/kritadefaulttools.desktop --- calligra-2.4.0/krita/plugins/tools/defaulttools/kritadefaulttools.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/defaulttools/kritadefaulttools.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Инструменти по подразбиране Name[br]=Ostilhoù dre ziouer Name[ca]=Eines per defecte +Name[ca@valencia]=Eines per defecte Name[cs]=Výchozí nástroje Name[cy]=Offer Rhagosodol Name[da]=Standardværktøjer diff -Nru calligra-2.4.0/krita/plugins/tools/selectiontools/kritaselectiontools.desktop calligra-2.4.3/krita/plugins/tools/selectiontools/kritaselectiontools.desktop --- calligra-2.4.0/krita/plugins/tools/selectiontools/kritaselectiontools.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/selectiontools/kritaselectiontools.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Инструмент за маркиране Name[br]=Ostilhoù choazh Name[ca]=Eines de selecció +Name[ca@valencia]=Eines de selecció Name[cs]=Nástroje výběru Name[cy]=Offer Detholi Name[da]=Markeringsværktøj diff -Nru calligra-2.4.0/krita/plugins/tools/tool_crop/kritatoolcrop.desktop calligra-2.4.3/krita/plugins/tools/tool_crop/kritatoolcrop.desktop --- calligra-2.4.0/krita/plugins/tools/tool_crop/kritatoolcrop.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_crop/kritatoolcrop.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Инструмент за изрязване Name[br]=Ostilh krennañ Name[ca]=Eina de tall +Name[ca@valencia]=Eina de tall Name[cs]=Nástroje ořezu Name[cy]=Hidlen Docio Name[da]=Beskæringsværktøj diff -Nru calligra-2.4.0/krita/plugins/tools/tool_curves/kritatoolcurves.desktop calligra-2.4.3/krita/plugins/tools/tool_curves/kritatoolcurves.desktop --- calligra-2.4.0/krita/plugins/tools/tool_curves/kritatoolcurves.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_curves/kritatoolcurves.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Curves Tool Name[bg]=Инструмент криви Name[ca]=Eina de corbes +Name[ca@valencia]=Eina de corbes Name[cs]=Nástroje křivek Name[da]=Kurveværktøj Name[de]=Kurvenwerkzeug diff -Nru calligra-2.4.0/krita/plugins/tools/tool_dyna/kritatooldyna.desktop calligra-2.4.3/krita/plugins/tools/tool_dyna/kritatooldyna.desktop --- calligra-2.4.0/krita/plugins/tools/tool_dyna/kritatooldyna.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_dyna/kritatooldyna.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Dyna Tool Name[ca]=Eina dinàmica +Name[ca@valencia]=Eina dinàmica Name[da]=Dyna-værktøj Name[de]=Dyna-Werkzeug Name[el]=Εργαλείο Dyna diff -Nru calligra-2.4.0/krita/plugins/tools/tool_grid/kritatoolgrid.desktop calligra-2.4.3/krita/plugins/tools/tool_grid/kritatoolgrid.desktop --- calligra-2.4.0/krita/plugins/tools/tool_grid/kritatoolgrid.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_grid/kritatoolgrid.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Grid Name[bg]=Мрежа Name[ca]=Graella +Name[ca@valencia]=Graella Name[cs]=Mřížka Name[da]=Gitter Name[de]=Gitter diff -Nru calligra-2.4.0/krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop calligra-2.4.3/krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop --- calligra-2.4.0/krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Perspective Grid Tool Name[bg]=Инструмент перспективна мрежа Name[ca]=Eina de graella de perspectiva +Name[ca@valencia]=Eina de graella de perspectiva Name[da]=Perspektivgitterværktøj Name[de]=Perspektive-Raster-Werkzeug Name[el]=Εργαλείο προοπτικού καννάβου diff -Nru calligra-2.4.0/krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop calligra-2.4.3/krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop --- calligra-2.4.0/krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Инструмент многоъгълник Name[br]=Ostilh liestueg Name[ca]=Eina de polígon +Name[ca@valencia]=Eina de polígon Name[cs]=Nástroj mnohoúhelníků Name[cy]=Erfyn Polygon Name[da]=Polygonværktøj diff -Nru calligra-2.4.0/krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop calligra-2.4.3/krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop --- calligra-2.4.0/krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Инструмент съставна линия Name[br]=Ostilh lieslinenn Name[ca]=Eina de polilínia +Name[ca@valencia]=Eina de polilínia Name[cy]=Erfyn Polylinell Name[da]=Flerlinjeværktøj Name[de]=Linienketten-Werkzeug diff -Nru calligra-2.4.0/krita/plugins/tools/tool_star/kritatoolstar.desktop calligra-2.4.3/krita/plugins/tools/tool_star/kritatoolstar.desktop --- calligra-2.4.0/krita/plugins/tools/tool_star/kritatoolstar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_star/kritatoolstar.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Инструмент звезда Name[br]=Ostilh steredenn Name[ca]=Eina d'estrella +Name[ca@valencia]=Eina d'estrella Name[cy]=Erfyn Seren Name[da]=Stjerneværktøj Name[de]=Stern-Werkzeug diff -Nru calligra-2.4.0/krita/plugins/tools/tool_text/kis_tool_text.cc calligra-2.4.3/krita/plugins/tools/tool_text/kis_tool_text.cc --- calligra-2.4.0/krita/plugins/tools/tool_text/kis_tool_text.cc 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_text/kis_tool_text.cc 2012-06-26 04:18:01.000000000 +0000 @@ -55,7 +55,9 @@ if (textFactory) { KoShape* shape = textFactory->createDefaultShape(canvas()->shapeController()->resourceManager()); shape->setSize(r.size()); - shape->setPosition(r.topLeft()); + qreal x = r.x() + r.width() / 2; + qreal y = r.y() + r.height() / 2; + shape->setPosition(QPointF(x,y)); addShape(shape); KisCanvas2* kiscanvas = dynamic_cast(canvas()); diff -Nru calligra-2.4.0/krita/plugins/tools/tool_text/kritatooltext.desktop calligra-2.4.3/krita/plugins/tools/tool_text/kritatooltext.desktop --- calligra-2.4.0/krita/plugins/tools/tool_text/kritatooltext.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_text/kritatooltext.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Text Tool Name[bg]=Инструмент текст Name[ca]=Eina de text +Name[ca@valencia]=Eina de text Name[cs]=Textový nástroj Name[da]=Tekstværktøj Name[de]=Textwerkzeug diff -Nru calligra-2.4.0/krita/plugins/tools/tool_transform2/kritatooltransform.desktop calligra-2.4.3/krita/plugins/tools/tool_transform2/kritatooltransform.desktop --- calligra-2.4.0/krita/plugins/tools/tool_transform2/kritatooltransform.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/plugins/tools/tool_transform2/kritatooltransform.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Инструмент за преобразуване Name[br]=Ostilh treuzfurmiñ Name[ca]=Eina de transformació +Name[ca@valencia]=Eina de transformació Name[cy]=Erfyn Trawsffurfio Name[da]=Transformeringsværktøj Name[de]=Transformation-Werkzeug diff -Nru calligra-2.4.0/krita/sdk/templates/docker/krita_APPNAMELC.desktop calligra-2.4.3/krita/sdk/templates/docker/krita_APPNAMELC.desktop --- calligra-2.4.0/krita/sdk/templates/docker/krita_APPNAMELC.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/sdk/templates/docker/krita_APPNAMELC.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[be]=%{APPNAME} Name[bg]=%{APPNAME} Name[ca]=%{APPNAME} +Name[ca@valencia]=%{APPNAME} Name[cs]=%{APPNAME} Name[da]=%{APPNAME} Name[de]=%{APPNAME} @@ -45,6 +46,7 @@ Comment[be]=%{APPNAME} Comment[bg]=%{APPNAME} Comment[ca]=%{APPNAME} +Comment[ca@valencia]=%{APPNAME} Comment[cs]=%{APPNAME} Comment[da]=%{APPNAME} Comment[de]=%{APPNAME} diff -Nru calligra-2.4.0/krita/sdk/templates/filefilter/krita_APPNAMELC.desktop calligra-2.4.3/krita/sdk/templates/filefilter/krita_APPNAMELC.desktop --- calligra-2.4.0/krita/sdk/templates/filefilter/krita_APPNAMELC.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/sdk/templates/filefilter/krita_APPNAMELC.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ GenericName=Application for Drawing and Handling of Images GenericName[bg]=Приложение за рисуване и обработка на изображения GenericName[ca]=Aplicació per a dibuix i modificació d'imatges +GenericName[ca@valencia]=Aplicació per a dibuix i modificació d'imatges GenericName[da]=Tegne- og billedbehandlingsprogram GenericName[de]=Programm zum Zeichnen und Bearbeiten von Bildern GenericName[el]=Εφαρμογή για επεξεργασία και χειρισμό εικόνων @@ -52,6 +53,7 @@ Name[bg]=Krita Name[br]=Krita Name[ca]=Krita +Name[ca@valencia]=Krita Name[cs]=Krita Name[cy]=Krita Name[da]=Krita diff -Nru calligra-2.4.0/krita/sdk/templates/filefilter/krita_APPNAMELC_export.desktop calligra-2.4.3/krita/sdk/templates/filefilter/krita_APPNAMELC_export.desktop --- calligra-2.4.0/krita/sdk/templates/filefilter/krita_APPNAMELC_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/sdk/templates/filefilter/krita_APPNAMELC_export.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita %{APPNAMELC} Export Filter Name[bg]=Филтър за изнасяне от Krita в %{APPNAMELC} Name[ca]=Filtre d'exportació %{APPNAMELC} per al Krita +Name[ca@valencia]=Filtre d'exportació %{APPNAMELC} per al Krita Name[da]=Krita %{APPNAMELC}-eksportfilter Name[de]=Krita %{APPNAMELC}-Exportfilter Name[el]=Φίλτρο εξαγωγής %{APPNAMELC} του Krita diff -Nru calligra-2.4.0/krita/sdk/templates/filefilter/krita_APPNAMELC_import.desktop calligra-2.4.3/krita/sdk/templates/filefilter/krita_APPNAMELC_import.desktop --- calligra-2.4.0/krita/sdk/templates/filefilter/krita_APPNAMELC_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/sdk/templates/filefilter/krita_APPNAMELC_import.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name=Krita %{APPNAMELC} Import Filter Name[bg]=Филтър за внасяне от %{APPNAMELC} в Krita Name[ca]=Filtre d'importació %{APPNAMELC} per al Krita +Name[ca@valencia]=Filtre d'importació %{APPNAMELC} per al Krita Name[da]=Krita %{APPNAMELC}-importfilter Name[de]=Krita %{APPNAMELC}-Importfilter Name[el]=Φίλτρο εισαγωγής %{APPNAMELC} του Krita diff -Nru calligra-2.4.0/krita/sdk/templates/filter/kritaAPPNAMELC.desktop calligra-2.4.3/krita/sdk/templates/filter/kritaAPPNAMELC.desktop --- calligra-2.4.0/krita/sdk/templates/filter/kritaAPPNAMELC.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/sdk/templates/filter/kritaAPPNAMELC.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[be]=%{APPNAME} Name[bg]=%{APPNAME} Name[ca]=%{APPNAME} +Name[ca@valencia]=%{APPNAME} Name[cs]=%{APPNAME} Name[da]=%{APPNAME} Name[de]=%{APPNAME} @@ -45,6 +46,7 @@ Comment[be]=%{APPNAME} Comment[bg]=%{APPNAME} Comment[ca]=%{APPNAME} +Comment[ca@valencia]=%{APPNAME} Comment[cs]=%{APPNAME} Comment[da]=%{APPNAME} Comment[de]=%{APPNAME} diff -Nru calligra-2.4.0/krita/sdk/templates/tool/kritatoolAPPNAMELC.desktop calligra-2.4.3/krita/sdk/templates/tool/kritatoolAPPNAMELC.desktop --- calligra-2.4.0/krita/sdk/templates/tool/kritatoolAPPNAMELC.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/sdk/templates/tool/kritatoolAPPNAMELC.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[be]=%{APPNAME} Name[bg]=%{APPNAME} Name[ca]=%{APPNAME} +Name[ca@valencia]=%{APPNAME} Name[cs]=%{APPNAME} Name[da]=%{APPNAME} Name[de]=%{APPNAME} @@ -45,6 +46,7 @@ Comment[be]=%{APPNAME} Comment[bg]=%{APPNAME} Comment[ca]=%{APPNAME} +Comment[ca@valencia]=%{APPNAME} Comment[cs]=%{APPNAME} Comment[da]=%{APPNAME} Comment[de]=%{APPNAME} diff -Nru calligra-2.4.0/krita/sdk/templates/view/kritaAPPNAMELC.desktop calligra-2.4.3/krita/sdk/templates/view/kritaAPPNAMELC.desktop --- calligra-2.4.0/krita/sdk/templates/view/kritaAPPNAMELC.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/sdk/templates/view/kritaAPPNAMELC.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name[be]=%{APPNAME} Name[bg]=%{APPNAME} Name[ca]=%{APPNAME} +Name[ca@valencia]=%{APPNAME} Name[cs]=%{APPNAME} Name[da]=%{APPNAME} Name[de]=%{APPNAME} @@ -45,6 +46,7 @@ Comment[be]=%{APPNAME} Comment[bg]=%{APPNAME} Comment[ca]=%{APPNAME} +Comment[ca@valencia]=%{APPNAME} Comment[cs]=%{APPNAME} Comment[da]=%{APPNAME} Comment[de]=%{APPNAME} diff -Nru calligra-2.4.0/krita/ui/kis_control_frame.cpp calligra-2.4.3/krita/ui/kis_control_frame.cpp --- calligra-2.4.0/krita/ui/kis_control_frame.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/ui/kis_control_frame.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -97,6 +97,7 @@ /**** Temporary hack to test the KoDualColorButton ***/ KoDualColorButton * dual = new KoDualColorButton(view->resourceProvider()->fgColor(), view->resourceProvider()->bgColor(), view, view); + dual->setPopDialog(false); action = new KAction(i18n("&Color"), this); view->actionCollection()->addAction("dual", action); action->setDefaultWidget(dual); diff -Nru calligra-2.4.0/krita/ui/kis_selection_manager.cc calligra-2.4.3/krita/ui/kis_selection_manager.cc --- calligra-2.4.0/krita/ui/kis_selection_manager.cc 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/ui/kis_selection_manager.cc 2012-06-26 04:21:31.000000000 +0000 @@ -353,6 +353,7 @@ { KisLayerSP layer = m_view->activeLayer(); if (!layer) return; + if (!layer->isEditable()) return; if (haveShapesSelected()) { m_view->canvasBase()->toolProxy()->cut(); @@ -542,6 +543,9 @@ void KisSelectionManager::clear() { + KisNodeSP node = m_view->activeNode(); + if (!node || !node->isEditable()) return; + m_view->canvasBase()->toolProxy()->deleteSelection(); updateGUI(); } @@ -551,6 +555,9 @@ KisPaintDeviceSP device = m_view->activeDevice(); if (!device) return; + KisNodeSP node = m_view->activeNode(); + if (!node || !node->isEditable()) return; + KisSelectionSP selection = m_view->selection(); QRect selectedRect = selection ? selection->selectedRect() : m_view->image()->bounds(); diff -Nru calligra-2.4.0/krita/ui/kis_view2.cpp calligra-2.4.3/krita/ui/kis_view2.cpp --- calligra-2.4.0/krita/ui/kis_view2.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/krita/ui/kis_view2.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -288,10 +288,6 @@ actionCollection()->addAction("createTemplate", m_d->createTemplate); connect(m_d->createTemplate, SIGNAL(triggered()), this, SLOT(slotCreateTemplate())); - KAction *firstRun = new KAction( i18n( "Load Tutorial"), this); - actionCollection()->addAction("first_run", firstRun); - connect(firstRun, SIGNAL(triggered()), this, SLOT(slotFirstRun())); - m_d->mirrorCanvas = new KToggleAction(i18n("Mirror Image"), this); m_d->mirrorCanvas->setChecked(false); actionCollection()->addAction("mirror_canvas", m_d->mirrorCanvas); @@ -352,6 +348,8 @@ connect(canvasController, SIGNAL(toolOptionWidgetsChanged(const QList &)), shell()->dockerManager(), SLOT(newOptionWidgets(const QList &))); + + shell()->dockerManager()->setIcons(false); } m_d->statusBar = new KisStatusBar(this); @@ -1175,26 +1173,6 @@ } } -void KisView2::slotFirstRun() -{ - QString fname = KisFactory2::componentData().dirs()->findResource("kis_images", "krita_first_start.kra"); - if (!fname.isEmpty()) { - KoDocumentEntry entry = KoDocumentEntry(KoDocument::readNativeService()); - QString errorMsg; - KoDocument* doc = entry.createDoc(&errorMsg); - if (!doc) return; - KoMainWindow *shell = new KoMainWindow(doc->componentData()); - shell->show(); - QObject::connect(doc, SIGNAL(sigProgress(int)), shell, SLOT(slotProgress(int))); - // for initDoc to fill in the recent docs list - // and for KoDocument::slotStarted - doc->addShell(shell); - doc->showStartUpWidget(shell, true); - doc->openUrl(fname); - } - -} - void KisView2::showStatusBar(bool toggled) { if (KoView::statusBar()) { diff -Nru calligra-2.4.0/krita/ui/kis_view2.h calligra-2.4.3/krita/ui/kis_view2.h --- calligra-2.4.0/krita/ui/kis_view2.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/ui/kis_view2.h 2012-06-26 04:18:01.000000000 +0000 @@ -191,7 +191,6 @@ void slotDocumentSaved(); void slotSaveIncremental(); void slotSaveIncrementalBackup(); - void slotFirstRun(); void showStatusBar(bool toggled); void showJustTheCanvas(bool toggled); diff -Nru calligra-2.4.0/krita/ui/kis_zoom_manager.cc calligra-2.4.3/krita/ui/kis_zoom_manager.cc --- calligra-2.4.0/krita/ui/kis_zoom_manager.cc 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/ui/kis_zoom_manager.cc 2012-06-26 04:21:31.000000000 +0000 @@ -68,8 +68,8 @@ void KisZoomManager::setup(KActionCollection * actionCollection) { - KoZoomMode::setMinimumZoom(0.00391); - KoZoomMode::setMaximumZoom(256.0); + KoZoomMode::setMinimumZoom(0.125); + KoZoomMode::setMaximumZoom(64.0); KisConfig cfg; m_zoomController = new KoZoomController(m_canvasController, m_zoomHandler, actionCollection, KoZoomAction::AspectMode, this); diff -Nru calligra-2.4.0/krita/ui/opengl/kis_opengl.h calligra-2.4.3/krita/ui/opengl/kis_opengl.h --- calligra-2.4.0/krita/ui/opengl/kis_opengl.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/ui/opengl/kis_opengl.h 2012-06-26 04:18:01.000000000 +0000 @@ -21,10 +21,12 @@ /** @file */ #include -#include #ifdef HAVE_OPENGL +#include + + #if defined(_WIN32) || defined(_WIN64) #include #endif diff -Nru calligra-2.4.0/krita/ui/tool/kis_tool_rectangle_base.cpp calligra-2.4.3/krita/ui/tool/kis_tool_rectangle_base.cpp --- calligra-2.4.0/krita/ui/tool/kis_tool_rectangle_base.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/krita/ui/tool/kis_tool_rectangle_base.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -128,7 +128,7 @@ QRectF bound; bound.setTopLeft(m_dragStart); bound.setBottomRight(m_dragEnd); - canvas()->updateCanvas(convertToPt(bound.normalized())); + canvas()->updateCanvas(convertToPt(bound.normalized()).adjusted(-100, -100, +200, +200)); } #include "kis_tool_rectangle_base.moc" diff -Nru calligra-2.4.0/libs/flake/filtereffect.desktop calligra-2.4.3/libs/flake/filtereffect.desktop --- calligra-2.4.0/libs/flake/filtereffect.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/filtereffect.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Filter effect definition Name[ca]=Definició d'efecte de filtre +Name[ca@valencia]=Definició d'efecte de filtre Name[da]=Definition af filtereffekt Name[de]=Filtereffekt-Definition Name[el]=Ορισμός εφέ φίλτρου @@ -30,6 +31,7 @@ X-KDE-ServiceType=Calligra/FilterEffect Comment=Definition of a flake filter effect Comment[ca]=Definició d'un efecte de filtre de floc +Comment[ca@valencia]=Definició d'un efecte de filtre de floc Comment[da]=Definition af et flake filtereffekt Comment[de]=Definition eines Flake-Filtereffekts Comment[el]=Ορισμός εφέ φίλτρου flake diff -Nru calligra-2.4.0/libs/flake/flakeborder.desktop calligra-2.4.3/libs/flake/flakeborder.desktop --- calligra-2.4.0/libs/flake/flakeborder.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/flakeborder.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Shape border definition Name[ca]=Definició de forma de la vora +Name[ca@valencia]=Definició de forma de la vora Name[da]=Definition af form-kant Name[de]=Objektumrandungsdefinition Name[el]=Ορισμός περιγράμματος σχήματος @@ -37,6 +38,7 @@ X-KDE-ServiceType=Calligra/Border Comment=Definition of a flake shape border Comment[ca]=Definició d'una vora en forma de floc +Comment[ca@valencia]=Definició d'una vora en forma de floc Comment[da]=Definition af en flake-forms kant Comment[de]=Definition einer Flake-Objektumrandung Comment[el]=Ορισμός ενός περιγράμματος σχήματος flake diff -Nru calligra-2.4.0/libs/flake/flake.desktop calligra-2.4.3/libs/flake/flake.desktop --- calligra-2.4.0/libs/flake/flake.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/flake.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Flake Plugin Name[ca]=Connector Flake +Name[ca@valencia]=Connector Flake Name[cs]=Modul Flake Name[da]=Flake-plugin Name[de]=Flake-Modul @@ -43,6 +44,7 @@ X-KDE-ServiceType=Calligra/Flake Comment=A plugin that contains a set of a shape and a tool Comment[ca]=Un connector que conté un conjunt d'una forma i una eina +Comment[ca@valencia]=Un connector que conté un conjunt d'una forma i una eina Comment[da]=Et plugin som består af et sæt af en form og et værktøj Comment[de]=Ein Modul, das einen Satz an Objekten und ein Werkzeug enthält Comment[el]=Ένα πρόσθετο που περιέχει ένα σύνολο σχήματος και εργαλείου @@ -52,7 +54,7 @@ Comment[fi]=Liitännäinen, joka sisältää muodon ja vastaavan työkalun Comment[fr]=Un module externe qui contient un ensemble de formes et un outil Comment[ga]=Breiseán a bhfuil giuirléid agus uirlis ann -Comment[gl]=Unha extensión que conten un conxunto de moldes en unha ferramenta +Comment[gl]=Un engadido que contén un conxunto de moldes nunha ferramenta Comment[hi]=एक प्लगइन जिसमें आकात तथा औजार का सेट है Comment[hne]=एक प्लगइन जेमां आकात अउ औजार के सेट हे Comment[it]=Un'estensione contenente un insieme di una forma e uno strumento diff -Nru calligra-2.4.0/libs/flake/flakedevice.desktop calligra-2.4.3/libs/flake/flakedevice.desktop --- calligra-2.4.0/libs/flake/flakedevice.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/flakedevice.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Flake device definition Name[ca]=Definició d'aparell de floc +Name[ca@valencia]=Definició d'aparell de floc Name[da]=Definition af flake-enhed Name[de]=Flake-Gerätedefinition Name[el]=Ορισμός συσκευής Flake @@ -33,6 +34,7 @@ X-KDE-ServiceType=Calligra/Device Comment=Definition of flake devices Comment[ca]=Definició d'aparells de floc +Comment[ca@valencia]=Definició d'aparells de floc Comment[da]=Definition af flake-enheder Comment[de]=Definition von Flake-Geräten Comment[el]=Ορισμός των συσκευών Flake diff -Nru calligra-2.4.0/libs/flake/flakeshape.desktop calligra-2.4.3/libs/flake/flakeshape.desktop --- calligra-2.4.0/libs/flake/flakeshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/flakeshape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Shape definition Name[ca]=Definició de forma +Name[ca@valencia]=Definició de forma Name[da]=Form-definition Name[de]=Objektdefinition Name[el]=Ορισμός σχήματος @@ -39,6 +40,7 @@ X-KDE-ServiceType=Calligra/Shape Comment=Definition of a flake shape object Comment[ca]=Definició d'un objecte amb forma de floc +Comment[ca@valencia]=Definició d'un objecte amb forma de floc Comment[da]=Definition af et flake-form-objekt Comment[de]=Definition eines Flake-Objektes Comment[el]=Καθορισμός ενός αντικειμένου σχήματος flake diff -Nru calligra-2.4.0/libs/flake/flaketool.desktop calligra-2.4.3/libs/flake/flaketool.desktop --- calligra-2.4.0/libs/flake/flaketool.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/flaketool.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Flake tool definition Name[ca]=Definició d'eina de floc +Name[ca@valencia]=Definició d'eina de floc Name[da]=Definition af flake-værktøj Name[de]=Flake-Werkzeugdefinition Name[el]=Ορισμός εργαλείου flake @@ -38,6 +39,7 @@ X-KDE-ServiceType=Calligra/Tool Comment=Definition of flake tools Comment[ca]=Definició d'eines de floc +Comment[ca@valencia]=Definició d'eines de floc Comment[da]=Definition af flake-værktøjer Comment[de]=Definition von Flake-Werkzeugen Comment[el]=Ορισμός των εργαλείων flake diff -Nru calligra-2.4.0/libs/flake/KoCanvasResourceManager.cpp calligra-2.4.3/libs/flake/KoCanvasResourceManager.cpp --- calligra-2.4.0/libs/flake/KoCanvasResourceManager.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/KoCanvasResourceManager.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -28,6 +28,7 @@ #include "KoShape.h" #include "KoLineBorder.h" #include "KoResourceManager_p.h" +#include class KoCanvasResourceManager::Private { @@ -39,6 +40,9 @@ : QObject(parent), d(new Private()) { + const KoColorSpace* cs = KoColorSpaceRegistry::instance()->rgb8(); + setForegroundColor(KoColor(Qt::black, cs)); + setBackgroundColor(KoColor(Qt::white, cs)); } KoCanvasResourceManager::~KoCanvasResourceManager() diff -Nru calligra-2.4.0/libs/flake/KoPatternBackground.cpp calligra-2.4.3/libs/flake/KoPatternBackground.cpp --- calligra-2.4.0/libs/flake/KoPatternBackground.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/flake/KoPatternBackground.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -368,9 +368,9 @@ QSizeF targetSize = d->targetSize(); QSizeF imageSize = d->imageData->imageSize(); if (targetSize.height() != imageSize.height()) - style.addProperty("draw:fill-image-height", QString("%1").arg(targetSize.height())); + style.addPropertyPt("draw:fill-image-height", targetSize.height()); if (targetSize.width() != imageSize.width()) - style.addProperty("draw:fill-image-width", QString("%1").arg(targetSize.width())); + style.addPropertyPt("draw:fill-image-width", targetSize.width()); } KoGenStyle patternStyle(KoGenStyle::FillImageStyle /*no family name*/); @@ -380,7 +380,6 @@ patternStyle.addAttribute("xlink:href", context.imageHref(d->imageData)); QString patternStyleName = context.mainStyles().insert(patternStyle, "picture"); - context.mainStyles().insert(style, context.isSet(KoShapeSavingContext::PresentationShape) ? "pr" : "gr"); style.addProperty("draw:fill", "bitmap"); style.addProperty("draw:fill-image-name", patternStyleName); diff -Nru calligra-2.4.0/libs/flake/KoShapePaintingContext.cpp calligra-2.4.3/libs/flake/KoShapePaintingContext.cpp --- calligra-2.4.0/libs/flake/KoShapePaintingContext.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/flake/KoShapePaintingContext.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -39,13 +39,14 @@ if (forPrint) { showTextShapeOutlines = false; showFormattingCharacters = false; + showTableBorders = false; } else { showTextShapeOutlines = rm->boolResource(KoCanvasResourceManager::ShowTextShapeOutlines); - } - if (rm->hasResource(KoCanvasResourceManager::ShowTableBorders)) { - showTableBorders = rm->boolResource(KoCanvasResourceManager::ShowTableBorders); - } else { - showTableBorders = true; + if (rm->hasResource(KoCanvasResourceManager::ShowTableBorders)) { + showTableBorders = rm->boolResource(KoCanvasResourceManager::ShowTableBorders); + } else { + showTableBorders = true; + } } showSpellChecking = !forPrint; showSelections = !forPrint; diff -Nru calligra-2.4.0/libs/flake/presentationeventaction.desktop calligra-2.4.3/libs/flake/presentationeventaction.desktop --- calligra-2.4.0/libs/flake/presentationeventaction.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/presentationeventaction.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Presentation Event Action Plugin Name[ca]=Connector d'acció de presentació d'esdeveniments +Name[ca@valencia]=Connector d'acció de presentació d'esdeveniments Name[da]=Plugin til begivenhedshandlinger til præsentationer Name[de]=Präsentationsaktionsereignis-Modul Name[el]=Πρόσθετο ενέργειας γεγονότος παρουσίασης @@ -8,7 +9,7 @@ Name[es]=Complemento de acciones de eventos de la presentación Name[et]=Esitluse sündmustoimingute plugin Name[fr]=Module externe d'action de présentation d'évènement -Name[gl]=Extensión de Accións do Evento de Presentación +Name[gl]=Engadido de accións de Presentacións Name[hne]=प्रस्तुतिकरन घटना काम प्लगइन Name[it]=Plugin per azioni d'evento delle presentazioni Name[ja]=プレゼンテーションイベントアクションプラグイン @@ -33,6 +34,7 @@ X-KDE-ServiceType=Calligra/PresentationEventAction Comment=A plugin that contains a presentation event action Comment[ca]=Un connector que conté una acció de presentació d'esdeveniment +Comment[ca@valencia]=Un connector que conté una acció de presentació d'esdeveniment Comment[da]=Et plugin som indeholder en begivenhedshandling til præsentationer Comment[de]=Ein Modul, das ein Präsentationsaktionsereignis enthält Comment[el]=Ένα πρόσθετο που περιέχει μια ενέργεια γεγονότος παρουσίασης diff -Nru calligra-2.4.0/libs/flake/scripteventaction.desktop calligra-2.4.3/libs/flake/scripteventaction.desktop --- calligra-2.4.0/libs/flake/scripteventaction.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/flake/scripteventaction.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Script Event Action Plugin Name[ca]=Connector d'script d'acció d'esdeveniment +Name[ca@valencia]=Connector d'script d'acció d'esdeveniment Name[da]=Plugin til script-begivenhedshandling Name[de]=Skriptaktionsereignis-Modul Name[el]=Πρόσθετο ενέργειας γεγονότος σεναρίου @@ -8,7 +9,7 @@ Name[es]=Complemento de acción de evento de guión Name[et]=Skripti sündmustoimingute plugin Name[fr]=Module externe d'action de script d'évènement -Name[gl]=Extensión de Guións de Accións de Presentación +Name[gl]=Engadido de scripts de presentacións Name[hne]=स्क्रिप्ट घटना काम प्लगइन Name[it]=Plugin per azioni d'evento degli script Name[ja]=スクリプトイベントアクションプラグイン @@ -32,6 +33,7 @@ X-KDE-ServiceType=Calligra/ScriptEventAction Comment=A plugin that contains a script event action Comment[ca]=Un connector que conté un script d'acció d'esdeveniment +Comment[ca@valencia]=Un connector que conté un script d'acció d'esdeveniment Comment[da]=Et plugin som indeholder en script-begivenhedshandling Comment[de]=Ein Modul, das ein Skriptaktionsereignis enthält Comment[el]=Ένα πρόσθετο που περιέχει μια ενέργεια γεγονότος σεναρίου @@ -39,7 +41,7 @@ Comment[es]=Un complemento que contiene una acción de evento de guión Comment[et]=Skripti sündmustoiminguid sisaldav plugin Comment[fr]=Module externe contenant une action de script d'évènement -Comment[gl]=Unha extensión que contén un guión de acción eventual +Comment[gl]=Un engadido que contén un script de acción eventual Comment[hne]=एक प्लगइन जेमां प्रस्तुतिकरन घटना काम हे Comment[it]=Un'estensione contenente un'azione d'evento degli script Comment[ja]=スクリプトイベントアクションを含むプラグイン diff -Nru calligra-2.4.0/libs/flake/svg/SvgUtil.cpp calligra-2.4.3/libs/flake/svg/SvgUtil.cpp --- calligra-2.4.0/libs/flake/svg/SvgUtil.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/flake/svg/SvgUtil.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -188,6 +188,10 @@ QRectF SvgUtil::parseViewBox(QString viewbox) { QRectF viewboxRect; + // this is a workaround for bug 260429 for a file generated by blender + // who has px in the viewbox which is wrong. + // reported as bug http://projects.blender.org/tracker/?group_id=9&atid=498&func=detail&aid=30971 + viewbox.remove("px"); QStringList points = viewbox.replace(',', ' ').simplified().split(' '); if (points.count() == 4) { diff -Nru calligra-2.4.0/libs/kopageapp/KoPAView.cpp calligra-2.4.3/libs/kopageapp/KoPAView.cpp --- calligra-2.4.0/libs/kopageapp/KoPAView.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/kopageapp/KoPAView.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -290,6 +290,7 @@ d->tabBarLayout->addWidget(d->insideWidget, 1, 1); setTabBarPosition(Qt::Horizontal); + gridLayout->addWidget(d->horizontalRuler->tabChooser(), 0, 0); gridLayout->addWidget(d->horizontalRuler, 0, 1); gridLayout->addWidget(d->verticalRuler, 1, 0); gridLayout->addWidget(canvasController, 1, 1); diff -Nru calligra-2.4.0/libs/kopageapp/tools/backgroundTool/kopabackgroundtool.desktop calligra-2.4.3/libs/kopageapp/tools/backgroundTool/kopabackgroundtool.desktop --- calligra-2.4.0/libs/kopageapp/tools/backgroundTool/kopabackgroundtool.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/kopageapp/tools/backgroundTool/kopabackgroundtool.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Page Application Background Tool Name[ca]=Eina d'aplicació de fons de pàgina +Name[ca@valencia]=Eina d'aplicació de fons de pàgina Name[da]=Værktøj til side-program-baggrund Name[de]=Hintergrundwerkzeug für Seitenanwendungen Name[el]=Εργαλείο φόντου εφαρμογής σελίδας diff -Nru calligra-2.4.0/libs/koreport/koreport_itemplugin.desktop calligra-2.4.3/libs/koreport/koreport_itemplugin.desktop --- calligra-2.4.0/libs/koreport/koreport_itemplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/koreport/koreport_itemplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ X-KDE-ServiceType=KoReport/ItemPlugin Comment=KoReport Item Plugin Comment[ca]=Connector de l'ítem KoReport +Comment[ca@valencia]=Connector de l'ítem KoReport Comment[da]=Plugin til KoReport-element Comment[el]=Πρόσθετο αντικειμένου KoReport Comment[en_GB]=KoReport Item Plugin diff -Nru calligra-2.4.0/libs/koreport/wrtembed/KoReportDesigner.cpp calligra-2.4.3/libs/koreport/wrtembed/KoReportDesigner.cpp --- calligra-2.4.0/libs/koreport/wrtembed/KoReportDesigner.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/koreport/wrtembed/KoReportDesigner.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -156,8 +156,6 @@ d->pageButton = new ReportPropertiesButton(this); - //Messy, but i cant find another way - delete d->hruler->tabChooser(); d->hruler->setUnit(KoUnit(KoUnit::Centimeter)); d->grid->addWidget(d->pageButton, 0, 0); diff -Nru calligra-2.4.0/libs/kotext/commands/ChangeStylesMacroCommand.cpp calligra-2.4.3/libs/kotext/commands/ChangeStylesMacroCommand.cpp --- calligra-2.4.0/libs/kotext/commands/ChangeStylesMacroCommand.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/kotext/commands/ChangeStylesMacroCommand.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -50,6 +50,16 @@ // finally the new styles are applied to the documents through super::redo() void ChangeStylesMacroCommand::redo() { + QList commands; + if (m_first) { + // IMPORTANT: the sub commands needs to be created now so the can collect + // info before we change the styles + foreach(ChangeFollower *cf, m_changeFollowers) { + commands.append(new ChangeStylesCommand(cf, m_origCharacterStyles, m_origParagraphStyles, m_changedStyles, this)); + } + } + + // Okay so now it's safe to change the styles and this should always be done foreach(KoCharacterStyle *newStyle, m_changedCharacterStyles) { int id = newStyle->styleId(); m_styleManager->characterStyle(id)->copyProperties(newStyle); @@ -65,11 +75,11 @@ } if (m_first) { + int i = 0; foreach(ChangeFollower *cf, m_changeFollowers) { - ChangeStylesCommand *cmd = new ChangeStylesCommand(cf, m_origCharacterStyles, m_origParagraphStyles, m_changedStyles, this); - //add and execute it's redo - KoTextDocument(cf->document()).textEditor()->addCommand(cmd); + KoTextDocument(cf->document()).textEditor()->addCommand(commands[i]); + i++; } m_first = false; } else { diff -Nru calligra-2.4.0/libs/kotext/inlinetextobject.desktop calligra-2.4.3/libs/kotext/inlinetextobject.desktop --- calligra-2.4.0/libs/kotext/inlinetextobject.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/kotext/inlinetextobject.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Inline Text Object Plugin Name[ca]=Connector d'objecte de text a la línia +Name[ca@valencia]=Connector d'objecte de text a la línia Name[da]=Plugin til indlejret tekstobjekt Name[de]=Mitfließendes-Textobjekt-Modul Name[el]=Πρόσθετο ενσωμάτωσης αντικειμένου κειμένου @@ -9,7 +10,7 @@ Name[et]=Tekstiobjekti plugin Name[fi]=Liitännäinen rivinsisäisiä tekstiobjekteja varten Name[fr]=Module externe d'objet de texte interne -Name[gl]=Extensión dos Obxectos de Contido Enlazado +Name[gl]=Engadido de obxectos de texto citado Name[hi]=इनलाइन पाठ वस्तु प्लगइन Name[hne]=इनलाइन पाठ चीज प्लगइन Name[it]=Estensione per oggetti di testo in linea @@ -36,6 +37,7 @@ X-KDE-ServiceType=Calligra/Text-InlineObject Comment=Definition of a text object Comment[ca]=Definició d'objecte de text +Comment[ca@valencia]=Definició d'objecte de text Comment[da]=Definition af et tekstobjekt Comment[de]=Definition eines Textobjektes Comment[el]=Ορισμός ενός αντικειμένου κειμένου diff -Nru calligra-2.4.0/libs/kotext/KoBookmark.cpp calligra-2.4.3/libs/kotext/KoBookmark.cpp --- calligra-2.4.0/libs/kotext/KoBookmark.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/kotext/KoBookmark.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -205,7 +205,7 @@ nodeName = "text:bookmark-end"; } writer->startElement(nodeName.toLatin1(), false); - writer->addAttribute("text:name", d->name.toLatin1()); + writer->addAttribute("text:name", d->name.toUtf8()); if (d->type == StartBookmark && inlineRdf()) { inlineRdf()->saveOdf(context, writer); diff -Nru calligra-2.4.0/libs/kotext/KoTableOfContentsGeneratorInfo.cpp calligra-2.4.3/libs/kotext/KoTableOfContentsGeneratorInfo.cpp --- calligra-2.4.0/libs/kotext/KoTableOfContentsGeneratorInfo.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/kotext/KoTableOfContentsGeneratorInfo.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -74,7 +74,7 @@ // index-entry-chapter // use null String if the style name is not present, it means that we inherit it from the parent IndexEntryChapter *entryChapter = new IndexEntryChapter(QString()); - entryChapter->display = "number-and-name"; + entryChapter->display = "number"; entryChapter->outlineLevel = level; tocEntryTemplate.indexEntries.append(static_cast(entryChapter)); diff -Nru calligra-2.4.0/libs/kotext/KoTextDocument.cpp calligra-2.4.3/libs/kotext/KoTextDocument.cpp --- calligra-2.4.0/libs/kotext/KoTextDocument.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/kotext/KoTextDocument.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -281,7 +281,7 @@ QVariant resource = m_document->resource(KoTextDocument::Selections, SelectionsURL); QVariantList variants = resource.toList(); - QVector selections(variants.size()); + QVector selections; foreach(const QVariant &variant, variants) { selections.append(variant.value()); } diff -Nru calligra-2.4.0/libs/kotext/KoTextEditingPlugin.cpp calligra-2.4.3/libs/kotext/KoTextEditingPlugin.cpp --- calligra-2.4.0/libs/kotext/KoTextEditingPlugin.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/kotext/KoTextEditingPlugin.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -110,7 +110,7 @@ return d->actionCollection; } -void KoTextEditingPlugin::setCurrentCursorPosition(const QTextDocument *document, int cursorPosition) +void KoTextEditingPlugin::setCurrentCursorPosition(QTextDocument *document, int cursorPosition) { Q_UNUSED(cursorPosition); Q_UNUSED(document); diff -Nru calligra-2.4.0/libs/kotext/KoTextEditingPlugin.h calligra-2.4.3/libs/kotext/KoTextEditingPlugin.h --- calligra-2.4.0/libs/kotext/KoTextEditingPlugin.h 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/kotext/KoTextEditingPlugin.h 2012-06-26 04:18:01.000000000 +0000 @@ -81,7 +81,7 @@ virtual void checkSection(QTextDocument *document, int startPosition, int endPosition); /// can be called when this plugin needs the current position of the textcursor - virtual void setCurrentCursorPosition(const QTextDocument *document, int cursorPosition); + virtual void setCurrentCursorPosition(QTextDocument *document, int cursorPosition); /** * Retrieves the entire collection of actions for the plugin diff -Nru calligra-2.4.0/libs/kotext/styles/KoListLevelProperties.cpp calligra-2.4.3/libs/kotext/styles/KoListLevelProperties.cpp --- calligra-2.4.0/libs/kotext/styles/KoListLevelProperties.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/kotext/styles/KoListLevelProperties.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -768,14 +768,6 @@ } } -static QString toPoint(qreal number) -{ - QString str; - str.setNum(number, 'f', DBL_DIG); - str += "pt"; - return str; -} - void KoListLevelProperties::saveOdf(KoXmlWriter *writer, KoShapeSavingContext &context) const { bool isNumber = KoListStyle::isNumberingStyle(d->stylesPrivate.value(QTextListFormat::ListStyle).toInt()); @@ -862,16 +854,16 @@ writer->addAttribute("text:list-level-position-and-space-mode","label-width-and-position"); if (d->stylesPrivate.contains(KoListStyle::Indent)) - writer->addAttribute("text:space-before", toPoint(indent())); + writer->addAttributePt("text:space-before", indent()); if (d->stylesPrivate.contains(KoListStyle::MinimumWidth)) - writer->addAttribute("text:min-label-width", toPoint(minimumWidth())); + writer->addAttributePt("text:min-label-width", minimumWidth()); if (d->stylesPrivate.contains(KoListStyle::Alignment)) writer->addAttribute("fo:text-align", KoText::alignmentToString(alignment())); if (d->stylesPrivate.contains(KoListStyle::MinimumDistance)) - writer->addAttribute("text:min-label-distance", toPoint(minimumDistance())); + writer->addAttributePt("text:min-label-distance", minimumDistance()); } else { writer->addAttribute("text:list-level-position-and-space-mode","label-alignment"); @@ -880,27 +872,26 @@ writer->startElement("style:list-level-label-alignment"); - KoUnit unit(KoUnit::Centimeter); if(labelFollowedBy()==KoListStyle::ListTab) { writer->addAttribute("text:label-followed-by","listtab"); - writer->addAttribute("text:list-tab-stop-position",unit.toUserStringValue(tabStopPosition())+"cm"); + writer->addAttributePt("text:list-tab-stop-position", tabStopPosition()); } else if (labelFollowedBy()==KoListStyle::Nothing){ writer->addAttribute("text:label-followed-by","nothing"); }else{ writer->addAttribute("text:label-followed-by","space"); } - writer->addAttribute("fo:text-indent",unit.toUserStringValue(textIndent())+"cm"); - writer->addAttribute("fo:margin-left",unit.toUserStringValue(margin())+"cm"); + writer->addAttributePt("fo:text-indent", textIndent()); + writer->addAttributePt("fo:margin-left", margin()); writer->endElement(); } if (d->stylesPrivate.contains(KoListStyle::Width)) { - writer->addAttribute("fo:width", toPoint(width())); + writer->addAttributePt("fo:width", width()); } if (d->stylesPrivate.contains(KoListStyle::Height)) { - writer->addAttribute("fo:height", toPoint(height())); + writer->addAttributePt("fo:height", height()); } writer->endElement(); // list-level-properties diff -Nru calligra-2.4.0/libs/kotext/texteditingplugin.desktop calligra-2.4.3/libs/kotext/texteditingplugin.desktop --- calligra-2.4.0/libs/kotext/texteditingplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/kotext/texteditingplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Text Editing plugin for the Calligra text tool Name[ca]=Connector d'edició de text per a l'eina de text del Calligra +Name[ca@valencia]=Connector d'edició de text per a l'eina de text del Calligra Name[cs]=Modul pro editaci textu nástroje Calligra pro úpravu textu Name[da]=Plugin til tekstredigering til Calligras tekstværktøj Name[de]=Modul zur Textbearbeitung für das Calligra-Textwerkzeug @@ -8,7 +9,9 @@ Name[es]=Complemento de edición de texto para la herramienta de texto de Calligra Name[et]=Calligra tekstitööriista teksti redigeerimise plugin Name[fr]=Module externe d'édition de texte pour l'outil texte de Calligra +Name[gl]=Engadido de edición de texto para a ferramenta de texto de Calligra Name[it]=Estensione di modifica del testo per lo strumento di testo di Calligra +Name[ja]=Calligra テキストツールのためのテキスト編集プラグイン Name[kk]=Calligra мәтін құралына арналған мәтін өңдеу плагині Name[nb]=Programtillegg for tekstredigering for Calligra tekstverktøy Name[nds]=Textbewerk-Moduul för dat Calligra-Textwarktüüch @@ -17,6 +20,7 @@ Name[pt]='Plugin' de edição de texto para a ferramenta de texto do Calligra Name[pt_BR]=Plugin de edição de texto para a ferramenta de texto do Calligra Name[ru]=Модуль редактирования текста для Calligra +Name[sk]=Plugin textového editora pre textový nástroj Calligra Name[sv]=Insticksprogram med textredigering för Calligra textverktyg Name[uk]=Додаток редагування тексту для текстового редактора Calligra Name[x-test]=xxText Editing plugin for the Calligra text toolxx @@ -26,6 +30,7 @@ X-KDE-ServiceType=Calligra/Text-EditingPlugin Comment=Definition of a text-editing plugin Comment[ca]=Definició d'un connector d'edició de text +Comment[ca@valencia]=Definició d'un connector d'edició de text Comment[da]=Definition af et plugin til tekstredigering Comment[de]=Definition eines Moduls zur Textbearbeitung Comment[el]=Καθορισμός ενός πρόσθετου επεξεργασίας κειμένου @@ -34,7 +39,7 @@ Comment[et]=Teksti redigeerimise plugina definitsioon Comment[fi]=Tekstinmuokkausliitännäisen määrittely Comment[fr]=Définition d'un module externe d'édition de texte -Comment[gl]=Definición dunha extensión de edición de texto +Comment[gl]=Definición dun engadido de edición de texto Comment[hi]=पाठ संपादन प्लगइन की परिभाषा Comment[hne]=पाठ संपादन प्लगइन के परिभासा Comment[it]=Definizione di un'estensione di modifica di testo diff -Nru calligra-2.4.0/libs/kotext/textvariableplugin.desktop calligra-2.4.3/libs/kotext/textvariableplugin.desktop --- calligra-2.4.0/libs/kotext/textvariableplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/kotext/textvariableplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Text Variable Plugin Name[bg]=Приставка за текстови променливи Name[ca]=Connector de variables de text +Name[ca@valencia]=Connector de variables de text Name[da]=Plugin til tekstvariable Name[de]=Textvariablen-Modul Name[el]=Πρόσθετο μεταβλητής κειμένου @@ -11,7 +12,7 @@ Name[fi]=Tekstimuuttujien liitännäinen Name[fr]=Module externe de texte variable Name[fy]=Fariabele tekst plugin -Name[gl]=Extensión de Variable de Texto +Name[gl]=Extensión de variable de texto Name[hi]=पाठ वेरिएबल प्लगइन Name[hne]=पाठ वेरिएबल प्लगइन Name[it]=Estensione per le variabili di testo @@ -38,6 +39,7 @@ Comment=A plugin that contains text variables Comment[bg]=Приставка, която съдържа текстови променливи Comment[ca]=Un connector que conté variables de text +Comment[ca@valencia]=Un connector que conté variables de text Comment[da]=Et plugin som indeholder tekstvariable Comment[de]=Ein Modul, das Textvariablen enthält Comment[el]=Ένα πρόσθετο που περιέχει μεταβλητές κειμένου @@ -46,7 +48,7 @@ Comment[et]=Teksti muutujaid sisaldav plugin Comment[fi]=Liitännäinen, joka sisältää tekstimuuttujia Comment[fr]=Module externe contenant des variables de texte -Comment[gl]=Unha extensión que contén variables de texto +Comment[gl]=Un engadido que contén variables de texto Comment[hi]=एक प्लगइन जिसमें पाठ वेरिएबल्स हैं Comment[hne]=एक प्लगइन जेमां पाठ वेरिएबल्स हे Comment[it]=Un'estensione contenente variabili di testo diff -Nru calligra-2.4.0/libs/main/calligradocker.desktop calligra-2.4.3/libs/main/calligradocker.desktop --- calligra-2.4.0/libs/main/calligradocker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/main/calligradocker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Calligra Docker Plugin Name[ca]=Connector amarrador del Calligra +Name[ca@valencia]=Connector amarrador del Calligra Name[cs]=Modul doků Calligra Name[da]=Dokker-plugin til Calligra Name[de]=Calligra Docker-Modul @@ -8,7 +9,9 @@ Name[es]=Complemento de ventana acoplable de Calligra Name[et]=Calligra dokkide plugin Name[fr]=Module externe de panneaux pour Calligra +Name[gl]=Engadido Calligra Docker Name[it]=Estensione per i ganci di Calligra +Name[ja]=Calligra ドッキングパネル・プラグイン Name[kk]=Calligra-ның докер плагині Name[nb]=Calligra dokker-programtillegg Name[nds]=Calligra-Dockermoduul @@ -17,6 +20,7 @@ Name[pt]='Plugin' de Área Acoplável do Calligra Name[pt_BR]=Plugin acoplável do Calligra Name[ru]=Модуль Calligra Docker +Name[sk]=Plugin Calligra docker Name[sv]=Calligra-dockningsinsticksprogram Name[uk]=Додаток панелі для Calligra Name[x-test]=xxCalligra Docker Pluginxx @@ -26,6 +30,7 @@ X-KDE-ServiceType=Calligra/Dock Comment=A plugin that contains a so called 'dockwidget' Comment[ca]=Un connector que en conté un anomenat «dockwidget» +Comment[ca@valencia]=Un connector que en conté un anomenat «dockwidget» Comment[da]=Et plugin som indeholder en såkaldt 'dock-kontrol' Comment[de]=Ein Modul, das ein sogenanntes „dockwidget“ enthält Comment[el]=Ένα πρόσθετο που περιέχει ένα γραφικό συστατικό προσάρτησης @@ -34,7 +39,7 @@ Comment[et]=Niinimetatud dokividinat sisaldav plugin Comment[fi]=Liitännäinen, joka sisältää ns. dock-elementin Comment[fr]=Module externe contenant un plasmoïde « panneau » -Comment[gl]=Unha extensión que contén o chamado 'dockwidget' +Comment[gl]=Un engadido que contén o chamado 'dockwidget' Comment[hi]=एक प्लगइन जिसमें तथाकथित 'डॉकविजेट' हैं Comment[hne]=एक प्लगइन जेमां तथाकथित 'डाकविजेट' हे Comment[it]=Un'estensione contenente un cosiddetto «oggetto agganciato» diff -Nru calligra-2.4.0/libs/main/calligraversion.h calligra-2.4.3/libs/main/calligraversion.h --- calligra-2.4.0/libs/main/calligraversion.h 2012-04-06 15:45:44.000000000 +0000 +++ calligra-2.4.3/libs/main/calligraversion.h 2012-06-26 04:22:03.000000000 +0000 @@ -33,7 +33,7 @@ * it contains the version at compile time. See Calligra::versionString() if you need * the Calligra version used at runtime. */ -#define CALLIGRA_VERSION_STRING "2.4.0" +#define CALLIGRA_VERSION_STRING "2.4.3" /** * @def CALLIGRA_VERSION_MAJOR @@ -54,7 +54,7 @@ * @ingroup CalligraMacros * @brief Release version of Calligra, at compile time */ -#define CALLIGRA_VERSION_RELEASE 0 +#define CALLIGRA_VERSION_RELEASE 3 /** * @ingroup CalligraMacros diff -Nru calligra-2.4.0/libs/main/calligraversion.h~ calligra-2.4.3/libs/main/calligraversion.h~ --- calligra-2.4.0/libs/main/calligraversion.h~ 2012-04-06 15:45:44.000000000 +0000 +++ calligra-2.4.3/libs/main/calligraversion.h~ 2012-06-26 04:22:03.000000000 +0000 @@ -33,7 +33,7 @@ * it contains the version at compile time. See Calligra::versionString() if you need * the Calligra version used at runtime. */ -#define CALLIGRA_VERSION_STRING "2.4 RC 2" +#define CALLIGRA_VERSION_STRING "2.4.2" /** * @def CALLIGRA_VERSION_MAJOR @@ -47,14 +47,14 @@ * @ingroup CalligraMacros * @brief Minor version of Calligra, at compile time */ -#define CALLIGRA_VERSION_MINOR 3 +#define CALLIGRA_VERSION_MINOR 4 /** * @def CALLIGRA_VERSION_RELEASE * @ingroup CalligraMacros * @brief Release version of Calligra, at compile time */ -#define CALLIGRA_VERSION_RELEASE 92 +#define CALLIGRA_VERSION_RELEASE 2 /** * @ingroup CalligraMacros @@ -84,7 +84,7 @@ * @ingroup CalligraMacros * @brief If defined, indicates at compile time that Calligra is in "release candidate" stage */ -#define CALLIGRA_RC 2 +// #define CALLIGRA_RC 2 /** * @ingroup CalligraMacros diff -Nru calligra-2.4.0/libs/main/kodocinfopropspage.desktop calligra-2.4.3/libs/main/kodocinfopropspage.desktop --- calligra-2.4.0/libs/main/kodocinfopropspage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/main/kodocinfopropspage.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Calligra Document Info Properties Page Name[bg]=Страница с данни за документ на Calligra Name[ca]=Pàgina d'informació de propietats de documents Calligra +Name[ca@valencia]=Pàgina d'informació de propietats de documents Calligra Name[cs]=Stránka s informacemi o dokumentu Calligra Name[da]=Egenskabsside for Calligra-dokumentinformation Name[de]=Calligra Dokumentinfo-Eigenschaftenseite @@ -10,7 +11,9 @@ Name[es]=Página de propiedades de información del documento de Calligra Name[et]=Calligra dokumendiinfo omaduste lehekülg Name[fr]=Page des propriétés d'un document Calligra +Name[gl]=Páxina de información das propiedades do documento de Calligra Name[it]=Pagina proprietà informazioni documento Calligra +Name[ja]=Calligra 文書情報プロパティページ Name[kk]=Calligra құжатының қасиеттер мәліметінің беті Name[nb]=Calligra dokumentinformasjonsside Name[nds]=Dokmentinformatschonen-Egenschappensiet för Calligra @@ -19,6 +22,7 @@ Name[pt]=Página de Propriedades do Documento do Calligra Name[pt_BR]=Página de propriedades do documento do Calligra Name[ru]=Страница сведений о документе Calligra +Name[sk]=Informačná strana dokumentu Calligra Name[sv]=Calligra-sida med dokumentinformation Name[uk]=Сторінка властивостей документу Calligra Name[x-test]=xxCalligra Document Info Properties Pagexx diff -Nru calligra-2.4.0/libs/main/KoDockerManager.cpp calligra-2.4.3/libs/main/KoDockerManager.cpp --- calligra-2.4.0/libs/main/KoDockerManager.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/main/KoDockerManager.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -176,6 +176,12 @@ d->showOptionsDocker = false; } +void KoDockerManager::setIcons(bool enabled) +{ + d->toolOptionsDocker->setLockEnabled(enabled); + d->toolOptionsDocker->setTabEnabled(enabled); +} + void KoDockerManager::resetToolDockerWidgets() { d->toolOptionsDocker->resetWidgets(); diff -Nru calligra-2.4.0/libs/main/KoDockerManager.h calligra-2.4.3/libs/main/KoDockerManager.h --- calligra-2.4.0/libs/main/KoDockerManager.h 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/main/KoDockerManager.h 2012-06-26 04:21:31.000000000 +0000 @@ -40,6 +40,9 @@ void removeToolOptionsDocker(); + /// sets the visibility of the tab and lock icons + void setIcons(bool enabled); + public slots: /** * Update the option widgets to the argument ones, removing the currently set widgets. diff -Nru calligra-2.4.0/libs/main/KoDocument.cpp calligra-2.4.3/libs/main/KoDocument.cpp --- calligra-2.4.0/libs/main/KoDocument.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoDocument.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -812,7 +812,7 @@ return d->docInfo; } -KoDocumentRdf *KoDocument::documentRdf() const +KoDocumentRdfBase *KoDocument::documentRdf() const { #ifdef SHOULD_BUILD_RDF if (d->docRdf && d->docRdf->model()) { @@ -1071,6 +1071,38 @@ return nwritten == (int)s.size(); } +QString KoDocument::checkImageMimeTypes(const QString &mimeType, const KUrl &url) const +{ + if (!url.isLocalFile()) return mimeType; + + QStringList imageMimeTypes; + imageMimeTypes << "image/jpeg" + << "image/x-psd" << "image/photoshop" << "image/x-photoshop" << "image/x-vnd.adobe.photoshop" << "image/vnd.adobe.photoshop" + << "image/x-portable-pixmap" << "image/x-portable-graymap" << "image/x-portable-bitmap" + << "application/pdf" + << "image/x-exr" + << "image/x-xcf" + << "image/x-eps" + << "image/x-nikon-nef" << "image/x-canon-cr2" << "image/x-sony-sr2" << "image/x-canon-crw" << "image/x-pentax-pef" << "image/x-sigma-x3f" << "image/x-kodak-kdc" << "image/x-minolta-mrw" << "image/x-sony-arw" << "image/x-kodak-k25" << "image/x-kodak-dcr" << "image/x-olympus-orf" << "image/x-panasonic-raw" << "image/x-panasonic-raw2" << "image/x-fuji-raf" << "image/x-sony-srf" << "image/x-adobe-dng" + << "image/png" + << "image/bmp" << "image/x-xpixmap" << "image/gif" << "image/x-xbitmap" + << "image/tiff" + << "image/openraster" + << "image/jp2"; + + if (!imageMimeTypes.contains(mimeType)) return mimeType; + + int accuracy = 0; + + QFile f(url.toLocalFile()); + f.open(QIODevice::ReadOnly); + QByteArray ba = f.read(qMin(f.size(), (qint64)512)); // should be enough for images + KMimeType::Ptr mime = KMimeType::findByContent(ba, &accuracy); + f.close(); + + return mime->name(); +} + // Called for embedded documents bool KoDocument::saveToStore(KoStore *_store, const QString & _path) { @@ -1401,12 +1433,13 @@ KUrl u(localFilePath()); QString typeName = arguments().mimeType(); - //kDebug(30003) << "mimetypes 1:" << typeName; if (typeName.isEmpty()) { typeName = KMimeType::findByUrl(u, 0, true)->name(); } - //kDebug(30003) << "mimetypes 2:" << typeName; + + // for images, always check content. + typeName = checkImageMimeTypes(typeName, u); // Sometimes it seems that arguments().mimeType() contains a much // too generic mime type. In that case, let's try some educated @@ -1414,7 +1447,7 @@ // // FIXME: Should we just ignore this and always call // KMimeType::findByUrl()? David Faure says that it's - // impossible for findByUrl() to fail ot initiate the + // impossible for findByUrl() to fail to initiate the // mimetype for "*.doc" to application/msword. This hints // that we should do that. But why does it happen like // this at all? diff -Nru calligra-2.4.0/libs/main/KoDocument.h calligra-2.4.3/libs/main/KoDocument.h --- calligra-2.4.0/libs/main/KoDocument.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoDocument.h 2012-06-26 04:21:31.000000000 +0000 @@ -595,7 +595,7 @@ * the RDF system and needs full access to the KoDocumentRdf object. * @see KoDocumentRdf */ - KoDocumentRdf *documentRdf() const; + KoDocumentRdfBase *documentRdf() const; /** * Replace the current rdf document with the given rdf document. The existing RDF document @@ -1060,6 +1060,7 @@ bool saveToStream(QIODevice *dev); + QString checkImageMimeTypes(const QString &mimeType, const KUrl& url) const; /// @return the current KoMainWindow shell KoMainWindow *currentShell(); diff -Nru calligra-2.4.0/libs/main/KoDocumentInfoDlg.cpp calligra-2.4.3/libs/main/KoDocumentInfoDlg.cpp --- calligra-2.4.0/libs/main/KoDocumentInfoDlg.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoDocumentInfoDlg.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -26,8 +26,10 @@ #include "KoDocumentInfo.h" #include "KoDocument.h" #include "KoMainWindow.h" + #include "rdf/KoDocumentRdfEditWidgetBase.h" #ifdef SHOULD_BUILD_RDF +#include "rdf/KoDocumentRdf.h" #include "rdf/KoDocumentRdfEditWidget.h" #endif @@ -68,7 +70,7 @@ QList m_pages; Ui::KoDocumentInfoAboutWidget* m_aboutUi; Ui::KoDocumentInfoAuthorWidget* m_authorUi; - KoDocumentRdf* m_rdf; + KoDocumentRdfBase* m_rdf; #ifdef SHOULD_BUILD_RDF KoDocumentRdfEditWidget* m_rdfEditWidget; #else @@ -80,7 +82,7 @@ }; -KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, KoDocumentRdf* docRdf) +KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, KoDocumentRdfBase* docRdf) : KPageDialog(parent) , d(new KoDocumentInfoDlgPrivate) { @@ -136,7 +138,7 @@ d->m_rdfEditWidget = 0; #ifdef SHOULD_BUILD_RDF - d->m_rdfEditWidget = new KoDocumentRdfEditWidget(this, d->m_rdf); + d->m_rdfEditWidget = new KoDocumentRdfEditWidget(this, (KoDocumentRdf*)d->m_rdf); page = new KPageWidgetItem(d->m_rdfEditWidget->widget(), i18n("Rdf")); page->setHeader(i18n("Rdf")); page->setIcon(KIcon("text-rdf")); diff -Nru calligra-2.4.0/libs/main/KoDocumentInfoDlg.h calligra-2.4.3/libs/main/KoDocumentInfoDlg.h --- calligra-2.4.0/libs/main/KoDocumentInfoDlg.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoDocumentInfoDlg.h 2012-06-26 04:21:31.000000000 +0000 @@ -24,7 +24,7 @@ #include class KoDocumentInfo; -class KoDocumentRdf; +class KoDocumentRdfBase; class KPageWidgetItem; /** @@ -55,7 +55,7 @@ * @param parent a pointer to the parent widget * @param docInfo a pointer to the shown KoDocumentInfo */ - KoDocumentInfoDlg(QWidget *parent, KoDocumentInfo* docInfo, KoDocumentRdf* docRdf = 0); + KoDocumentInfoDlg(QWidget *parent, KoDocumentInfo* docInfo, KoDocumentRdfBase* docRdf = 0); /** The destructor */ virtual ~KoDocumentInfoDlg(); diff -Nru calligra-2.4.0/libs/main/KoRulerController.cpp calligra-2.4.3/libs/main/KoRulerController.cpp --- calligra-2.4.0/libs/main/KoRulerController.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoRulerController.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -64,21 +64,18 @@ ruler->setShowTabs(false); return; } + QRectF activeRange = resourceManager->resource(KoCanvasResourceManager::ActiveRange).toRectF(); ruler->setOverrideActiveRange(activeRange.left(), activeRange.right()); - ruler->setShowIndents(true); - ruler->setShowTabs(true); lastPosition = block.position(); currentTabIndex = -2; tabList.clear(); QTextBlockFormat format = block.blockFormat(); - ruler->setShowIndents(true); ruler->setRightToLeft(block.layout()->textOption().textDirection() == Qt::RightToLeft); ruler->setParagraphIndent(format.leftMargin()); ruler->setFirstLineIndent(format.textIndent()); ruler->setEndIndent(format.rightMargin()); - ruler->setShowTabs(true); ruler->setRelativeTabs(relativeTabs()); QList tabs; @@ -98,6 +95,9 @@ tabStopDistance = block.document()->documentLayout()->defaultTabSpacing(); } */ ruler->updateTabs(tabs, tabStopDistance); + + ruler->setShowIndents(true); + ruler->setShowTabs(true); } void indentsChanged() { diff -Nru calligra-2.4.0/libs/main/KoRuler.cpp calligra-2.4.3/libs/main/KoRuler.cpp --- calligra-2.4.0/libs/main/KoRuler.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoRuler.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -43,6 +43,10 @@ void RulerTabChooser::mousePressEvent(QMouseEvent *) { + if (! m_showTabs) { + return; + } + switch(m_type) { case QTextOption::LeftTab: m_type = QTextOption::RightTab; @@ -62,6 +66,10 @@ void RulerTabChooser::paintEvent(QPaintEvent *) { + if (! m_showTabs) { + return; + } + QPainter painter(this); QPolygonF polygon; @@ -675,8 +683,6 @@ paintingStrategy(normalPaintingStrategy), ruler(parent) { - if(orientation == Qt::Horizontal) - tabChooser = new RulerTabChooser(parent); } KoRulerPrivate::~KoRulerPrivate() @@ -917,19 +923,25 @@ void KoRuler::setFirstLineIndent(qreal indent) { d->firstLineIndent = indent; - update(); + if (d->showIndents) { + update(); + } } void KoRuler::setParagraphIndent(qreal indent) { d->paragraphIndent = indent; - update(); + if (d->showIndents) { + update(); + } } void KoRuler::setEndIndent(qreal indent) { d->endIndent = indent; - update(); + if (d->showIndents) { + update(); + } } qreal KoRuler::firstLineIndent() const @@ -949,6 +961,11 @@ QWidget *KoRuler::tabChooser() { + if ((d->tabChooser == 0) && (d->orientation == Qt::Horizontal)) { + d->tabChooser = new RulerTabChooser(parentWidget()); + d->tabChooser->setShowTabs(d->showTabs); + } + return d->tabChooser; } @@ -969,18 +986,32 @@ void KoRuler::setShowTabs(bool show) { + if (d->showTabs == show) { + return; + } + d->showTabs = show; + if (d->tabChooser) { + d->tabChooser->setShowTabs(show); + } + update(); } void KoRuler::setRelativeTabs(bool relative) { d->relativeTabs = relative; + if (d->showTabs) { + update(); + } } void KoRuler::updateTabs(const QList &tabs, qreal tabDistance) { d->tabs = tabs; d->tabDistance = tabDistance; + if (d->showTabs) { + update(); + } } QList KoRuler::tabs() const @@ -1056,7 +1087,9 @@ tabpos = d->viewConverter->viewToDocumentX(pos.x() - d->offset) - d->effectiveActiveRangeStart() - (d->relativeTabs ? d->paragraphIndent : 0); } - Tab t = {tabpos, d->tabChooser->type()}; + Tab t = {tabpos, d->tabChooser ? d->tabChooser->type() : + d->rightToLeft ? QTextOption::RightTab : + QTextOption::LeftTab}; d->tabs.append(t); d->selectOffset = 0; d->selected = KoRulerPrivate::Tab; diff -Nru calligra-2.4.0/libs/main/KoRuler_p.h calligra-2.4.3/libs/main/KoRuler_p.h --- calligra-2.4.0/libs/main/KoRuler_p.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoRuler_p.h 2012-06-26 04:18:01.000000000 +0000 @@ -22,16 +22,18 @@ class RulerTabChooser : public QWidget { public: - RulerTabChooser(QWidget *parent) : QWidget(parent), m_type(QTextOption::LeftTab) {} + RulerTabChooser(QWidget *parent) : QWidget(parent), m_type(QTextOption::LeftTab), m_showTabs(false) {} virtual ~RulerTabChooser() {} inline QTextOption::TabType type() {return m_type;} + void setShowTabs(bool showTabs) { if (m_showTabs == showTabs) return; m_showTabs = showTabs; update(); } void mousePressEvent(QMouseEvent *); void paintEvent(QPaintEvent *); private: QTextOption::TabType m_type; + bool m_showTabs :1; }; class PaintingStrategy diff -Nru calligra-2.4.0/libs/main/KoToolDocker.cpp calligra-2.4.3/libs/main/KoToolDocker.cpp --- calligra-2.4.0/libs/main/KoToolDocker.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoToolDocker.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -40,14 +40,15 @@ #include #include #include +#include class KoToolDocker::Private { public: Private(KoToolDocker *dock) : q(dock) - ,tabbed(false) - ,hasTitle(false) - { + , tabbed(false) + , hasTitle(false) + { lockIcon = KIcon("object-locked"); unlockIcon = KIcon("object-unlocked"); tabIcon = KIcon("tab-new"); @@ -71,6 +72,7 @@ QToolButton *lockButton; QToolButton *tabButton; + void resetWidgets() { currentWidgetList.clear(); @@ -289,6 +291,16 @@ return !d->currentWidgetList.isEmpty(); } +void KoToolDocker::setLockEnabled(bool enabled) +{ + d->lockButton->setVisible(enabled); +} + +void KoToolDocker::setTabEnabled(bool enabled) +{ + d->tabButton->setVisible(enabled); +} + void KoToolDocker::setOptionWidgets(const QList &optionWidgetList) { d->recreateLayout(optionWidgetList); diff -Nru calligra-2.4.0/libs/main/KoToolDocker_p.h calligra-2.4.3/libs/main/KoToolDocker_p.h --- calligra-2.4.0/libs/main/KoToolDocker_p.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/main/KoToolDocker_p.h 2012-06-26 04:21:31.000000000 +0000 @@ -51,6 +51,16 @@ */ bool hasOptionWidget(); + /** + * set the lock option + */ + void setLockEnabled(bool enabled); + + /** + * set the tab option + */ + void setTabEnabled(bool enabled); + private: Q_PRIVATE_SLOT(d, void toggleLock()) Q_PRIVATE_SLOT(d, void toggleTab()) diff -Nru calligra-2.4.0/libs/odf/CMakeLists.txt calligra-2.4.3/libs/odf/CMakeLists.txt --- calligra-2.4.0/libs/odf/CMakeLists.txt 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/odf/CMakeLists.txt 2012-06-26 04:18:01.000000000 +0000 @@ -31,6 +31,7 @@ KoOdfDocument.cpp KoEmbeddedDocumentSaver.cpp KoBorder.cpp + Ko3dScene.cpp KoShadowStyle.cpp KoPageLayout.cpp KoPageFormat.cpp @@ -105,6 +106,7 @@ KoGenChanges.h KoEmbeddedDocumentSaver.h KoBorder.h + Ko3dScene.h KoShadowStyle.h KoPageLayout.h KoPageFormat.h diff -Nru calligra-2.4.0/libs/odf/Ko3dScene.cpp calligra-2.4.3/libs/odf/Ko3dScene.cpp --- calligra-2.4.0/libs/odf/Ko3dScene.cpp 1970-01-01 00:00:00.000000000 +0000 +++ calligra-2.4.3/libs/odf/Ko3dScene.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -0,0 +1,330 @@ +/* This file is part of the KDE project + * + * Copyright (C) 2012 Inge Wallin + * + * 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; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +// Own +#include "Ko3dScene.h" + +// KDE +#include + +// Calligra +#include +#include +#include + + +static QVector3D odfToVector3D(QString &string); + + + +// ---------------------------------------------------------------- +// Ko3dScene::Private + + +class Ko3dScene::Private +{ +public: + Private() {}; + ~Private() {}; + + // Camera attributes + QVector3D vrp; // Camera origin + QVector3D vpn; // Camera direction + QVector3D vup; // Up direction + Projection projection; + QString distance; + QString focalLength; + QString shadowSlant; + + // Rendering attributes + Shademode shadeMode; + QColor ambientColor; + bool lightingMode; // True: enable lights, false: disable lights + QString transform; + + // Lightsources (these are children of the element, not attributes) + QList lights; +}; + + +// ---------------------------------------------------------------- +// Lightsource + + +Ko3dScene::Lightsource::Lightsource() +{ +} + +Ko3dScene::Lightsource::~Lightsource() +{ +} + + +// getters +QColor Ko3dScene::Lightsource::diffuseColor() const { return m_diffuseColor; } +QVector3D Ko3dScene::Lightsource::direction() const { return m_direction; } +bool Ko3dScene::Lightsource::enabled() const { return m_enabled; } +bool Ko3dScene::Lightsource::specular() const { return m_specular; } + +// setters +void +Ko3dScene::Lightsource::setDiffuseColor(const QColor &color) +{ + m_diffuseColor = color; +} + +void +Ko3dScene::Lightsource::setDirection(const QVector3D &direction) +{ + m_direction = direction; +} + +void +Ko3dScene::Lightsource::setEnabled(const bool enabled) +{ + m_enabled = enabled; +} + +void +Ko3dScene::Lightsource::setSpecular(const bool specular) +{ + m_specular = specular; +} + + +bool Ko3dScene::Lightsource::loadOdf(const KoXmlElement &lightElement) +{ + m_diffuseColor = QColor(lightElement.attributeNS(KoXmlNS::dr3d, "diffuse-color", "#ffffff")); + QString direction = lightElement.attributeNS(KoXmlNS::dr3d, "direction"); + m_direction = odfToVector3D(direction); + m_enabled = (lightElement.attributeNS(KoXmlNS::dr3d, "enabled") == "true"); + m_specular = (lightElement.attributeNS(KoXmlNS::dr3d, "specular") == "true"); + + return true; +} + +void Ko3dScene::Lightsource::saveOdf(KoXmlWriter &writer) const +{ + writer.startElement("dr3d:light"); + + writer.addAttribute("dr3d:diffuse-color", m_diffuseColor.name()); + writer.addAttribute("dr3d:direction", QString("(%1 %2 %3)").arg(m_direction.x()) + .arg(m_direction.y()).arg(m_direction.z())); + writer.addAttribute("dr3d:enabled", m_enabled); + writer.addAttribute("dr3d:specular", m_specular); + + writer.endElement(); // dr3d:light +} + + +// ---------------------------------------------------------------- +// Ko3dScene + + +Ko3dScene::Ko3dScene() + : d(new Private()) +{ +} + +Ko3dScene::~Ko3dScene() +{ + delete d; +} + + +// getters +QVector3D Ko3dScene::vrp() const { return d->vrp; } +QVector3D Ko3dScene::vpn() const { return d->vpn; } +QVector3D Ko3dScene::vup() const { return d->vup; } +Ko3dScene::Projection Ko3dScene::projection() const { return d->projection; } +QString Ko3dScene::distance() const { return d->distance; } +QString Ko3dScene::focalLength() const { return d->focalLength; } +QString Ko3dScene::shadowSlant() const { return d->shadowSlant; } +Ko3dScene::Shademode Ko3dScene::shadeMode() const { return d->shadeMode; } +QColor Ko3dScene::ambientColor() const { return d->ambientColor; } +bool Ko3dScene::lightingMode() const { return d->lightingMode; } +QString Ko3dScene::transform() const { return d->transform; } + + // setters +void Ko3dScene::setVrp(QVector3D vrp) { d->vrp = vrp; } +void Ko3dScene::setVpn(QVector3D vpn) { d->vpn = vpn; } +void Ko3dScene::setVup(QVector3D vup) { d->vup = vup; } +void Ko3dScene::setProjection(Projection projection) { d->projection = projection; } +void Ko3dScene::setDistance(QString distance) { d->distance = distance; } +void Ko3dScene::setFocalLength(QString focalLength) { d->focalLength = focalLength; } +void Ko3dScene::setShadowSlant(QString shadowSlant) { d->shadowSlant = shadowSlant; } +void Ko3dScene::setShadeMode(Shademode shadeMode) { d->shadeMode = shadeMode; } +void Ko3dScene::setAmbientColor(QColor ambientColor) { d->ambientColor = ambientColor; } +void Ko3dScene::setLightingMode(bool lightingMode) { d->lightingMode = lightingMode; } +void Ko3dScene::setTransform(QString transform) { d->transform = transform; } + + +bool Ko3dScene::loadOdf(const KoXmlElement &sceneElement) +{ + QString dummy; + + // Check if there is a 3d scene at all in this element. We + // approximate that by checking if there are any camera parameters. + if (!sceneElement.hasAttributeNS(KoXmlNS::dr3d, "vrp") + && !sceneElement.hasAttributeNS(KoXmlNS::dr3d, "vpn") + && !sceneElement.hasAttributeNS(KoXmlNS::dr3d, "vup")) + { + return false; + } + + // 1. Load the scene attributes. + + // Camera attributes + dummy = sceneElement.attributeNS(KoXmlNS::dr3d, "vrp"); + d->vrp = odfToVector3D(dummy); + dummy = sceneElement.attributeNS(KoXmlNS::dr3d, "vpn"); + d->vpn = odfToVector3D(dummy); + dummy = sceneElement.attributeNS(KoXmlNS::dr3d, "vup", "(0.0 0.0 1.0)"); + d->vup = odfToVector3D(dummy); + + dummy = sceneElement.attributeNS(KoXmlNS::dr3d, "projection", "perspective"); + if (dummy == "parallel") { + d->projection = Parallel; + } + else { + d->projection = Perspective; + } + + d->distance = sceneElement.attributeNS(KoXmlNS::dr3d, "distance"); + d->focalLength = sceneElement.attributeNS(KoXmlNS::dr3d, "focal-length"); + d->shadowSlant = sceneElement.attributeNS(KoXmlNS::dr3d, "shadow-slant"); + d->ambientColor = QColor(sceneElement.attributeNS(KoXmlNS::dr3d, "ambient-color", "#888888")); + + // Rendering attributes + dummy = sceneElement.attributeNS(KoXmlNS::dr3d, "shade-mode", "gouraud"); + if (dummy == "flat") { + d->shadeMode = Flat; + } + else if (dummy == "phong") { + d->shadeMode = Phong; + } + else if (dummy == "draft") { + d->shadeMode = Draft; + } + else { + d->shadeMode = Gouraud; + } + + d->lightingMode = (sceneElement.attributeNS(KoXmlNS::dr3d, "lighting-mode") == "true"); + d->transform = sceneElement.attributeNS(KoXmlNS::dr3d, "transform"); + + // 2. Load the light sources. + + // From the ODF 1.1 spec section 9.4.1: + KoXmlElement elem; + forEachElement(elem, sceneElement) { + if (elem.localName() == "light" && elem.namespaceURI() == KoXmlNS::dr3d) { + Lightsource light; + light.loadOdf(elem); + d->lights.append(light); + } + } + + //kDebug(31000) << "Lights:" << d->lights.size(); + + return true; +} + +void Ko3dScene::saveOdfAttributes(KoXmlWriter &writer) const +{ + // 1. Write scene attributes + // Camera attributes + writer.addAttribute("dr3d:vrp", QString("(%1 %2 %3)").arg(d->vrp.x()) + .arg(d->vrp.y()).arg(d->vrp.z())); + writer.addAttribute("dr3d:vpn", QString("(%1 %2 %3)").arg(d->vpn.x()) + .arg(d->vpn.y()).arg(d->vpn.z())); + writer.addAttribute("dr3d:vup", QString("(%1 %2 %3)").arg(d->vup.x()) + .arg(d->vup.y()).arg(d->vup.z())); + + writer.addAttribute("dr3d:projection", (d->projection == Parallel) ? "parallel" : "perspective"); + + writer.addAttribute("dr3d:distance", d->distance); + writer.addAttribute("dr3d:focal-length", d->focalLength); + writer.addAttribute("dr3d:shadow-slant", d->shadowSlant); + writer.addAttribute("dr3d:ambient-color", d->ambientColor.name()); + + // Rendering attributes + switch (d->shadeMode) { + case Flat: + writer.addAttribute("dr3d:shade-mode", "flat"); + break; + case Phong: + writer.addAttribute("dr3d:shade-mode", "phong"); + break; + case Draft: + writer.addAttribute("dr3d:shade-mode", "draft"); + break; + case Gouraud: + default: + writer.addAttribute("dr3d:shade-mode", "gouraud"); + break; + } + + writer.addAttribute("dr3d:lighting-mode", d->lightingMode); + writer.addAttribute("dr3d:transform", d->transform); +} + + +void Ko3dScene::saveOdfChildren(KoXmlWriter &writer) const +{ + // Write light sources. + foreach (const Lightsource &light, d->lights) { + light.saveOdf(writer); + } +} + + +// ---------------------------------------------------------------- +// Public functions + + +KOODF_EXPORT Ko3dScene *load3dScene(const KoXmlElement &element) +{ + Ko3dScene *scene = new Ko3dScene(); + + if (scene->loadOdf(element)) { + return scene; + } + + delete scene; + return 0; +} + + +// ---------------------------------------------------------------- +// Static functions + + +QVector3D odfToVector3D(QString &string) +{ + // The string comes into this function in the form "(0 3.5 0.3)". + QStringList elements = string.mid(1, string.size() - 2).split(' ', QString::SkipEmptyParts); + if (elements.size() == 3) { + return QVector3D(elements[0].toDouble(), elements[1].toDouble(), elements[2].toDouble()); + } + else { + return QVector3D(0, 0, 1); + } +} diff -Nru calligra-2.4.0/libs/odf/Ko3dScene.h calligra-2.4.3/libs/odf/Ko3dScene.h --- calligra-2.4.0/libs/odf/Ko3dScene.h 1970-01-01 00:00:00.000000000 +0000 +++ calligra-2.4.3/libs/odf/Ko3dScene.h 2012-06-26 04:21:31.000000000 +0000 @@ -0,0 +1,142 @@ +/* This file is part of the KDE project + * + * Copyright (C) 2012 Inge Wallin + * + * 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; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef KO3DSCENE_H +#define KO3DSCENE_H + +// Qt +#include +#include +#include +#include + +class KoXmlWriter; +class KoXmlElement; + + +/** A scene in which to show 3d objects. + * + * The scene parameters include camera parameters (origin, direction + * and up direction), the projection to be used and a shadow + * slant. All these are attributes of the element. + * + * The scene can also have a number of light sources as child + * elements. These are picked up from the XML element but others are + * ignored and have to be loaded by code that handles the actual + * element. + * + * In ODF 1.2, a scene description can be part of a dr3d:scene or + * chart:plot-area if the chart also has 3D mode set. + */ + + +#include "koodf_export.h" + + +class KOODF_EXPORT Ko3dScene +{ +public: + enum Projection { + Parallel, + Perspective + }; + + enum Shademode { + Flat, + Gouraud, + Phong, + Draft // Wireframe + }; + + class Lightsource + { + public: + Lightsource(); + ~Lightsource(); + + bool loadOdf(const KoXmlElement &lightElement); + void saveOdf(KoXmlWriter &writer) const; + + // getters + QColor diffuseColor() const; + QVector3D direction() const; + bool enabled() const; + bool specular() const; + + // setters + void setDiffuseColor(const QColor &color); + void setDirection(const QVector3D &direction); + void setEnabled(const bool enabled); + void setSpecular(const bool specular); + + private: + QColor m_diffuseColor; + QVector3D m_direction; + bool m_enabled; + bool m_specular; + }; + + Ko3dScene(); + ~Ko3dScene(); + + bool loadOdf(const KoXmlElement &sceneElement); + void saveOdfAttributes(KoXmlWriter &writer) const; + void saveOdfChildren(KoXmlWriter &writer) const; + + // getters + QVector3D vrp() const; + QVector3D vpn() const; + QVector3D vup() const; + Projection projection() const; + QString distance() const; + QString focalLength() const; + QString shadowSlant() const; + Shademode shadeMode() const; + QColor ambientColor() const; + bool lightingMode() const; + QString transform() const; + + // setters + void setVrp(QVector3D vrp); + void setVpn(QVector3D vpn); + void setVup(QVector3D vup); + void setProjection(Projection projection); + void setDistance(QString distance); + void setFocalLength(QString focalLength); + void setShadowSlant(QString shadowSlant); + void setShadeMode(Shademode shadeMode); + void setAmbientColor(QColor ambientColor); + void setLightingMode(bool lightingMode); + void setTransform(QString transform); + +private: + class Private; + Private *d; + +}; + + +/** Try to load a 3d scene from an element and return a pointer to a + * Ko3dScene if it succeeded. + */ +Ko3dScene *load3dScene(const KoXmlElement &element); + + +#endif diff -Nru calligra-2.4.0/libs/odf/KoGenChanges.cpp calligra-2.4.3/libs/odf/KoGenChanges.cpp --- calligra-2.4.0/libs/odf/KoGenChanges.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/odf/KoGenChanges.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -103,7 +103,7 @@ xmlWriter->startElement("delta:tracked-changes"); } else { xmlWriter->startElement("text:tracked-changes"); - xmlWriter->addAttribute("track-changes", trackChanges); + xmlWriter->addAttribute("text:track-changes", trackChanges); } for (; it != d->changeMap.constEnd() ; ++it) { diff -Nru calligra-2.4.0/libs/odf/KoXmlWriter.h calligra-2.4.3/libs/odf/KoXmlWriter.h --- calligra-2.4.0/libs/odf/KoXmlWriter.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/odf/KoXmlWriter.h 2012-06-26 04:18:01.000000000 +0000 @@ -252,6 +252,14 @@ Tag(const char* t = 0, bool ind = true) : tagName(t), hasChildren(false), lastChildIsText(false), openingTagClosed(false), indentInside(ind) {} + Tag(const Tag &original) + { + tagName = original.tagName; + hasChildren = original.hasChildren; + lastChildIsText = original.lastChildIsText; + openingTagClosed = original.openingTagClosed; + indentInside = original.indentInside; + } const char* tagName; bool hasChildren : 1; ///< element or text children bool lastChildIsText : 1; ///< last child is a text node diff -Nru calligra-2.4.0/libs/pigment/KoBasicHistogramProducers.cpp calligra-2.4.3/libs/pigment/KoBasicHistogramProducers.cpp --- calligra-2.4.0/libs/pigment/KoBasicHistogramProducers.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/pigment/KoBasicHistogramProducers.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -455,23 +455,23 @@ } -void KoGenericLabHistogramProducer::addRegionToBin(const quint8 * pixels, const quint8 * selectionMask, quint32 nPixels, const KoColorSpace *cs) +void KoGenericLabHistogramProducer::addRegionToBin(const quint8 *pixels, const quint8 *selectionMask, quint32 nPixels, const KoColorSpace *cs) { for (int i = 0; i < m_channels; i++) { m_outRight[i] = 0; m_outLeft[i] = 0; } - quint8 dst[8]; + qint32 dstPixelSize = m_colorSpace->pixelSize(); + + quint8 *dstPixels = new quint8[nPixels * dstPixelSize]; + cs->convertPixelsTo(pixels, dstPixels, m_colorSpace, nPixels); + qint32 pSize = cs->pixelSize(); if (selectionMask) { while (nPixels > 0) { if (!((m_skipUnselected && *selectionMask == 0) || (m_skipTransparent && cs->opacityU8(pixels) == OPACITY_TRANSPARENT_U8))) { - /* - cs->toQColor(pixels, &c); - m_bins.at(0).at(c.red())++; - */ m_count++; } pixels += pSize; @@ -479,19 +479,21 @@ nPixels--; } } else { + quint8 *dst = dstPixels; while (nPixels > 0) { if (!(m_skipTransparent && cs->opacityU8(pixels) == OPACITY_TRANSPARENT_U8)) { - cs->convertPixelsTo(pixels, dst, m_colorSpace, 1); m_bins[0][m_colorSpace->scaleToU8(dst, 0)]++; m_bins[1][m_colorSpace->scaleToU8(dst, 1)]++; m_bins[2][m_colorSpace->scaleToU8(dst, 2)]++; m_count++; } - pixels += pSize; + dst+= dstPixelSize; nPixels--; } } + delete[] dstPixels; } + diff -Nru calligra-2.4.0/libs/pigment/KoCompositeOp.h calligra-2.4.3/libs/pigment/KoCompositeOp.h --- calligra-2.4.0/libs/pigment/KoCompositeOp.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/pigment/KoCompositeOp.h 2012-06-26 04:21:31.000000000 +0000 @@ -79,7 +79,7 @@ * @param userVisible define whether or not that composite op should be visible in an user * interface */ - KoCompositeOp(const KoColorSpace * cs, const QString& id, const QString& description, const QString & categoryMisc = categoryMisc()); + KoCompositeOp(const KoColorSpace * cs, const QString& id, const QString& description, const QString & category = categoryMisc()); virtual ~KoCompositeOp(); /** diff -Nru calligra-2.4.0/libs/pigment/pigment.desktop calligra-2.4.3/libs/pigment/pigment.desktop --- calligra-2.4.0/libs/pigment/pigment.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/pigment/pigment.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Comment=A module implementing a complete colorspace for use with Pigment Color Manipulation System Comment[bg]=Модул, реализиращ пълна цветова гама за употреба с Pigment Color Manipulation System Comment[ca]=Un mòdul que implementa un espai de colors complet per a usar-lo amb el Sistema de Manipulació Pigment Color +Comment[ca@valencia]=Un mòdul que implementa un espai de colors complet per a usar-lo amb el Sistema de Manipulació Pigment Color Comment[da]=Et modul som implementerer et komplet farveområde til brug med Pigment Color Manipulation System Comment[de]=Ein Modul, das einen kompletten Farbraum zur Benutzung mit dem „Pigment Color Manipulation System“ implementiert Comment[el]=Ένα άρθρωμα που υλοποιεί έναν πλήρη χρωματικό χώρο με χρήση του συστήματος χειρισμού χρωμάτων βαφής diff -Nru calligra-2.4.0/libs/pigment/pigmentextension.desktop calligra-2.4.3/libs/pigment/pigmentextension.desktop --- calligra-2.4.0/libs/pigment/pigmentextension.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/pigment/pigmentextension.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Comment=A module implementing an extension to a colorspace of the Pigment Color Manipulation System Comment[bg]=Модул, реализиращ пълна цветова гама за употреба с Pigment Color Manipulation System Comment[ca]=Un mòdul que implementa una extensió a un espai de colors del Sistema de Manipulació Pigment Color +Comment[ca@valencia]=Un mòdul que implementa una extensió a un espai de colors del Sistema de Manipulació Pigment Color Comment[da]=Et modul som implementerer et udvidelse til et farveområde til Pigment Color Manipulation System Comment[de]=Ein Modul, das eine Erweiterung eines Farbraums zur Benutzung mit dem „Pigment Color Manipulation System“ implementiert Comment[el]=Ένα άρθρωμα που υλοποιεί μια επέκταση σε έναν χρωματικό χώρο με χρήση του συστήματος χειρισμού χρωμάτων βαφής @@ -13,7 +14,7 @@ Comment[fi]=Moduli, joka laajentaa Pigment Color Manipulation System -väriavaruuden laajennuksen Comment[fr]=Un module implantant une extension à un espace de couleurs d'un système de manipulation des pigment de couleurs Comment[fy]=In útwreiding dy't in folslein kleurgebiet ymplementearret dat brûkt kin wurde mei libkritacolor -Comment[gl]=Um módulo que define unha extensión para os espazos de cores para o seu uso co Sistema de Manipulación dos Pigmentos de Cores +Comment[gl]=Un módulo que complementa un engadido para os espazos de cores para o seu uso co sistema de manipulación dos pigmentos de cores Comment[it]=Un modulo che implementa un'estensione a uno spazio di colori da usare con il sistema di manipolazione dei colori di Pigment Comment[kk]=Пигмент түсімен айналасу жүйесінің түстер кеңістігінің кеңейтуін іске асыратын модулі Comment[nb]=En modul som implementerer en utvidelse til et fargerom for Pigment Color Manipulation System diff -Nru calligra-2.4.0/libs/pigment/resources/KoColorSet.cpp calligra-2.4.3/libs/pigment/resources/KoColorSet.cpp --- calligra-2.4.0/libs/pigment/resources/KoColorSet.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/pigment/resources/KoColorSet.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -29,30 +29,6 @@ #include "KoColorSpaceRegistry.h" -/* -KoColorSet::KoColorSet(const KisGradient * gradient, qint32 nColors, const QString & name) - : KoResource(QString("")), - m_name(name) -{ - Q_ASSERT(nColors > 0); - Q_ASSERT(gradient != 0); - - qreal dx, cur_x; - qint32 i; - dx = 1.0 / (nColors - 1); - - KoColorSetEntry e; - KoColor c; - for (i = 0, cur_x = 0; i < nColors; i++, cur_x += dx) { - gradient->colorAt(c,cur_x); - e.color = c; - e.name = "Untitled"; - add(e); - } - - m_columns = 0; // Set the default value that the GIMP uses... -} -*/ KoColorSet::KoColorSet(const QString& filename) : KoResource(filename) { @@ -126,6 +102,7 @@ bool KoColorSet::init() { + m_colors.clear(); // just in case this is a reload (eg by KoEditColorSetDialog), QString s = QString::fromUtf8(m_data.data(), m_data.count()); diff -Nru calligra-2.4.0/libs/pigment/resources/KoColorSet.h calligra-2.4.3/libs/pigment/resources/KoColorSet.h --- calligra-2.4.0/libs/pigment/resources/KoColorSet.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/pigment/resources/KoColorSet.h 2012-06-26 04:18:01.000000000 +0000 @@ -19,6 +19,7 @@ #ifndef KOCOLORSET #define KOCOLORSET +#include #include #include #include @@ -42,8 +43,9 @@ * Open Gimp, Photoshop or RIFF palette files. This is a straight port * from the Gimp. */ -class PIGMENTCMS_EXPORT KoColorSet : public KoResource +class PIGMENTCMS_EXPORT KoColorSet : public QObject, public KoResource { + Q_OBJECT public: /** * Load a color set from a file. This can be a Gimp diff -Nru calligra-2.4.0/libs/textlayout/KoTextLayoutArea_paint.cpp calligra-2.4.3/libs/textlayout/KoTextLayoutArea_paint.cpp --- calligra-2.4.0/libs/textlayout/KoTextLayoutArea_paint.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/textlayout/KoTextLayoutArea_paint.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -934,11 +934,14 @@ for (int i = searchForCharFrom ; i < searchForCharTill; i++) { if (currentTabStop >= tabList.size() && !showFormattingCharacters) // no more decorations break; - qreal x1 = line.cursorToX(startOfFragmentInBlock + i); - qreal x2 = line.cursorToX(startOfFragmentInBlock + i + 1); if (fragText[i] == '\t') { + qreal x1; + qreal x2; + if (showFormattingCharacters) { + x1 = line.cursorToX(startOfFragmentInBlock + i); + x2 = line.cursorToX(startOfFragmentInBlock + i + 1); qreal y = line.position().y() + line.ascent() - fm.xHeight()/2.0; qreal arrowDim = fm.xHeight()/2.0; QPen penBackup = painter->pen(); @@ -962,7 +965,16 @@ // comparing with x1 should work for all of left/right/center/char tabs } while (tab.position <= x1 && currentTabStop < tabList.size()); + if (!showFormattingCharacters) { + // only then was it not calculated + x1 = line.cursorToX(startOfFragmentInBlock + i); + } + if (tab.position > x1) { + if (!showFormattingCharacters) { + // only then was it not calculated + x2 = line.cursorToX(startOfFragmentInBlock + i + 1); + } qreal tabStyleLeftLineMargin = tabStyleLineMargin; qreal tabStyleRightLineMargin = tabStyleLineMargin; // no margin if its adjacent char is also a tab @@ -988,11 +1000,16 @@ } } } else if (showFormattingCharacters) { - qreal y = line.position().y() + line.ascent(); if (fragText[i] == ' ' || fragText[i] == QChar::Nbsp) { - painter->drawText(QPointF(x1, y), QChar((ushort)0xb7)); + qreal x = line.cursorToX(startOfFragmentInBlock + i); + qreal y = line.position().y() + line.ascent(); + + painter->drawText(QPointF(x, y), QChar((ushort)0xb7)); } else if (fragText[i] == QChar::LineSeparator){ - painter->drawText(QPointF(x1, y), QChar((ushort)0x21B5)); + qreal x = line.cursorToX(startOfFragmentInBlock + i); + qreal y = line.position().y() + line.ascent(); + + painter->drawText(QPointF(x, y), QChar((ushort)0x21B5)); } } } diff -Nru calligra-2.4.0/libs/textlayout/KoTextLayoutCellHelper.cpp calligra-2.4.3/libs/textlayout/KoTextLayoutCellHelper.cpp --- calligra-2.4.0/libs/textlayout/KoTextLayoutCellHelper.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/textlayout/KoTextLayoutCellHelper.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -45,7 +45,7 @@ void KoTextLayoutCellHelper::drawHorizontalWave(KoBorder::BorderStyle style, QPainter &painter, qreal x, qreal w, qreal t) const { QPen pen = painter.pen(); - const qreal linewidth = pen.width(); + const qreal linewidth = pen.widthF(); const qreal penwidth = linewidth/6; pen.setWidth(penwidth); painter.setPen(pen); @@ -262,7 +262,7 @@ } const KoBorder::BorderData &edge = paintThis ? m_cellStyle.getEdge(KoBorder::Bottom) : styleBelow.getEdge(KoBorder::Top); - const KoBorder::BorderStyle borderStyle = paintThis ? m_cellStyle.getBorderStyle(KoBorder::Bottom): m_cellStyle.getBorderStyle(KoBorder::Top); + const KoBorder::BorderStyle borderStyle = paintThis ? m_cellStyle.getBorderStyle(KoBorder::Bottom): styleBelow.getBorderStyle(KoBorder::Top); qreal t=y; if (edge.outerPen.widthF() > 0) { @@ -304,7 +304,7 @@ } else { painter.drawLine(QLineF(x, t, x+w, t)); } - t = y - m_cellStyle.getEdge(KoBorder::Bottom).spacing - pen.widthF(); + t = y + m_cellStyle.getEdge(KoBorder::Bottom).spacing + pen.widthF(); } else if (accumulatedBlankBorders) { // No border but we'd like to draw one for user convenience when on screen accumulatedBlankBorders->append(QLineF(x, t, x+w, t)); @@ -315,7 +315,7 @@ if (m_cellStyle.getEdge(KoBorder::Bottom).innerPen.widthF() > 0) { QPen pen = m_cellStyle.getEdge(KoBorder::Bottom).innerPen; painter.setPen(pen); - t -= pen.widthF() / 2.0; + t += pen.widthF() / 2.0; if(isSpeciallyDrawn(m_cellStyle.getBorderStyle(KoBorder::Bottom))) { drawHorizontalWave(m_cellStyle.getBorderStyle(KoBorder::Bottom), painter,x,w,t); } else { @@ -407,8 +407,8 @@ painter.setPen(pen); l += pen.widthF() / 2.0; - if(isSpeciallyDrawn(m_cellStyle.getBorderStyle(KoBorder::Left))) { - drawVerticalWave(m_cellStyle.getBorderStyle(KoBorder::Left), painter,y,h,l); + if(isSpeciallyDrawn(styleRight.getBorderStyle(KoBorder::Left))) { + drawVerticalWave(styleRight.getBorderStyle(KoBorder::Left), painter,y,h,l); } else { painter.drawLine(QLineF(l, y, l, y+h)); } @@ -419,8 +419,8 @@ QPen pen = styleRight.getEdge(KoBorder::Left).innerPen; painter.setPen(pen); l += pen.widthF() / 2.0; - if(isSpeciallyDrawn(m_cellStyle.getBorderStyle(KoBorder::Left))) { - drawVerticalWave(m_cellStyle.getBorderStyle(KoBorder::Left), painter,y,h,l); + if(isSpeciallyDrawn(styleRight.getBorderStyle(KoBorder::Left))) { + drawVerticalWave(styleRight.getBorderStyle(KoBorder::Left), painter,y,h,l); } else { painter.drawLine(QLineF(l, y, l, y+h)); } @@ -443,7 +443,7 @@ } else { painter.drawLine(QLineF(l, y, l, y+h)); } - l += m_cellStyle.getEdge(KoBorder::Right).spacing - pen.widthF() / 2.0; + l += m_cellStyle.getEdge(KoBorder::Right).spacing + pen.widthF() / 2.0; } else if (accumulatedBlankBorders) { // No border but we'd like to draw one for user convenience when on screen accumulatedBlankBorders->append(QLineF(l, y, l, y+h)); diff -Nru calligra-2.4.0/libs/textlayout/KoTextLayoutCellHelper.h calligra-2.4.3/libs/textlayout/KoTextLayoutCellHelper.h --- calligra-2.4.0/libs/textlayout/KoTextLayoutCellHelper.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/textlayout/KoTextLayoutCellHelper.h 2012-06-26 04:18:01.000000000 +0000 @@ -25,14 +25,16 @@ #ifndef KOTEXTLAYOUTCELLHELPER_H #define KOTEXTLAYOUTCELLHELPER_H -#include +#include "textlayout_export.h" + #include #include -class KoTableBorderStyle; +#include + class QPainter; -class KoTextLayoutCellHelper : public QObject +class TEXTLAYOUT_EXPORT KoTextLayoutCellHelper : public QObject { Q_OBJECT public: diff -Nru calligra-2.4.0/libs/textlayout/KoTextLayoutTableArea.cpp calligra-2.4.3/libs/textlayout/KoTextLayoutTableArea.cpp --- calligra-2.4.0/libs/textlayout/KoTextLayoutTableArea.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/textlayout/KoTextLayoutTableArea.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -232,24 +232,22 @@ bool complete = first; qreal topBorderWidth = 0; qreal bottomBorderWidth = 0; - qreal nextTopBorderWidth = 0; - - collectBorderThicknesss(cursor->row - 1, topBorderWidth, nextTopBorderWidth); - topBorderWidth = nextTopBorderWidth; + qreal dummyWidth = 0; + collectBorderThicknesss(cursor->row - 1, dummyWidth, topBorderWidth); collectBorderThicknesss(cursor->row, topBorderWidth, bottomBorderWidth); do { - nextTopBorderWidth = 0; - collectBorderThicknesss(cursor->row+1, bottomBorderWidth, nextTopBorderWidth); + qreal nextBottomBorderWidth = 0; + collectBorderThicknesss(cursor->row+1, bottomBorderWidth, nextBottomBorderWidth); d->lastRowHasSomething = false; complete = layoutRow(cursor, topBorderWidth, bottomBorderWidth); - bottomBorderWidth = topBorderWidth; - topBorderWidth = nextTopBorderWidth; - setBottom(d->rowPositions[cursor->row + 1] + bottomBorderWidth); + topBorderWidth = bottomBorderWidth; + bottomBorderWidth = nextBottomBorderWidth; + if (complete) { setVirginPage(false); @@ -908,7 +906,6 @@ qreal x = qMax(bRect.x(), belowBRect.x()); qreal x2 = qMin(bRect.right(), belowBRect.right()); KoTableCellStyle cellBelowStyle(belowTfm); - KoTextLayoutCellHelper cellBelowStyleHelper(cellBelowStyle); cellStyleHelper.drawSharedHorizontalBorder(*painter, cellBelowStyle, x, bRect.bottom(), x2 - x, accuBlankBorders); c = tableCellBelow.column() + tableCellBelow.columnSpan(); } @@ -927,13 +924,12 @@ while (r < row + tableCell.rowSpan()) { QTextTableCell tableCellRight = d->table->cellAt(r, column + tableCell.columnSpan()); QTextTableCellFormat rightTfm(tableCellRight.format().toTableCellFormat()); - KoTableCellStyle cellBelowRight(rightTfm); - KoTextLayoutCellHelper cellBelowRightHelper(cellBelowRight); + KoTableCellStyle cellRightStyle(rightTfm); QRectF rightBRect = cellBoundingRect(tableCellRight); qreal y = qMax(bRect.y(), rightBRect.y()); - qreal y2 = qMin(bRect.bottom() + cellStyle.bottomOuterBorderWidth(), rightBRect.bottom() + cellBelowRight.bottomOuterBorderWidth()); - cellBelowRightHelper.drawSharedVerticalBorder(*painter, cellBelowRight, bRect.right(), y, y2-y, accuBlankBorders); - r = tableCellRight.row() + rightTfm.tableCellRowSpan(); + qreal y2 = qMin(bRect.bottom() + cellStyle.bottomOuterBorderWidth(), rightBRect.bottom() + cellRightStyle.bottomOuterBorderWidth()); + cellStyleHelper.drawSharedVerticalBorder(*painter, cellRightStyle, bRect.right(), y, y2-y, accuBlankBorders); + r = tableCellRight.row() + tableCellRight.rowSpan(); } } diff -Nru calligra-2.4.0/libs/widgets/KoColorPopupAction.cpp calligra-2.4.3/libs/widgets/KoColorPopupAction.cpp --- calligra-2.4.0/libs/widgets/KoColorPopupAction.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/widgets/KoColorPopupAction.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -25,6 +25,8 @@ #include "KoColorSlider.h" #include "KoCheckerBoardPainter.h" #include "KoColorSpaceRegistry.h" +#include +#include #include #include @@ -43,7 +45,7 @@ class KoColorPopupAction::KoColorPopupActionPrivate { public: - KoColorPopupActionPrivate() + KoColorPopupActionPrivate() : colorSetWidget(0), colorChooser(0), opacitySlider(0), menu(0), checkerPainter(4) , showFilter(true), applyMode(true) {} @@ -55,7 +57,7 @@ delete opacitySlider; delete menu; } - + KoColor currentColor; KoColor buddyColor; @@ -76,6 +78,13 @@ QWidget *widget = new QWidget(d->menu); QWidgetAction *wdgAction = new QWidgetAction(d->menu); d->colorSetWidget = new KoColorSetWidget(widget); + + KoResourceServer* srv = KoResourceServerProvider::instance()->paletteServer(); + QList palettes = srv->resources(); + if (palettes.size() > 0) { + d->colorSetWidget->setColorSet(palettes.first()); + } + d->colorChooser = new KoTriangleColorSelector( widget ); // prevent mouse release on color selector from closing popup d->colorChooser->setAttribute( Qt::WA_NoMousePropagation ); @@ -102,9 +111,9 @@ connect(d->colorSetWidget, SIGNAL(colorChanged(const KoColor &, bool)), this, SLOT(colorWasSelected(const KoColor &, bool))); - connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ), + connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ), this, SLOT( colorWasEdited( const QColor &) ) ); - connect( d->opacitySlider, SIGNAL(valueChanged(int)), + connect( d->opacitySlider, SIGNAL(valueChanged(int)), this, SLOT(opacityWasChanged(int))); } @@ -162,7 +171,7 @@ { pm = QImage(iconSize, QImage::Format_ARGB32_Premultiplied); pm.fill(Qt::transparent); - // there was no icon set so we assume + // there was no icon set so we assume // that we create an icon from the current color d->applyMode = false; } diff -Nru calligra-2.4.0/libs/widgets/KoColorSetWidget.cpp calligra-2.4.3/libs/widgets/KoColorSetWidget.cpp --- calligra-2.4.0/libs/widgets/KoColorSetWidget.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/widgets/KoColorSetWidget.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -49,11 +50,10 @@ class KoColorSetWidget::KoColorSetWidgetPrivate { public: KoColorSetWidget *thePublic; - KoColorSet *colorSet; + QPointer colorSet; QTimer m_timer; QVBoxLayout *mainLayout; bool firstShowOfContainer; - QCheckBox *filterCheckBox; QWidget *colorSetContainer; QScrollArea *scrollArea; QGridLayout *colorSetLayout; @@ -65,14 +65,12 @@ void colorTriggered(KoColorPatch *patch); void addRecent(const KoColor &); void activateRecent(int i); - void filter(int state); + void fillColors(); void addRemoveColors(); }; -void KoColorSetWidget::KoColorSetWidgetPrivate::filter(int state) +void KoColorSetWidget::KoColorSetWidgetPrivate::fillColors() { - bool hide = (state == Qt::Checked); - delete colorSetContainer; colorSetContainer = new QWidget(); colorSetLayout = new QGridLayout(); @@ -86,14 +84,12 @@ if (colorSet) { for( int i = 0, p= 0; i < colorSet->nColors(); i++) { - if(!hide || (i % 3 != 0 && i % 16 != 5)) { - KoColorPatch *patch = new KoColorPatch(colorSetContainer); - patch->setFrameStyle(QFrame::NoFrame); - patch->setColor(colorSet->getColor(i).color); - connect(patch, SIGNAL(triggered(KoColorPatch *)), thePublic, SLOT(colorTriggered(KoColorPatch *))); - colorSetLayout->addWidget(patch, p/16, p%16); - ++p; - } + KoColorPatch *patch = new KoColorPatch(colorSetContainer); + patch->setFrameStyle(QFrame::NoFrame); + patch->setColor(colorSet->getColor(i).color); + connect(patch, SIGNAL(triggered(KoColorPatch *)), thePublic, SLOT(colorTriggered(KoColorPatch *))); + colorSetLayout->addWidget(patch, p/16, p%16); + ++p; } } @@ -193,15 +189,10 @@ color.fromQColor(QColor(128,0,0)); d->addRecent(color); - d->filterCheckBox = new QCheckBox(i18n("Hide colors with bad contrast")); - d->filterCheckBox->setChecked(true); - d->mainLayout->addWidget(d->filterCheckBox); - connect(d->filterCheckBox, SIGNAL(stateChanged(int)), SLOT(filter(int))); - d->scrollArea = new QScrollArea(); d->scrollArea->setBackgroundRole(QPalette::Dark); d->mainLayout->addWidget(d->scrollArea); - d->filter(Qt::Checked); + d->fillColors(); d->addRemoveButton = new QToolButton(this); d->addRemoveButton->setText(i18n("Add / Remove Colors...")); @@ -252,7 +243,7 @@ } d->colorSet = colorSet; - d->filter(d->filterCheckBox->checkState()); + d->fillColors(); } void KoColorSetWidget::resizeEvent(QResizeEvent *event) diff -Nru calligra-2.4.0/libs/widgets/KoColorSetWidget.h calligra-2.4.3/libs/widgets/KoColorSetWidget.h --- calligra-2.4.0/libs/widgets/KoColorSetWidget.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/widgets/KoColorSetWidget.h 2012-06-26 04:21:31.000000000 +0000 @@ -83,7 +83,6 @@ private: Q_PRIVATE_SLOT(d, void colorTriggered(KoColorPatch *)) - Q_PRIVATE_SLOT(d, void filter(int)) Q_PRIVATE_SLOT(d, void addRemoveColors()) class KoColorSetWidgetPrivate; diff -Nru calligra-2.4.0/libs/widgets/KoResourceServer.h calligra-2.4.3/libs/widgets/KoResourceServer.h --- calligra-2.4.0/libs/widgets/KoResourceServer.h 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/libs/widgets/KoResourceServer.h 2012-06-26 04:21:31.000000000 +0000 @@ -163,7 +163,7 @@ /// Adds an already loaded resource to the server - bool addResource(T* resource, bool save = true) { + bool addResource(T* resource, bool save = true, bool infront = false) { if (!resource->valid()) { kWarning(30009) << "Tried to add an invalid resource!"; return false; @@ -195,7 +195,12 @@ m_resourcesByFilename[resource->shortFilename()] = resource; m_resourcesByName[resource->name()] = resource; - m_resources.append(resource); + if (infront) { + m_resources.insert(0, resource); + } + else { + m_resources.append(resource); + } notifyResourceAdded(resource); diff -Nru calligra-2.4.0/libs/widgets/KoResourceServerProvider.cpp calligra-2.4.3/libs/widgets/KoResourceServerProvider.cpp --- calligra-2.4.0/libs/widgets/KoResourceServerProvider.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/widgets/KoResourceServerProvider.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -41,26 +41,32 @@ GradientResourceServer(const QString& type, const QString& extensions) : KoResourceServer(type, extensions) { + } + + void insertSpecialGradients() + { const KoColorSpace* cs = KoColorSpaceRegistry::instance()->rgb8(); + QList stops; + KoStopGradient* gradient = new KoStopGradient(""); gradient->setType(QGradient::LinearGradient); - gradient->setName("Foreground to Background"); + gradient->setName("Foreground to Transparent"); + stops << KoGradientStop(0.0, KoColor(Qt::black, cs)) << KoGradientStop(1.0, KoColor(QColor(0, 0, 0, 0), cs)); - QList stops; - stops << KoGradientStop(0.0, KoColor(Qt::black, cs)) << KoGradientStop(1.0, KoColor(Qt::white, cs)); gradient->setStops(stops); gradient->setValid(true); - addResource(gradient, false); + addResource(gradient, false, true); gradient = new KoStopGradient(""); gradient->setType(QGradient::LinearGradient); - gradient->setName("Foreground to Transparent"); + gradient->setName("Foreground to Background"); stops.clear(); - stops << KoGradientStop(0.0, KoColor(Qt::black, cs)) << KoGradientStop(1.0, KoColor(QColor(0, 0, 0, 0), cs)); + stops << KoGradientStop(0.0, KoColor(Qt::black, cs)) << KoGradientStop(1.0, KoColor(Qt::white, cs)); + gradient->setStops(stops); gradient->setValid(true); - addResource(gradient, false); + addResource(gradient, false, true); } private: @@ -161,6 +167,7 @@ d->m_gradientServer = new GradientResourceServer("ko_gradients", "*.kgr:*.svg:*.ggr"); d->gradientThread = new KoResourceLoaderThread(d->m_gradientServer); + connect(d->gradientThread, SIGNAL(finished()), this, SLOT(allGradientsLoaded())); d->gradientThread->start(); d->m_paletteServer = new KoResourceServer("ko_palettes", "*.gpl:*.pal:*.act"); @@ -205,3 +212,8 @@ d->patternThread->barrier(); return d->m_paletteServer; } + +void KoResourceServerProvider::allGradientsLoaded() +{ + static_cast(d->m_gradientServer)->insertSpecialGradients(); +} diff -Nru calligra-2.4.0/libs/widgets/KoResourceServerProvider.h calligra-2.4.3/libs/widgets/KoResourceServerProvider.h --- calligra-2.4.0/libs/widgets/KoResourceServerProvider.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/widgets/KoResourceServerProvider.h 2012-06-26 04:18:01.000000000 +0000 @@ -81,6 +81,11 @@ KoResourceServer* patternServer(); KoResourceServer* gradientServer(); KoResourceServer* paletteServer(); + +private slots: + + void allGradientsLoaded(); + private: KoResourceServerProvider(); KoResourceServerProvider(const KoResourceServerProvider&); diff -Nru calligra-2.4.0/libs/widgets/KoShadowConfigWidget.ui calligra-2.4.3/libs/widgets/KoShadowConfigWidget.ui --- calligra-2.4.0/libs/widgets/KoShadowConfigWidget.ui 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/libs/widgets/KoShadowConfigWidget.ui 2012-06-26 04:21:31.000000000 +0000 @@ -71,6 +71,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + diff -Nru calligra-2.4.0/plan/libs/kernel/plan_schedulerplugin.desktop calligra-2.4.3/plan/libs/kernel/plan_schedulerplugin.desktop --- calligra-2.4.0/plan/libs/kernel/plan_schedulerplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/libs/kernel/plan_schedulerplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,12 +1,15 @@ [Desktop Entry] Name=Plan Scheduler Plugin Name[ca]=Connector de planificador del Plan +Name[ca@valencia]=Connector de planificador del Plan Name[da]=Skemalægnings-plugin til Plan Name[de]=Plan-Planermodul Name[el]=Πρόσθετο χρονοπρογραμματιστή Plan Name[es]=Complemento de planificador de Plan Name[et]=Plani ajaplaneerijaplugin +Name[gl]=Engadido Plan Scheduler Name[it]=Estensione di pianificazione di Plan +Name[ja]=Plan スケジューラプラグイン Name[kk]=Plan жоспарлағыш плагині Name[nb]=Plan planleggingsprogramtillegg Name[nds]=Plan-Plaanmoduul @@ -15,6 +18,7 @@ Name[pt]='Plugin' de Calendarização do Plan Name[pt_BR]=Plugin de Calendário do Plan Name[ru]=Модуль планировщика +Name[sk]=Plánovací plugin Plan Name[sv]=Plan insticksprogram för schemaläggning Name[uk]=Додаток планування Plan Name[x-test]=xxPlan Scheduler Pluginxx @@ -24,6 +28,7 @@ X-KDE-ServiceType=Plan/SchedulerPlugin Comment=A plugin that calculates a project schedule Comment[ca]=Un connector que calcula un planificador de projectes +Comment[ca@valencia]=Un connector que calcula un planificador de projectes Comment[da]=Et plugin som udregner et projektskema Comment[de]=Ein Modul, das einen Projektzeitplan berechnet Comment[el]=Ένα πρόσθετο που υπολογίζει το χρονοπρογραμματισμό ενός έργου @@ -32,7 +37,7 @@ Comment[et]=Projekti ajakava arvutav plugin Comment[fi]=Projektin aikataulun laskeva liitännäinen Comment[fr]=Un Module externe qui calcule le programme d'un projet -Comment[gl]=Unha extensión que calcula a axenda do proxecto +Comment[gl]=Un engadido que calcula a axenda do proxecto Comment[it]=Un'estensione per pianificare progetti Comment[ja]=プロジェクトスケジュールを計算するプラグイン Comment[kk]=Жоба жоспарын есептейтін плагині diff -Nru calligra-2.4.0/plan/plan.desktop calligra-2.4.3/plan/plan.desktop --- calligra-2.4.0/plan/plan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/plan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Plan Name[ca]=Plan +Name[ca@valencia]=Plan Name[cs]=Plan Name[da]=Plan Name[de]=Plan @@ -10,6 +11,7 @@ Name[fi]=Plan Name[hu]=Plan Name[it]=Plan +Name[ja]=Plan Name[kk]=Plan Name[nb]=Plan Name[nds]=Plan @@ -29,6 +31,7 @@ GenericName[bg]=Управление на проекти GenericName[br]=Mererezh raktresioù GenericName[ca]=Gestió de projectes +GenericName[ca@valencia]=Gestió de projectes GenericName[cs]=Správa projektů GenericName[cy]=Rheoli Cywaith GenericName[da]=Projektstyring diff -Nru calligra-2.4.0/plan/planpart.desktop calligra-2.4.3/plan/planpart.desktop --- calligra-2.4.0/plan/planpart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/planpart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Calligra Project Management Component Name[bg]=Компонент за управление на проекти в Calligra Name[ca]=Component de gestió de projectes del Calligra +Name[ca@valencia]=Component de gestió de projectes del Calligra Name[cs]=Komponenta Calligra pro správu projektů Name[da]=Calligra-komponent til projektstyring Name[de]=Calligra-Komponente für Projektmanagement @@ -10,8 +11,10 @@ Name[et]=Calligra projektihalduse komponent Name[fi]=Calligran projektinhallintaosa Name[fr]=Composant gestion de projets de Calligra +Name[gl]=Compoñente de xestión de proxectos de Calligra Name[hu]=Calligra projektkezelő komponens Name[it]=Componente per la gestione dei progetti di Calligra +Name[ja]=Calligra プロジェクト管理コンポーネント Name[kk]=Calligra-ның жоба басқару бағдарламасы Name[nb]=Calligra-komponent for prosjektstyring Name[nds]=Calligra-Komponent för Projektpleeg @@ -20,6 +23,7 @@ Name[pt]=Componente de Gestão de Projectos do Calligra Name[pt_BR]=Componente de gerenciamento de projetos do Calligra Name[ru]=Компонент управления проектами Calligra +Name[sk]=Calligra modul pre správu projektov Name[sv]=Calligra-projekthanteringskomponent Name[uk]=Компонент керування проектами Calligra Name[x-test]=xxCalligra Project Management Componentxx @@ -34,6 +38,7 @@ GenericName[bg]=Управление на проекти GenericName[br]=Mererezh raktresioù GenericName[ca]=Gestió de projectes +GenericName[ca@valencia]=Gestió de projectes GenericName[cs]=Správa projektů GenericName[cy]=Rheoli Cywaith GenericName[da]=Projektstyring diff -Nru calligra-2.4.0/plan/plugins/filters/icalendar/export/plan_icalendar_export.desktop calligra-2.4.3/plan/plugins/filters/icalendar/export/plan_icalendar_export.desktop --- calligra-2.4.0/plan/plugins/filters/icalendar/export/plan_icalendar_export.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/plugins/filters/icalendar/export/plan_icalendar_export.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -8,6 +8,7 @@ Name=Plan iCalendar Export Filter Name[bg]=Филтър за изнасяне от Plan в iCalendar Name[ca]=Filtre d'exportació iCalendar del Plan +Name[ca@valencia]=Filtre d'exportació iCalendar del Plan Name[da]=iCalendar-eksportfilter til Plan Name[de]=iCalendar-Exportfilter für Plan Name[el]=Φίλτρο εξαγωγής Plan iCalendar @@ -16,6 +17,7 @@ Name[fi]=Planin iCalendar-vientisuodin Name[hu]=Plan iCalendar exportszűrő Name[it]=Filtro di esportazione iCalendar di Plan +Name[ja]=Plan iCalendar エクスポートフィルタ Name[kk]=Plan -> iCalendar экспорт сүзгісі Name[nb]=Plan eksportfilter for iCalendar Name[nds]=iCalendar-Exportfilter för Plan @@ -24,6 +26,7 @@ Name[pt]=Filtro de Exportação de iCalendar para o Plan Name[pt_BR]=Filtro de exportação de iCalendar para o Plan Name[ru]=Фильтр экспорта файлов планировщика в iCalendar +Name[sk]=Exportný filter Plan iCalendar Name[sv]=Plan iCalendar exportfilter Name[uk]=Фільтр експорту до iCalendar Plan Name[x-test]=xxPlan iCalendar Export Filterxx diff -Nru calligra-2.4.0/plan/plugins/filters/kplato/import/plan_kplato_import.desktop calligra-2.4.3/plan/plugins/filters/kplato/import/plan_kplato_import.desktop --- calligra-2.4.0/plan/plugins/filters/kplato/import/plan_kplato_import.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/plugins/filters/kplato/import/plan_kplato_import.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ Name=Plan KPlato Import Filter Name[bg]=Филтър за внасяне от KPlato в Plan Name[ca]=Filtre d'importació KPlato per al Plan +Name[ca@valencia]=Filtre d'importació KPlato per al Plan Name[da]=KPlato-importfilter til Plan Name[de]=KPlato-Importfilter für Calligra Plan Name[el]=Φίλτρο εισαγωγής Plan KPlato @@ -11,6 +12,7 @@ Name[fi]=Planin KPlato-tuontisuodin Name[hu]=Plan KPlato importszűrő Name[it]=Filtro di importazione da KPlato di Plan +Name[ja]=Plan KPlato インポートフィルタ Name[kk]=KPlato -> Plan импорт сүзгісі Name[nb]=KPlato-importfilter for Plan Name[nds]=KPlato-Importfilter för Plan @@ -19,6 +21,7 @@ Name[pt]=Filtro de Importação do KPlato para o Plan Name[pt_BR]=Filtro de importação do KPlato para o Plan Name[ru]=Фильтр импорта файлов планировщика KPlato +Name[sk]=Importný filter Plan KPlato Name[sv]=Plan Kplato-importfilter Name[uk]=Фільтр імпорту файлів KPlato для Plan Name[x-test]=xxPlan KPlato Import Filterxx diff -Nru calligra-2.4.0/plan/plugins/schedulers/rcps/planrcpsscheduler.desktop calligra-2.4.3/plan/plugins/schedulers/rcps/planrcpsscheduler.desktop --- calligra-2.4.0/plan/plugins/schedulers/rcps/planrcpsscheduler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/plugins/schedulers/rcps/planrcpsscheduler.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name=RCPS Scheduler Name[ca]=Planificador RCPS +Name[ca@valencia]=Planificador RCPS Name[da]=RCPS-skemalægning Name[de]=RCPS-Planer Name[el]=Χρονοπρογραμματιστής RCPS @@ -13,6 +14,7 @@ Name[et]=RCPS ajakava Name[fr]=Programe RCPS Name[gl]=Axenda RCPS +Name[hu]=RCPS ütemező Name[it]=Pianificatore RCPS Name[ja]=RCPS スケジューラ Name[kk]=RCPS жоспарлағышы @@ -32,11 +34,13 @@ Name[zh_TW]=RCPS 排程器 Comment=Genetics based Resource Constrained Project Scheduler Comment[ca]=Recurs de conflictes de planificador de projectes basat en la genètica +Comment[ca@valencia]=Recurs de conflictes de planificador de projectes basat en la genètica Comment[da]=Genetikbaseret projektskemalægning med begrænsede ressourcer Comment[el]=Χρονοπρογραμματιστής έργων με περιορισμένους πόρους με βάση τη Γενετική Comment[en_GB]=Genetics based Resource Constrained Project Scheduler Comment[es]=Planificador de proyecto con recursos limitados basado en Genética Comment[et]=Geneetilise algoritmi põhine ressursipiirangutega projektide ajakava +Comment[gl]=Planificador de proxectos con conflitos de recursos naseado en algorítmos xenéticos Comment[it]=Pianificatore di progetto a risorse limitate basato su algoritmo genetico Comment[kk]=Қайшылықты ресурс жоба жоспарлағыштың (RCPS) туысы Comment[nb]=Genetisk basert Resource Constrained Project Scheduler @@ -45,6 +49,7 @@ Comment[pt]=Calendarização de Projectos com Conflitos de Recursos baseada em algoritmos genéticos Comment[pt_BR]=Calendarização de projetos com restrições de recursos baseada em algoritmos genéticos Comment[ru]=Планировщик Resource Constrained Project (основан на Genetics) +Comment[sk]=Genetický projektový plánovač konfilktov prostriedkov Comment[sv]=Genetiskt baserad resurskonfliktschemaläggning av projekt Comment[uk]=Генетичний планувальник обмежень ресурсів проекту Comment[x-test]=xxGenetics based Resource Constrained Project Schedulerxx diff -Nru calligra-2.4.0/plan/plugins/schedulers/tj/plantjscheduler.desktop calligra-2.4.3/plan/plugins/schedulers/tj/plantjscheduler.desktop --- calligra-2.4.0/plan/plugins/schedulers/tj/plantjscheduler.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/plugins/schedulers/tj/plantjscheduler.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -5,11 +5,13 @@ Name=TJ Scheduler Name[ca]=Planificador TJ +Name[ca@valencia]=Planificador TJ Name[cs]=Plánovač TJ Name[da]=TJ-skemalægning Name[el]=Χρονοπρογραμματιστής TJ Name[es]=Planificador TJ Name[et]=TJ planeerija +Name[gl]=Axenda TJ Name[it]=Pianificatore TJ Name[kk]=TJ жоспарлағышы Name[nb]=TJ planlegger @@ -18,6 +20,7 @@ Name[pt]=Calendarização TJ Name[pt_BR]=Calendarização TJ Name[ru]=Планировщик TJ +Name[sk]=TJ plánovač Name[sv]=TJ-schemaläggning Name[uk]=Засіб планування TJ Name[x-test]=xxTJ Schedulerxx @@ -25,11 +28,13 @@ Name[zh_TW]=TJ 排程器 Comment=The TaskJuggler scheduler Comment[ca]=El planificador TakJuggler +Comment[ca@valencia]=El planificador TakJuggler Comment[cs]=Plánovač TaskJuggler Comment[da]=TaskJugglers skemalægning Comment[el]=Ο χρονοπρογραμματιστής TaskJuggler Comment[es]=El planificador TaskJuggler Comment[et]=TaskJuggleri planeerija +Comment[gl]=O xestor de proxectos TaskJuggler Comment[it]=La pianificazione di TaskJuggler Comment[kk]=TaskJuggler жоспарлағыш Comment[nb]=Planleggeren TaskJuggler @@ -38,6 +43,7 @@ Comment[pt]=O escalonamento do TaskJuggler Comment[pt_BR]=O calendarizador da TaskJuggler Comment[ru]=Планировщик TaskJuggler +Comment[sk]=Plánovač TaskJuggler Comment[sv]=Taskjuggler-schemaläggning Comment[uk]=Засіб планування TaskJuggler Comment[x-test]=xxThe TaskJuggler schedulerxx diff -Nru calligra-2.4.0/plan/plugins/scripting/krossmoduleplan.desktop calligra-2.4.3/plan/plugins/scripting/krossmoduleplan.desktop --- calligra-2.4.0/plan/plugins/scripting/krossmoduleplan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/plugins/scripting/krossmoduleplan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Scripting plugin Name[bg]=Приставка за скриптове Name[ca]=Connector d'scripting +Name[ca@valencia]=Connector d'scripting Name[cs]=Skriptovací modul Name[da]=Scriptplugin Name[de]=Skripting-Modul @@ -15,7 +16,7 @@ Name[fr]=Module de scriptage Name[fy]=Skriptplugin Name[ga]=Breiseán scriptithe -Name[gl]=Plugin de programación +Name[gl]=Engadido de scripting Name[he]=תוסף לתסריטים Name[hi]=स्क्रिप्टिंग प्लगइन Name[hne]=स्क्रिप्टिंग प्लगइन @@ -47,6 +48,7 @@ Comment=Allow execution of scripts Comment[bg]=Изпълнение на скриптове Comment[ca]=Permet l'execució d'scripts +Comment[ca@valencia]=Permet l'execució d'scripts Comment[cs]=Umožní spouštění skriptů Comment[da]=Tillad kørsel af script Comment[de]=Ermöglicht das Ausführen von Skripten @@ -60,7 +62,7 @@ Comment[fr]=Permet d'exécuter des scripts Comment[fy]=It útfieren fan skripts tastean Comment[ga]=Ceadaigh scripteanna a rith -Comment[gl]=Permite executar guións +Comment[gl]=Permite executar engadidos Comment[he]=אפשרות להרצת תסריטים Comment[hi]=स्क्रिप्ट को चलाने की अनुमति दें Comment[hne]=स्क्रिप्ट ल चलाय के अनुमति देव diff -Nru calligra-2.4.0/plan/templates/Simple/8HourDay-40HourWeek.desktop calligra-2.4.3/plan/templates/Simple/8HourDay-40HourWeek.desktop --- calligra-2.4.0/plan/templates/Simple/8HourDay-40HourWeek.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/templates/Simple/8HourDay-40HourWeek.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=8 hour day, 40 hour week Name[bg]=8 часа дневно, 40 часа седмично Name[ca]=Dia de 8 hores, setmana de 40 hores +Name[ca@valencia]=Dia de 8 hores, setmana de 40 hores Name[cs]=8 hodin denně, 40 hodin týdně Name[da]=8-timers dag, 40-timers uge Name[de]=8 Stunden / Tag, 40 Stunden / Woche diff -Nru calligra-2.4.0/plan/templates/Simple/Basicproject.desktop calligra-2.4.3/plan/templates/Simple/Basicproject.desktop --- calligra-2.4.0/plan/templates/Simple/Basicproject.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/templates/Simple/Basicproject.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Basic project Name[ca]=Projecte bàsic +Name[ca@valencia]=Projecte bàsic Name[cs]=Základní projekt Name[da]=Basisprojekt Name[de]=Einfaches Projekt diff -Nru calligra-2.4.0/plan/templates/Simple/.directory calligra-2.4.3/plan/templates/Simple/.directory --- calligra-2.4.0/plan/templates/Simple/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/templates/Simple/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Обикновен Name[br]=Eeun Name[ca]=Simple +Name[ca@valencia]=Simple Name[cs]=Jednoduchý Name[cy]=Syml Name[da]=Simpel diff -Nru calligra-2.4.0/plan/templates/Simple/Plain.desktop calligra-2.4.3/plan/templates/Simple/Plain.desktop --- calligra-2.4.0/plan/templates/Simple/Plain.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/templates/Simple/Plain.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Изчистен Name[br]=Kompez Name[ca]=Pla +Name[ca@valencia]=Pla Name[cs]=Prázdný Name[cy]=Plaen Name[da]=Ren diff -Nru calligra-2.4.0/plan/workpackage/planwork.desktop calligra-2.4.3/plan/workpackage/planwork.desktop --- calligra-2.4.0/plan/workpackage/planwork.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/workpackage/planwork.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Plan WorkPackage Handler Name[ca]=Gestor de paquets de feina del Plan +Name[ca@valencia]=Gestor de paquets de faena del Plan Name[da]=Håndtering af WorkPackage til Plan Name[de]=Plan-Arbeitspaketverwaltung Name[el]=Χειριστής πακέτου εργασίας Plan @@ -8,6 +9,7 @@ Name[et]=Plani töölõikude käitleja Name[fi]=Plan-työpakettikäsittelijä Name[it]=Gestore dei pacchetti di lavoro di Plan +Name[ja]=Plan ワークパッケージハンドラ Name[kk]=Plan жұмыс дестесінің өңдеуіші Name[nb]=Plan arbeidspakkestyring Name[nl]=Plan werkpakketbeheerder @@ -15,6 +17,7 @@ Name[pt]=Tratamento de Pacotes de Trabalho do Plan Name[pt_BR]=Tratamento de pacotes de trabalho do Plan Name[ru]=Программа обработки Plan WorkPackage +Name[sk]=Spracovač pracovných balíkov Plan Name[sv]=Hantering av arbetspaket i Plan Name[uk]=Програма опрацювання робочих пакунків Plan Name[x-test]=xxPlan WorkPackage Handlerxx @@ -24,6 +27,7 @@ GenericName[bg]=Управление на проекти GenericName[br]=Mererezh raktresioù GenericName[ca]=Gestió de projectes +GenericName[ca@valencia]=Gestió de projectes GenericName[cs]=Správa projektů GenericName[cy]=Rheoli Cywaith GenericName[da]=Projektstyring diff -Nru calligra-2.4.0/plan/workpackage/planworkpart.desktop calligra-2.4.3/plan/workpackage/planworkpart.desktop --- calligra-2.4.0/plan/workpackage/planworkpart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/workpackage/planworkpart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Calligra Project Management Component Name[bg]=Компонент за управление на проекти в Calligra Name[ca]=Component de gestió de projectes del Calligra +Name[ca@valencia]=Component de gestió de projectes del Calligra Name[cs]=Komponenta Calligra pro správu projektů Name[da]=Calligra-komponent til projektstyring Name[de]=Calligra-Komponente für Projektmanagement @@ -10,8 +11,10 @@ Name[et]=Calligra projektihalduse komponent Name[fi]=Calligran projektinhallintaosa Name[fr]=Composant gestion de projets de Calligra +Name[gl]=Compoñente de xestión de proxectos de Calligra Name[hu]=Calligra projektkezelő komponens Name[it]=Componente per la gestione dei progetti di Calligra +Name[ja]=Calligra プロジェクト管理コンポーネント Name[kk]=Calligra-ның жоба басқару бағдарламасы Name[nb]=Calligra-komponent for prosjektstyring Name[nds]=Calligra-Komponent för Projektpleeg @@ -20,6 +23,7 @@ Name[pt]=Componente de Gestão de Projectos do Calligra Name[pt_BR]=Componente de gerenciamento de projetos do Calligra Name[ru]=Компонент управления проектами Calligra +Name[sk]=Calligra modul pre správu projektov Name[sv]=Calligra-projekthanteringskomponent Name[uk]=Компонент керування проектами Calligra Name[x-test]=xxCalligra Project Management Componentxx @@ -35,6 +39,7 @@ GenericName[bg]=Управление на проекти GenericName[br]=Mererezh raktresioù GenericName[ca]=Gestió de projectes +GenericName[ca@valencia]=Gestió de projectes GenericName[cs]=Správa projektů GenericName[cy]=Rheoli Cywaith GenericName[da]=Projektstyring diff -Nru calligra-2.4.0/plan/workpackage/templates/Simple/.directory calligra-2.4.3/plan/workpackage/templates/Simple/.directory --- calligra-2.4.0/plan/workpackage/templates/Simple/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/workpackage/templates/Simple/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Обикновен Name[br]=Eeun Name[ca]=Simple +Name[ca@valencia]=Simple Name[cs]=Jednoduchý Name[cy]=Syml Name[da]=Simpel diff -Nru calligra-2.4.0/plan/workpackage/templates/Simple/Empty.desktop calligra-2.4.3/plan/workpackage/templates/Simple/Empty.desktop --- calligra-2.4.0/plan/workpackage/templates/Simple/Empty.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plan/workpackage/templates/Simple/Empty.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Празен документ Name[br]=Teul goullo Name[ca]=Document buit +Name[ca@valencia]=Document buit Name[cs]=Prázdný dokument Name[cy]=Dogfen Wag Name[da]=Tomt dokument @@ -60,6 +61,7 @@ Comment[bg]=Създаване на празен документ Comment[br]=Krouiñ un teul goullo Comment[ca]=Crea un document buit +Comment[ca@valencia]=Crea un document buit Comment[cs]=Vytvoří prázdný dokument Comment[cy]=Creuir dogfen wag Comment[da]=Opretter et tomt dokument diff -Nru calligra-2.4.0/plugins/artistictextshape/artistictextshape.desktop calligra-2.4.3/plugins/artistictextshape/artistictextshape.desktop --- calligra-2.4.0/plugins/artistictextshape/artistictextshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/artistictextshape/artistictextshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Artistic Text Shape Name[ca]=Forma de text artístic +Name[ca@valencia]=Forma de text artístic Name[da]=Kunstnerisk tekst-form Name[de]=Künstlerisches Text-Objekt Name[el]=Καλλιτεχνικό σχήμα κειμένου @@ -21,7 +22,7 @@ Name[nl]=Artistieke tekstvorm Name[pl]=Artystyczny kształt tekstu Name[pt]=Forma de Texto Artístico -Name[pt_BR]=Forma de Texto Artístico +Name[pt_BR]=Forma de texto artístico Name[ru]=Художественный текст Name[sk]=Tvar umelecký text Name[sv]=Artistisk textform diff -Nru calligra-2.4.0/plugins/chartshape/ARCHITECTURE calligra-2.4.3/plugins/chartshape/ARCHITECTURE --- calligra-2.4.0/plugins/chartshape/ARCHITECTURE 1970-01-01 00:00:00.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ARCHITECTURE 2012-06-26 04:18:01.000000000 +0000 @@ -0,0 +1,264 @@ +This text provides a very short introduction to the architecture of +the chart shape. At this time it's work in progress. + + +Part I: Components + +Part I describes the organization of the code and what can be found +where. + + +Subdirectories +============== + +dialogs/ various dialogs for the chart tool +commands/ undo/redo commands +kdchart/ the chart drawing engine from KDAB. +tests/ test code -- run it by 'make tests' in the build dir + + +Classes in the top directory +============================ + +Shape classes +------------- +ChartShapeFactory All these classes are standard KoShape classes +ChartShape +ChartToolFactory +ChartTool +ChartConfigWidget + +chartshape.desktop The desktop file describing this plugin + +ChartDocument This class inherits KoDocument. The chart and + the formula are special shapes because they + are their own document types, defined in + ODF. This also means that they can be saved in + a subdirectory or inline inside the XML tree. + +kchart_export.h Defines import and export for exported classes. + + +Chart classes +------------- + +The following classes are central in the loading, rendering and +editing of charts. Most (all?) of the classes directly represent a +chart entity defined in the ODF standard. + +Axis data about an axis in the chart +DataSet data _about_ a dataset. The actual data + is stored in a table. +Legend stores information about the legend +PlotArea the main area where the chart itself is shown +Surface wall or floor in a 3D chart +CellRegion a region in e.g. a spreadsheet where a dataset + can fetch its values. + + +Data classes +------------ + +KDChartModel Takes a list of DataSet's and compiles them + into a QAbstractItemModel for use with KDChart. +KDChartConversions Conversions between odf concepts and KDChart + concepts + +ChartProxyModel Factory for DataSets and decoration of a + ChartTableModel . +TableSource FIXME: Something to do with connection to Sheets. +OdfLoadingHelper Helper for loading data when connected to a + spreadsheet. FIXME: find out more. + +ChartTableModel Stores the numeric data if this isn't provided + from the outside, e.g. from a spreadsheet. +ChartTableView A view of a table. Used in the data editor. + + +Helper classes +-------------- + +kchart_global Common definitions of enums and some + category functions +CellRegionStringValidator Validates a cell region descriptor string +ChartLayout Manages the layout of the parts (plot area, + legend, titles, etc) +ScreenConversions Conversions between pt (distance) and px (pixels) +SingleModelHelper FIXME: No idea what this is +TextLabelDummy Place holder for text labels (title, etc) + + + +Part II: Functional description + +Part II contains high-level descriptions on key structures and +processes. + + +General Architecture +==================== + +The chart shape is a rather complex shape that inherits KoShape. It is +also at the same time a KoShapeContainer, i.e. it can contain other +KoShapes. The parts of a chart -- plot area, legend, axes titles, +chart title, subtitle and footer -- are all KoShapes themselves, owned +by the ChartShape class. The geometric relationship between them is +managed by the ChartLayout class. This is especially visible when +resizing the chart, something which sometimes rearranges the chart +drastically if the available area becomes very small. + +The chart shape is also special because it publishes a small part of +its internal API to the world. Normally the only external API for a +shape is the generic one defined in KoShape.h. The more detailed API +that is used by the tool(s) is seldom published. However, the chart +shape is designed to be used by applications and controlled +programmatically, e.g. from the spreadsheet. When a user updates the +cell values then the chart also has to be updated. This API is +published in interfaces/KoChartInterface.h. (As a side note, I think +this could be done for more shapes.) + +The second thing that makes the chart shape special is that Charts +(and Formulas) are defined as their own document types in the ODF +standard. This means that a chart can actually be its own standalone +document with the file extension .odc. Everything that has to do with +the chart document is collected into the class ChartDocument. + +The actual rendering of the chart parts is done with the KDChart +engine from KDAB. This component is licensed under GPL (used here) and +a commercial license. KDChart can render most chart types in ODF with +the exception of 3D type charts. Surface charts are not handled at +all, and 3D variants of 2D charts (bar, line, etc) are shown with +simple extrusions and not real perspective 3D. 3D only types, like +cylinder, cone, etc are not handled at all. Nevertheless, KDChart is +quite capable and works well in general. + + +ODF and KDChart +--------------- + +As described above, there are a number of classes which directly +represent entities in the ODF chart standard. These are Axis, Legend, +PlotArea, Surface, DataSet, and CellRegion. All these classes load and +save their internal data to the ODF xml tree and also manage their +respective counterparts from KDChart, so for instance the Axis class +handles all settings and data of the KDChartAxis classes (different +ones for Cartesian and Circular axes). + +Unfortunately there is not a perfect 1-to-1 relationship between the +concepts in ODF charts and KDChart so there is some complexity in the +mapping between them. See below for more details. + + +KDChart concepts +================ + +Objects +------- + +KDChart is a library of classes that are used to show a chart and also +offers some interaction with them. All the classes are in the KDChart +namespace but in the description below we shall forego the namespace +prefix in the interest of clarity. + +The main class in KDChart is _Chart_. This class manages the rest of +the classes and represents the canvas on which the chart parts are +painted. On this Chart there can be zero or more _Diagrams_, each of +which is what we in daily talk call a 'chart'. There is one type of +subclass to Diagram for each chart type, e.g. PieDiagram or +BarDiagram. If we want to create new types we can subclass +AbstractDiagram. + +Each diagram is associated with a CoordinatePlane which defines the +scale and transformation between data coordinates and pixel +coordinates. There are 3 types of coordinate planes: Cartesian, Polar +and Radar. One coordinate plane can be shared by several diagrams, +making it possible to e.g. create a combined bar and line chart. + +A Chart can hold several CoordinatePlanes and/or Diagrams, making it +possible to create advanced layouts with separate diagrams or diagrams +that overlap. + +An _Axis_ is what connects the coordinate plane with a diagram. The +axis is owned by a diagram but can also be associated with other +diagrams, thereby creating a shared axis. + +In addition to diagrams there are other types of visible objects on +the Chart: Legends, Headers, Footers, or custom elements that inherit +KDChart::Area. + +A KDChart::Chart is a QWidget, as are many other KDChart objects. The +Legend is the only object that can be placed outside this widget +according to the documentation. + + +Styling +------- + +Each type of object (Diagram, Axis, etc) in KDChart has a set of +attributes associated with it, much like ODF styles. These are all +named after the object they describe, e.g. BarAttributes, +RulerAttributes, etc. + +The normal way to configure an object is to fetch out the attributes, +change some of them, and put them back into the object. + + +Data +---- + +KDChart uses the Qt4 model/view paradigm. A class that inherits +AbstractDiagram is at the same time a QAbstractItemView and takes a +QAbstractItemModel as its data input. + +The item models that are given to the diagrams combine the numeric +data in that is presented in the chart with some styling coming from +the datasets, e.g. color, marker, etc. + + +Mapping ODF concepts to KDChart classes +======================================= + +The main KDChart::Chart instance is owned by PlotArea. PlotArea also +holds 2 cartesian coordinate plane, one polar and one radar +plane. Third, it holds a list of Diagrams, one per diagram type that +was ever used(?). + +The KDChart::Chart can show headers, footers, axis labels and other +text items. The chart shape does not use this but instead uses +standard text shapes for them. There are several reasons for this: + - The KDChart items are not interactively editable and styleable + - They cannot be easily moved around + - The loading and saving of them would be much more difficult, + especially if rich text is used. +This means that the Chart inside the plotarea will only contain the +diagrams and axes; all other areas are shown outside the Chart, but +inside the ChartShape. + +Each class that represents an ODF type (Axis, Legend, etc) also has +ownership of the corresponding KDChart type. Some exceptions exist +(FIXME: Check this in more detail). + +The class ChartProxyModel connects the ODF Datasets and numeric data +with KDChart. It takes the numeric input and rearranges it in the +order that is necessary for each chart type. + + +Editing +======= + +Editing of the chart settings can be done only by the ChartTool. The +chart tool uses the API calls in the different storage classes to +change the values. All manipulations are direct and there is currently +no undo/redo with the exception of setting the chart type. [This needs +to be fixed.] + +Changing of the data values can be done through the sheet connection +model that are used by e.g. Calligra Sheets (FIXME: Find out more +details). + + +Using External Data Sources +=========================== + +E.g. spreadsheets FIXME: find out more and write this. + diff -Nru calligra-2.4.0/plugins/chartshape/Axis.cpp calligra-2.4.3/plugins/chartshape/Axis.cpp --- calligra-2.4.0/plugins/chartshape/Axis.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/Axis.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -85,7 +85,7 @@ class Axis::Private { public: - Private( Axis *axis, AxisDimension dim ); + Private(Axis *axis, AxisDimension dim); ~Private(); void adjustAllDiagrams(); @@ -94,12 +94,12 @@ /// and have the layout find out about our position when it changes. void updatePosition(); - void registerDiagram( KDChart::AbstractDiagram *diagram ); - void deregisterDiagram( KDChart::AbstractDiagram *diagram ); + void registerDiagram(KDChart::AbstractDiagram *diagram); + void deregisterDiagram(KDChart::AbstractDiagram *diagram); - KDChart::AbstractDiagram *getDiagramAndCreateIfNeeded( ChartType chartType ); - KDChart::AbstractDiagram *getDiagram( ChartType chartType ); - void deleteDiagram( ChartType chartType ); + KDChart::AbstractDiagram *getDiagramAndCreateIfNeeded(ChartType chartType); + KDChart::AbstractDiagram *getDiagram(ChartType chartType); + void deleteDiagram(ChartType chartType); void createBarDiagram(); void createLineDiagram(); @@ -112,7 +112,7 @@ void createBubbleDiagram(); void createSurfaceDiagram(); void createGanttDiagram(); - void applyAttributesToDataSet( DataSet* set, ChartType newCharttype ); + void applyAttributesToDataSet(DataSet* set, ChartType newCharttype); // Pointer to Axis that owns this Private instance Axis * const q; @@ -138,6 +138,8 @@ bool showMinorGrid; bool useAutomaticMajorInterval; bool useAutomaticMinorInterval; + bool useAutomaticMinimumRange; + bool useAutomaticMaximumRange; /// Font used for axis labels /// TODO: Save to ODF @@ -189,6 +191,7 @@ // TODO: Save // See ODF v1.2 $19.12 (chart:display-label) bool showLabels; + bool showOverlappingDataLabels; bool isVisible; }; @@ -196,9 +199,9 @@ class CartesianAxis : public KDChart::CartesianAxis { public: - CartesianAxis( KChart::Axis *_axis ) : KDChart::CartesianAxis(), axis(_axis) {} + CartesianAxis(KChart::Axis *_axis) : KDChart::CartesianAxis(), axis(_axis) {} virtual ~CartesianAxis() {} - virtual const QString customizedLabel( const QString& label ) const { + virtual const QString customizedLabel(const QString& label) const { if (KoOdfNumberStyles::NumericStyleFormat *n = axis->numericStyleFormat()) return KoOdfNumberStyles::format(label, *n); return label; @@ -207,14 +210,14 @@ KChart::Axis *axis; }; -Axis::Private::Private( Axis *axis, AxisDimension dim ) - : q( axis ) - , dimension( dim ) - , kdAxis( new CartesianAxis( axis ) ) - , kdPlane( 0 ) - , kdPolarPlane( 0 ) - , kdRadarPlane( 0 ) - , numericStyleFormat( 0 ) +Axis::Private::Private(Axis *axis, AxisDimension dim) + : q(axis) + , dimension(dim) + , kdAxis(new CartesianAxis(axis)) + , kdPlane(0) + , kdPolarPlane(0) + , kdRadarPlane(0) + , numericStyleFormat(0) { centerDataPoints = false; @@ -225,6 +228,8 @@ useAutomaticMajorInterval = true; useAutomaticMinorInterval = true; + useAutomaticMinimumRange = true; + useAutomaticMaximumRange = true; majorInterval = 2; minorIntervalDivisor = 1; @@ -232,6 +237,15 @@ showMajorGrid = false; showMinorGrid = false; + logarithmicScaling = false; + + showInnerMinorTicks = false; + showOuterMinorTicks = false; + showInnerMajorTicks = false; + showOuterMajorTicks = true; + + showOverlappingDataLabels = false; + kdBarDiagram = 0; kdLineDiagram = 0; kdAreaDiagram = 0; @@ -248,17 +262,16 @@ titleData = 0; KDChart::RulerAttributes attr = kdAxis->rulerAttributes(); - attr.setShowRulerLine( true ); - kdAxis->setRulerAttributes( attr ); + attr.setShowRulerLine(true); + kdAxis->setRulerAttributes(attr); } Axis::Private::~Private() { - Q_ASSERT( plotArea ); - - delete numericStyleFormat; + Q_ASSERT(plotArea); delete kdBarDiagram; + delete kdLineDiagram; delete kdAreaDiagram; delete kdCircleDiagram; delete kdRingDiagram; @@ -269,108 +282,110 @@ delete kdSurfaceDiagram; delete kdGanttDiagram; + delete numericStyleFormat; + delete kdAxis; - foreach( DataSet *dataSet, dataSets ) - dataSet->setAttachedAxis( 0 ); + foreach(DataSet *dataSet, dataSets) + dataSet->setAttachedAxis(0); } -void Axis::Private::registerDiagram( KDChart::AbstractDiagram *diagram ) +void Axis::Private::registerDiagram(KDChart::AbstractDiagram *diagram) { - KDChartModel *model = new KDChartModel( plotArea ); - diagram->setModel( model ); + KDChartModel *model = new KDChartModel(plotArea); + diagram->setModel(model); - QObject::connect( plotArea->proxyModel(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ), - model, SLOT( slotColumnsInserted( const QModelIndex&, int, int ) ) ); + QObject::connect(plotArea->proxyModel(), SIGNAL(columnsInserted(const QModelIndex&, int, int)), + model, SLOT(slotColumnsInserted(const QModelIndex&, int, int))); - QObject::connect( diagram, SIGNAL( propertiesChanged() ), - plotArea, SLOT( plotAreaUpdate() ) ); - QObject::connect( diagram, SIGNAL( layoutChanged( AbstractDiagram* ) ), - plotArea, SLOT( plotAreaUpdate() ) ); - QObject::connect( diagram, SIGNAL( modelsChanged() ), - plotArea, SLOT( plotAreaUpdate() ) ); - QObject::connect( diagram, SIGNAL( dataHidden() ), - plotArea, SLOT( plotAreaUpdate() ) ); + QObject::connect(diagram, SIGNAL(propertiesChanged()), + plotArea, SLOT(plotAreaUpdate())); + QObject::connect(diagram, SIGNAL(layoutChanged(AbstractDiagram*)), + plotArea, SLOT(plotAreaUpdate())); + QObject::connect(diagram, SIGNAL(modelsChanged()), + plotArea, SLOT(plotAreaUpdate())); + QObject::connect(diagram, SIGNAL(dataHidden()), + plotArea, SLOT(plotAreaUpdate())); } -void Axis::Private::deregisterDiagram( KDChart::AbstractDiagram *diagram ) +void Axis::Private::deregisterDiagram(KDChart::AbstractDiagram *diagram) { - KDChartModel *model = dynamic_cast( diagram->model() ); - Q_ASSERT( model ); + KDChartModel *model = dynamic_cast(diagram->model()); + Q_ASSERT(model); - QObject::disconnect( plotArea->proxyModel(), SIGNAL( columnsInserted( const QModelIndex&, int, int ) ), - model, SLOT( slotColumnsInserted( const QModelIndex&, int, int ) ) ); + QObject::disconnect(plotArea->proxyModel(), SIGNAL(columnsInserted(const QModelIndex&, int, int)), + model, SLOT(slotColumnsInserted(const QModelIndex&, int, int))); - QObject::disconnect( diagram, SIGNAL( propertiesChanged() ), - plotArea, SLOT( plotAreaUpdate() ) ); - QObject::disconnect( diagram, SIGNAL( layoutChanged( AbstractDiagram* ) ), - plotArea, SLOT( plotAreaUpdate() ) ); - QObject::disconnect( diagram, SIGNAL( modelsChanged() ), - plotArea, SLOT( plotAreaUpdate() ) ); - QObject::disconnect( diagram, SIGNAL( dataHidden() ), - plotArea, SLOT( plotAreaUpdate() ) ); + QObject::disconnect(diagram, SIGNAL(propertiesChanged()), + plotArea, SLOT(plotAreaUpdate())); + QObject::disconnect(diagram, SIGNAL(layoutChanged(AbstractDiagram*)), + plotArea, SLOT(plotAreaUpdate())); + QObject::disconnect(diagram, SIGNAL(modelsChanged()), + plotArea, SLOT(plotAreaUpdate())); + QObject::disconnect(diagram, SIGNAL(dataHidden()), + plotArea, SLOT(plotAreaUpdate())); delete model; } -KDChart::AbstractDiagram *Axis::Private::getDiagramAndCreateIfNeeded( ChartType chartType ) +KDChart::AbstractDiagram *Axis::Private::getDiagramAndCreateIfNeeded(ChartType chartType) { KDChart::AbstractDiagram *diagram = 0; - switch ( chartType ) { + switch (chartType) { case BarChartType: - if ( !kdBarDiagram ) + if (!kdBarDiagram) createBarDiagram(); diagram = kdBarDiagram; break; case LineChartType: - if ( !kdLineDiagram ) + if (!kdLineDiagram) createLineDiagram(); diagram = kdLineDiagram; break; case AreaChartType: - if ( !kdAreaDiagram ) + if (!kdAreaDiagram) createAreaDiagram(); diagram = kdAreaDiagram; break; case CircleChartType: - if ( !kdCircleDiagram ) + if (!kdCircleDiagram) createCircleDiagram(); diagram = kdCircleDiagram; break; case RingChartType: - if ( !kdRingDiagram ) + if (!kdRingDiagram) createRingDiagram(); diagram = kdRingDiagram; break; case RadarChartType: case FilledRadarChartType: - if ( !kdRadarDiagram ) + if (!kdRadarDiagram) createRadarDiagram(chartType == FilledRadarChartType); diagram = kdRadarDiagram; break; case ScatterChartType: - if ( !kdScatterDiagram ) + if (!kdScatterDiagram) createScatterDiagram(); diagram = kdScatterDiagram; break; case StockChartType: - if ( !kdStockDiagram ) + if (!kdStockDiagram) createStockDiagram(); diagram = kdStockDiagram; break; case BubbleChartType: - if ( !kdBubbleDiagram ) + if (!kdBubbleDiagram) createBubbleDiagram(); diagram = kdBubbleDiagram; break; case SurfaceChartType: - if ( !kdSurfaceDiagram ) + if (!kdSurfaceDiagram) createSurfaceDiagram(); diagram = kdSurfaceDiagram; break; case GanttChartType: - if ( !kdGanttDiagram ) + if (!kdGanttDiagram) createGanttDiagram(); diagram = kdGanttDiagram; break; @@ -386,9 +401,9 @@ /** * Returns currently used internal KDChart diagram for the specified chart type */ -KDChart::AbstractDiagram *Axis::Private::getDiagram( ChartType chartType ) +KDChart::AbstractDiagram *Axis::Private::getDiagram(ChartType chartType) { - switch ( chartType ) { + switch (chartType) { case BarChartType: return kdBarDiagram; case LineChartType: @@ -416,16 +431,16 @@ return 0; // Compiler warning for unhandled chart type is intentional. } - Q_ASSERT( !"Unhandled chart type" ); + Q_ASSERT(!"Unhandled chart type"); return 0; } -void Axis::Private::deleteDiagram( ChartType chartType ) +void Axis::Private::deleteDiagram(ChartType chartType) { KDChart::AbstractDiagram **diagram = 0; - switch ( chartType ) { + switch (chartType) { case BarChartType: diagram = (KDChart::AbstractDiagram**)&kdBarDiagram; break; @@ -461,14 +476,14 @@ diagram = (KDChart::AbstractDiagram**)&kdGanttDiagram; break; case LastChartType: - Q_ASSERT( "There is no diagram with type LastChartType" ); + Q_ASSERT("There is no diagram with type LastChartType"); // Compiler warning for unhandled chart type is intentional. } - Q_ASSERT( diagram ); - Q_ASSERT( *diagram ); + Q_ASSERT(diagram); + Q_ASSERT(*diagram); - deregisterDiagram( *diagram ); + deregisterDiagram(*diagram); delete *diagram; *diagram = 0; @@ -479,182 +494,187 @@ void Axis::Private::createBarDiagram() { - Q_ASSERT( kdBarDiagram == 0 ); + Q_ASSERT(kdBarDiagram == 0); - kdBarDiagram = new KDChart::BarDiagram( plotArea->kdChart(), kdPlane ); - registerDiagram( kdBarDiagram ); + kdBarDiagram = new KDChart::BarDiagram(plotArea->kdChart(), kdPlane); + registerDiagram(kdBarDiagram); // By 'vertical', KDChart means the orientation of a chart's bars, // not the orientation of the x axis. - kdBarDiagram->setOrientation( plotArea->isVertical() ? Qt::Horizontal : Qt::Vertical ); - kdBarDiagram->setPen( QPen( Qt::black, 0.0 ) ); + kdBarDiagram->setOrientation(plotArea->isVertical() ? Qt::Horizontal : Qt::Vertical); + kdBarDiagram->setPen(QPen(Qt::black, 0.0)); - if ( plotAreaChartSubType == StackedChartSubtype ) - kdBarDiagram->setType( KDChart::BarDiagram::Stacked ); - else if ( plotAreaChartSubType == PercentChartSubtype ) { - kdBarDiagram->setType( KDChart::BarDiagram::Percent ); + kdBarDiagram->setAllowOverlappingDataValueTexts(showOverlappingDataLabels); + + if (plotAreaChartSubType == StackedChartSubtype) + kdBarDiagram->setType(KDChart::BarDiagram::Stacked); + else if (plotAreaChartSubType == PercentChartSubtype) { + kdBarDiagram->setType(KDChart::BarDiagram::Percent); kdBarDiagram->setUnitSuffix("%", kdBarDiagram->orientation()); } - if ( isVisible ) - kdBarDiagram->addAxis( kdAxis ); - kdPlane->addDiagram( kdBarDiagram ); - - Q_ASSERT( plotArea ); - foreach ( Axis *axis, plotArea->axes() ) - { - if ( axis->isVisible() && axis->dimension() == XAxisDimension ) - kdBarDiagram->addAxis( axis->kdAxis() ); + if (isVisible) + kdBarDiagram->addAxis(kdAxis); + kdPlane->addDiagram(kdBarDiagram); + + Q_ASSERT(plotArea); + foreach (Axis *axis, plotArea->axes()) { + if (axis->isVisible() && axis->dimension() == XAxisDimension) + kdBarDiagram->addAxis(axis->kdAxis()); } // Set default bar diagram attributes - q->setGapBetweenBars( 0 ); - q->setGapBetweenSets( 100 ); + q->setGapBetweenBars(0); + q->setGapBetweenSets(100); // Propagate existing settings - KDChart::ThreeDBarAttributes attributes( kdBarDiagram->threeDBarAttributes() ); - attributes.setEnabled( plotArea->isThreeD() ); - attributes.setThreeDBrushEnabled( plotArea->isThreeD() ); - kdBarDiagram->setThreeDBarAttributes( attributes ); + KDChart::ThreeDBarAttributes attributes(kdBarDiagram->threeDBarAttributes()); + attributes.setEnabled(plotArea->isThreeD()); + attributes.setThreeDBrushEnabled(plotArea->isThreeD()); + kdBarDiagram->setThreeDBarAttributes(attributes); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdBarDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdBarDiagram); } void Axis::Private::createLineDiagram() { - Q_ASSERT( kdLineDiagram == 0 ); + Q_ASSERT(kdLineDiagram == 0); + + kdLineDiagram = new KDChart::LineDiagram(plotArea->kdChart(), kdPlane); + registerDiagram(kdLineDiagram); - kdLineDiagram = new KDChart::LineDiagram( plotArea->kdChart(), kdPlane ); - registerDiagram( kdLineDiagram ); + kdLineDiagram->setAllowOverlappingDataValueTexts(showOverlappingDataLabels); - if ( plotAreaChartSubType == StackedChartSubtype ) - kdLineDiagram->setType( KDChart::LineDiagram::Stacked ); - else if ( plotAreaChartSubType == PercentChartSubtype ) - kdLineDiagram->setType( KDChart::LineDiagram::Percent ); - - if ( isVisible ) - kdLineDiagram->addAxis( kdAxis ); - kdPlane->addDiagram( kdLineDiagram ); - - Q_ASSERT( plotArea ); - foreach ( Axis *axis, plotArea->axes() ) { - if ( axis->dimension() == XAxisDimension ) - if ( axis->isVisible() ) - kdLineDiagram->addAxis( axis->kdAxis() ); + if (plotAreaChartSubType == StackedChartSubtype) + kdLineDiagram->setType(KDChart::LineDiagram::Stacked); + else if (plotAreaChartSubType == PercentChartSubtype) + kdLineDiagram->setType(KDChart::LineDiagram::Percent); + + if (isVisible) + kdLineDiagram->addAxis(kdAxis); + kdPlane->addDiagram(kdLineDiagram); + + Q_ASSERT(plotArea); + foreach (Axis *axis, plotArea->axes()) { + if (axis->dimension() == XAxisDimension) + if (axis->isVisible()) + kdLineDiagram->addAxis(axis->kdAxis()); } // Propagate existing settings - KDChart::ThreeDLineAttributes attributes( kdLineDiagram->threeDLineAttributes() ); - attributes.setEnabled( plotArea->isThreeD() ); - attributes.setThreeDBrushEnabled( plotArea->isThreeD() ); - kdLineDiagram->setThreeDLineAttributes( attributes ); + KDChart::ThreeDLineAttributes attributes(kdLineDiagram->threeDLineAttributes()); + attributes.setEnabled(plotArea->isThreeD()); + attributes.setThreeDBrushEnabled(plotArea->isThreeD()); + kdLineDiagram->setThreeDLineAttributes(attributes); KDChart::LineAttributes lineAttr = kdLineDiagram->lineAttributes(); - lineAttr.setMissingValuesPolicy( KDChart::LineAttributes::MissingValuesHideSegments ); - kdLineDiagram->setLineAttributes( lineAttr ); + lineAttr.setMissingValuesPolicy(KDChart::LineAttributes::MissingValuesHideSegments); + kdLineDiagram->setLineAttributes(lineAttr); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdLineDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdLineDiagram); } void Axis::Private::createAreaDiagram() { - Q_ASSERT( kdAreaDiagram == 0 ); + Q_ASSERT(kdAreaDiagram == 0); - kdAreaDiagram = new KDChart::LineDiagram( plotArea->kdChart(), kdPlane ); - registerDiagram( kdAreaDiagram ); + kdAreaDiagram = new KDChart::LineDiagram(plotArea->kdChart(), kdPlane); + registerDiagram(kdAreaDiagram); KDChart::LineAttributes attr = kdAreaDiagram->lineAttributes(); // Draw the area under the lines. This makes this diagram an area chart. - attr.setDisplayArea( true ); - kdAreaDiagram->setLineAttributes( attr ); - kdAreaDiagram->setPen( QPen( Qt::black, 0.0 ) ); + attr.setDisplayArea(true); + kdAreaDiagram->setLineAttributes(attr); + kdAreaDiagram->setPen(QPen(Qt::black, 0.0)); // KD Chart by default draws the first data set as last line in a normal // line diagram, we however want the first series to appear in front. - kdAreaDiagram->setReverseDatasetOrder( true ); + kdAreaDiagram->setReverseDatasetOrder(true); - if ( plotAreaChartSubType == StackedChartSubtype ) - kdAreaDiagram->setType( KDChart::LineDiagram::Stacked ); - else if ( plotAreaChartSubType == PercentChartSubtype ) + kdAreaDiagram->setAllowOverlappingDataValueTexts(showOverlappingDataLabels); + + if (plotAreaChartSubType == StackedChartSubtype) + kdAreaDiagram->setType(KDChart::LineDiagram::Stacked); + else if (plotAreaChartSubType == PercentChartSubtype) { - kdAreaDiagram->setType( KDChart::LineDiagram::Percent ); + kdAreaDiagram->setType(KDChart::LineDiagram::Percent); kdAreaDiagram->setUnitSuffix("%", Qt::Vertical); } - if ( isVisible ) - kdAreaDiagram->addAxis( kdAxis ); - kdPlane->addDiagram( kdAreaDiagram ); - - Q_ASSERT( plotArea ); - foreach ( Axis *axis, plotArea->axes() ) { - if ( axis->dimension() == XAxisDimension ) - if ( axis->isVisible() ) - kdAreaDiagram->addAxis( axis->kdAxis() ); + if (isVisible) + kdAreaDiagram->addAxis(kdAxis); + kdPlane->addDiagram(kdAreaDiagram); + + Q_ASSERT(plotArea); + foreach (Axis *axis, plotArea->axes()) { + if (axis->dimension() == XAxisDimension) + if (axis->isVisible()) + kdAreaDiagram->addAxis(axis->kdAxis()); } // Propagate existing settings - KDChart::ThreeDLineAttributes attributes( kdAreaDiagram->threeDLineAttributes() ); - attributes.setEnabled( plotArea->isThreeD() ); - attributes.setThreeDBrushEnabled( plotArea->isThreeD() ); - kdAreaDiagram->setThreeDLineAttributes( attributes ); + KDChart::ThreeDLineAttributes attributes(kdAreaDiagram->threeDLineAttributes()); + attributes.setEnabled(plotArea->isThreeD()); + attributes.setThreeDBrushEnabled(plotArea->isThreeD()); + kdAreaDiagram->setThreeDLineAttributes(attributes); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdAreaDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdAreaDiagram); } void Axis::Private::createCircleDiagram() { - Q_ASSERT( kdCircleDiagram == 0 ); + Q_ASSERT(kdCircleDiagram == 0); - kdCircleDiagram = new KDChart::PieDiagram( plotArea->kdChart(), kdPolarPlane ); - registerDiagram( kdCircleDiagram ); - KDChartModel *model = dynamic_cast( kdCircleDiagram->model() ); - Q_ASSERT( model ); - model->setDataDirection( Qt::Horizontal ); + kdCircleDiagram = new KDChart::PieDiagram(plotArea->kdChart(), kdPolarPlane); + registerDiagram(kdCircleDiagram); + KDChartModel *model = dynamic_cast(kdCircleDiagram->model()); + Q_ASSERT(model); + model->setDataDirection(Qt::Horizontal); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdCircleDiagram ); - kdPolarPlane->addDiagram( kdCircleDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdCircleDiagram); + kdPolarPlane->addDiagram(kdCircleDiagram); // Propagate existing settings - KDChart::ThreeDPieAttributes attributes( kdCircleDiagram->threeDPieAttributes() ); - attributes.setEnabled( plotArea->isThreeD() ); - attributes.setThreeDBrushEnabled( plotArea->isThreeD() ); - kdCircleDiagram->setThreeDPieAttributes( attributes ); + KDChart::ThreeDPieAttributes attributes(kdCircleDiagram->threeDPieAttributes()); + attributes.setEnabled(plotArea->isThreeD()); + attributes.setThreeDBrushEnabled(plotArea->isThreeD()); + kdCircleDiagram->setThreeDPieAttributes(attributes); // Initialize with default values that are specified in PlotArea // Note: KDChart takes an int here, though ODF defines the offset to be a double. - kdPolarPlane->setStartPosition( (int)plotArea->pieAngleOffset() ); + kdPolarPlane->setStartPosition((int)plotArea->pieAngleOffset()); } void Axis::Private::createRingDiagram() { - Q_ASSERT( kdRingDiagram == 0 ); + Q_ASSERT(kdRingDiagram == 0); - kdRingDiagram = new KDChart::RingDiagram( plotArea->kdChart(), kdPolarPlane ); - registerDiagram( kdRingDiagram ); - KDChartModel *model = dynamic_cast( kdRingDiagram->model() ); - Q_ASSERT( model ); - model->setDataDirection( Qt::Horizontal ); + kdRingDiagram = new KDChart::RingDiagram(plotArea->kdChart(), kdPolarPlane); + registerDiagram(kdRingDiagram); + KDChartModel *model = dynamic_cast(kdRingDiagram->model()); + Q_ASSERT(model); + model->setDataDirection(Qt::Horizontal); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdRingDiagram ); - kdPolarPlane->addDiagram( kdRingDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdRingDiagram); + kdPolarPlane->addDiagram(kdRingDiagram); // Propagate existing settings - KDChart::ThreeDPieAttributes attributes( kdRingDiagram->threeDPieAttributes() ); - attributes.setEnabled( plotArea->isThreeD() ); - attributes.setThreeDBrushEnabled( plotArea->isThreeD() ); - kdRingDiagram->setThreeDPieAttributes( attributes ); + KDChart::ThreeDPieAttributes attributes(kdRingDiagram->threeDPieAttributes()); + attributes.setEnabled(plotArea->isThreeD()); + attributes.setThreeDBrushEnabled(plotArea->isThreeD()); + kdRingDiagram->setThreeDPieAttributes(attributes); // Initialize with default values that are specified in PlotArea // Note: KDChart takes an int here, though ODF defines the offset to be a double. - kdPolarPlane->setStartPosition( (int)plotArea->pieAngleOffset() ); + kdPolarPlane->setStartPosition((int)plotArea->pieAngleOffset()); } void Axis::Private::createRadarDiagram(bool filled) { - Q_ASSERT( kdRadarDiagram == 0 ); + Q_ASSERT(kdRadarDiagram == 0); - //kdRadarDiagramModel->setDataDimensions( 2 ); - //kdRadarDiagramModel->setDataDirection( Qt::Horizontal ); + //kdRadarDiagramModel->setDataDimensions(2); + //kdRadarDiagramModel->setDataDirection(Qt::Horizontal); - kdRadarDiagram = new KDChart::RadarDiagram( plotArea->kdChart(), kdRadarPlane ); - registerDiagram( kdRadarDiagram ); + kdRadarDiagram = new KDChart::RadarDiagram(plotArea->kdChart(), kdRadarPlane); + registerDiagram(kdRadarDiagram); kdRadarDiagram->setCloseDatasets(true); if (filled) { @@ -666,133 +686,133 @@ } #if 0 // Stacked and Percent not supported by KDChart. - if ( plotAreaChartSubType == StackedChartSubtype ) - kdRadarDiagram->setType( KDChart::PolarDiagram::Stacked ); - else if ( plotAreaChartSubType == PercentChartSubtype ) - kdRadarDiagram->setType( KDChart::PolarDiagram::Percent ); + if (plotAreaChartSubType == StackedChartSubtype) + kdRadarDiagram->setType(KDChart::PolarDiagram::Stacked); + else if (plotAreaChartSubType == PercentChartSubtype) + kdRadarDiagram->setType(KDChart::PolarDiagram::Percent); #endif - plotArea->parent()->legend()->kdLegend()->addDiagram( kdRadarDiagram ); - kdRadarPlane->addDiagram( kdRadarDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdRadarDiagram); + kdRadarPlane->addDiagram(kdRadarDiagram); } void Axis::Private::createScatterDiagram() { - Q_ASSERT( kdScatterDiagram == 0 ); - Q_ASSERT( plotArea ); + Q_ASSERT(kdScatterDiagram == 0); + Q_ASSERT(plotArea); - kdScatterDiagram = new KDChart::Plotter( plotArea->kdChart(), kdPlane ); - registerDiagram( kdScatterDiagram ); + kdScatterDiagram = new KDChart::Plotter(plotArea->kdChart(), kdPlane); + registerDiagram(kdScatterDiagram); - KDChartModel *model = dynamic_cast( kdScatterDiagram->model() ); - Q_ASSERT( model ); - model->setDataDimensions( 2 ); + KDChartModel *model = dynamic_cast(kdScatterDiagram->model()); + Q_ASSERT(model); + model->setDataDimensions(2); - kdScatterDiagram->setPen( Qt::NoPen ); + kdScatterDiagram->setPen(Qt::NoPen); - if ( isVisible ) - kdScatterDiagram->addAxis( kdAxis ); - kdPlane->addDiagram( kdScatterDiagram ); + if (isVisible) + kdScatterDiagram->addAxis(kdAxis); + kdPlane->addDiagram(kdScatterDiagram); - foreach ( Axis *axis, plotArea->axes() ) { - if ( axis->dimension() == XAxisDimension ) - if ( axis->isVisible() ) - kdScatterDiagram->addAxis( axis->kdAxis() ); + foreach (Axis *axis, plotArea->axes()) { + if (axis->dimension() == XAxisDimension) + if (axis->isVisible()) + kdScatterDiagram->addAxis(axis->kdAxis()); } // Propagate existing settings - KDChart::ThreeDLineAttributes attributes( kdScatterDiagram->threeDLineAttributes() ); - attributes.setEnabled( plotArea->isThreeD() ); - attributes.setThreeDBrushEnabled( plotArea->isThreeD() ); - kdScatterDiagram->setThreeDLineAttributes( attributes ); + KDChart::ThreeDLineAttributes attributes(kdScatterDiagram->threeDLineAttributes()); + attributes.setEnabled(plotArea->isThreeD()); + attributes.setThreeDBrushEnabled(plotArea->isThreeD()); + kdScatterDiagram->setThreeDLineAttributes(attributes); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdScatterDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdScatterDiagram); } void Axis::Private::createStockDiagram() { - Q_ASSERT( kdStockDiagram == 0 ); + Q_ASSERT(kdStockDiagram == 0); - kdStockDiagram = new KDChart::StockDiagram( plotArea->kdChart(), kdPlane ); - registerDiagram( kdStockDiagram ); + kdStockDiagram = new KDChart::StockDiagram(plotArea->kdChart(), kdPlane); + registerDiagram(kdStockDiagram); - KDChartModel *model = dynamic_cast( kdStockDiagram->model() ); - Q_ASSERT( model ); - model->setDataDimensions( 3 ); + KDChartModel *model = dynamic_cast(kdStockDiagram->model()); + Q_ASSERT(model); + model->setDataDimensions(3); #if 0 // Stacked and Percent not supported by KDChart. - if ( plotAreaChartSubType == StackedChartSubtype ) - kdStockDiagram->setType( KDChart::StockDiagram::Stacked ); - else if ( plotAreaChartSubType == PercentChartSubtype ) - kdStockDiagram->setType( KDChart::StockDiagram::Percent ); + if (plotAreaChartSubType == StackedChartSubtype) + kdStockDiagram->setType(KDChart::StockDiagram::Stacked); + else if (plotAreaChartSubType == PercentChartSubtype) + kdStockDiagram->setType(KDChart::StockDiagram::Percent); #endif - if ( isVisible ) - kdStockDiagram->addAxis( kdAxis ); - kdPlane->addDiagram( kdStockDiagram ); - - Q_ASSERT( plotArea ); - foreach ( Axis *axis, plotArea->axes() ) { - if ( axis->dimension() == XAxisDimension ) - if ( axis->isVisible() ) - kdStockDiagram->addAxis( axis->kdAxis() ); + if (isVisible) + kdStockDiagram->addAxis(kdAxis); + kdPlane->addDiagram(kdStockDiagram); + + Q_ASSERT(plotArea); + foreach (Axis *axis, plotArea->axes()) { + if (axis->dimension() == XAxisDimension) + if (axis->isVisible()) + kdStockDiagram->addAxis(axis->kdAxis()); } - plotArea->parent()->legend()->kdLegend()->addDiagram( kdStockDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdStockDiagram); } void Axis::Private::createBubbleDiagram() { - Q_ASSERT( kdBubbleDiagram == 0 ); - Q_ASSERT( plotArea ); + Q_ASSERT(kdBubbleDiagram == 0); + Q_ASSERT(plotArea); - kdBubbleDiagram = new KDChart::Plotter( plotArea->kdChart(), kdPlane ); - registerDiagram( kdBubbleDiagram ); + kdBubbleDiagram = new KDChart::Plotter(plotArea->kdChart(), kdPlane); + registerDiagram(kdBubbleDiagram); - KDChartModel *model = dynamic_cast( kdBubbleDiagram->model() ); - Q_ASSERT( model ); - model->setDataDimensions( 2 ); - - kdPlane->addDiagram( kdBubbleDiagram ); - - foreach ( Axis *axis, plotArea->axes() ) { - //if ( axis->dimension() == XAxisDimension ) - if ( axis->isVisible() ) - kdBubbleDiagram->addAxis( axis->kdAxis() ); + KDChartModel *model = dynamic_cast(kdBubbleDiagram->model()); + Q_ASSERT(model); + model->setDataDimensions(2); + + kdPlane->addDiagram(kdBubbleDiagram); + + foreach (Axis *axis, plotArea->axes()) { + //if (axis->dimension() == XAxisDimension) + if (axis->isVisible()) + kdBubbleDiagram->addAxis(axis->kdAxis()); } // disable the connecting line KDChart::LineAttributes la = kdBubbleDiagram->lineAttributes(); - la.setVisible( false ); - kdBubbleDiagram->setLineAttributes( la ); + la.setVisible(false); + kdBubbleDiagram->setLineAttributes(la); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdBubbleDiagram ); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdBubbleDiagram); } void Axis::Private::createSurfaceDiagram() { - Q_ASSERT( !kdSurfaceDiagram ); + Q_ASSERT(!kdSurfaceDiagram); // This is a so far a by KDChart unsupported chart type. // Fall back to bar diagram for now. - kdSurfaceDiagram = new KDChart::BarDiagram( plotArea->kdChart(), kdPlane ); - registerDiagram( kdSurfaceDiagram ); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdSurfaceDiagram ); - kdPlane->addDiagram( kdSurfaceDiagram ); + kdSurfaceDiagram = new KDChart::BarDiagram(plotArea->kdChart(), kdPlane); + registerDiagram(kdSurfaceDiagram); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdSurfaceDiagram); + kdPlane->addDiagram(kdSurfaceDiagram); } void Axis::Private::createGanttDiagram() { // This is a so far a by KDChart unsupported chart type (through KDGantt got merged into KDChart with 2.3) - Q_ASSERT( !kdGanttDiagram ); + Q_ASSERT(!kdGanttDiagram); // This is a so far a by KDChart unsupported chart type. // Fall back to bar diagram for now. - kdGanttDiagram = new KDChart::BarDiagram( plotArea->kdChart(), kdPlane ); - registerDiagram( kdGanttDiagram ); - plotArea->parent()->legend()->kdLegend()->addDiagram( kdGanttDiagram ); - kdPlane->addDiagram( kdGanttDiagram ); + kdGanttDiagram = new KDChart::BarDiagram(plotArea->kdChart(), kdPlane); + registerDiagram(kdGanttDiagram); + plotArea->parent()->legend()->kdLegend()->addDiagram(kdGanttDiagram); + kdPlane->addDiagram(kdGanttDiagram); } /** @@ -804,10 +824,10 @@ // If at least one dataset is attached that belongs to a // horizontal bar chart, set centerDataPoints to true. centerDataPoints = kdBarDiagram != 0; - if ( kdLineDiagram ) - kdLineDiagram->setCenterDataPoints( centerDataPoints ); - if ( kdAreaDiagram ) - kdAreaDiagram->setCenterDataPoints( centerDataPoints ); + if (kdLineDiagram) + kdLineDiagram->setCenterDataPoints(centerDataPoints); + if (kdAreaDiagram) + kdAreaDiagram->setCenterDataPoints(centerDataPoints); } @@ -815,67 +835,67 @@ // class Axis -Axis::Axis( PlotArea *parent, AxisDimension dimension ) - : d( new Private( this, dimension ) ) +Axis::Axis(PlotArea *parent, AxisDimension dimension) + : d(new Private(this, dimension)) { - Q_ASSERT( parent ); + Q_ASSERT(parent); - parent->addAxis( this ); + parent->addAxis(this); d->plotArea = parent; - KDChart::BackgroundAttributes batt( d->kdAxis->backgroundAttributes() ); - batt.setBrush( QBrush( Qt::white ) ); - d->kdAxis->setBackgroundAttributes( batt ); - d->kdPlane = parent->kdCartesianPlane( this ); + KDChart::BackgroundAttributes batt(d->kdAxis->backgroundAttributes()); + batt.setBrush(QBrush(Qt::white)); + d->kdAxis->setBackgroundAttributes(batt); + d->kdPlane = parent->kdCartesianPlane(this); d->kdPolarPlane = parent->kdPolarPlane(); d->kdRadarPlane = parent->kdRadarPlane(); d->plotAreaChartType = d->plotArea->chartType(); d->plotAreaChartSubType = d->plotArea->chartSubType(); - KoShapeFactoryBase *textShapeFactory = KoShapeRegistry::instance()->value( TextShapeId ); - if ( textShapeFactory ) - d->title = textShapeFactory->createDefaultShape( parent->parent()->resourceManager() ); - if ( d->title ) { - d->titleData = qobject_cast( d->title->userData() ); - if ( d->titleData == 0 ) { + KoShapeFactoryBase *textShapeFactory = KoShapeRegistry::instance()->value(TextShapeId); + if (textShapeFactory) + d->title = textShapeFactory->createDefaultShape(parent->parent()->resourceManager()); + if (d->title) { + d->titleData = qobject_cast(d->title->userData()); + if (d->titleData == 0) { d->titleData = new TextLabelData; - d->title->setUserData( d->titleData ); + d->title->setUserData(d->titleData); } QFont font = d->titleData->document()->defaultFont(); - font.setPointSizeF( 9 ); - d->titleData->document()->setDefaultFont( font ); + font.setPointSizeF(9); + d->titleData->document()->setDefaultFont(font); } else { d->title = new TextLabelDummy; d->titleData = new TextLabelData; - KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout( d->titleData->document() ); - d->titleData->document()->setDocumentLayout( documentLayout ); - d->title->setUserData( d->titleData ); + KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout(d->titleData->document()); + d->titleData->document()->setDocumentLayout(documentLayout); + d->title->setUserData(d->titleData); } - d->title->setSize( QSizeF( CM_TO_POINT( 3 ), CM_TO_POINT( 0.75 ) ) ); + d->title->setSize(QSizeF(CM_TO_POINT(3), CM_TO_POINT(0.75))); - d->plotArea->parent()->addShape( d->title ); - d->plotArea->parent()->setClipped( d->title, true ); + d->plotArea->parent()->addShape(d->title); + d->plotArea->parent()->setClipped(d->title, true); d->plotArea->parent()->setInheritsTransform(d->title, true); - connect( d->plotArea, SIGNAL( gapBetweenBarsChanged( int ) ), - this, SLOT( setGapBetweenBars( int ) ) ); - connect( d->plotArea, SIGNAL( gapBetweenSetsChanged( int ) ), - this, SLOT( setGapBetweenSets( int ) ) ); - connect( d->plotArea, SIGNAL( pieAngleOffsetChanged( qreal ) ), - this, SLOT( setPieAngleOffset( qreal ) ) ); + connect(d->plotArea, SIGNAL(gapBetweenBarsChanged(int)), + this, SLOT(setGapBetweenBars(int))); + connect(d->plotArea, SIGNAL(gapBetweenSetsChanged(int)), + this, SLOT(setGapBetweenSets(int))); + connect(d->plotArea, SIGNAL(pieAngleOffsetChanged(qreal)), + this, SLOT(setPieAngleOffset(qreal))); d->updatePosition(); } Axis::~Axis() { - Q_ASSERT( d->plotArea ); - d->plotArea->parent()->KoShapeContainer::removeShape( d->title ); + Q_ASSERT(d->plotArea); + d->plotArea->parent()->KoShapeContainer::removeShape(d->title); - Q_ASSERT( d->title ); + Q_ASSERT(d->title); delete d->title; delete d; @@ -901,6 +921,11 @@ return d->showLabels; } +bool Axis::showOverlappingDataLabels() const +{ + return d->showOverlappingDataLabels; +} + QString Axis::id() const { return d->id; @@ -916,27 +941,27 @@ return d->dataSets; } -bool Axis::attachDataSet( DataSet *dataSet ) +bool Axis::attachDataSet(DataSet *dataSet) { - Q_ASSERT( !d->dataSets.contains( dataSet ) ); - if ( d->dataSets.contains( dataSet ) ) + Q_ASSERT(!d->dataSets.contains(dataSet)); + if (d->dataSets.contains(dataSet)) return false; - d->dataSets.append( dataSet ); + d->dataSets.append(dataSet); - if ( dimension() == YAxisDimension ) { - dataSet->setAttachedAxis( this ); + if (dimension() == YAxisDimension) { + dataSet->setAttachedAxis(this); ChartType chartType = dataSet->chartType(); - if ( chartType == LastChartType ) + if (chartType == LastChartType) chartType = d->plotAreaChartType; - KDChart::AbstractDiagram *diagram = d->getDiagramAndCreateIfNeeded( chartType ); - Q_ASSERT( diagram ); - KDChartModel *model = dynamic_cast( diagram->model() ); - Q_ASSERT( model ); + KDChart::AbstractDiagram *diagram = d->getDiagramAndCreateIfNeeded(chartType); + Q_ASSERT(diagram); + KDChartModel *model = dynamic_cast(diagram->model()); + Q_ASSERT(model); - model->addDataSet( dataSet ); + model->addDataSet(dataSet); layoutPlanes(); requestRepaint(); @@ -945,37 +970,37 @@ return true; } -bool Axis::detachDataSet( DataSet *dataSet, bool silent ) +bool Axis::detachDataSet(DataSet *dataSet, bool silent) { - Q_ASSERT( d->dataSets.contains( dataSet ) ); - if ( !d->dataSets.contains( dataSet ) ) + Q_ASSERT(d->dataSets.contains(dataSet)); + if (!d->dataSets.contains(dataSet)) return false; - d->dataSets.removeAll( dataSet ); + d->dataSets.removeAll(dataSet); - if ( dimension() == YAxisDimension ) { + if (dimension() == YAxisDimension) { ChartType chartType = dataSet->chartType(); - if ( chartType == LastChartType ) + if (chartType == LastChartType) chartType = d->plotAreaChartType; - KDChart::AbstractDiagram *oldDiagram = d->getDiagram( chartType ); - Q_ASSERT( oldDiagram ); - KDChartModel *oldModel = dynamic_cast( oldDiagram->model() ); - Q_ASSERT( oldModel ); + KDChart::AbstractDiagram *oldDiagram = d->getDiagram(chartType); + Q_ASSERT(oldDiagram); + KDChartModel *oldModel = dynamic_cast(oldDiagram->model()); + Q_ASSERT(oldModel); const int rowCount = oldModel->dataDirection() == Qt::Vertical ? oldModel->columnCount() : oldModel->rowCount(); // If there's only as many rows as needed for *one* // dataset, that means that the dataset we're removing is // the last one in the model --> delete model - if ( rowCount == oldModel->dataDimensions() ) - d->deleteDiagram( chartType ); + if (rowCount == oldModel->dataDimensions()) + d->deleteDiagram(chartType); else - oldModel->removeDataSet( dataSet, silent ); + oldModel->removeDataSet(dataSet, silent); - dataSet->setKdChartModel( 0 ); - dataSet->setAttachedAxis( 0 ); + dataSet->setKdChartModel(0); + dataSet->setAttachedAxis(0); - if ( !silent ) { + if (!silent) { layoutPlanes(); requestRepaint(); } @@ -987,8 +1012,8 @@ void Axis::clearDataSets() { QList list = d->dataSets; - foreach( DataSet *dataSet, list ) - detachDataSet( dataSet, true ); + foreach(DataSet *dataSet, list) + detachDataSet(dataSet, true); } qreal Axis::majorInterval() const @@ -996,43 +1021,43 @@ return d->majorInterval; } -void Axis::setMajorInterval( qreal interval ) +void Axis::setMajorInterval(qreal interval) { - // Don't overwrite if automatic interval is being requested ( for - // interval = 0 ) - if ( interval != 0.0 ) { + // Don't overwrite if automatic interval is being requested (for + // interval = 0) + if (interval != 0.0) { d->majorInterval = interval; d->useAutomaticMajorInterval = false; } else d->useAutomaticMajorInterval = true; // KDChart - KDChart::GridAttributes attributes = d->kdPlane->gridAttributes( orientation() ); - attributes.setGridStepWidth( interval ); - d->kdPlane->setGridAttributes( orientation(), attributes ); - - attributes = d->kdPolarPlane->gridAttributes( true ); - attributes.setGridStepWidth( interval ); - d->kdPolarPlane->setGridAttributes( true, attributes ); + KDChart::GridAttributes attributes = d->kdPlane->gridAttributes(orientation()); + attributes.setGridStepWidth(interval); + d->kdPlane->setGridAttributes(orientation(), attributes); + + attributes = d->kdPolarPlane->gridAttributes(true); + attributes.setGridStepWidth(interval); + d->kdPolarPlane->setGridAttributes(true, attributes); // FIXME: Hide minor tick marks more appropriately - if ( !d->showMinorGrid && interval != 0.0 ) - setMinorInterval( interval ); + if (!d->showMinorGrid && interval != 0.0) + setMinorInterval(interval); requestRepaint(); } qreal Axis::minorInterval() const { - return ( d->majorInterval / (qreal)d->minorIntervalDivisor ); + return (d->majorInterval / (qreal)d->minorIntervalDivisor); } -void Axis::setMinorInterval( qreal interval ) +void Axis::setMinorInterval(qreal interval) { - if ( interval == 0.0 ) - setMinorIntervalDivisor( 0 ); + if (interval == 0.0) + setMinorIntervalDivisor(0); else - setMinorIntervalDivisor( int( qRound( d->majorInterval / interval ) ) ); + setMinorIntervalDivisor(int(qRound(d->majorInterval / interval))); } int Axis::minorIntervalDivisor() const @@ -1040,23 +1065,23 @@ return d->minorIntervalDivisor; } -void Axis::setMinorIntervalDivisor( int divisor ) +void Axis::setMinorIntervalDivisor(int divisor) { // A divisor of 0.0 means automatic minor interval calculation - if ( divisor != 0 ) { + if (divisor != 0) { d->minorIntervalDivisor = divisor; d->useAutomaticMinorInterval = false; } else d->useAutomaticMinorInterval = true; // KDChart - KDChart::GridAttributes attributes = d->kdPlane->gridAttributes( orientation() ); - attributes.setGridSubStepWidth( (divisor != 0) ? (d->majorInterval / divisor) : 0.0 ); - d->kdPlane->setGridAttributes( orientation(), attributes ); - - attributes = d->kdPolarPlane->gridAttributes( true ); - attributes.setGridSubStepWidth( (divisor != 0) ? (d->majorInterval / divisor) : 0.0 ); - d->kdPolarPlane->setGridAttributes( true, attributes ); + KDChart::GridAttributes attributes = d->kdPlane->gridAttributes(orientation()); + attributes.setGridSubStepWidth((divisor != 0) ? (d->majorInterval / divisor) : 0.0); + d->kdPlane->setGridAttributes(orientation(), attributes); + + attributes = d->kdPolarPlane->gridAttributes(true); + attributes.setGridSubStepWidth((divisor != 0) ? (d->majorInterval / divisor) : 0.0); + d->kdPolarPlane->setGridAttributes(true, attributes); requestRepaint(); } @@ -1071,20 +1096,20 @@ return d->useAutomaticMinorInterval; } -void Axis::setUseAutomaticMajorInterval( bool automatic ) +void Axis::setUseAutomaticMajorInterval(bool automatic) { d->useAutomaticMajorInterval = automatic; // A value of 0.0 will activate automatic intervals, // but not change d->majorInterval - setMajorInterval( automatic ? 0.0 : majorInterval() ); + setMajorInterval(automatic ? 0.0 : majorInterval()); } -void Axis::setUseAutomaticMinorInterval( bool automatic ) +void Axis::setUseAutomaticMinorInterval(bool automatic) { d->useAutomaticMinorInterval = automatic; // A value of 0.0 will activate automatic intervals, // but not change d->minorIntervalDivisor - setMinorInterval( automatic ? 0.0 : minorInterval() ); + setMinorInterval(automatic ? 0.0 : minorInterval()); } bool Axis::showInnerMinorTicks() const @@ -1107,48 +1132,48 @@ return d->showOuterMajorTicks; } -void Axis::setShowInnerMinorTicks( bool showTicks ) +void Axis::setShowInnerMinorTicks(bool showTicks) { d->showInnerMinorTicks = showTicks; KDChart::RulerAttributes attr = kdAxis()->rulerAttributes(); attr.setShowMinorTickMarks(d->showInnerMinorTicks || d->showOuterMinorTicks); - kdAxis()->setRulerAttributes( attr ); + kdAxis()->setRulerAttributes(attr); } -void Axis::setShowOuterMinorTicks( bool showTicks ) +void Axis::setShowOuterMinorTicks(bool showTicks) { d->showOuterMinorTicks = showTicks; KDChart::RulerAttributes attr = kdAxis()->rulerAttributes(); attr.setShowMinorTickMarks(d->showInnerMinorTicks || d->showOuterMinorTicks); - kdAxis()->setRulerAttributes( attr ); + kdAxis()->setRulerAttributes(attr); } -void Axis::setShowInnerMajorTicks( bool showTicks ) +void Axis::setShowInnerMajorTicks(bool showTicks) { d->showInnerMajorTicks = showTicks; KDChart::RulerAttributes attr = kdAxis()->rulerAttributes(); attr.setShowMajorTickMarks(d->showInnerMajorTicks || d->showOuterMajorTicks); - kdAxis()->setRulerAttributes( attr ); + kdAxis()->setRulerAttributes(attr); } -void Axis::setShowOuterMajorTicks( bool showTicks ) +void Axis::setShowOuterMajorTicks(bool showTicks) { d->showOuterMajorTicks = showTicks; KDChart::RulerAttributes attr = kdAxis()->rulerAttributes(); attr.setShowMajorTickMarks(d->showInnerMajorTicks || d->showOuterMajorTicks); - kdAxis()->setRulerAttributes( attr ); + kdAxis()->setRulerAttributes(attr); } -void Axis::setScalingLogarithmic( bool logarithmicScaling ) +void Axis::setScalingLogarithmic(bool logarithmicScaling) { d->logarithmicScaling = logarithmicScaling; - if ( dimension() != YAxisDimension ) + if (dimension() != YAxisDimension) return; - d->kdPlane->setAxesCalcModeY( d->logarithmicScaling + d->kdPlane->setAxesCalcModeY(d->logarithmicScaling ? KDChart::AbstractCoordinatePlane::Logarithmic - : KDChart::AbstractCoordinatePlane::Linear ); + : KDChart::AbstractCoordinatePlane::Linear); d->kdPlane->layoutPlanes(); requestRepaint(); @@ -1164,18 +1189,18 @@ return d->showMajorGrid; } -void Axis::setShowMajorGrid( bool showGrid ) +void Axis::setShowMajorGrid(bool showGrid) { d->showMajorGrid = showGrid; // KDChart - KDChart::GridAttributes attributes = d->kdPlane->gridAttributes( orientation() ); - attributes.setGridVisible( d->showMajorGrid ); - d->kdPlane->setGridAttributes( orientation(), attributes ); - - attributes = d->kdPolarPlane->gridAttributes( true ); - attributes.setGridVisible( d->showMajorGrid ); - d->kdPolarPlane->setGridAttributes( true, attributes ); + KDChart::GridAttributes attributes = d->kdPlane->gridAttributes(orientation()); + attributes.setGridVisible(d->showMajorGrid); + d->kdPlane->setGridAttributes(orientation(), attributes); + + attributes = d->kdPolarPlane->gridAttributes(true); + attributes.setGridVisible(d->showMajorGrid); + d->kdPolarPlane->setGridAttributes(true, attributes); requestRepaint(); } @@ -1185,52 +1210,57 @@ return d->showMinorGrid; } -void Axis::setShowMinorGrid( bool showGrid ) +void Axis::setShowMinorGrid(bool showGrid) { d->showMinorGrid = showGrid; // KDChart - KDChart::GridAttributes attributes = d->kdPlane->gridAttributes( orientation() ); - attributes.setSubGridVisible( d->showMinorGrid ); - d->kdPlane->setGridAttributes( orientation(), attributes ); - - attributes = d->kdPolarPlane->gridAttributes( true ); - attributes.setSubGridVisible( d->showMinorGrid ); - d->kdPolarPlane->setGridAttributes( true, attributes ); + KDChart::GridAttributes attributes = d->kdPlane->gridAttributes(orientation()); + attributes.setSubGridVisible(d->showMinorGrid); + d->kdPlane->setGridAttributes(orientation(), attributes); + + attributes = d->kdPolarPlane->gridAttributes(true); + attributes.setSubGridVisible(d->showMinorGrid); + d->kdPolarPlane->setGridAttributes(true, attributes); requestRepaint(); } -void Axis::setTitleText( const QString &text ) +void Axis::setTitleText(const QString &text) { - d->titleData->document()->setPlainText( text ); + d->titleData->document()->setPlainText(text); } -void Axis::setShowLabels( bool show ) +void Axis::setShowLabels(bool show) { d->showLabels = show; KDChart::TextAttributes textAttr = d->kdAxis->textAttributes(); - textAttr.setVisible( show ); - d->kdAxis->setTextAttributes( textAttr ); + textAttr.setVisible(show); + d->kdAxis->setTextAttributes(textAttr); +} + +void Axis::setShowOverlappingDataLabels(bool show) +{ + d->showOverlappingDataLabels = show; } Qt::Orientation Axis::orientation() { bool chartIsVertical = d->plotArea->isVertical(); bool horizontal = d->dimension == (chartIsVertical ? YAxisDimension - : XAxisDimension ); + : XAxisDimension); return horizontal ? Qt::Horizontal : Qt::Vertical; } -bool Axis::loadOdf( const KoXmlElement &axisElement, KoShapeLoadingContext &context ) +bool Axis::loadOdf(const KoXmlElement &axisElement, KoShapeLoadingContext &context) { KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); KoOdfStylesReader &stylesReader = context.odfLoadingContext().stylesReader(); - OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData( OdfLoadingHelperId ); + OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData(OdfLoadingHelperId); bool reverseAxis = false; - d->title->setVisible( false ); + d->title->setVisible(false); QPen gridPen(Qt::NoPen); QPen subGridPen(Qt::NoPen); @@ -1244,10 +1274,10 @@ d->showOuterMajorTicks = true; // Use automatic interval calculation by default - setMajorInterval( 0.0 ); - setMinorInterval( 0.0 ); + setMajorInterval(0.0); + setMinorInterval(0.0); - if ( !axisElement.isNull() ) { + if (!axisElement.isNull()) { QString styleName = axisElement.attributeNS(KoXmlNS::chart, "style-name", QString()); const KoXmlElement *stylElement = stylesReader.findStyle(styleName, "chart"); @@ -1260,168 +1290,196 @@ } KoXmlElement n; - forEachElement ( n, axisElement ) { - if ( n.namespaceURI() != KoXmlNS::chart ) + forEachElement (n, axisElement) { + if (n.namespaceURI() != KoXmlNS::chart) continue; - if ( n.localName() == "title" ) { - if ( n.hasAttributeNS( KoXmlNS::svg, "x" ) - && n.hasAttributeNS( KoXmlNS::svg, "y" ) ) - { - const qreal x = KoUnit::parseValue( n.attributeNS( KoXmlNS::svg, "x" ) ); - const qreal y = KoUnit::parseValue( n.attributeNS( KoXmlNS::svg, "y" ) ); - d->title->setPosition( QPointF( x, y ) ); - } - - if ( n.hasAttributeNS( KoXmlNS::svg, "width" ) - && n.hasAttributeNS( KoXmlNS::svg, "height" ) ) + if (n.localName() == "title") { + if (n.hasAttributeNS(KoXmlNS::svg, "x") + && n.hasAttributeNS(KoXmlNS::svg, "y")) { - const qreal width = KoUnit::parseValue( n.attributeNS( KoXmlNS::svg, "width" ) ); - const qreal height = KoUnit::parseValue( n.attributeNS( KoXmlNS::svg, "height" ) ); - d->title->setSize( QSizeF( width, height ) ); + const qreal x = KoUnit::parseValue(n.attributeNS(KoXmlNS::svg, "x")); + const qreal y = KoUnit::parseValue(n.attributeNS(KoXmlNS::svg, "y")); + d->title->setPosition(QPointF(x, y)); } - if ( n.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + if (n.hasAttributeNS(KoXmlNS::chart, "style-name")) { styleStack.clear(); - context.odfLoadingContext().fillStyleStack( n, KoXmlNS::chart, "style-name", "chart" ); - styleStack.setTypeProperties( "text" ); + context.odfLoadingContext().fillStyleStack(n, KoXmlNS::chart, "style-name", "chart"); + + if (styleStack.hasProperty(KoXmlNS::style, "rotation-angle")) { + qreal rotationAngle = 360 - KoUnit::parseValue(styleStack.property(KoXmlNS::style, "rotation-angle")); + + if (kdAxis()->position() == KDChart::CartesianAxis::Left) + rotationAngle = 90 + rotationAngle; + else if (kdAxis()->position() == KDChart::CartesianAxis::Right) + rotationAngle = -90 + rotationAngle; + d->title->rotate(rotationAngle); + } + + styleStack.setTypeProperties("text"); + + if (styleStack.hasProperty(KoXmlNS::fo, "font-size")) { + const qreal fontSize = KoUnit::parseValue(styleStack.property(KoXmlNS::fo, "font-size")); + QFont font = d->titleData->document()->defaultFont(); + font.setPointSizeF(fontSize); + d->titleData->document()->setDefaultFont(font); + } - if ( styleStack.hasProperty( KoXmlNS::fo, "font-size" ) ) { - const qreal fontSize = KoUnit::parseValue( styleStack.property( KoXmlNS::fo, "font-size" ) ); + if (styleStack.hasProperty(KoXmlNS::fo, "font-family")) { + const QString fontFamily = styleStack.property(KoXmlNS::fo, "font-family"); QFont font = d->titleData->document()->defaultFont(); - font.setPointSizeF( fontSize ); - d->titleData->document()->setDefaultFont( font ); + font.setFamily(fontFamily); + d->titleData->document()->setDefaultFont(font); } } - const KoXmlElement textElement = KoXml::namedItemNS( n, KoXmlNS::text, "p" ); - if ( !textElement.isNull() ) { - d->title->setVisible( true ); - setTitleText( textElement.text() ); + const KoXmlElement textElement = KoXml::namedItemNS(n, KoXmlNS::text, "p"); + if (!textElement.isNull()) { + d->title->setVisible(true); + setTitleText(textElement.text()); } else { qWarning() << "Error: Axis' element contains no "; } + + if (n.hasAttributeNS(KoXmlNS::svg, "width") + && n.hasAttributeNS(KoXmlNS::svg, "height")) + { + const qreal width = KoUnit::parseValue(n.attributeNS(KoXmlNS::svg, "width")); + const qreal height = KoUnit::parseValue(n.attributeNS(KoXmlNS::svg, "height")); + d->title->setSize(QSizeF(width, height)); + } else { + QTextDocument* doc = d->titleData->document(); + QRect r = QFontMetrics(doc->defaultFont()).boundingRect(doc->toPlainText()); + d->title->setSize(r.size()); + } } - else if ( n.localName() == "grid" ) { + else if (n.localName() == "grid") { bool major = false; - if ( n.hasAttributeNS( KoXmlNS::chart, "class" ) ) { - const QString className = n.attributeNS( KoXmlNS::chart, "class" ); - if ( className == "major" ) + if (n.hasAttributeNS(KoXmlNS::chart, "class")) { + const QString className = n.attributeNS(KoXmlNS::chart, "class"); + if (className == "major") major = true; } else { qWarning() << "Error: Axis' element contains no valid class. It must be either \"major\" or \"minor\"."; continue; } - if ( major ) { + if (major) { d->showMajorGrid = true; } else { d->showMinorGrid = true; } - if ( n.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + if (n.hasAttributeNS(KoXmlNS::chart, "style-name")) { styleStack.clear(); - context.odfLoadingContext().fillStyleStack( n, KoXmlNS::style, "style-name", "chart" ); - styleStack.setTypeProperties( "graphic" ); - if ( styleStack.hasProperty( KoXmlNS::svg, "stroke-color" ) ) { - const QString strokeColor = styleStack.property( KoXmlNS::svg, "stroke-color" ); + context.odfLoadingContext().fillStyleStack(n, KoXmlNS::style, "style-name", "chart"); + styleStack.setTypeProperties("graphic"); + if (styleStack.hasProperty(KoXmlNS::svg, "stroke-color")) { + const QString strokeColor = styleStack.property(KoXmlNS::svg, "stroke-color"); //d->showMajorGrid = true; - if ( major ) - gridPen = QPen( QColor( strokeColor ) ); + if (major) + gridPen = QPen(QColor(strokeColor)); else - subGridPen = QPen( QColor( strokeColor ) ); + subGridPen = QPen(QColor(strokeColor)); } } } - else if ( n.localName() == "categories" ) { - if ( n.hasAttributeNS( KoXmlNS::table, "cell-range-address" ) ) { - const CellRegion region = CellRegion( helper->tableSource, n.attributeNS( KoXmlNS::table, "cell-range-address" ) ); + else if (n.localName() == "categories") { + if (n.hasAttributeNS(KoXmlNS::table, "cell-range-address")) { + const CellRegion region = CellRegion(helper->tableSource, n.attributeNS(KoXmlNS::table, "cell-range-address")); helper->categoryRegionSpecifiedInXAxis = true; - plotArea()->proxyModel()->setCategoryDataRegion( region ); + plotArea()->proxyModel()->setCategoryDataRegion(region); } } } - if ( axisElement.hasAttributeNS( KoXmlNS::chart, "axis-name" ) ) { - const QString name = axisElement.attributeNS( KoXmlNS::chart, "axis-name", QString() ); - //setTitleText( name ); + if (axisElement.hasAttributeNS(KoXmlNS::chart, "axis-name")) { + const QString name = axisElement.attributeNS(KoXmlNS::chart, "axis-name", QString()); + //setTitleText(name); } // NOTE: chart:dimension already handled by PlotArea before and passed // explicitly in the constructor. } - if ( axisElement.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + if (axisElement.hasAttributeNS(KoXmlNS::chart, "style-name")) { styleStack.clear(); - context.odfLoadingContext().fillStyleStack( axisElement, KoXmlNS::chart, "style-name", "chart" ); + context.odfLoadingContext().fillStyleStack(axisElement, KoXmlNS::chart, "style-name", "chart"); KoCharacterStyle charStyle; - charStyle.loadOdf(&axisElement, context ); - setFont( charStyle.font() ); + charStyle.loadOdf(&axisElement, context); + setFont(charStyle.font()); - styleStack.setTypeProperties( "chart" ); + styleStack.setTypeProperties("chart"); - if ( styleStack.hasProperty( KoXmlNS::chart, "logarithmic" ) - && styleStack.property( KoXmlNS::chart, "logarithmic" ) == "true" ) + if (styleStack.hasProperty(KoXmlNS::chart, "logarithmic") + && styleStack.property(KoXmlNS::chart, "logarithmic") == "true") { - setScalingLogarithmic( true ); + setScalingLogarithmic(true); } - if ( styleStack.hasProperty( KoXmlNS::chart, "reverse-direction" ) - && styleStack.property( KoXmlNS::chart, "reverse-direction" ) == "true" ) + if (styleStack.hasProperty(KoXmlNS::chart, "reverse-direction") + && styleStack.property(KoXmlNS::chart, "reverse-direction") == "true") { reverseAxis = true; } - if ( styleStack.hasProperty( KoXmlNS::chart, "interval-major" ) ) - setMajorInterval( KoUnit::parseValue( styleStack.property( KoXmlNS::chart, "interval-major" ) ) ); - if ( styleStack.hasProperty( KoXmlNS::chart, "interval-minor-divisor" ) ) - setMinorIntervalDivisor( KoUnit::parseValue( styleStack.property( KoXmlNS::chart, "interval-minor-divisor" ) ) ); - else if ( styleStack.hasProperty( KoXmlNS::chart, "interval-minor" ) ) - setMinorInterval( KoUnit::parseValue( styleStack.property( KoXmlNS::chart, "interval-minor" ) ) ); - - if ( styleStack.hasProperty( KoXmlNS::chart, "tick-marks-minor-inner" ) ) - setShowInnerMinorTicks(styleStack.property( KoXmlNS::chart, "tick-marks-minor-inner" ) == "true"); - if ( styleStack.hasProperty( KoXmlNS::chart, "tick-marks-minor-outer" ) ) - setShowOuterMinorTicks(styleStack.property( KoXmlNS::chart, "tick-marks-minor-outer" ) == "true"); - if ( styleStack.hasProperty( KoXmlNS::chart, "tick-marks-major-inner" ) ) - setShowInnerMajorTicks(styleStack.property( KoXmlNS::chart, "tick-marks-major-inner" ) == "true"); - if ( styleStack.hasProperty( KoXmlNS::chart, "tick-marks-major-outer" ) ) - setShowOuterMajorTicks(styleStack.property( KoXmlNS::chart, "tick-marks-major-outer" ) == "true"); - - if ( styleStack.hasProperty( KoXmlNS::chart, "display-label" ) ) - setShowLabels( styleStack.property( KoXmlNS::chart, "display-label" ) != "false" ); - if ( styleStack.hasProperty( KoXmlNS::chart, "visible" ) ) - setVisible( styleStack.property( KoXmlNS::chart, "visible" ) != "false" ); - if ( styleStack.hasProperty( KoXmlNS::chart, "minimum" ) ) { - const qreal minimum = styleStack.property( KoXmlNS::chart, "minimum" ).toDouble(); + if (styleStack.hasProperty(KoXmlNS::chart, "interval-major")) + setMajorInterval(KoUnit::parseValue(styleStack.property(KoXmlNS::chart, "interval-major"))); + if (styleStack.hasProperty(KoXmlNS::chart, "interval-minor-divisor")) + setMinorIntervalDivisor(KoUnit::parseValue(styleStack.property(KoXmlNS::chart, "interval-minor-divisor"))); + else if (styleStack.hasProperty(KoXmlNS::chart, "interval-minor")) + setMinorInterval(KoUnit::parseValue(styleStack.property(KoXmlNS::chart, "interval-minor"))); + + if (styleStack.hasProperty(KoXmlNS::chart, "tick-marks-minor-inner")) + setShowInnerMinorTicks(styleStack.property(KoXmlNS::chart, "tick-marks-minor-inner") == "true"); + if (styleStack.hasProperty(KoXmlNS::chart, "tick-marks-minor-outer")) + setShowOuterMinorTicks(styleStack.property(KoXmlNS::chart, "tick-marks-minor-outer") == "true"); + if (styleStack.hasProperty(KoXmlNS::chart, "tick-marks-major-inner")) + setShowInnerMajorTicks(styleStack.property(KoXmlNS::chart, "tick-marks-major-inner") == "true"); + if (styleStack.hasProperty(KoXmlNS::chart, "tick-marks-major-outer")) + setShowOuterMajorTicks(styleStack.property(KoXmlNS::chart, "tick-marks-major-outer") == "true"); + + if (styleStack.hasProperty(KoXmlNS::chart, "display-label")) + setShowLabels(styleStack.property(KoXmlNS::chart, "display-label") != "false"); + if (styleStack.hasProperty(KoXmlNS::chart, "text-overlap")) + setShowOverlappingDataLabels(styleStack.property(KoXmlNS::chart, "text-overlap") != "false"); + if (styleStack.hasProperty(KoXmlNS::chart, "visible")) + setVisible(styleStack.property(KoXmlNS::chart, "visible") != "false"); + if (styleStack.hasProperty(KoXmlNS::chart, "minimum")) { + const qreal minimum = styleStack.property(KoXmlNS::chart, "minimum").toDouble(); const qreal maximum = orientation() == Qt::Vertical ? d->kdPlane->verticalRange().second : d->kdPlane->horizontalRange().second; - if ( orientation() == Qt::Vertical ) - d->kdPlane->setVerticalRange( qMakePair( minimum, maximum ) ); + if (orientation() == Qt::Vertical) + d->kdPlane->setVerticalRange(qMakePair(minimum, maximum)); else - d->kdPlane->setHorizontalRange( qMakePair( minimum, maximum ) ); + d->kdPlane->setHorizontalRange(qMakePair(minimum, maximum)); + d->useAutomaticMinimumRange = false; } - if ( styleStack.hasProperty( KoXmlNS::chart, "maximum" ) ) { + if (styleStack.hasProperty(KoXmlNS::chart, "maximum")) { const qreal minimum = orientation() == Qt::Vertical ? d->kdPlane->verticalRange().first : d->kdPlane->horizontalRange().first; - const qreal maximum = styleStack.property( KoXmlNS::chart, "maximum" ).toDouble(); - if ( orientation() == Qt::Vertical ) - d->kdPlane->setVerticalRange( qMakePair( minimum, maximum ) ); + const qreal maximum = styleStack.property(KoXmlNS::chart, "maximum").toDouble(); + if (orientation() == Qt::Vertical) + d->kdPlane->setVerticalRange(qMakePair(minimum, maximum)); else - d->kdPlane->setHorizontalRange( qMakePair( minimum, maximum ) ); + d->kdPlane->setHorizontalRange(qMakePair(minimum, maximum)); + d->useAutomaticMaximumRange = false; } - - styleStack.setTypeProperties( "text" ); - if ( styleStack.hasProperty( KoXmlNS::fo, "font-size" ) ) - { - QString fontSizeString = styleStack.property( KoXmlNS::fo, "font-size" ); - const QString unitString = fontSizeString.right( 2 ); - fontSizeString.remove( unitString ); + /*if (styleStack.hasProperty(KoXmlNS::chart, "origin")) { + const qreal origin = KoUnit::parseValue(styleStack.property(KoXmlNS::chart, "origin")); + }*/ + + styleStack.setTypeProperties("text"); + if (styleStack.hasProperty(KoXmlNS::fo, "font-size")) { + QString fontSizeString = styleStack.property(KoXmlNS::fo, "font-size"); + const QString unitString = fontSizeString.right(2); + fontSizeString.remove(unitString); bool ok = false; - qreal fontSize = fontSizeString.toDouble( &ok ); + qreal fontSize = fontSizeString.toDouble(&ok); if (unitString == "cm") fontSize = CM_TO_POINT(fontSize); else if (unitString == "pc") @@ -1430,78 +1488,75 @@ fontSize = MM_TO_POINT(fontSize); else if (unitString == "in") fontSize = INCH_TO_POINT(fontSize); - if ( ok ) - { + if (ok) { KDChart::TextAttributes tatt = kdAxis()->textAttributes(); - tatt.setFontSize( KDChart::Measure( fontSize, KDChartEnums::MeasureCalculationModeAbsolute ) ); - kdAxis()->setTextAttributes( tatt ); + tatt.setFontSize(KDChart::Measure(fontSize, KDChartEnums::MeasureCalculationModeAbsolute)); + kdAxis()->setTextAttributes(tatt); } } - if ( styleStack.hasProperty( KoXmlNS::fo, "font-color" ) ) - { - QString fontColorString = styleStack.property( KoXmlNS::fo, "font-color" ); + if (styleStack.hasProperty(KoXmlNS::fo, "font-color")) { + QString fontColorString = styleStack.property(KoXmlNS::fo, "font-color"); QColor color(fontColorString); - if ( color.isValid() ) + if (color.isValid()) { KDChart::TextAttributes tatt = kdAxis()->textAttributes(); QPen pen = tatt.pen(); pen.setColor(color); tatt.setPen(pen); - kdAxis()->setTextAttributes( tatt ); + kdAxis()->setTextAttributes(tatt); } } } else { - setShowLabels( KoOdfWorkaround::fixMissingStyle_DisplayLabel( axisElement, context ) ); + setShowLabels(KoOdfWorkaround::fixMissingStyle_DisplayLabel(axisElement, context)); } - KDChart::GridAttributes gridAttr = d->kdPlane->gridAttributes( orientation() ); - gridAttr.setGridVisible( d->showMajorGrid ); - gridAttr.setSubGridVisible( d->showMinorGrid ); - if ( gridPen.style() != Qt::NoPen ) - gridAttr.setGridPen( gridPen ); - if ( subGridPen.style() != Qt::NoPen ) - gridAttr.setSubGridPen( subGridPen ); - d->kdPlane->setGridAttributes( orientation(), gridAttr ); - - gridAttr = d->kdPolarPlane->gridAttributes( orientation() ); - gridAttr.setGridVisible( d->showMajorGrid ); - gridAttr.setSubGridVisible( d->showMinorGrid ); - if ( gridPen.style() != Qt::NoPen ) - gridAttr.setGridPen( gridPen ); - if ( subGridPen.style() != Qt::NoPen ) - gridAttr.setSubGridPen( subGridPen ); -// if ( plotArea()->chartType() == RadarChartType || plotArea()->chartType() == FilledRadarChartType ) -// d->kdPolarPlane->setGridAttributes( false, gridAttr ); + KDChart::GridAttributes gridAttr = d->kdPlane->gridAttributes(orientation()); + gridAttr.setGridVisible(d->showMajorGrid); + gridAttr.setSubGridVisible(d->showMinorGrid); + if (gridPen.style() != Qt::NoPen) + gridAttr.setGridPen(gridPen); + if (subGridPen.style() != Qt::NoPen) + gridAttr.setSubGridPen(subGridPen); + d->kdPlane->setGridAttributes(orientation(), gridAttr); + + gridAttr = d->kdPolarPlane->gridAttributes(orientation()); + gridAttr.setGridVisible(d->showMajorGrid); + gridAttr.setSubGridVisible(d->showMinorGrid); + if (gridPen.style() != Qt::NoPen) + gridAttr.setGridPen(gridPen); + if (subGridPen.style() != Qt::NoPen) + gridAttr.setSubGridPen(subGridPen); +// if (plotArea()->chartType() == RadarChartType || plotArea()->chartType() == FilledRadarChartType) +// d->kdPolarPlane->setGridAttributes(false, gridAttr); // else - d->kdPolarPlane->setGridAttributes( true, gridAttr ); + d->kdPolarPlane->setGridAttributes(true, gridAttr); gridAttr = d->kdRadarPlane->globalGridAttributes(); - gridAttr.setGridVisible( d->showMajorGrid ); - gridAttr.setSubGridVisible( d->showMinorGrid ); - if ( gridPen.style() != Qt::NoPen ) - gridAttr.setGridPen( gridPen ); - if ( subGridPen.style() != Qt::NoPen ) - gridAttr.setSubGridPen( subGridPen ); - d->kdRadarPlane->setGlobalGridAttributes( gridAttr ); - KDChart::TextAttributes ta( d->kdRadarPlane->textAttributes() ); - ta.setVisible( helper->categoryRegionSpecifiedInXAxis ); - ta.setFont( font() ); - ta.setFontSize( 50 ); - d->kdRadarPlane->setTextAttributes( ta ); - - if ( reverseAxis ) - { - KDChart::CartesianCoordinatePlane *plane = dynamic_cast( kdPlane() ); - if ( plane ) { - if ( orientation() == Qt::Horizontal ) - plane->setHorizontalRangeReversed( reverseAxis ); + gridAttr.setGridVisible(d->showMajorGrid); + gridAttr.setSubGridVisible(d->showMinorGrid); + if (gridPen.style() != Qt::NoPen) + gridAttr.setGridPen(gridPen); + if (subGridPen.style() != Qt::NoPen) + gridAttr.setSubGridPen(subGridPen); + d->kdRadarPlane->setGlobalGridAttributes(gridAttr); + KDChart::TextAttributes ta(d->kdRadarPlane->textAttributes()); + ta.setVisible(helper->categoryRegionSpecifiedInXAxis); + ta.setFont(font()); + ta.setFontSize(50); + d->kdRadarPlane->setTextAttributes(ta); + + if (reverseAxis) { + KDChart::CartesianCoordinatePlane *plane = dynamic_cast(kdPlane()); + if (plane) { + if (orientation() == Qt::Horizontal) + plane->setHorizontalRangeReversed(reverseAxis); else // Qt::Vertical - plane->setVerticalRangeReversed( reverseAxis ); + plane->setVerticalRangeReversed(reverseAxis); } } // Style of axis is still in styleStack - if ( !loadOdfChartSubtypeProperties( axisElement, context ) ) + if (!loadOdfChartSubtypeProperties(axisElement, context)) return false; requestRepaint(); @@ -1509,47 +1564,89 @@ return true; } -bool Axis::loadOdfChartSubtypeProperties( const KoXmlElement &axisElement, - KoShapeLoadingContext &context ) +bool Axis::loadOdfChartSubtypeProperties(const KoXmlElement &axisElement, + KoShapeLoadingContext &context) { Q_UNUSED(axisElement); KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); - styleStack.setTypeProperties( "chart" ); + styleStack.setTypeProperties("chart"); // Load these attributes regardless of the actual chart type. They'll have // no effect if their respective chart type is not in use. // However, they'll be saved back to ODF that way. - if ( styleStack.hasProperty( KoXmlNS::chart, "gap-width" ) ) - setGapBetweenSets( KoUnit::parseValue( styleStack.property( KoXmlNS::chart, "gap-width" ) ) ); - if ( styleStack.hasProperty( KoXmlNS::chart, "overlap" ) ) + if (styleStack.hasProperty(KoXmlNS::chart, "gap-width")) + setGapBetweenSets(KoUnit::parseValue(styleStack.property(KoXmlNS::chart, "gap-width"))); + if (styleStack.hasProperty(KoXmlNS::chart, "overlap")) // The minus is intended! - setGapBetweenBars( -KoUnit::parseValue( styleStack.property( KoXmlNS::chart, "overlap" ) ) ); + setGapBetweenBars(-KoUnit::parseValue(styleStack.property(KoXmlNS::chart, "overlap"))); return true; } -void Axis::saveOdf( KoShapeSavingContext &context ) +void Axis::saveOdf(KoShapeSavingContext &context) { KoXmlWriter &bodyWriter = context.xmlWriter(); KoGenStyles &mainStyles = context.mainStyles(); - bodyWriter.startElement( "chart:axis" ); + bodyWriter.startElement("chart:axis"); - KoGenStyle axisStyle( KoGenStyle::ChartAutoStyle, "chart" ); - axisStyle.addProperty( "chart:display-label", "true" ); + KoGenStyle axisStyle(KoGenStyle::ChartAutoStyle, "chart"); + axisStyle.addProperty("chart:logarithmic", scalingIsLogarithmic()); + + KDChart::CartesianCoordinatePlane *plane = dynamic_cast(kdPlane()); + bool reverseAxis = false; + if (plane) { + if (orientation() == Qt::Horizontal) + reverseAxis = plane->isHorizontalRangeReversed(); + else // Qt::Vertical + reverseAxis = plane->isVerticalRangeReversed(); + } + axisStyle.addProperty("chart:reverse-direction", reverseAxis); + + axisStyle.addProperty("chart:tick-marks-minor-inner", showInnerMinorTicks()); + axisStyle.addProperty("chart:tick-marks-minor-outer", showOuterMinorTicks()); + axisStyle.addProperty("chart:tick-marks-major-inner", showInnerMajorTicks()); + axisStyle.addProperty("chart:tick-marks-major-outer", showOuterMajorTicks()); + + axisStyle.addProperty("chart:display-label", showLabels()); + axisStyle.addProperty("chart:text-overlap", showOverlappingDataLabels()); + axisStyle.addProperty("chart:visible", isVisible()); + axisStyle.addPropertyPt("chart:gap-width", d->gapBetweenSets); + axisStyle.addPropertyPt("chart:overlap", -d->gapBetweenBars); + + if (!d->useAutomaticMinimumRange) { + const qreal minimum = orientation() == Qt::Vertical + ? d->kdPlane->verticalRange().first + : d->kdPlane->horizontalRange().first; + axisStyle.addProperty("chart:minimum", (int)minimum); + } + if (!d->useAutomaticMaximumRange) { + const qreal maximum = orientation() == Qt::Vertical + ? d->kdPlane->verticalRange().second + : d->kdPlane->horizontalRange().second; + axisStyle.addProperty("chart:maximum", (int)maximum); + } + + //axisStyle.addPropertyPt("chart:origin", origin); + + axisStyle.addPropertyPt("fo:font-size", font().pointSize(), KoGenStyle::TextType); + + KDChart::TextAttributes tatt = kdAxis()->textAttributes(); + QPen pen = tatt.pen(); + axisStyle.addProperty("fo:font-color", pen.color().name(), KoGenStyle::TextType); - const QString styleName = mainStyles.insert( axisStyle, "ch" ); - bodyWriter.addAttribute( "chart:style-name", styleName ); + const QString styleName = mainStyles.insert(axisStyle, "ch"); + bodyWriter.addAttribute("chart:style-name", styleName); // TODO scale: logarithmic/linear // TODO visibility - if ( dimension() == XAxisDimension ) - bodyWriter.addAttribute( "chart:dimension", "x" ); - else if ( dimension() == YAxisDimension ) - bodyWriter.addAttribute( "chart:dimension", "y" ); + if (dimension() == XAxisDimension) + bodyWriter.addAttribute("chart:dimension", "x"); + else if (dimension() == YAxisDimension) + bodyWriter.addAttribute("chart:dimension", "y"); QString name; - switch( dimension() ) { + switch(dimension()) { case XAxisDimension: name = "x"; break; @@ -1561,79 +1658,94 @@ break; } int i = 1; - foreach ( Axis *axis, d->plotArea->axes() ) { - if ( axis == this ) + foreach (Axis *axis, d->plotArea->axes()) { + if (axis == this) break; - if ( axis->dimension() == dimension() ) + if (axis->dimension() == dimension()) i++; } - if ( i == 1 ) + if (i == 1) name = "primary-" + name; - else if ( i == 2 ) + else if (i == 2) name = "secondary-" + name; // Usually, there's not more than two axes of the same dimension. // But use a fallback name here nevertheless. else - name = QString::number( i ) + '-' + name; - bodyWriter.addAttribute( "chart:name", name ); + name = QString::number(i) + '-' + name; + bodyWriter.addAttribute("chart:name", name); - bodyWriter.startElement( "chart:title" ); + bodyWriter.startElement("chart:title"); + + bodyWriter.addAttributePt("svg:x", d->title->position().x()); + bodyWriter.addAttributePt("svg:y", d->title->position().y()); + bodyWriter.addAttributePt("svg:width", d->title->size().width()); + bodyWriter.addAttributePt("svg:height", d->title->size().height()); + + KoGenStyle axisTitleStyle(KoGenStyle::ChartAutoStyle, "chart"); + axisTitleStyle.addPropertyPt("style:rotation-angle", 360 - d->title->rotation()); + + QTextCursor cursor(d->titleData->document()); + QFont titleFont = cursor.charFormat().font(); + axisTitleStyle.addProperty("fo:font-family", titleFont.family(), KoGenStyle::TextType); + axisTitleStyle.addPropertyPt("fo:font-size", titleFont.pointSize(), KoGenStyle::TextType); + + const QString titleStyleName = mainStyles.insert(axisTitleStyle, "ch"); + bodyWriter.addAttribute("chart:style-name", titleStyleName); + + QString axisLabel = d->titleData->document()->toPlainText(); + if (!axisLabel.isEmpty()) { + bodyWriter.startElement("text:p"); + bodyWriter.addTextNode(axisLabel); + bodyWriter.endElement(); // text:p + } - bodyWriter.addAttributePt( "svg:x", d->title->position().x() ); - bodyWriter.addAttributePt( "svg:y", d->title->position().y() ); - bodyWriter.addAttributePt( "svg:width", d->title->size().width() ); - bodyWriter.addAttributePt( "svg:height", d->title->size().height() ); - - bodyWriter.startElement( "text:p" ); - bodyWriter.addTextNode( d->titleData->document()->toPlainText() ); - bodyWriter.endElement(); // text:p bodyWriter.endElement(); // chart:title - if ( plotArea()->proxyModel()->categoryDataRegion().isValid() ) { - bodyWriter.startElement( "chart:categories" ); - bodyWriter.addAttribute( "table:cell-range-address", plotArea()->proxyModel()->categoryDataRegion().toString() ); + if (plotArea()->proxyModel()->categoryDataRegion().isValid()) { + bodyWriter.startElement("chart:categories"); + bodyWriter.addAttribute("table:cell-range-address", plotArea()->proxyModel()->categoryDataRegion().toString()); bodyWriter.endElement(); } - if ( showMajorGrid() ) - saveOdfGrid( context, OdfMajorGrid ); - if ( showMinorGrid() ) - saveOdfGrid( context, OdfMinorGrid ); + if (showMajorGrid()) + saveOdfGrid(context, OdfMajorGrid); + if (showMinorGrid()) + saveOdfGrid(context, OdfMinorGrid); bodyWriter.endElement(); // chart:axis } -void Axis::saveOdfGrid( KoShapeSavingContext &context, OdfGridClass gridClass ) +void Axis::saveOdfGrid(KoShapeSavingContext &context, OdfGridClass gridClass) { KoXmlWriter &bodyWriter = context.xmlWriter(); KoGenStyles &mainStyles = context.mainStyles(); - KoGenStyle gridStyle( KoGenStyle::GraphicAutoStyle, "chart" ); + KoGenStyle gridStyle(KoGenStyle::GraphicAutoStyle, "chart"); - KDChart::GridAttributes attributes = d->kdPlane->gridAttributes( orientation() ); + KDChart::GridAttributes attributes = d->kdPlane->gridAttributes(orientation()); QPen gridPen = (gridClass == OdfMinorGrid ? attributes.subGridPen() : attributes.gridPen()); - KoOdfGraphicStyles::saveOdfStrokeStyle( gridStyle, mainStyles, gridPen ); + KoOdfGraphicStyles::saveOdfStrokeStyle(gridStyle, mainStyles, gridPen); - bodyWriter.startElement( "chart:grid" ); - bodyWriter.addAttribute( "chart:class", gridClass == OdfMinorGrid ? "minor" : "major" ); + bodyWriter.startElement("chart:grid"); + bodyWriter.addAttribute("chart:class", gridClass == OdfMinorGrid ? "minor" : "major"); - bodyWriter.addAttribute( "chart:style-name", mainStyles.insert( gridStyle, "ch" ) ); + bodyWriter.addAttribute("chart:style-name", mainStyles.insert(gridStyle, "ch")); bodyWriter.endElement(); // chart:grid } void Axis::update() const { - if ( d->kdBarDiagram ) { + if (d->kdBarDiagram) { d->kdBarDiagram->doItemsLayout(); d->kdBarDiagram->update(); } - if ( d->kdLineDiagram ) { + if (d->kdLineDiagram) { d->kdLineDiagram->doItemsLayout(); d->kdLineDiagram->update(); } - if ( d->kdStockDiagram ) { + if (d->kdStockDiagram) { d->kdStockDiagram->doItemsLayout(); d->kdStockDiagram->update(); } @@ -1651,16 +1763,16 @@ return d->kdPlane; } -void Axis::plotAreaChartTypeChanged( ChartType newChartType ) +void Axis::plotAreaChartTypeChanged(ChartType newChartType) { - if ( dimension() != YAxisDimension ) + if (dimension() != YAxisDimension) return; // Return if there's nothing to do - if ( newChartType == d->plotAreaChartType ) + if (newChartType == d->plotAreaChartType) return; - if ( d->dataSets.isEmpty() ) { + if (d->dataSets.isEmpty()) { d->plotAreaChartType = newChartType; return; } @@ -1669,49 +1781,58 @@ ChartType oldChartType = d->plotAreaChartType; - KDChart::AbstractDiagram *newDiagram = d->getDiagramAndCreateIfNeeded( newChartType ); + // Change only the fill in case of type change from RadarChartType to FilledRadarChartType + // or viceversa as rest of the properties remain same + if (newChartType == RadarChartType && oldChartType == FilledRadarChartType) { + d->kdRadarDiagram->setFillAlpha(0); + } else if (newChartType == FilledRadarChartType && oldChartType == RadarChartType) { + d->kdRadarDiagram->setFillAlpha(0.4); + } else { + KDChart::AbstractDiagram *newDiagram = d->getDiagramAndCreateIfNeeded(newChartType); + + KDChartModel *newModel = dynamic_cast(newDiagram->model()); + // FIXME: This causes a crash on unimplemented types. We should + // handle that in some other way. + Q_ASSERT(newModel); + + foreach (DataSet *dataSet, d->dataSets) { + //if (dataSet->chartType() != LastChartType) { + dataSet->setChartType(LastChartType); + dataSet->setChartSubType(NoChartSubtype); + //} + } + + KDChart::AbstractDiagram *oldDiagram = d->getDiagram(oldChartType); + Q_ASSERT(oldDiagram); + // We need to know the old model so that we can remove the data sets + // from the old model that we added to the new model. + KDChartModel *oldModel = dynamic_cast(oldDiagram->model()); + Q_ASSERT(oldModel); + + foreach (DataSet *dataSet, d->dataSets) { + if (dataSet->chartType() != LastChartType) + continue; + + // FIXME: What does this do? Only the user may set a data set's pen through + // a proper UI, in any other case the pen falls back to a default + // which depends on the chart type, so setting it here will break the default + // for other chart types. + #if 0 + Qt::PenStyle newPenStyle = newDiagram->pen().style(); + QPen newPen = dataSet->pen(); + newPen.setStyle(newPenStyle); + dataSet->setPen( newPen); + #endif + newModel->addDataSet(dataSet); + const int dataSetCount = oldModel->dataDirection() == Qt::Vertical + ? oldModel->columnCount() : oldModel->rowCount(); + if (dataSetCount == oldModel->dataDimensions()) + // We need to call this method so set it sets d->kd[TYPE]Diagram to NULL + d->deleteDiagram(oldChartType); + else + oldModel->removeDataSet(dataSet); + } - KDChartModel *newModel = dynamic_cast( newDiagram->model() ); - // FIXME: This causes a crash on unimplemented types. We should - // handle that in some other way. - Q_ASSERT( newModel ); - - foreach ( DataSet *dataSet, d->dataSets ) { - //if ( dataSet->chartType() != LastChartType ) { - dataSet->setChartType( LastChartType ); - dataSet->setChartSubType( NoChartSubtype ); - //} - } - - KDChart::AbstractDiagram *oldDiagram = d->getDiagram( oldChartType ); - Q_ASSERT( oldDiagram ); - // We need to know the old model so that we can remove the data sets - // from the old model that we added to the new model. - KDChartModel *oldModel = dynamic_cast( oldDiagram->model() ); - Q_ASSERT( oldModel ); - - foreach ( DataSet *dataSet, d->dataSets ) { - if ( dataSet->chartType() != LastChartType ) - continue; - -// FIXME: What does this do? Only the user may set a data set's pen through -// a proper UI, in any other case the pen falls back to a default -// which depends on the chart type, so setting it here will break the default -// for other chart types. -#if 0 - Qt::PenStyle newPenStyle = newDiagram->pen().style(); - QPen newPen = dataSet->pen(); - newPen.setStyle( newPenStyle ); - dataSet->setPen( newPen ); -#endif - newModel->addDataSet( dataSet ); - const int dataSetCount = oldModel->dataDirection() == Qt::Vertical - ? oldModel->columnCount() : oldModel->rowCount(); - if ( dataSetCount == oldModel->dataDimensions() ) - // We need to call this method so set it sets d->kd[TYPE]Diagram to NULL - d->deleteDiagram( oldChartType ); - else - oldModel->removeDataSet( dataSet ); } d->plotAreaChartType = newChartType; @@ -1721,17 +1842,17 @@ requestRepaint(); } -void Axis::plotAreaChartSubTypeChanged( ChartSubtype subType ) +void Axis::plotAreaChartSubTypeChanged(ChartSubtype subType) { d->plotAreaChartSubType = subType; - if ( d->kdBarDiagram ) { + if (d->kdBarDiagram) { d->kdBarDiagram->setUnitSuffix("", d->kdBarDiagram->orientation()); } - switch ( d->plotAreaChartType ) { + switch (d->plotAreaChartType) { case BarChartType: - if ( d->kdBarDiagram ) { + if (d->kdBarDiagram) { KDChart::BarDiagram::BarType type; - switch ( subType ) { + switch (subType) { case StackedChartSubtype: type = KDChart::BarDiagram::Stacked; break; case PercentChartSubtype: @@ -1741,13 +1862,13 @@ default: type = KDChart::BarDiagram::Normal; } - d->kdBarDiagram->setType( type ); + d->kdBarDiagram->setType(type); } break; case LineChartType: - if ( d->kdLineDiagram ) { + if (d->kdLineDiagram) { KDChart::LineDiagram::LineType type; - switch ( subType ) { + switch (subType) { case StackedChartSubtype: type = KDChart::LineDiagram::Stacked; break; case PercentChartSubtype: @@ -1757,13 +1878,13 @@ default: type = KDChart::LineDiagram::Normal; } - d->kdLineDiagram->setType( type ); + d->kdLineDiagram->setType(type); } break; case AreaChartType: - if ( d->kdAreaDiagram ) { + if (d->kdAreaDiagram) { KDChart::LineDiagram::LineType type; - switch ( subType ) { + switch (subType) { case StackedChartSubtype: type = KDChart::LineDiagram::Stacked; break; case PercentChartSubtype: @@ -1773,15 +1894,15 @@ default: type = KDChart::LineDiagram::Normal; } - d->kdAreaDiagram->setType( type ); + d->kdAreaDiagram->setType(type); } break; case RadarChartType: case FilledRadarChartType: #if 0 // FIXME: Stacked and Percent not supported by KDChart - if ( d->kdRadarDiagram ) { + if (d->kdRadarDiagram) { KDChart::PolarDiagram::PolarType type; - switch ( subType ) { + switch (subType) { case StackedChartSubtype: type = KDChart::PolarDiagram::Stacked; break; case PercentChartSubtype: @@ -1789,14 +1910,14 @@ default: type = KDChart::PolarDiagram::Normal; } - d->kdRadarDiagram->setType( type ); + d->kdRadarDiagram->setType(type); } #endif break; case StockChartType: - if ( d->kdStockDiagram ) { + if (d->kdStockDiagram) { KDChart::StockDiagram::Type type; - switch ( subType ) { + switch (subType) { #if 0 case StackedChartSubtype: type = KDChart::StockDiagram::Candlestick; break; @@ -1806,16 +1927,15 @@ default: type = KDChart::StockDiagram::HighLowClose; } - d->kdStockDiagram->setType( type ); + d->kdStockDiagram->setType(type); } break; default:; // FIXME: Implement more chart types } - Q_FOREACH( DataSet* set, d->dataSets ) - { - set->setChartType( d->plotAreaChartType ); - set->setChartSubType( subType ); + Q_FOREACH(DataSet* set, d->dataSets) { + set->setChartType(d->plotAreaChartType); + set->setChartSubType(subType); } } @@ -1831,102 +1951,102 @@ : plotArea->yAxis() == q; Position position; - if ( q->orientation() == Qt::Horizontal ) + if (q->orientation() == Qt::Horizontal) position = first ? BottomPosition : TopPosition; else position = first ? StartPosition : EndPosition; - if ( position == StartPosition ) - title->rotate( -90 - title->rotation() ); - else if ( position == EndPosition ) - title->rotate( 90 - title->rotation() ); + if (position == StartPosition) + title->rotate(-90 - title->rotation()); + else if (position == EndPosition) + title->rotate(90 - title->rotation()); // KDChart - kdAxis->setPosition( PositionToKDChartAxisPosition( position ) ); + kdAxis->setPosition(PositionToKDChartAxisPosition(position)); ChartLayout *layout = plotArea->parent()->layout(); - layout->setPosition( title, position ); + layout->setPosition(title, position); layout->layout(); q->requestRepaint(); } -void Axis::registerKdAxis( KDChart::CartesianAxis *axis ) +void Axis::registerKdAxis(KDChart::CartesianAxis *axis) { - if ( d->kdBarDiagram ) - d->kdBarDiagram->addAxis( axis ); - if ( d->kdLineDiagram ) - d->kdLineDiagram->addAxis( axis ); - if ( d->kdAreaDiagram ) - d->kdAreaDiagram->addAxis( axis ); - if ( d->kdScatterDiagram ) - d->kdScatterDiagram->addAxis( axis ); - if ( d->kdStockDiagram ) - d->kdStockDiagram->addAxis( axis ); - if ( d->kdBubbleDiagram ) - d->kdBubbleDiagram->addAxis( axis ); + if (d->kdBarDiagram) + d->kdBarDiagram->addAxis(axis); + if (d->kdLineDiagram) + d->kdLineDiagram->addAxis(axis); + if (d->kdAreaDiagram) + d->kdAreaDiagram->addAxis(axis); + if (d->kdScatterDiagram) + d->kdScatterDiagram->addAxis(axis); + if (d->kdStockDiagram) + d->kdStockDiagram->addAxis(axis); + if (d->kdBubbleDiagram) + d->kdBubbleDiagram->addAxis(axis); // FIXME: Add all diagrams here } -void Axis::deregisterKdAxis( KDChart::CartesianAxis *axis ) +void Axis::deregisterKdAxis(KDChart::CartesianAxis *axis) { - if ( d->kdBarDiagram ) - d->kdBarDiagram->takeAxis( axis ); - if ( d->kdLineDiagram ) - d->kdLineDiagram->takeAxis( axis ); - if ( d->kdAreaDiagram ) - d->kdAreaDiagram->takeAxis( axis ); - if ( d->kdScatterDiagram ) - d->kdScatterDiagram->takeAxis( axis ); - if ( d->kdStockDiagram ) - d->kdStockDiagram->takeAxis( axis ); - if ( d->kdBubbleDiagram ) - d->kdBubbleDiagram->takeAxis( axis ); + if (d->kdBarDiagram) + d->kdBarDiagram->takeAxis(axis); + if (d->kdLineDiagram) + d->kdLineDiagram->takeAxis(axis); + if (d->kdAreaDiagram) + d->kdAreaDiagram->takeAxis(axis); + if (d->kdScatterDiagram) + d->kdScatterDiagram->takeAxis(axis); + if (d->kdStockDiagram) + d->kdStockDiagram->takeAxis(axis); + if (d->kdBubbleDiagram) + d->kdBubbleDiagram->takeAxis(axis); // FIXME: Add all diagrams here } -void Axis::setThreeD( bool threeD ) +void Axis::setThreeD(bool threeD) { // FIXME: Setting KD Chart attributes does not belong here. They should be // determined dynamically somehow. // KDChart - if ( d->kdBarDiagram ) { - KDChart::ThreeDBarAttributes attributes( d->kdBarDiagram->threeDBarAttributes() ); - attributes.setEnabled( threeD ); - attributes.setDepth( 15.0 ); - attributes.setThreeDBrushEnabled( threeD ); - d->kdBarDiagram->setThreeDBarAttributes( attributes ); - } - - if ( d->kdLineDiagram ) { - KDChart::ThreeDLineAttributes attributes( d->kdLineDiagram->threeDLineAttributes() ); - attributes.setEnabled( threeD ); - attributes.setDepth( 15.0 ); - attributes.setThreeDBrushEnabled( threeD ); - d->kdLineDiagram->setThreeDLineAttributes( attributes ); - } - - if ( d->kdAreaDiagram ) { - KDChart::ThreeDLineAttributes attributes( d->kdAreaDiagram->threeDLineAttributes() ); - attributes.setEnabled( threeD ); - attributes.setDepth( 15.0 ); - attributes.setThreeDBrushEnabled( threeD ); - d->kdAreaDiagram->setThreeDLineAttributes( attributes ); - } - - if ( d->kdCircleDiagram ) { - KDChart::ThreeDPieAttributes attributes( d->kdCircleDiagram->threeDPieAttributes() ); - attributes.setEnabled( threeD ); - attributes.setDepth( 15.0 ); - attributes.setThreeDBrushEnabled( threeD ); - d->kdCircleDiagram->setThreeDPieAttributes( attributes ); - } - - if ( d->kdRingDiagram ) { - KDChart::ThreeDPieAttributes attributes( d->kdRingDiagram->threeDPieAttributes() ); - attributes.setEnabled( threeD ); - attributes.setDepth( 15.0 ); - attributes.setThreeDBrushEnabled( threeD ); - d->kdRingDiagram->setThreeDPieAttributes( attributes ); + if (d->kdBarDiagram) { + KDChart::ThreeDBarAttributes attributes(d->kdBarDiagram->threeDBarAttributes()); + attributes.setEnabled(threeD); + attributes.setDepth(15.0); + attributes.setThreeDBrushEnabled(threeD); + d->kdBarDiagram->setThreeDBarAttributes(attributes); + } + + if (d->kdLineDiagram) { + KDChart::ThreeDLineAttributes attributes(d->kdLineDiagram->threeDLineAttributes()); + attributes.setEnabled(threeD); + attributes.setDepth(15.0); + attributes.setThreeDBrushEnabled(threeD); + d->kdLineDiagram->setThreeDLineAttributes(attributes); + } + + if (d->kdAreaDiagram) { + KDChart::ThreeDLineAttributes attributes(d->kdAreaDiagram->threeDLineAttributes()); + attributes.setEnabled(threeD); + attributes.setDepth(15.0); + attributes.setThreeDBrushEnabled(threeD); + d->kdAreaDiagram->setThreeDLineAttributes(attributes); + } + + if (d->kdCircleDiagram) { + KDChart::ThreeDPieAttributes attributes(d->kdCircleDiagram->threeDPieAttributes()); + attributes.setEnabled(threeD); + attributes.setDepth(15.0); + attributes.setThreeDBrushEnabled(threeD); + d->kdCircleDiagram->setThreeDPieAttributes(attributes); + } + + if (d->kdRingDiagram) { + KDChart::ThreeDPieAttributes attributes(d->kdRingDiagram->threeDPieAttributes()); + attributes.setEnabled(threeD); + attributes.setDepth(15.0); + attributes.setThreeDBrushEnabled(threeD); + d->kdRingDiagram->setThreeDPieAttributes(attributes); } // The following types don't support 3D, at least not in KDChart: @@ -1947,42 +2067,42 @@ d->kdRadarPlane->layoutPlanes(); } -void Axis::setGapBetweenBars( int percent ) +void Axis::setGapBetweenBars(int percent) { // This method is also used to override KDChart's default attributes. // Do not just return and do nothing if value doesn't differ from stored one. d->gapBetweenBars = percent; - if ( d->kdBarDiagram ) { + if (d->kdBarDiagram) { KDChart::BarAttributes attributes = d->kdBarDiagram->barAttributes(); - attributes.setBarGapFactor( (float)percent / 100.0 ); - d->kdBarDiagram->setBarAttributes( attributes ); + attributes.setBarGapFactor((float)percent / 100.0); + d->kdBarDiagram->setBarAttributes(attributes); } requestRepaint(); } -void Axis::setGapBetweenSets( int percent ) +void Axis::setGapBetweenSets(int percent) { // This method is also used to override KDChart's default attributes. // Do not just return and do nothing if value doesn't differ from stored one. d->gapBetweenSets = percent; - if ( d->kdBarDiagram ) { + if (d->kdBarDiagram) { KDChart::BarAttributes attributes = d->kdBarDiagram->barAttributes(); - attributes.setGroupGapFactor( (float)percent / 100.0 ); - d->kdBarDiagram->setBarAttributes( attributes ); + attributes.setGroupGapFactor((float)percent / 100.0); + d->kdBarDiagram->setBarAttributes(attributes); } requestRepaint(); } -void Axis::setPieAngleOffset( qreal angle ) +void Axis::setPieAngleOffset(qreal angle) { // only set if we already have a diagram else the value will be picked up on creating the diagram - if ( d->kdPolarPlane->diagram() ) { + if (d->kdPolarPlane->diagram()) { // KDChart takes an int here, though ODF defines it to be a double. - d->kdPolarPlane->setStartPosition( (int)angle ); + d->kdPolarPlane->setStartPosition((int)angle); requestRepaint(); } @@ -1993,15 +2113,15 @@ return d->font; } -void Axis::setFont( const QFont &font ) +void Axis::setFont(const QFont &font) { // Save the font for later retrieval d->font = font; // Set the KDChart axis to use this font as well. KDChart::TextAttributes attr = d->kdAxis->textAttributes(); - attr.setFont( font ); - d->kdAxis->setTextAttributes( attr ); + attr.setFont(font); + d->kdAxis->setTextAttributes(attr); } bool Axis::isVisible() const @@ -2009,14 +2129,14 @@ return d->isVisible; } -void Axis::setVisible( bool visible ) +void Axis::setVisible(bool visible) { d->isVisible = visible; - if ( visible ) - registerKdAxis( d->kdAxis ); + if (visible) + registerKdAxis(d->kdAxis); else - deregisterKdAxis( d->kdAxis ); + deregisterKdAxis(d->kdAxis); } KoOdfNumberStyles::NumericStyleFormat *Axis::numericStyleFormat() const diff -Nru calligra-2.4.0/plugins/chartshape/Axis.h calligra-2.4.3/plugins/chartshape/Axis.h --- calligra-2.4.0/plugins/chartshape/Axis.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/Axis.h 2012-06-26 04:21:31.000000000 +0000 @@ -53,13 +53,14 @@ Q_OBJECT public: - Axis( PlotArea *parent, AxisDimension dimension ); + Axis(PlotArea *parent, AxisDimension dimension); ~Axis(); PlotArea *plotArea() const; KoShape *title() const; QString titleText() const; bool showLabels() const; + bool showOverlappingDataLabels() const; QString id() const; AxisDimension dimension() const; QList dataSets() const; @@ -79,20 +80,21 @@ QFont font() const; bool isVisible() const; - void setTitleText( const QString &text ); - void setShowLabels( bool show ); + void setTitleText(const QString &text); + void setShowLabels(bool show); + void setShowOverlappingDataLabels(bool show); /** * Attaches a data set to this axis, adding it to a diagram * of its chart type, creating it if necessary */ - bool attachDataSet( DataSet *dataSet ); + bool attachDataSet(DataSet *dataSet); /** * Detaches a data set from this axis, removing it from the diagram of * its chart type, and deleting it if it was the last data set in this diagram. */ - bool detachDataSet( DataSet *dataSet, bool silent = false ); + bool detachDataSet(DataSet *dataSet, bool silent = false); /** * Detaches all data sets in this axis, deleting any diagram @@ -100,50 +102,50 @@ */ void clearDataSets(); - void setMajorInterval( qreal interval ); - void setMinorInterval( qreal interval ); - void setMinorIntervalDivisor( int divisor ); - void setUseAutomaticMajorInterval( bool automatic ); - void setUseAutomaticMinorInterval( bool automatic ); - void setShowInnerMinorTicks( bool showTicks ); - void setShowOuterMinorTicks( bool showTicks ); - void setShowInnerMajorTicks( bool showTicks ); - void setShowOuterMajorTicks( bool showTicks ); - void setScalingLogarithmic( bool logarithmicScaling ); - void setShowMajorGrid( bool showGrid ); - void setShowMinorGrid( bool showGrid ); - void setThreeD( bool threeD ); - void setFont( const QFont &font ); - void setVisible( bool visible ); + void setMajorInterval(qreal interval); + void setMinorInterval(qreal interval); + void setMinorIntervalDivisor(int divisor); + void setUseAutomaticMajorInterval(bool automatic); + void setUseAutomaticMinorInterval(bool automatic); + void setShowInnerMinorTicks(bool showTicks); + void setShowOuterMinorTicks(bool showTicks); + void setShowInnerMajorTicks(bool showTicks); + void setShowOuterMajorTicks(bool showTicks); + void setScalingLogarithmic(bool logarithmicScaling); + void setShowMajorGrid(bool showGrid); + void setShowMinorGrid(bool showGrid); + void setThreeD(bool threeD); + void setFont(const QFont &font); + void setVisible(bool visible); KoOdfNumberStyles::NumericStyleFormat *numericStyleFormat() const; void SetNumericStyleFormat(KoOdfNumberStyles::NumericStyleFormat *numericStyleFormat) const; - bool loadOdf( const KoXmlElement &axisElement, KoShapeLoadingContext &context); - bool loadOdfChartSubtypeProperties( const KoXmlElement &axisElement, - KoShapeLoadingContext &context ); - void saveOdf( KoShapeSavingContext &context ); - void saveOdfGrid( KoShapeSavingContext &context, OdfGridClass gridClass ); + bool loadOdf(const KoXmlElement &axisElement, KoShapeLoadingContext &context); + bool loadOdfChartSubtypeProperties(const KoXmlElement &axisElement, + KoShapeLoadingContext &context); + void saveOdf(KoShapeSavingContext &context); + void saveOdfGrid(KoShapeSavingContext &context, OdfGridClass gridClass); // KDChart stuff KDChart::CartesianAxis *kdAxis() const; KDChart::AbstractCoordinatePlane *kdPlane() const; - void plotAreaChartTypeChanged( ChartType chartType ); - void plotAreaChartSubTypeChanged( ChartSubtype chartSubType ); + void plotAreaChartTypeChanged(ChartType chartType); + void plotAreaChartSubTypeChanged(ChartSubtype chartSubType); void plotAreaIsVerticalChanged(); - void registerKdAxis( KDChart::CartesianAxis *axis ); - void deregisterKdAxis( KDChart::CartesianAxis *axis ); + void registerKdAxis(KDChart::CartesianAxis *axis); + void deregisterKdAxis(KDChart::CartesianAxis *axis); void update() const; void requestRepaint() const; void layoutPlanes(); public slots: - void setGapBetweenBars( int percent ); - void setGapBetweenSets( int percent ); - void setPieAngleOffset( qreal angle ); + void setGapBetweenBars(int percent); + void setGapBetweenSets(int percent); + void setPieAngleOffset(qreal angle); private: class Private; diff -Nru calligra-2.4.0/plugins/chartshape/CellRegion.cpp calligra-2.4.3/plugins/chartshape/CellRegion.cpp --- calligra-2.4.0/plugins/chartshape/CellRegion.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/CellRegion.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -17,7 +17,7 @@ along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. -*/ + */ // Own @@ -48,14 +48,14 @@ class Parser { public: - Parser( const QString & input ) - : m_input( input ) - , m_pos( m_input.constEnd() ) - { - m_delimiter.append( QChar::fromLatin1( '.' ) ); - m_delimiter.append( QChar::fromLatin1( ':' ) ); - m_delimiter.append( QChar::fromLatin1( ';' ) ); - m_delimiter.append( QChar::fromLatin1( ' ' ) ); + Parser(const QString & input) + : m_input(input) + , m_pos(m_input.constEnd()) + { + m_delimiter.append(QChar::fromLatin1('.')); + m_delimiter.append(QChar::fromLatin1(':')); + m_delimiter.append(QChar::fromLatin1(';')); + m_delimiter.append(QChar::fromLatin1(' ')); } bool parse(); QList< QRect > getResult() const { return m_result; } @@ -65,8 +65,8 @@ struct Token { enum TokenType{ Dot = 0, DoubleDot = 1, Space = 2, Spacer = 3, Identifier = 4, End }; - Token( TokenType type, const QString & identifier ): m_type( type ), m_identifier( identifier ){} - Token(): m_type( End ) {} + Token(TokenType type, const QString & identifier): m_type(type), m_identifier(identifier){} + Token(): m_type(End) {} TokenType m_type; QString m_identifier; }; @@ -79,7 +79,7 @@ inline bool parseName2(); inline bool parsePoint(); inline bool parseRegion2(); - inline void setTableName( const QString &name ); + inline void setTableName(const QString &name); private: const QString m_input; @@ -93,15 +93,15 @@ QVector< QChar > m_delimiter; }; -void Parser::setTableName( const QString &name ) +void Parser::setTableName(const QString &name) { QString strippedName = name; - if ( name.startsWith( QChar::fromLatin1( '$' ) ) ) - strippedName.remove( 0, 1 ); - if ( m_tableName.isEmpty() ) + if (name.startsWith(QChar::fromLatin1('$'))) + strippedName.remove(0, 1); + if (m_tableName.isEmpty()) m_tableName = strippedName; else - if ( strippedName != m_tableName ) + if (strippedName != m_tableName) kDebug() << "More than one sheet referenced, this is currently not supported"; } @@ -117,18 +117,16 @@ Parser::Token Parser::parseToken() { Token::TokenType type = Token::End; - if ( m_pos != m_input.constEnd() ) - { - switch( m_delimiter.indexOf( *m_pos ) ) - { - case( 0 ): + if (m_pos != m_input.constEnd()) { + switch(m_delimiter.indexOf(*m_pos)) { + case(0): type = Token::Dot; break; - case( 1 ): + case(1): type = Token::DoubleDot; break; - case( 2 ): - case( 3 ): + case(2): + case(3): type = Token::Space; break; default: @@ -136,61 +134,54 @@ } } bool dollarPrefix = false; - if ( m_index >= m_input.size() ) + if (m_index >= m_input.size()) type = Token::End; - else if ( *m_pos == QChar::fromLatin1( '$' ) ) - { + else if (*m_pos == QChar::fromLatin1('$')) { ++m_pos; ++m_index; } QString identifier; - if ( m_pos != m_input.constEnd() && *m_pos == QChar::fromLatin1( '\'' ) ) - { + if (m_pos != m_input.constEnd() && *m_pos == QChar::fromLatin1('\'')) { ++m_pos; ++m_index; int startPos = m_index; - for ( ; m_pos != m_input.constEnd() && *m_pos != QChar::fromLatin1( '\'' ); ++m_pos, ++m_index ) + for (; m_pos != m_input.constEnd() && *m_pos != QChar::fromLatin1('\''); ++m_pos, ++m_index) ; - if ( type == Token::Identifier ) - identifier = m_input.mid( startPos, m_index - startPos ); - if ( m_pos != m_input.constEnd() ) - { + if (type == Token::Identifier) + identifier = m_input.mid(startPos, m_index - startPos); + if (m_pos != m_input.constEnd()) { ++m_pos; ++m_index; } } - else - { + else { int startPos = m_index; - for ( ; m_pos != m_input.constEnd() && !m_delimiter.contains( *m_pos ); ++m_pos, ++m_index ) + for (; m_pos != m_input.constEnd() && !m_delimiter.contains(*m_pos); ++m_pos, ++m_index) ; - if ( m_pos != m_input.constEnd() && startPos == m_index ) - { + if (m_pos != m_input.constEnd() && startPos == m_index) { ++m_index; ++m_pos; } - if ( type == Token::Identifier ) - identifier = m_input.mid( startPos, m_index - startPos ); + if (type == Token::Identifier) + identifier = m_input.mid(startPos, m_index - startPos); } - return Token( type, identifier ); + return Token(type, identifier); } void Parser::eatWhitespaces() { - for ( ; m_pos != m_input.constEnd() && *m_pos == QChar::fromLatin1( ' ' ); ++m_pos, ++m_index ) + for (; m_pos != m_input.constEnd() && *m_pos == QChar::fromLatin1(' '); ++m_pos, ++m_index) ; } bool Parser::parseRegionList() { bool res = true; - for ( ; m_currentToken.m_type != Token::End; m_currentToken = parseToken() ) - { - if ( m_currentToken.m_type != Token::Space ) - { - if ( m_currentToken.m_type == Token::Identifier ) + for (; m_currentToken.m_type != Token::End; m_currentToken = parseToken()) { + if (m_currentToken.m_type != Token::Space) { + if (m_currentToken.m_type == Token::Identifier) res = parseRegion(); else res = false; @@ -206,24 +197,22 @@ res &= parseRegion2(); m_currentToken = parseToken(); //qDebug() << "CurrentToken " << m_currentToken.m_identifier << m_currentToken.m_type; - if ( m_currentToken.m_type == Token::DoubleDot ) - { + if (m_currentToken.m_type == Token::DoubleDot) { const QPoint topLeft = m_currentPoint; m_currentToken = parseToken(); res &= parseRegion2(); //m_currentToken = parseToken(); - m_result.append( QRect( topLeft, m_currentPoint ) ); + m_result.append(QRect(topLeft, m_currentPoint)); //qDebug() << "DoubleDot"; } - else - { - m_result.append( QRect( m_currentPoint, m_currentPoint ) ); + else { + m_result.append(QRect(m_currentPoint, m_currentPoint)); //qDebug() << "NODoubleDot"; } - if ( m_currentToken.m_type == Token::Space ) + if (m_currentToken.m_type == Token::Space) res &= parseRegionList(); - else if ( m_currentToken.m_type == Token::End ) + else if (m_currentToken.m_type == Token::End) return res; else res = false; @@ -236,32 +225,32 @@ //qDebug() << "ParseRegion2"; bool res = true; - if ( m_currentToken.m_type != Token::Identifier && m_currentToken.m_type != Token::Dot ) + if (m_currentToken.m_type != Token::Identifier && m_currentToken.m_type != Token::Dot) res = false; const QString firstIdentifier = m_currentToken.m_type != Token::Dot ? m_currentToken.m_identifier : tableName(); - if ( m_currentToken.m_type != Token::Dot ) + if (m_currentToken.m_type != Token::Dot) m_currentToken = parseToken(); - if ( m_currentToken.m_type == Token::Dot ) + if (m_currentToken.m_type == Token::Dot) { m_currentToken = parseToken(); - if ( m_currentToken.m_type == Token::Identifier ) + if (m_currentToken.m_type == Token::Identifier) { - QRegExp regEx( QString::fromLatin1( "([$]*)([A-Z]+)([$]*)([0-9]+)" ) ); - regEx.exactMatch( m_currentToken.m_identifier ); - m_currentPoint = QPoint( CellRegion::rangeStringToInt( regEx.cap( 2 ) ), regEx.cap( 4 ).toInt() ); - //qDebug() << "FUN" << regEx.cap( 2 ) << " " << regEx.cap( 4 ); - setTableName( firstIdentifier ); + QRegExp regEx(QString::fromLatin1("([$]*)([A-Z]+)([$]*)([0-9]+)")); + regEx.exactMatch(m_currentToken.m_identifier); + m_currentPoint = QPoint(CellRegion::rangeStringToInt(regEx.cap(2)), regEx.cap(4).toInt()); + //qDebug() << "FUN" << regEx.cap(2) << " " << regEx.cap(4); + setTableName(firstIdentifier); } else res = false; } else { - QRegExp regEx( QString::fromLatin1( "([$]*)([A-Z]+)([$]*)([0-9]+)" ) ); - regEx.exactMatch( firstIdentifier ); - //qDebug() << "FUN" << regEx.cap( 2 ) << " " << regEx.cap( 4 ); - m_currentPoint = QPoint( CellRegion::rangeStringToInt( regEx.cap( 2 ) ), regEx.cap( 4 ).toInt() ); + QRegExp regEx(QString::fromLatin1("([$]*)([A-Z]+)([$]*)([0-9]+)")); + regEx.exactMatch(firstIdentifier); + //qDebug() << "FUN" << regEx.cap(2) << " " << regEx.cap(4); + m_currentPoint = QPoint(CellRegion::rangeStringToInt(regEx.cap(2)), regEx.cap(4).toInt()); } //qDebug() << "TableName "<< m_tableName; //qDebug() << firstIdentifier; @@ -277,51 +266,51 @@ // { // bool res = true; // int startIndex = m_index; -// while( m_pos != m_input.end() && *m_pos != QChar::fromLatin1( ':' ) ) +// while(m_pos != m_input.end() && *m_pos != QChar::fromLatin1(':')) // { // ++m_pos; // ++m_index; // } -// const QString currentString = m_input.mid( startIndex, m_index - startIndex ); +// const QString currentString = m_input.mid(startIndex, m_index - startIndex); // qDebug() << "PointString" << currentString; -// QRegExp regEx( QString::fromLatin1( "[A-Z]+[0-9]+" ) ); -// regEx.indexIn( currentString ); -// m_currentPoint = QPoint( CellRegion::rangeStringToInt( regEx.cap(0) ), regEx.cap(1).toInt() ); +// QRegExp regEx(QString::fromLatin1("[A-Z]+[0-9]+")); +// regEx.indexIn(currentString); +// m_currentPoint = QPoint(CellRegion::rangeStringToInt(regEx.cap(0)), regEx.cap(1).toInt()); // return res; // } /************************ENDRegionParser*******************************/ -static QString columnName( uint column ); -//static int rangeCharToInt( char c ); +static QString columnName(uint column); +//static int rangeCharToInt(char c); /** * Makes sure that quotes are added if name contains spaces or special * characters. May also be used to escape certain characters if needed. */ -static QString formatTableName( QString name ) +static QString formatTableName(QString name) { static const QList specialChars = QList() << ' ' << '\t' << '-' << '\''; bool containsSpecialChars = false; - foreach( QChar c, specialChars ) - containsSpecialChars = containsSpecialChars || name.contains( c ); + foreach(QChar c, specialChars) + containsSpecialChars = containsSpecialChars || name.contains(c); - if( containsSpecialChars ) - name.prepend( '\'' ).append( '\'' ); + if(containsSpecialChars) + name.prepend('\'').append('\''); return name; } /** * Reverts any operation done by formatTableName(), so that ideally - * unformatTableName( formatTableName( name ) ) == name + * unformatTableName(formatTableName(name)) == name */ -static QString unformatTableName( QString name ) +static QString unformatTableName(QString name) { - if ( name.startsWith( '\'' ) && name.endsWith( '\'' ) ) { - name.remove( 0, 1 ); - name.remove( name.length() - 1, 1 ); + if (name.startsWith('\'') && name.endsWith('\'')) { + name.remove(0, 1); + name.remove(name.length() - 1, 1); } return name; @@ -333,7 +322,7 @@ Private(); ~Private(); - QString pointToString( const QPoint &point ) const; + QString pointToString(const QPoint &point) const; // These are actually one-dimensional, but can have different // orientations (hor / vert). @@ -362,93 +351,93 @@ CellRegion::CellRegion() - : d( new Private() ) + : d(new Private()) { } -CellRegion::CellRegion( const CellRegion ®ion ) - : d( new Private() ) +CellRegion::CellRegion(const CellRegion ®ion) + : d(new Private()) { // Use operator=(); *this = region; } -CellRegion::CellRegion( TableSource *source, const QString& regions ) - : d( new Private() ) +CellRegion::CellRegion(TableSource *source, const QString& regions) + : d(new Private()) { // A dollar sign before a part of the address means that this part // is absolute. This is irrelevant for us, however, thus we can remove // all occurences of '$', and handle relative and absolute addresses in // the same way. // See ODF specs $8.3.1 "Referencing Table Cells" - Parser parser( regions ); + Parser parser(regions); const bool success = parser.parse(); - if ( !success ) + if (!success) kDebug() << "Parsing cell region failed"; d->rects = parser.getResult().toVector(); - d->table = source->get( parser.tableName() ); -// QStringList regionsList = regions.split( " ", QString::SkipEmptyParts ); -// Q_FOREACH( const QString& region, regionsList ) { -// QString searchStr = QString( region ).remove( "$" ); + d->table = source->get(parser.tableName()); +// QStringList regionsList = regions.split(" ", QString::SkipEmptyParts); +// Q_FOREACH(const QString& region, regionsList) { +// QString searchStr = QString(region).remove("$"); // QRegExp regEx; // -// QStringList regionList = searchStr.split( ";" ); -// Q_FOREACH( const QString ®ion, regionList ) { -// const bool isPoint = !region.contains( ':' ); -// if ( isPoint ) -// regEx = QRegExp( "(|.*\\.)([A-Z]+)([0-9]+)" ); +// QStringList regionList = searchStr.split(";"); +// Q_FOREACH(const QString ®ion, regionList) { +// const bool isPoint = !region.contains(':'); +// if (isPoint) +// regEx = QRegExp("(|.*\\.)([A-Z]+)([0-9]+)"); // else // support range-notations like Sheet1.D2:Sheet1.F2 Sheet1.D2:F2 D2:F2 -// regEx = QRegExp ( "(|.*\\.)([A-Z]+)([0-9]+)\\:(|.*\\.)([A-Z]+)([0-9]+)" ); +// regEx = QRegExp ("(|.*\\.)([A-Z]+)([0-9]+)\\:(|.*\\.)([A-Z]+)([0-9]+)"); // // // Check if region string is valid (e.g. not empty) -// if ( regEx.indexIn( region ) >= 0 ) { +// if (regEx.indexIn(region) >= 0) { // // It is possible for a cell-range-address as defined in ODF to contain // // refernces to cells of more than one sheet. This, however, we ignore // // here. We do not support more than one table in a cell region. // // Also we do not support regions spanned over different sheets. For us // // everything is either on no sheet or on the same sheet. -// QString sheetName = regEx.cap( 1 ); -// if ( sheetName.endsWith( "." ) ) -// sheetName = sheetName.left( sheetName.length() - 1 ); +// QString sheetName = regEx.cap(1); +// if (sheetName.endsWith(".")) +// sheetName = sheetName.left(sheetName.length() - 1); // // TODO: Support for multiple tables in one region -// d->table = source->get( unformatTableName( sheetName ) ); +// d->table = source->get(unformatTableName(sheetName)); // -// QPoint topLeft( rangeStringToInt( regEx.cap(2) ), regEx.cap(3).toInt() ); -// if ( isPoint ) { -// d->rects.append( QRect( topLeft, QSize( 1, 1 ) ) ); +// QPoint topLeft(rangeStringToInt(regEx.cap(2)), regEx.cap(3).toInt()); +// if (isPoint) { +// d->rects.append(QRect(topLeft, QSize(1, 1))); // } else { -// QPoint bottomRight( rangeStringToInt( regEx.cap(5) ), regEx.cap(6).toInt() ); -// d->rects.append( QRect( topLeft, bottomRight ) ); +// QPoint bottomRight(rangeStringToInt(regEx.cap(5)), regEx.cap(6).toInt()); +// d->rects.append(QRect(topLeft, bottomRight)); // } // } // } // } } -CellRegion::CellRegion( Table *table, const QPoint &point ) - : d( new Private() ) +CellRegion::CellRegion(Table *table, const QPoint &point) + : d(new Private()) { d->table = table; - add( point ); + add(point); } -CellRegion::CellRegion( Table *table, const QRect &rect ) - : d( new Private() ) +CellRegion::CellRegion(Table *table, const QRect &rect) + : d(new Private()) { d->table = table; - add( rect ); + add(rect); } -CellRegion::CellRegion( Table *table, const QVector &rects ) - : d( new Private() ) +CellRegion::CellRegion(Table *table, const QVector &rects) + : d(new Private()) { d->table = table; - foreach( const QRect& rect, rects ) - add( rect ); + foreach(const QRect& rect, rects) + add(rect); } -CellRegion::CellRegion( Table *table ) - : d( new Private() ) +CellRegion::CellRegion(Table *table) + : d(new Private()) { d->table = table; } @@ -459,16 +448,16 @@ } -CellRegion& CellRegion::operator = ( const CellRegion& region ) +CellRegion& CellRegion::operator = (const CellRegion& region) { d->rects = region.d->rects; d->boundingRect = region.d->boundingRect; - d->table = region.d->table; + d->table = region.d->table; return *this; } -bool CellRegion::operator == ( const CellRegion &other ) const +bool CellRegion::operator == (const CellRegion &other) const { return d->rects == other.d->rects; } @@ -499,74 +488,74 @@ return d->rects.size() > 0 && d->table ; } -QString CellRegion::Private::pointToString( const QPoint &point ) const +QString CellRegion::Private::pointToString(const QPoint &point) const { QString result; - result.append( '$' + columnName( point.x() ) ); - result.append( '$' + QString::number( point.y() ) ); + result.append('$' + columnName(point.x())); + result.append('$' + QString::number(point.y())); return result; } QString CellRegion::toString() const { - if ( !isValid() ) + if (!isValid()) return QString(); QString result; - for ( int i = 0; i < d->rects.count(); ++i ) { + for (int i = 0; i < d->rects.count(); ++i) { const QRect range = d->rects[i]; // Top-left corner - if ( table() ) - result.append( '$' + formatTableName( table()->name() ) + '.' ); - result.append( d->pointToString( range.topLeft() ) ); + if (table()) + result.append('$' + formatTableName(table()->name()) + '.'); + result.append(d->pointToString(range.topLeft())); // If it is not a point, append rect's bottom-right corner - if ( range.topLeft() != range.bottomRight() ) { - result.append( ':' ); - result.append( d->pointToString( range.bottomRight() ) ); + if (range.topLeft() != range.bottomRight()) { + result.append(':'); + result.append(d->pointToString(range.bottomRight())); } // Separate ranges by a comma, except for the last one - if ( i < d->rects.count() - 1 ) - result.append( ';' ); + if (i < d->rects.count() - 1) + result.append(';'); } return result; } -bool CellRegion::contains( const QPoint &point, bool proper ) const +bool CellRegion::contains(const QPoint &point, bool proper) const { - foreach ( const QRect &rect, d->rects ) { - if ( rect.contains( point, proper ) ) + foreach (const QRect &rect, d->rects) { + if (rect.contains(point, proper)) return true; } return false; } -bool CellRegion::contains( const QRect &rect, bool proper ) const +bool CellRegion::contains(const QRect &rect, bool proper) const { - foreach ( const QRect &r, d->rects ) { - if ( r.contains( rect, proper ) ) + foreach (const QRect &r, d->rects) { + if (r.contains(rect, proper)) return true; } return false; } -bool CellRegion::intersects( const CellRegion &other ) const +bool CellRegion::intersects(const CellRegion &other) const { // If both regions lie within only one table and these tables // are different, they trivially do not intersect. - if ( table() && other.table() && - table() != other.table() ) + if (table() && other.table() && + table() != other.table()) return false; - foreach ( const QRect &r, d->rects ) { - foreach( const QRect &_r, other.d->rects ) { - if ( r.intersects( _r ) ) + foreach (const QRect &r, d->rects) { + foreach(const QRect &_r, other.d->rects) { + if (r.intersects(_r)) return true; } } @@ -574,13 +563,13 @@ return false; } -CellRegion CellRegion::intersected( const QRect &rect ) const +CellRegion CellRegion::intersected(const QRect &rect) const { CellRegion intersections; - foreach ( const QRect &r, d->rects ) { - if ( r.intersects( rect ) ) - intersections.add( r.intersected( rect ) ); + foreach (const QRect &r, d->rects) { + if (r.intersects(rect)) + intersections.add(r.intersected(rect)); } return intersections; @@ -588,10 +577,10 @@ Qt::Orientation CellRegion::orientation() const { - foreach ( const QRect &rect, d->rects ) { - if ( rect.width() > 1 ) + foreach (const QRect &rect, d->rects) { + if (rect.width() > 1) return Qt::Horizontal; - if ( rect.height() > 1 ) + if (rect.height() > 1) return Qt::Vertical; } @@ -610,56 +599,56 @@ * the CellRegion to proper handle multi-dimension * ranges too). * - foreach ( const QRect &rect, d->rects ) - count += ( rect.width() * rect.height() ); + foreach (const QRect &rect, d->rects) + count += (rect.width() * rect.height()); */ - if ( orientation() == Qt::Horizontal ) { - foreach ( const QRect &rect, d->rects ) + if (orientation() == Qt::Horizontal) { + foreach (const QRect &rect, d->rects) count += rect.width(); } else { - foreach( const QRect &rect, d->rects ) + foreach(const QRect &rect, d->rects) count += rect.height(); } return count; } -void CellRegion::add( const CellRegion &other ) +void CellRegion::add(const CellRegion &other) { - add( other.rects() ); + add(other.rects()); } -void CellRegion::add( const QPoint &point ) +void CellRegion::add(const QPoint &point) { - add( QRect( point, QSize( 1, 1 ) ) ); + add(QRect(point, QSize(1, 1))); } -void CellRegion::add( const QRect &rect ) +void CellRegion::add(const QRect &rect) { // These checks are obsolete, a CellRegion can be used otherwise as well #if 0 - if ( !rect.isValid() ) { + if (!rect.isValid()) { qWarning() << "CellRegion::add() Attempt to add invalid rectangle"; qWarning() << "CellRegion::add():" << rect; return; } - if ( rect.width() > 1 && rect.height() > 1 ) { + if (rect.width() > 1 && rect.height() > 1) { qWarning() << "CellRegion::add() Attempt to add rectangle with height AND width > 1"; qWarning() << "CellRegion::add():" << rect; return; } #endif - d->rects.append( rect ); + d->rects.append(rect); d->boundingRect |= rect; } -void CellRegion::add( const QVector &rects ) +void CellRegion::add(const QVector &rects) { - foreach ( const QRect &rect, rects ) - add( rect ); + foreach (const QRect &rect, rects) + add(rect); } QRect CellRegion::boundingRect() const @@ -667,25 +656,25 @@ return d->boundingRect; } -bool CellRegion::hasPointAtIndex( int index ) const +bool CellRegion::hasPointAtIndex(int index) const { - return pointAtIndex( index ) != QPoint( -1, -1 ); + return pointAtIndex(index) != QPoint(-1, -1); } -QPoint CellRegion::pointAtIndex( int index ) const +QPoint CellRegion::pointAtIndex(int index) const { // sum of all previous rectangle indices int i = 0; - foreach ( const QRect &rect, d->rects ) { + foreach (const QRect &rect, d->rects) { // Rectangle is horizontal - if ( rect.width() > 1 ) { + if (rect.width() > 1) { // Found it! // Index refers to point in current rectangle - if ( i + rect.width() > index ) { + if (i + rect.width() > index) { // Local index of point in this rectangle int j = index - i; - return QPoint( rect.x() + j, rect.y() ); + return QPoint(rect.x() + j, rect.y()); } // add number of indices in current rectangle to total index count @@ -694,10 +683,10 @@ else { // Found it! // Index refers to point in current rectangle - if ( i + rect.height() > index ) { + if (i + rect.height() > index) { // Local index of point in this rectangle int j = index - i; - return QPoint( rect.x(), rect.y() + j ); + return QPoint(rect.x(), rect.y() + j); } // add number of indices in current rectangle to total index count @@ -706,22 +695,22 @@ } // Invalid index! - return QPoint( -1, -1 ); + return QPoint(-1, -1); } -int CellRegion::indexAtPoint( const QPoint &point ) const +int CellRegion::indexAtPoint(const QPoint &point) const { int indicesLeftToPoint = 0; bool found = false; - foreach ( const QRect &rect, d->rects ) { - if ( !rect.contains( point ) ) { + foreach (const QRect &rect, d->rects) { + if (!rect.contains(point)) { indicesLeftToPoint += rect.width() > 1 ? rect.width() : rect.height(); continue; } found = true; - if ( rect.width() > 1 ) + if (rect.width() > 1) indicesLeftToPoint += point.x() - rect.topLeft().x(); else indicesLeftToPoint += point.y() - rect.topLeft().y(); @@ -731,27 +720,27 @@ } #if 0 // Unused? -static int rangeCharToInt( char c ) +static int rangeCharToInt(char c) { return (c >= 'A' && c <= 'Z') ? (c - 'A' + 1) : -1; } -static int rangeStringToInt( const QString &string ) +static int rangeStringToInt(const QString &string) { int result = 0; const int size = string.size(); - for ( int i = 0; i < size; i++ ) { - //kDebug(350001) << "---" << float( rangeCharToInt( string[i].toAscii() ) * pow( 10.0, ( size - i - 1 ) ) ); - result += rangeCharToInt( string[i].toAscii() ) * pow( 10.0, ( size - i - 1 ) ); + for (int i = 0; i < size; i++) { + //kDebug(350001) << "---" << float(rangeCharToInt(string[i].toAscii()) * pow(10.0, (size - i - 1))); + result += rangeCharToInt(string[i].toAscii()) * pow(10.0, (size - i - 1)); } //kDebug(350001) << "+++++ result=" << result; return result; } -static QString rangeIntToString( int i ) +static QString rangeIntToString(int i) { - QString tmp = QString::number( i ); - for( int j = 0; j < tmp.size(); j++ ) { + QString tmp = QString::number(i); + for (int j = 0; j < tmp.size(); j++) { tmp[j] = 'A' + tmp[j].toAscii() - '1'; } @@ -760,26 +749,26 @@ } #endif -int CellRegion::rangeCharToInt( char c ) +int CellRegion::rangeCharToInt(char c) { return (c >= 'A' && c <= 'Z') ? (c - 'A' + 1) : -1; } -int CellRegion::rangeStringToInt( const QString &string ) +int CellRegion::rangeStringToInt(const QString &string) { int result = 0; const int size = string.size(); - for ( int i = 0; i < size; i++ ) { - result += rangeCharToInt( string[i].toAscii() ) * pow( 10.0, ( size - i - 1 ) ); + for (int i = 0; i < size; i++) { + result += rangeCharToInt(string[i].toAscii()) * pow(10.0, (size - i - 1)); } return result; } -QString CellRegion::rangeIntToString( int i ) +QString CellRegion::rangeIntToString(int i) { - QString tmp = QString::number( i ); - for( int j = 0; j < tmp.size(); j++ ) { + QString tmp = QString::number(i); + for (int j = 0; j < tmp.size(); j++) { tmp[j] = 'A' + tmp[j].toAscii() - '1'; } @@ -787,10 +776,10 @@ } // Return the symbolic name of any column. -static QString columnName( uint column ) +static QString columnName(uint column) { - if ( column < 1 || column > 32767 ) - return QString( "@@@" ); + if (column < 1 || column > 32767) + return QString("@@@"); QString str; unsigned digits = 1; @@ -798,11 +787,11 @@ column--; - for( unsigned limit = 26; column >= limit + offset; limit *= 26, ++digits ) + for (unsigned limit = 26; column >= limit + offset; limit *= 26, ++digits) offset += limit; - for( unsigned col = column - offset; digits; --digits, col /= 26 ) - str.prepend( QChar( 'A' + ( col % 26 ) ) ); + for (unsigned col = column - offset; digits; --digits, col /= 26) + str.prepend(QChar('A' + (col % 26))); return str; } diff -Nru calligra-2.4.0/plugins/chartshape/CellRegion.h calligra-2.4.3/plugins/chartshape/CellRegion.h --- calligra-2.4.0/plugins/chartshape/CellRegion.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/CellRegion.h 2012-06-26 04:18:01.000000000 +0000 @@ -59,7 +59,7 @@ * inserting the chart shape. * * In contrast to a QItemSelection, a CellRegion can include header - * data. Therefore, CellRegion( QPoint( 1, 1 ) ) represents the + * data. Therefore, CellRegion(QPoint(1, 1)) represents the * top-left item of a QAbstractItemModel. * * An instance can represent either a simple, continuous region of @@ -75,16 +75,16 @@ { public: CellRegion(); - CellRegion( const CellRegion& region ); - CellRegion( TableSource *source, const QString& regions ); - CellRegion( Table *table, const QPoint &point ); - CellRegion( Table *table, const QRect &rect ); - CellRegion( Table *table, const QVector &rects ); - CellRegion( Table *table ); + CellRegion(const CellRegion& region); + CellRegion(TableSource *source, const QString& regions); + CellRegion(Table *table, const QPoint &point); + CellRegion(Table *table, const QRect &rect); + CellRegion(Table *table, const QVector &rects); + CellRegion(Table *table); ~CellRegion(); - CellRegion& operator = ( const CellRegion& region ); - bool operator == ( const CellRegion &other ) const; + CellRegion& operator = (const CellRegion& region); + bool operator == (const CellRegion &other) const; Table *table() const; @@ -96,32 +96,32 @@ QString toString() const; - bool contains( const QPoint &point, bool proper = false ) const; - bool contains( const QRect &rect, bool proper = false ) const; + bool contains(const QPoint &point, bool proper = false) const; + bool contains(const QRect &rect, bool proper = false) const; - bool intersects( const CellRegion &other ) const; + bool intersects(const CellRegion &other) const; - CellRegion intersected( const QRect &rect ) const; + CellRegion intersected(const QRect &rect) const; int cellCount() const; int rectCount() const; Qt::Orientation orientation() const; - void add( const CellRegion &other ); - void add( const QPoint &point ); - void add( const QRect &rect ); - void add( const QVector &rects ); + void add(const CellRegion &other); + void add(const QPoint &point); + void add(const QRect &rect); + void add(const QVector &rects); QRect boundingRect() const; - bool hasPointAtIndex( int index ) const; - QPoint pointAtIndex( int index ) const; - int indexAtPoint( const QPoint &point ) const; - - static int rangeCharToInt( char c ); - static int rangeStringToInt( const QString &string ); - static QString rangeIntToString( int i ); + bool hasPointAtIndex(int index) const; + QPoint pointAtIndex(int index) const; + int indexAtPoint(const QPoint &point) const; + + static int rangeCharToInt(char c); + static int rangeStringToInt(const QString &string); + static QString rangeIntToString(int i); private: class Private; diff -Nru calligra-2.4.0/plugins/chartshape/CellRegionStringValidator.cpp calligra-2.4.3/plugins/chartshape/CellRegionStringValidator.cpp --- calligra-2.4.0/plugins/chartshape/CellRegionStringValidator.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/CellRegionStringValidator.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -42,7 +42,7 @@ }; CellRegionStringValidator::Private::Private() - : intermediatelyCorrectRegion( "[a-zA-Z0-9$.:;]*") + : intermediatelyCorrectRegion("[a-zA-Z0-9$.:;]*") { } @@ -50,9 +50,9 @@ { } -CellRegionStringValidator::CellRegionStringValidator( KoChart::ChartModel *model ) - : QValidator( 0 ), - d( new Private ) +CellRegionStringValidator::CellRegionStringValidator(KoChart::ChartModel *model) + : QValidator(0), + d(new Private) { d->model = model; } @@ -62,15 +62,14 @@ delete d; } -QValidator::State CellRegionStringValidator::validate( QString &string, - int &pos ) const +QValidator::State CellRegionStringValidator::validate(QString &string, int &pos) const { - Q_UNUSED( pos ); + Q_UNUSED(pos); - if ( !d->intermediatelyCorrectRegion.exactMatch( string ) ) + if (!d->intermediatelyCorrectRegion.exactMatch(string)) return QValidator::Invalid; - if ( d->model->isCellRegionValid(string) ) + if (d->model->isCellRegionValid(string)) return QValidator::Acceptable; return QValidator::Intermediate; diff -Nru calligra-2.4.0/plugins/chartshape/CellRegionStringValidator.h calligra-2.4.3/plugins/chartshape/CellRegionStringValidator.h --- calligra-2.4.0/plugins/chartshape/CellRegionStringValidator.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/CellRegionStringValidator.h 2012-06-26 04:18:01.000000000 +0000 @@ -32,10 +32,10 @@ class CellRegionStringValidator : public QValidator { public: - CellRegionStringValidator( KoChart::ChartModel *model ); + CellRegionStringValidator(KoChart::ChartModel *model); ~CellRegionStringValidator(); - State validate( QString &string, int & pos ) const; + State validate(QString &string, int & pos) const; private: class Private; diff -Nru calligra-2.4.0/plugins/chartshape/ChartConfigWidget.cpp calligra-2.4.3/plugins/chartshape/ChartConfigWidget.cpp --- calligra-2.4.0/plugins/chartshape/ChartConfigWidget.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartConfigWidget.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -72,7 +73,7 @@ class ChartConfigWidget::Private { public: - Private( QWidget *parent ); + Private(QWidget *parent); ~Private(); // The owner of this struct. @@ -172,11 +173,11 @@ }; -ChartConfigWidget::Private::Private( QWidget *parent ) - : tableEditorDialog( 0 ) - , newAxisDialog( parent ) - , axisScalingDialog( parent ) - , cellRegionDialog( parent ) +ChartConfigWidget::Private::Private(QWidget *parent) + : tableEditorDialog(0) + , newAxisDialog(parent) + , axisScalingDialog(parent) + , cellRegionDialog(parent) { lastHorizontalAlignment = 1; // Qt::AlignCenter @@ -233,11 +234,11 @@ * Returns, if existent, the name of the icon representing * a given chart type, following the KDE4 icon naming convention. */ -static QString chartTypeIcon( ChartType type, ChartSubtype subtype ) +static QString chartTypeIcon(ChartType type, ChartSubtype subtype) { - switch( type ) { + switch(type) { case BarChartType: - switch( subtype ) { + switch(subtype) { case NormalChartSubtype: return "office-chart-bar"; case StackedChartSubtype: @@ -245,10 +246,10 @@ case PercentChartSubtype: return "office-chart-bar-percentage"; default: - Q_ASSERT( "Invalid bar chart subtype!" ); + Q_ASSERT("Invalid bar chart subtype!"); } case LineChartType: - switch( subtype ) { + switch(subtype) { case NormalChartSubtype: return "office-chart-line"; case StackedChartSubtype: @@ -256,10 +257,10 @@ case PercentChartSubtype: return "office-chart-line-percentage"; default: - Q_ASSERT( "Invalid line chart subtype!" ); + Q_ASSERT("Invalid line chart subtype!"); } case AreaChartType: - switch( subtype ) { + switch(subtype) { case NormalChartSubtype: return "office-chart-area"; case StackedChartSubtype: @@ -267,7 +268,7 @@ case PercentChartSubtype: return "office-chart-area-percentage"; default: - Q_ASSERT( "Invalid area chart subtype!" ); + Q_ASSERT("Invalid area chart subtype!"); } case CircleChartType: return "office-chart-pie"; @@ -285,176 +286,176 @@ } ChartConfigWidget::ChartConfigWidget() - : d( new Private( this ) ) + : d(new Private(this)) { setObjectName("Chart Type"); - d->ui.setupUi( this ); + d->ui.setupUi(this); // Chart type button with its associated menu - QMenu *chartTypeMenu = new QMenu( this ); - chartTypeMenu->setIcon( KIcon( "office-chart-bar" ) ); + QMenu *chartTypeMenu = new QMenu(this); + chartTypeMenu->setIcon(KIcon("office-chart-bar")); // Bar charts - QMenu *barChartMenu = chartTypeMenu->addMenu( KIcon( "office-chart-bar" ), i18n( "Bar Chart" ) ); - d->normalBarChartAction = barChartMenu->addAction( KIcon( "office-chart-bar" ), i18n("Normal") ); - d->stackedBarChartAction = barChartMenu->addAction( KIcon( "office-chart-bar-stacked" ), i18n("Stacked") ); - d->percentBarChartAction = barChartMenu->addAction( KIcon( "office-chart-bar-percentage" ), i18n("Percent") ); + QMenu *barChartMenu = chartTypeMenu->addMenu(KIcon("office-chart-bar"), i18n("Bar Chart")); + d->normalBarChartAction = barChartMenu->addAction(KIcon("office-chart-bar"), i18n("Normal")); + d->stackedBarChartAction = barChartMenu->addAction(KIcon("office-chart-bar-stacked"), i18n("Stacked")); + d->percentBarChartAction = barChartMenu->addAction(KIcon("office-chart-bar-percentage"), i18n("Percent")); // Line charts - QMenu *lineChartMenu = chartTypeMenu->addMenu( KIcon( "office-chart-line" ), i18n( "Line Chart" ) ); - d->normalLineChartAction = lineChartMenu->addAction( KIcon( "office-chart-line" ), i18n("Normal") ); - d->stackedLineChartAction = lineChartMenu->addAction( KIcon( "office-chart-line-stacked" ), i18n("Stacked") ); - d->percentLineChartAction = lineChartMenu->addAction( KIcon( "office-chart-line-percentage" ), i18n("Percent") ); + QMenu *lineChartMenu = chartTypeMenu->addMenu(KIcon("office-chart-line"), i18n("Line Chart")); + d->normalLineChartAction = lineChartMenu->addAction(KIcon("office-chart-line"), i18n("Normal")); + d->stackedLineChartAction = lineChartMenu->addAction(KIcon("office-chart-line-stacked"), i18n("Stacked")); + d->percentLineChartAction = lineChartMenu->addAction(KIcon("office-chart-line-percentage"), i18n("Percent")); // Area charts - QMenu *areaChartMenu = chartTypeMenu->addMenu( KIcon( "office-chart-area" ), i18n( "Area Chart" ) ); - d->normalAreaChartAction = areaChartMenu->addAction( KIcon( "office-chart-area" ), i18n("Normal") ); - d->stackedAreaChartAction = areaChartMenu->addAction( KIcon( "office-chart-area-stacked" ), i18n("Stacked") ); - d->percentAreaChartAction = areaChartMenu->addAction( KIcon( "office-chart-area-percentage" ), i18n("Percent") ); + QMenu *areaChartMenu = chartTypeMenu->addMenu(KIcon("office-chart-area"), i18n("Area Chart")); + d->normalAreaChartAction = areaChartMenu->addAction(KIcon("office-chart-area"), i18n("Normal")); + d->stackedAreaChartAction = areaChartMenu->addAction(KIcon("office-chart-area-stacked"), i18n("Stacked")); + d->percentAreaChartAction = areaChartMenu->addAction(KIcon("office-chart-area-percentage"), i18n("Percent")); chartTypeMenu->addSeparator(); // Circular charts: pie and ring - d->circleChartAction = chartTypeMenu->addAction( KIcon( "office-chart-pie" ), i18n("Pie Chart") ); - d->ringChartAction = chartTypeMenu->addAction( KIcon( "office-chart-ring" ), i18n("Ring Chart") ); + d->circleChartAction = chartTypeMenu->addAction(KIcon("office-chart-pie"), i18n("Pie Chart")); + d->ringChartAction = chartTypeMenu->addAction(KIcon("office-chart-ring"), i18n("Ring Chart")); chartTypeMenu->addSeparator(); // Polar charts: radar - QMenu *radarChartMenu = chartTypeMenu->addMenu( KIcon( "office-chart-polar" ), i18n( "Polar Chart" ) ); - d->radarChartAction = radarChartMenu->addAction( KIcon( "office-chart-polar" ), i18n("Normal") ); - d->filledRadarChartAction = radarChartMenu->addAction( KIcon( "office-chart-polar-filled" ), i18n("Filled") ); + QMenu *radarChartMenu = chartTypeMenu->addMenu(KIcon("office-chart-polar"), i18n("Polar Chart")); + d->radarChartAction = radarChartMenu->addAction(KIcon("office-chart-polar"), i18n("Normal")); + d->filledRadarChartAction = radarChartMenu->addAction(KIcon("office-chart-polar-filled"), i18n("Filled")); chartTypeMenu->addSeparator(); // X/Y charts: scatter and bubble - d->scatterChartAction = chartTypeMenu->addAction( KIcon( "office-chart-scatter" ), i18n("Scatter Chart") ); - d->bubbleChartAction = chartTypeMenu->addAction( i18n("Bubble Chart") ); + d->scatterChartAction = chartTypeMenu->addAction(KIcon("office-chart-scatter"), i18n("Scatter Chart")); + d->bubbleChartAction = chartTypeMenu->addAction(i18n("Bubble Chart")); chartTypeMenu->addSeparator(); - d->stockChartAction = chartTypeMenu->addAction( i18n("Stock Chart") ); - d->surfaceChartAction = chartTypeMenu->addAction( i18n("Surface Chart") ); - d->surfaceChartAction->setEnabled( false ); - d->ganttChartAction = chartTypeMenu->addAction( i18n("Gantt Chart") ); - d->ganttChartAction->setEnabled( false ); + d->stockChartAction = chartTypeMenu->addAction(i18n("Stock Chart")); + d->surfaceChartAction = chartTypeMenu->addAction(i18n("Surface Chart")); + d->surfaceChartAction->setEnabled(false); + d->ganttChartAction = chartTypeMenu->addAction(i18n("Gantt Chart")); + d->ganttChartAction->setEnabled(false); - d->ui.chartTypeMenu->setMenu( chartTypeMenu ); - d->ui.chartTypeMenu->setIconSize( QSize( 32, 32 ) ); + d->ui.chartTypeMenu->setMenu(chartTypeMenu); + d->ui.chartTypeMenu->setIconSize(QSize(32, 32)); - connect( chartTypeMenu, SIGNAL( triggered( QAction* ) ), - this, SLOT( chartTypeSelected( QAction* ) ) ); + connect(chartTypeMenu, SIGNAL(triggered(QAction*)), + this, SLOT(chartTypeSelected(QAction*))); // Data set chart type button - QMenu *dataSetChartTypeMenu = new QMenu( this ); + QMenu *dataSetChartTypeMenu = new QMenu(this); // Default chart type is a bar chart - dataSetChartTypeMenu->setIcon( KIcon( "chart-bar" ) ); + dataSetChartTypeMenu->setIcon(KIcon("office-chart-bar")); - d->dataSetBarChartMenu = dataSetChartTypeMenu->addMenu( KIcon( "office-chart-bar" ), "Bar Chart" ); - d->dataSetNormalBarChartAction = d->dataSetBarChartMenu->addAction( KIcon( "office-chart-bar" ), i18n("Normal") ); - d->dataSetStackedBarChartAction = d->dataSetBarChartMenu->addAction( KIcon( "office-chart-bar-stacked" ), i18n("Stacked") ); - d->dataSetPercentBarChartAction = d->dataSetBarChartMenu->addAction( KIcon( "office-chart-bar-percentage" ), i18n("Percent") ); + d->dataSetBarChartMenu = dataSetChartTypeMenu->addMenu(KIcon("office-chart-bar"), "Bar Chart"); + d->dataSetNormalBarChartAction = d->dataSetBarChartMenu->addAction(KIcon("office-chart-bar"), i18n("Normal")); + d->dataSetStackedBarChartAction = d->dataSetBarChartMenu->addAction(KIcon("office-chart-bar-stacked"), i18n("Stacked")); + d->dataSetPercentBarChartAction = d->dataSetBarChartMenu->addAction(KIcon("office-chart-bar-percentage"), i18n("Percent")); - d->dataSetLineChartMenu = dataSetChartTypeMenu->addMenu( KIcon( "office-chart-line" ), "Line Chart" ); - d->dataSetNormalLineChartAction = d->dataSetLineChartMenu->addAction( KIcon( "office-chart-line" ), i18n("Normal") ); - d->dataSetStackedLineChartAction = d->dataSetLineChartMenu->addAction( KIcon( "office-chart-line-stacked" ), i18n("Stacked") ); - d->dataSetPercentLineChartAction = d->dataSetLineChartMenu->addAction( KIcon( "office-chart-line-percentage" ), i18n("Percent") ); + d->dataSetLineChartMenu = dataSetChartTypeMenu->addMenu(KIcon("office-chart-line"), "Line Chart"); + d->dataSetNormalLineChartAction = d->dataSetLineChartMenu->addAction(KIcon("office-chart-line"), i18n("Normal")); + d->dataSetStackedLineChartAction = d->dataSetLineChartMenu->addAction(KIcon("office-chart-line-stacked"), i18n("Stacked")); + d->dataSetPercentLineChartAction = d->dataSetLineChartMenu->addAction(KIcon("office-chart-line-percentage"), i18n("Percent")); - d->dataSetAreaChartMenu = dataSetChartTypeMenu->addMenu( KIcon( "office-chart-area" ), "Area Chart" ); - d->dataSetNormalAreaChartAction = d->dataSetAreaChartMenu->addAction( KIcon( "office-chart-area" ), i18n("Normal") ); - d->dataSetStackedAreaChartAction = d->dataSetAreaChartMenu->addAction( KIcon( "office-chart-area-stacked" ), i18n("Stacked") ); - d->dataSetPercentAreaChartAction = d->dataSetAreaChartMenu->addAction( KIcon( "office-chart-area-percentage" ), i18n("Percent") ); + d->dataSetAreaChartMenu = dataSetChartTypeMenu->addMenu(KIcon("office-chart-area"), "Area Chart"); + d->dataSetNormalAreaChartAction = d->dataSetAreaChartMenu->addAction(KIcon("office-chart-area"), i18n("Normal")); + d->dataSetStackedAreaChartAction = d->dataSetAreaChartMenu->addAction(KIcon("office-chart-area-stacked"), i18n("Stacked")); + d->dataSetPercentAreaChartAction = d->dataSetAreaChartMenu->addAction(KIcon("office-chart-area-percentage"), i18n("Percent")); - d->dataSetCircleChartAction = dataSetChartTypeMenu->addAction( KIcon( "office-chart-pie" ), i18n("Pie Chart") ); - d->dataSetRingChartAction = dataSetChartTypeMenu->addAction( KIcon( "office-chart-ring" ), i18n("Ring Chart") ); + d->dataSetCircleChartAction = dataSetChartTypeMenu->addAction(KIcon("office-chart-pie"), i18n("Pie Chart")); + d->dataSetRingChartAction = dataSetChartTypeMenu->addAction(KIcon("office-chart-ring"), i18n("Ring Chart")); - d->dataSetRadarChartMenu = dataSetChartTypeMenu->addMenu( KIcon( "office-chart-polar" ), "Polar Chart" ); - d->dataSetRadarChartAction = d->dataSetRadarChartMenu->addAction( KIcon( "office-chart-polar" ), i18n("Normal") ); - d->dataSetFilledRadarChartAction = d->dataSetRadarChartMenu->addAction( KIcon( "office-chart-polar-filled" ), i18n("Filled") ); + d->dataSetRadarChartMenu = dataSetChartTypeMenu->addMenu(KIcon("office-chart-polar"), "Polar Chart"); + d->dataSetRadarChartAction = d->dataSetRadarChartMenu->addAction(KIcon("office-chart-polar"), i18n("Normal")); + d->dataSetFilledRadarChartAction = d->dataSetRadarChartMenu->addAction(KIcon("office-chart-polar-filled"), i18n("Filled")); - d->dataSetStockChartAction = dataSetChartTypeMenu->addAction( i18n("Stock Chart") ); - d->dataSetBubbleChartAction = dataSetChartTypeMenu->addAction( i18n("Bubble Chart") ); + d->dataSetStockChartAction = dataSetChartTypeMenu->addAction(i18n("Stock Chart")); + d->dataSetBubbleChartAction = dataSetChartTypeMenu->addAction(i18n("Bubble Chart")); - d->dataSetScatterChartAction = dataSetChartTypeMenu->addAction( KIcon( "office-chart-scatter" ), i18n("Scatter Chart") ); + d->dataSetScatterChartAction = dataSetChartTypeMenu->addAction(KIcon("office-chart-scatter"), i18n("Scatter Chart")); - d->ui.dataSetChartTypeMenu->setMenu( dataSetChartTypeMenu ); + d->ui.dataSetChartTypeMenu->setMenu(dataSetChartTypeMenu); - connect( dataSetChartTypeMenu, SIGNAL( triggered( QAction* ) ), - this, SLOT( dataSetChartTypeSelected( QAction* ) ) ); + connect(dataSetChartTypeMenu, SIGNAL(triggered(QAction*)), + this, SLOT(dataSetChartTypeSelected(QAction*))); - connect( d->ui.dataSetHasChartType, SIGNAL( toggled( bool ) ), - this, SLOT( ui_dataSetHasChartTypeChanged( bool ) ) ); + connect(d->ui.dataSetHasChartType, SIGNAL(toggled(bool)), + this, SLOT(ui_dataSetHasChartTypeChanged(bool))); // "Plot Area" tab - connect( d->ui.showTitle, SIGNAL( toggled( bool ) ), - this, SIGNAL( showTitleChanged( bool ) ) ); - connect( d->ui.showSubTitle, SIGNAL( toggled( bool ) ), - this, SIGNAL( showSubTitleChanged( bool ) ) ); - connect( d->ui.showFooter, SIGNAL( toggled( bool ) ), - this, SIGNAL( showFooterChanged( bool ) ) ); - - connect( d->ui.threeDLook, SIGNAL( toggled( bool ) ), - this, SLOT( setThreeDMode( bool ) ) ); - connect( d->ui.showLegend, SIGNAL( toggled( bool ) ), - this, SIGNAL( showLegendChanged( bool ) ) ); + connect(d->ui.showTitle, SIGNAL(toggled(bool)), + this, SIGNAL(showTitleChanged(bool))); + connect(d->ui.showSubTitle, SIGNAL(toggled(bool)), + this, SIGNAL(showSubTitleChanged(bool))); + connect(d->ui.showFooter, SIGNAL(toggled(bool)), + this, SIGNAL(showFooterChanged(bool))); + + connect(d->ui.threeDLook, SIGNAL(toggled(bool)), + this, SLOT(setThreeDMode(bool))); + connect(d->ui.showLegend, SIGNAL(toggled(bool)), + this, SIGNAL(showLegendChanged(bool))); // "Datasets" tab - connect( d->ui.datasetBrush, SIGNAL( changed( const QColor& ) ), - this, SLOT( datasetBrushSelected( const QColor& ) ) ); - connect( d->ui.datasetPen, SIGNAL( changed( const QColor& ) ), - this, SLOT( datasetPenSelected( const QColor& ) ) ); - connect( d->ui.datasetShowCategory, SIGNAL( toggled( bool ) ), - this, SLOT( ui_datasetShowCategoryChanged( bool ) ) ); - connect( d->ui.dataSetShowNumber, SIGNAL( toggled( bool ) ), - this, SLOT( ui_dataSetShowNumberChanged( bool ) ) ); - connect( d->ui.datasetShowPercent, SIGNAL( toggled( bool ) ), - this, SLOT( ui_datasetShowPercentChanged( bool ) ) ); - connect( d->ui.datasetShowSymbol, SIGNAL( toggled( bool ) ), - this, SLOT( ui_datasetShowSymbolChanged( bool ) ) ); - connect( d->ui.gapBetweenBars, SIGNAL( valueChanged( int ) ), - this, SIGNAL( gapBetweenBarsChanged( int ) ) ); - connect( d->ui.gapBetweenSets, SIGNAL( valueChanged( int ) ), - this, SIGNAL( gapBetweenSetsChanged( int ) ) ); - connect( d->ui.pieExplodeFactor, SIGNAL( valueChanged( int ) ), - this, SLOT( ui_dataSetPieExplodeFactorChanged( int ) ) ); + connect(d->ui.datasetBrush, SIGNAL(changed(const QColor&)), + this, SLOT(datasetBrushSelected(const QColor&))); + connect(d->ui.datasetPen, SIGNAL(changed(const QColor&)), + this, SLOT(datasetPenSelected(const QColor&))); + connect(d->ui.datasetShowCategory, SIGNAL(toggled(bool)), + this, SLOT(ui_datasetShowCategoryChanged(bool))); + connect(d->ui.dataSetShowNumber, SIGNAL(toggled(bool)), + this, SLOT(ui_dataSetShowNumberChanged(bool))); + connect(d->ui.datasetShowPercent, SIGNAL(toggled(bool)), + this, SLOT(ui_datasetShowPercentChanged(bool))); + connect(d->ui.datasetShowSymbol, SIGNAL(toggled(bool)), + this, SLOT(ui_datasetShowSymbolChanged(bool))); + connect(d->ui.gapBetweenBars, SIGNAL(valueChanged(int)), + this, SIGNAL(gapBetweenBarsChanged(int))); + connect(d->ui.gapBetweenSets, SIGNAL(valueChanged(int)), + this, SIGNAL(gapBetweenSetsChanged(int))); + connect(d->ui.pieExplodeFactor, SIGNAL(valueChanged(int)), + this, SLOT(ui_dataSetPieExplodeFactorChanged(int))); // "Legend" tab - connect( d->ui.legendTitle, SIGNAL( textChanged( const QString& ) ), - this, SIGNAL( legendTitleChanged( const QString& ) ) ); - connect( d->ui.legendShowFrame, SIGNAL( toggled( bool ) ), - this, SIGNAL( legendShowFrameChanged( bool ) ) ); - connect( d->ui.legendOrientationIsVertical, SIGNAL( toggled( bool ) ), - this, SLOT( setLegendOrientationIsVertical( bool ) ) ); + connect(d->ui.legendTitle, SIGNAL(textChanged(const QString&)), + this, SIGNAL(legendTitleChanged(const QString&))); + connect(d->ui.legendShowFrame, SIGNAL(toggled(bool)), + this, SIGNAL(legendShowFrameChanged(bool))); + connect(d->ui.legendOrientationIsVertical, SIGNAL(toggled(bool)), + this, SLOT(setLegendOrientationIsVertical(bool))); // Second part of "Plot Area" tab. // FIXME: Is there any particular reason it's separated from the Labels? - d->ui.addAxis->setIcon( KIcon( "list-add" ) ); - d->ui.removeAxis->setIcon( KIcon( "list-remove" ) ); + d->ui.addAxis->setIcon(KIcon("list-add")); + d->ui.removeAxis->setIcon(KIcon("list-remove")); - connect( d->ui.axisTitle, SIGNAL( textChanged( const QString& ) ), - this, SLOT( ui_axisTitleChanged( const QString& ) ) ); - connect( d->ui.axisShowTitle, SIGNAL( toggled( bool ) ), - this, SLOT( ui_axisShowTitleChanged( bool ) ) ); - connect( d->ui.axisShowGridLines, SIGNAL( toggled( bool ) ), - this, SLOT( ui_axisShowGridLinesChanged( bool ) ) ); - connect ( d->ui.axes, SIGNAL( currentIndexChanged( int ) ), - this, SLOT( ui_axisSelectionChanged( int ) ) ); - - connect( d->ui.dataSets, SIGNAL( currentIndexChanged( int ) ), - this, SLOT( ui_dataSetSelectionChanged( int ) ) ); - connect( d->ui.dataSetAxes, SIGNAL( currentIndexChanged( int ) ), - this, SLOT( ui_dataSetAxisSelectionChanged( int ) ) ); + connect(d->ui.axisTitle, SIGNAL(textChanged(const QString&)), + this, SLOT(ui_axisTitleChanged(const QString&))); + connect(d->ui.axisShowTitle, SIGNAL(toggled(bool)), + this, SLOT(ui_axisShowTitleChanged(bool))); + connect(d->ui.axisShowGridLines, SIGNAL(toggled(bool)), + this, SLOT(ui_axisShowGridLinesChanged(bool))); + connect(d->ui.axes, SIGNAL(currentIndexChanged(int)), + this, SLOT(ui_axisSelectionChanged(int))); + + connect(d->ui.dataSets, SIGNAL(currentIndexChanged(int)), + this, SLOT(ui_dataSetSelectionChanged(int))); + connect(d->ui.dataSetAxes, SIGNAL(currentIndexChanged(int)), + this, SLOT(ui_dataSetAxisSelectionChanged(int))); setupDialogs(); createActions(); // Activate spin box "acceleration" for "Data Sets"->"Foo Properties" // where Foo is one of the chart types with special property settings. - d->ui.gapBetweenBars->setAccelerated( true ); - d->ui.gapBetweenSets->setAccelerated( true ); - d->ui.pieExplodeFactor->setAccelerated( true ); + d->ui.gapBetweenBars->setAccelerated(true); + d->ui.gapBetweenSets->setAccelerated(true); + d->ui.pieExplodeFactor->setAccelerated(true); } ChartConfigWidget::~ChartConfigWidget() @@ -468,9 +469,9 @@ d->tableEditorDialog = 0; } -void ChartConfigWidget::open( KoShape* shape ) +void ChartConfigWidget::open(KoShape* shape) { - if ( ! shape ) { + if (! shape) { return; } @@ -482,78 +483,78 @@ // selected. Then select the tab depending on which one it was. // First see if it was the chart shape itself. - d->shape = dynamic_cast( shape ); - if ( !d->shape ) { + d->shape = dynamic_cast(shape); + if (!d->shape) { // If not, try to see if it was the plot area. - PlotArea *plotArea = dynamic_cast( shape ); - if ( plotArea ) { + PlotArea *plotArea = dynamic_cast(shape); + if (plotArea) { d->shape = plotArea->parent(); - d->ui.tabWidget->setCurrentIndex( 0 ); + d->ui.tabWidget->setCurrentIndex(0); } else { // And finally try if it was the legend. - Legend *legend = dynamic_cast( shape ); + Legend *legend = dynamic_cast(shape); #ifdef NDEBUG Q_UNUSED(legend); #else - Q_ASSERT( legend ); + Q_ASSERT(legend); #endif - d->shape = dynamic_cast( shape->parent() ); - Q_ASSERT( d->shape ); - d->ui.tabWidget->setCurrentIndex( 2 ); + d->shape = dynamic_cast(shape->parent()); + Q_ASSERT(d->shape); + d->ui.tabWidget->setCurrentIndex(2); } } d->tableSource = d->shape->tableSource(); // NOTE: There's no single source table anymore, a KSpread workbook allows multiple to be used with a chart. -// KoChart::ChartModel *spreadSheetModel = qobject_cast( d->shape->internalModel() ); +// KoChart::ChartModel *spreadSheetModel = qobject_cast(d->shape->internalModel()); // NOTE: This is obsolete, ChartShape::usesInternalModelOnly() is now used instead. -// ChartTableModel *tableModel = qobject_cast( d->shape->model() ); -// d->isExternalDataSource = ( spreadSheetModel != 0 && tableModel == 0 ); +// ChartTableModel *tableModel = qobject_cast(d->shape->model()); +// d->isExternalDataSource = (spreadSheetModel != 0 && tableModel == 0); // Update the axis titles - //d->ui.xAxisTitle->setText( ((KDChart::AbstractCartesianDiagram*)d->shape->chart()->coordinatePlane()->diagram())->axes()[0]->titleText() ); - //d->ui.yAxisTitle->setText( ((KDChart::AbstractCartesianDiagram*)d->shape->chart()->coordinatePlane()->diagram())->axes()[1]->titleText() ); + //d->ui.xAxisTitle->setText(((KDChart::AbstractCartesianDiagram*)d->shape->chart()->coordinatePlane()->diagram())->axes()[0]->titleText()); + //d->ui.yAxisTitle->setText(((KDChart::AbstractCartesianDiagram*)d->shape->chart()->coordinatePlane()->diagram())->axes()[1]->titleText()); // Update the legend title - //d->ui.legendTitle->setText( d->shape->legend()->title() ); + //d->ui.legendTitle->setText(d->shape->legend()->title()); // Fill the data table - if ( !d->shape->usesInternalModelOnly() ) { + if (!d->shape->usesInternalModelOnly()) { // FIXME: CellRegion itself together with a TableSource should now be used // to validate the correctness of a table range address. #if 0 - d->cellRegionStringValidator = new CellRegionStringValidator( spreadSheetModel ); - d->cellRegionDialog.labelDataRegion->setValidator( d->cellRegionStringValidator ); - d->cellRegionDialog.xDataRegion->setValidator( d->cellRegionStringValidator ); - d->cellRegionDialog.yDataRegion->setValidator( d->cellRegionStringValidator ); - d->cellRegionDialog.categoryDataRegion->setValidator( d->cellRegionStringValidator ); + d->cellRegionStringValidator = new CellRegionStringValidator(spreadSheetModel); + d->cellRegionDialog.labelDataRegion->setValidator(d->cellRegionStringValidator); + d->cellRegionDialog.xDataRegion->setValidator(d->cellRegionStringValidator); + d->cellRegionDialog.yDataRegion->setValidator(d->cellRegionStringValidator); + d->cellRegionDialog.categoryDataRegion->setValidator(d->cellRegionStringValidator); #endif // If the data source is external, the editData button opens a // dialog to edit the data ranges instead of the data itself. - d->ui.editData->setText( i18n( "Data Ranges..." ) ); - connect( d->ui.editData, SIGNAL( clicked( bool ) ), - this, SLOT( slotShowCellRegionDialog() ) ); - connect( d->cellRegionDialog.xDataRegion, SIGNAL( editingFinished() ), - this, SLOT( ui_dataSetXDataRegionChanged() ) ); - connect( d->cellRegionDialog.yDataRegion, SIGNAL( editingFinished() ), - this, SLOT( ui_dataSetYDataRegionChanged() ) ); - connect( d->cellRegionDialog.labelDataRegion, SIGNAL( editingFinished() ), - this, SLOT( ui_dataSetLabelDataRegionChanged() ) ); - //connect( d->cellRegionDialog.customDataRegion, SIGNAL( textEdited( const QString&) ), - // this, SLOT( ui_dataSetCustomDataRegionChanged( const QString& ) ) ); - connect( d->cellRegionDialog.categoryDataRegion, SIGNAL( editingFinished() ), - this, SLOT( ui_dataSetCategoryDataRegionChanged() ) ); - connect( d->cellRegionDialog.dataSets, SIGNAL( currentIndexChanged( int ) ), - this, SLOT( ui_dataSetSelectionChanged_CellRegionDialog( int ) ) ); + d->ui.editData->setText(i18n("Data Ranges...")); + connect(d->ui.editData, SIGNAL(clicked(bool)), + this, SLOT(slotShowCellRegionDialog())); + connect(d->cellRegionDialog.xDataRegion, SIGNAL(editingFinished()), + this, SLOT(ui_dataSetXDataRegionChanged())); + connect(d->cellRegionDialog.yDataRegion, SIGNAL(editingFinished()), + this, SLOT(ui_dataSetYDataRegionChanged())); + connect(d->cellRegionDialog.labelDataRegion, SIGNAL(editingFinished()), + this, SLOT(ui_dataSetLabelDataRegionChanged())); + //connect(d->cellRegionDialog.customDataRegion, SIGNAL(textEdited(const QString&)), + // this, SLOT(ui_dataSetCustomDataRegionChanged(const QString&))); + connect(d->cellRegionDialog.categoryDataRegion, SIGNAL(editingFinished()), + this, SLOT(ui_dataSetCategoryDataRegionChanged())); + connect(d->cellRegionDialog.dataSets, SIGNAL(currentIndexChanged(int)), + this, SLOT(ui_dataSetSelectionChanged_CellRegionDialog(int))); } else { // This part is run when the data source is not external, // i.e. the data is handled by the chart shape itself. - connect( d->ui.editData, SIGNAL( clicked( bool ) ), - this, SLOT( slotShowTableEditor() ) ); + connect(d->ui.editData, SIGNAL(clicked(bool)), + this, SLOT(slotShowTableEditor())); } update(); @@ -561,8 +562,8 @@ void ChartConfigWidget::save() { - ChartTypeCommand command( d->shape ); - command.setChartType( d->type, d->subtype ); + ChartTypeCommand command(d->shape); + command.setChartType(d->type, d->subtype); command.redo(); } @@ -571,88 +572,88 @@ return 0; } -void ChartConfigWidget::chartTypeSelected( QAction *action ) +void ChartConfigWidget::chartTypeSelected(QAction *action) { ChartType type = LastChartType; ChartSubtype subtype = NoChartSubtype; // Bar charts - if ( action == d->normalBarChartAction ) { + if (action == d->normalBarChartAction) { type = BarChartType; subtype = NormalChartSubtype; - } else if ( action == d->stackedBarChartAction ) { + } else if (action == d->stackedBarChartAction) { type = BarChartType; subtype = StackedChartSubtype; - } else if ( action == d->percentBarChartAction ) { + } else if (action == d->percentBarChartAction) { type = BarChartType; subtype = PercentChartSubtype; } // Line charts - else if ( action == d->normalLineChartAction ) { + else if (action == d->normalLineChartAction) { type = LineChartType; subtype = NormalChartSubtype; - } else if ( action == d->stackedLineChartAction ) { + } else if (action == d->stackedLineChartAction) { type = LineChartType; subtype = StackedChartSubtype; - } else if ( action == d->percentLineChartAction ) { + } else if (action == d->percentLineChartAction) { type = LineChartType; subtype = PercentChartSubtype; } // Area charts - else if ( action == d->normalAreaChartAction ) { + else if (action == d->normalAreaChartAction) { type = AreaChartType; subtype = NormalChartSubtype; - } else if ( action == d->stackedAreaChartAction ) { + } else if (action == d->stackedAreaChartAction) { type = AreaChartType; subtype = StackedChartSubtype; - } else if ( action == d->percentAreaChartAction ) { + } else if (action == d->percentAreaChartAction) { type = AreaChartType; subtype = PercentChartSubtype; } // also known as polar chart. - else if ( action == d->radarChartAction ) { + else if (action == d->radarChartAction) { type = RadarChartType; subtype = NoChartSubtype; } - else if ( action == d->filledRadarChartAction ) { + else if (action == d->filledRadarChartAction) { type = FilledRadarChartType; subtype = NoChartSubtype; } // Also known as pie chart - else if ( action == d->circleChartAction ) { + else if (action == d->circleChartAction) { type = CircleChartType; subtype = NoChartSubtype; } - else if ( action == d->ringChartAction ) { + else if (action == d->ringChartAction) { type = RingChartType; subtype = NoChartSubtype; } - else if ( action == d->scatterChartAction ) { + else if (action == d->scatterChartAction) { type = ScatterChartType; subtype = NoChartSubtype; } - else if ( action == d->stockChartAction ) { + else if (action == d->stockChartAction) { type = StockChartType; subtype = NoChartSubtype; } - else if ( action == d->bubbleChartAction ) { + else if (action == d->bubbleChartAction) { type = BubbleChartType; subtype = NoChartSubtype; } - else if ( action == d->surfaceChartAction ) { + else if (action == d->surfaceChartAction) { type = SurfaceChartType; subtype = NoChartSubtype; } - else if ( action == d->ganttChartAction ) { + else if (action == d->ganttChartAction) { type = GanttChartType; subtype = NoChartSubtype; } @@ -661,30 +662,30 @@ // o Make sure polar and cartesian plots can't conflict and // don't allow the user to mix these two types // o Hide axis configuration options for polar plots - if ( isPolar( type ) ) { - setPolarChartTypesEnabled( true ); - setCartesianChartTypesEnabled( false ); + if (isPolar(type)) { + setPolarChartTypesEnabled(true); + setCartesianChartTypesEnabled(false); // Pie charts and ring charts have no axes but radar charts do. // Disable choosing of attached axis if there is none. - bool hasAxes = !(type == CircleChartType || type == RingChartType ); - d->ui.axisConfiguration->setEnabled( hasAxes ); - d->ui.dataSetAxes->setEnabled( hasAxes ); - d->ui.dataSetHasChartType->setEnabled( hasAxes ); - d->ui.dataSetChartTypeMenu->setEnabled( hasAxes ); + bool hasAxes = !(type == CircleChartType || type == RingChartType); + d->ui.axisConfiguration->setEnabled(hasAxes); + d->ui.dataSetAxes->setEnabled(hasAxes); + d->ui.dataSetHasChartType->setEnabled(hasAxes); + d->ui.dataSetChartTypeMenu->setEnabled(hasAxes); } else { - setPolarChartTypesEnabled( false ); - setCartesianChartTypesEnabled( true ); + setPolarChartTypesEnabled(false); + setCartesianChartTypesEnabled(true); // All the cartesian chart types have axes. - d->ui.axisConfiguration->setEnabled( true ); - d->ui.dataSetAxes->setEnabled( true ); - d->ui.dataSetHasChartType->setEnabled( true ); - d->ui.dataSetChartTypeMenu->setEnabled( true ); + d->ui.axisConfiguration->setEnabled(true); + d->ui.dataSetAxes->setEnabled(true); + d->ui.dataSetHasChartType->setEnabled(true); + d->ui.dataSetChartTypeMenu->setEnabled(true); } - emit chartTypeChanged( type ); - emit chartSubTypeChanged( subtype ); + emit chartTypeChanged(type); + emit chartSubTypeChanged(subtype); update(); } @@ -692,26 +693,26 @@ /** * Enabled/Disabled menu actions to set a polar chart type */ -void ChartConfigWidget::setPolarChartTypesEnabled( bool enabled ) +void ChartConfigWidget::setPolarChartTypesEnabled(bool enabled) { - d->dataSetCircleChartAction->setEnabled( enabled ); - d->dataSetRingChartAction->setEnabled( enabled ); - d->dataSetRadarChartAction->setEnabled( enabled ); - d->dataSetFilledRadarChartAction->setEnabled( enabled ); + d->dataSetCircleChartAction->setEnabled(enabled); + d->dataSetRingChartAction->setEnabled(enabled); + d->dataSetRadarChartAction->setEnabled(enabled); + d->dataSetFilledRadarChartAction->setEnabled(enabled); } /** * Enabled/Disabled menu actions to set a cartesian chart type */ -void ChartConfigWidget::setCartesianChartTypesEnabled( bool enabled ) +void ChartConfigWidget::setCartesianChartTypesEnabled(bool enabled) { - d->dataSetBarChartMenu->setEnabled( enabled ); - d->dataSetLineChartMenu->setEnabled( enabled ); - d->dataSetAreaChartMenu->setEnabled( enabled ); - d->dataSetRadarChartMenu->setEnabled( enabled ); - d->dataSetScatterChartAction->setEnabled( enabled ); - d->dataSetStockChartAction->setEnabled( enabled ); - d->dataSetBubbleChartAction->setEnabled( enabled ); + d->dataSetBarChartMenu->setEnabled(enabled); + d->dataSetLineChartMenu->setEnabled(enabled); + d->dataSetAreaChartMenu->setEnabled(enabled); + d->dataSetRadarChartMenu->setEnabled(enabled); + d->dataSetScatterChartAction->setEnabled(enabled); + d->dataSetStockChartAction->setEnabled(enabled); + d->dataSetBubbleChartAction->setEnabled(enabled); // FIXME: Enable for: // pie, ring? //NYI: @@ -719,138 +720,138 @@ //gantt } -void ChartConfigWidget::ui_dataSetPieExplodeFactorChanged( int percent ) +void ChartConfigWidget::ui_dataSetPieExplodeFactorChanged(int percent) { - if ( d->selectedDataSet < 0 ) + if (d->selectedDataSet < 0) return; - DataSet *dataSet = d->dataSets[ d->selectedDataSet ]; - Q_ASSERT( dataSet ); - if ( !dataSet ) + DataSet *dataSet = d->dataSets[d->selectedDataSet]; + Q_ASSERT(dataSet); + if (!dataSet) return; - emit pieExplodeFactorChanged( dataSet, percent ); + emit pieExplodeFactorChanged(dataSet, percent); } -void ChartConfigWidget::ui_dataSetHasChartTypeChanged( bool b ) +void ChartConfigWidget::ui_dataSetHasChartTypeChanged(bool b) { - if ( d->selectedDataSet < 0 ) + if (d->selectedDataSet < 0) return; - if ( !b ) { - DataSet *dataSet = d->dataSets[ d->selectedDataSet ]; - Q_ASSERT( dataSet ); - if ( !dataSet ) + if (!b) { + DataSet *dataSet = d->dataSets[d->selectedDataSet]; + Q_ASSERT(dataSet); + if (!dataSet) return; - emit dataSetChartTypeChanged( dataSet, LastChartType ); - emit dataSetChartSubTypeChanged( dataSet, NoChartSubtype ); - d->ui.dataSetChartTypeMenu->setIcon( QIcon() ); + emit dataSetChartTypeChanged(dataSet, LastChartType); + emit dataSetChartSubTypeChanged(dataSet, NoChartSubtype); + d->ui.dataSetChartTypeMenu->setIcon(QIcon()); } } -void ChartConfigWidget::dataSetChartTypeSelected( QAction *action ) +void ChartConfigWidget::dataSetChartTypeSelected(QAction *action) { - if ( d->selectedDataSet < 0 ) + if (d->selectedDataSet < 0) return; ChartType type = LastChartType; ChartSubtype subtype = NoChartSubtype; - if ( action == d->dataSetNormalBarChartAction ) { + if (action == d->dataSetNormalBarChartAction) { type = BarChartType; subtype = NormalChartSubtype; - } else if ( action == d->dataSetStackedBarChartAction ) { + } else if (action == d->dataSetStackedBarChartAction) { type = BarChartType; subtype = StackedChartSubtype; - } else if ( action == d->dataSetPercentBarChartAction ) { + } else if (action == d->dataSetPercentBarChartAction) { type = BarChartType; subtype = PercentChartSubtype; } - else if ( action == d->dataSetNormalLineChartAction ) { + else if (action == d->dataSetNormalLineChartAction) { type = LineChartType; subtype = NormalChartSubtype; - } else if ( action == d->dataSetStackedLineChartAction ) { + } else if (action == d->dataSetStackedLineChartAction) { type = LineChartType; subtype = StackedChartSubtype; - } else if ( action == d->dataSetPercentLineChartAction ) { + } else if (action == d->dataSetPercentLineChartAction) { type = LineChartType; subtype = PercentChartSubtype; } - else if ( action == d->dataSetNormalAreaChartAction ) { + else if (action == d->dataSetNormalAreaChartAction) { type = AreaChartType; subtype = NormalChartSubtype; - } else if ( action == d->dataSetStackedAreaChartAction ) { + } else if (action == d->dataSetStackedAreaChartAction) { type = AreaChartType; subtype = StackedChartSubtype; - } else if ( action == d->dataSetPercentAreaChartAction ) { + } else if (action == d->dataSetPercentAreaChartAction) { type = AreaChartType; subtype = PercentChartSubtype; } - else if ( action == d->dataSetRadarChartAction ) + else if (action == d->dataSetRadarChartAction) type = RadarChartType; - else if ( action == d->dataSetFilledRadarChartAction ) + else if (action == d->dataSetFilledRadarChartAction) type = FilledRadarChartType; - else if ( action == d->dataSetCircleChartAction ) + else if (action == d->dataSetCircleChartAction) type = CircleChartType; - else if ( action == d->dataSetRingChartAction ) + else if (action == d->dataSetRingChartAction) type = RingChartType; - else if ( action == d->dataSetScatterChartAction ) + else if (action == d->dataSetScatterChartAction) type = ScatterChartType; - else if ( action == d->dataSetStockChartAction ) + else if (action == d->dataSetStockChartAction) type = StockChartType; - else if ( action == d->dataSetBubbleChartAction ) + else if (action == d->dataSetBubbleChartAction) type = BubbleChartType; // FIXME: Not supported by KChart yet: //surface //gantt - DataSet *dataSet = d->dataSets[ d->selectedDataSet ]; - Q_ASSERT( dataSet ); - if ( !dataSet ) + DataSet *dataSet = d->dataSets[d->selectedDataSet]; + Q_ASSERT(dataSet); + if (!dataSet) return; - QString iconName = chartTypeIcon( type, subtype ); - if ( !iconName.isEmpty() ) - d->ui.dataSetChartTypeMenu->setIcon( KIcon( iconName ) ); + QString iconName = chartTypeIcon(type, subtype); + if (!iconName.isEmpty()) + d->ui.dataSetChartTypeMenu->setIcon(KIcon(iconName)); - emit dataSetChartTypeChanged( dataSet, type ); - emit dataSetChartSubTypeChanged( dataSet, subtype ); + emit dataSetChartTypeChanged(dataSet, type); + emit dataSetChartSubTypeChanged(dataSet, subtype); update(); } -void ChartConfigWidget::chartSubTypeSelected( int type ) +void ChartConfigWidget::chartSubTypeSelected(int type) { d->subtype = (ChartSubtype) type; - emit chartSubTypeChanged( d->subtype ); + emit chartSubTypeChanged(d->subtype); } -void ChartConfigWidget::datasetBrushSelected( const QColor& color ) +void ChartConfigWidget::datasetBrushSelected(const QColor& color) { - if ( d->selectedDataSet < 0 ) + if (d->selectedDataSet < 0) return; - emit datasetBrushChanged( d->dataSets[ d->selectedDataSet ], color ); + emit datasetBrushChanged(d->dataSets[d->selectedDataSet], color); } -void ChartConfigWidget::datasetPenSelected( const QColor& color ) +void ChartConfigWidget::datasetPenSelected(const QColor& color) { - if ( d->selectedDataSet < 0 ) + if (d->selectedDataSet < 0) return; - emit datasetPenChanged( d->dataSets[ d->selectedDataSet ], color ); + emit datasetPenChanged(d->dataSets[d->selectedDataSet], color); } -void ChartConfigWidget::setThreeDMode( bool threeD ) +void ChartConfigWidget::setThreeDMode(bool threeD) { d->threeDMode = threeD; - emit threeDModeToggled( threeD ); + emit threeDModeToggled(threeD); update(); } @@ -858,9 +859,9 @@ /** * Only some chart types support a 3D mode in KD Chart. */ -static bool supportsThreeD( ChartType type ) +static bool supportsThreeD(ChartType type) { - switch ( type ) { + switch (type) { case BarChartType: case LineChartType: case AreaChartType: @@ -873,29 +874,29 @@ return false; } -static QString nonEmptyAxisTitle( Axis *axis, int index ) +static QString nonEmptyAxisTitle(Axis *axis, int index) { QString title = axis->titleText(); - if ( title.isEmpty() ) + if (title.isEmpty()) // TODO (post-2.3): Use "X Axis" or "Y Axis" as default labels instead - title = i18n( "Axis %1", index + 1 ); + title = i18n("Axis %1", index + 1); return title; } void ChartConfigWidget::update() { - if ( !d->shape ) + if (!d->shape) return; // We only want to update this widget according to the current // state of the shape // Note that this does not recursively block signals but only those // of ChartConfigWidget. - blockSignals( true ); + blockSignals(true); // Update cartesian diagram-specific properties // Always update, as e.g. name of axis could have changed - // if ( d->axes != d->shape->plotArea()->axes() ) { + // if (d->axes != d->shape->plotArea()->axes()) { // Remove old items from the combo box d->ui.axes->clear(); d->ui.dataSetAxes->clear(); @@ -903,60 +904,64 @@ d->axes = d->shape->plotArea()->axes(); d->dataSetAxes.clear(); - if ( !d->axes.isEmpty() ) { - foreach ( Axis *axis, d->axes ) { - QString title = nonEmptyAxisTitle( axis, d->axes.indexOf( axis ) ); + if (!d->axes.isEmpty()) { + foreach (Axis *axis, d->axes) { + QString title = nonEmptyAxisTitle(axis, d->axes.indexOf(axis)); // This automatically calls ui_axisSelectionChanged() // after first insertion - d->ui.axes->addItem( title ); - if ( axis->dimension() == YAxisDimension ) { - d->dataSetAxes.append( axis ); - d->ui.dataSetAxes->blockSignals( true ); - d->ui.dataSetAxes->addItem( title ); - d->ui.dataSetAxes->blockSignals( false ); + d->ui.axes->addItem(title); + if (axis->dimension() == YAxisDimension) { + d->dataSetAxes.append(axis); + d->ui.dataSetAxes->blockSignals(true); + d->ui.dataSetAxes->addItem(title); + d->ui.dataSetAxes->blockSignals(false); } } } else { - d->ui.axisShowGridLines->blockSignals( true ); - d->ui.axisShowGridLines->setChecked( false ); - d->ui.axisShowGridLines->setEnabled( false ); - d->ui.axisShowGridLines->blockSignals( false ); - - d->ui.axisShowTitle->blockSignals( true ); - d->ui.axisShowTitle->setChecked( false ); - d->ui.axisShowTitle->setEnabled( false ); - d->ui.axisShowTitle->blockSignals( false ); - - d->ui.axisTitle->blockSignals( true ); - d->ui.axisTitle->setText( "" ); - d->ui.axisTitle->setEnabled( false ); - d->ui.axisTitle->blockSignals( false ); + d->ui.axisShowGridLines->blockSignals(true); + d->ui.axisShowGridLines->setChecked(false); + d->ui.axisShowGridLines->setEnabled(false); + d->ui.axisShowGridLines->blockSignals(false); + + d->ui.axisShowTitle->blockSignals(true); + d->ui.axisShowTitle->setChecked(false); + d->ui.axisShowTitle->setEnabled(false); + d->ui.axisShowTitle->blockSignals(false); + + d->ui.axisTitle->blockSignals(true); + d->ui.axisTitle->setText(""); + d->ui.axisTitle->setEnabled(false); + d->ui.axisTitle->blockSignals(false); } // } // Update "Labels" section in "Plot Area" tab - d->ui.showTitle->setChecked( d->shape->title()->isVisible() ); - d->ui.showSubTitle->setChecked( d->shape->subTitle()->isVisible() ); - d->ui.showFooter->setChecked( d->shape->footer()->isVisible() ); + d->ui.showTitle->setChecked(d->shape->title()->isVisible()); + d->ui.showSubTitle->setChecked(d->shape->subTitle()->isVisible()); + d->ui.showFooter->setChecked(d->shape->footer()->isVisible()); // Update "Bar Properties" in "Data Sets" tab - d->ui.gapBetweenBars->setValue( d->shape->plotArea()->gapBetweenBars() ); - d->ui.gapBetweenSets->setValue( d->shape->plotArea()->gapBetweenSets() ); + d->ui.gapBetweenBars->setValue(d->shape->plotArea()->gapBetweenBars()); + d->ui.gapBetweenSets->setValue(d->shape->plotArea()->gapBetweenSets()); - if ( d->type != d->shape->chartType() - || d->subtype != d->shape->chartSubType() ) + // Update "Pie Properties" in "Data Sets" tab + d->ui.pieExplodeFactor->setValue( + (int)(d->shape->plotArea()->dataSets().at(0)->pieAttributes().explodeFactor()*100)); + + if ( d->type != d->shape->chartType() + || d->subtype != d->shape->chartSubType()) { // Update the chart type specific settings in the "Data Sets" tab bool needSeparator = false; - if ( d->shape->chartType() == BarChartType ) { + if (d->shape->chartType() == BarChartType) { d->ui.barProperties->show(); d->ui.pieProperties->hide(); needSeparator = true; - } else if ( d->shape->chartType() == CircleChartType ) { + } else if (d->shape->chartType() == CircleChartType) { d->ui.barProperties->hide(); d->ui.pieProperties->show(); needSeparator = true; - } else if ( d->shape->chartType() == RingChartType ) { + } else if (d->shape->chartType() == RingChartType) { d->ui.barProperties->hide(); d->ui.pieProperties->show(); needSeparator = true; @@ -964,20 +969,20 @@ d->ui.barProperties->hide(); d->ui.pieProperties->hide(); } - d->ui.propertiesSeparator->setVisible( needSeparator ); + d->ui.propertiesSeparator->setVisible(needSeparator); // Set the chart type icon in the chart type button. - QString iconName = chartTypeIcon( d->shape->chartType(), d->shape->chartSubType() ); - if ( !iconName.isEmpty() ) - d->ui.chartTypeMenu->setIcon( KIcon( iconName ) ); + QString iconName = chartTypeIcon(d->shape->chartType(), d->shape->chartSubType()); + if (!iconName.isEmpty()) + d->ui.chartTypeMenu->setIcon(KIcon(iconName)); // Make sure we only allow legal chart type combinations - if ( isPolar( d->shape->chartType() ) ) { - setPolarChartTypesEnabled( true ); - setCartesianChartTypesEnabled( false ); + if (isPolar(d->shape->chartType())) { + setPolarChartTypesEnabled(true); + setCartesianChartTypesEnabled(false); } else { - setPolarChartTypesEnabled( false ); - setCartesianChartTypesEnabled( true ); + setPolarChartTypesEnabled(false); + setCartesianChartTypesEnabled(true); } // ...and finally save the new chart type and subtype. @@ -986,51 +991,51 @@ } // If the datasets have changed, set up the new ones. - if ( d->shape->plotArea()->dataSets() != d->dataSets ) { + if (d->shape->plotArea()->dataSets() != d->dataSets) { d->dataSets = d->shape->plotArea()->dataSets(); d->ui.dataSets->clear(); d->cellRegionDialog.dataSets->clear(); - foreach ( DataSet *dataSet, d->dataSets ) { + foreach (DataSet *dataSet, d->dataSets) { QString title = dataSet->labelData().toString(); - if ( title.isEmpty() ) - title = i18n( "Data Set %1", d->ui.dataSets->count() + 1 ); - d->ui.dataSets->addItem( title ); - d->cellRegionDialog.dataSets->addItem( title ); + if (title.isEmpty()) + title = i18n("Data Set %1", d->ui.dataSets->count() + 1); + d->ui.dataSets->addItem(title); + d->cellRegionDialog.dataSets->addItem(title); } // Select the first data set - ui_dataSetSelectionChanged( 0 ); - ui_dataSetSelectionChanged_CellRegionDialog( 0 ); + ui_dataSetSelectionChanged(0); + ui_dataSetSelectionChanged_CellRegionDialog(0); } // If the "3D" checkbox is checked, then adapt the chart to that. - bool enableThreeDOption = supportsThreeD( d->type ); + bool enableThreeDOption = supportsThreeD(d->type); d->threeDMode = enableThreeDOption && d->shape->isThreeD(); - d->shape->setThreeD( d->threeDMode ); - d->ui.threeDLook->setChecked( d->threeDMode ); - d->ui.threeDLook->setEnabled( enableThreeDOption ); - - if ( d->shape->legend() ) { - d->ui.legendTitle->blockSignals( true ); - d->ui.legendTitle->setText( d->shape->legend()->title() ); - d->ui.legendTitle->blockSignals( false ); + d->shape->setThreeD(d->threeDMode); + d->ui.threeDLook->setChecked(d->threeDMode); + d->ui.threeDLook->setEnabled(enableThreeDOption); + + if (d->shape->legend()) { + d->ui.legendTitle->blockSignals(true); + d->ui.legendTitle->setText(d->shape->legend()->title()); + d->ui.legendTitle->blockSignals(false); } // "Fill" property of data set doesn't make sense for 2D line // charts, there's nothing to fill. bool enableFill = d->type != LineChartType || d->threeDMode; - d->ui.datasetBrush->setEnabled( enableFill ); + d->ui.datasetBrush->setEnabled(enableFill); - blockSignals( false ); + blockSignals(false); } void ChartConfigWidget::slotShowTableEditor() { - if ( !d->tableEditorDialog ) { + if (!d->tableEditorDialog) { d->tableEditorDialog = new TableEditorDialog; - d->tableEditorDialog->setProxyModel( d->shape->proxyModel() ); - d->tableEditorDialog->setModel( d->shape->internalModel() ); + d->tableEditorDialog->setProxyModel(d->shape->proxyModel()); + d->tableEditorDialog->setModel(d->shape->internalModel()); } d->tableEditorDialog->show(); @@ -1041,100 +1046,100 @@ { // Update regions of selected dataset int selectedDataSet = d->cellRegionDialog.dataSets->currentIndex(); - ui_dataSetSelectionChanged_CellRegionDialog( selectedDataSet ); + ui_dataSetSelectionChanged_CellRegionDialog(selectedDataSet); d->cellRegionDialog.show(); } -void ChartConfigWidget::setLegendOrientation( int boxEntryIndex ) +void ChartConfigWidget::setLegendOrientation(int boxEntryIndex) { Q_UNUSED(boxEntryIndex); - //emit legendOrientationChanged( ( Qt::Orientation ) ( d->ui.orientation->itemData( boxEntryIndex ).toInt() ) ); + //emit legendOrientationChanged((Qt::Orientation) (d->ui.orientation->itemData(boxEntryIndex).toInt())); } /* -void ChartConfigWidget::setLegendShowTitle( bool show ) +void ChartConfigWidget::setLegendShowTitle(bool show) { - if ( show ) { - d->ui.legendTitle->setEnabled( true ); - emit legendTitleChanged( d->ui.legendTitle->text() ); + if (show) { + d->ui.legendTitle->setEnabled(true); + emit legendTitleChanged(d->ui.legendTitle->text()); } else { - d->ui.legendTitle->setEnabled( false ); - emit legendTitleChanged( "" ); + d->ui.legendTitle->setEnabled(false); + emit legendTitleChanged(""); } } */ -void ChartConfigWidget::setLegendAlignment( int boxEntryIndex ) +void ChartConfigWidget::setLegendAlignment(int boxEntryIndex) { Q_UNUSED(boxEntryIndex); - if ( d->fixedPosition == KDChart::Position::North - || d->fixedPosition == KDChart::Position::South ) { + if ( d->fixedPosition == KDChart::Position::North + || d->fixedPosition == KDChart::Position::South) { //d->lastHorizontalAlignment = d->ui.alignment->currentIndex(); } else if ( d->fixedPosition == KDChart::Position::East - || d->fixedPosition == KDChart::Position::West ) { + || d->fixedPosition == KDChart::Position::West) { //d->lastVerticalAlignment = d->ui.alignment->currentIndex(); } - //emit legendAlignmentChanged( ( Qt::Alignment ) ( d->ui.alignment->itemData( boxEntryIndex ).toInt() ) ); + //emit legendAlignmentChanged((Qt::Alignment) (d->ui.alignment->itemData(boxEntryIndex).toInt())); } -void ChartConfigWidget::setLegendFixedPosition( int buttonGroupIndex ) +void ChartConfigWidget::setLegendFixedPosition(int buttonGroupIndex) { Q_UNUSED(buttonGroupIndex); d->lastFixedPosition = d->fixedPosition; - //d->fixedPosition = buttonIndexToFixedPosition[ buttonGroupIndex ]; - //emit legendFixedPositionChanged( buttonIndexToFixedPosition[ buttonGroupIndex ] ); + //d->fixedPosition = buttonIndexToFixedPosition[buttonGroupIndex]; + //emit legendFixedPositionChanged(buttonIndexToFixedPosition[buttonGroupIndex]); } -void ChartConfigWidget::updateFixedPosition( Position position ) +void ChartConfigWidget::updateFixedPosition(Position position) { Q_UNUSED(position); /* - if ( position == KDChart::Position::North - || position == KDChart::Position::South ) { - d->ui.alignment->setEnabled( true ); - d->ui.alignment->setItemText( 0, i18n( "Left" ) ); - d->ui.alignment->setItemData( 0, Qt::AlignLeft ); - d->ui.alignment->setItemData( 1, Qt::AlignCenter ); - d->ui.alignment->setItemText( 2, i18n( "Right" ) ); - d->ui.alignment->setItemData( 2, Qt::AlignRight ); + if ( position == KDChart::Position::North + || position == KDChart::Position::South) { + d->ui.alignment->setEnabled(true); + d->ui.alignment->setItemText(0, i18n("Left")); + d->ui.alignment->setItemData(0, Qt::AlignLeft); + d->ui.alignment->setItemData(1, Qt::AlignCenter); + d->ui.alignment->setItemText(2, i18n("Right")); + d->ui.alignment->setItemData(2, Qt::AlignRight); // Set the alignment to the one last used for horizontal legend alignment - if ( d->lastFixedPosition != KDChart::Position::North - && d->lastFixedPosition != KDChart::Position::South ) { + if ( d->lastFixedPosition != KDChart::Position::North + && d->lastFixedPosition != KDChart::Position::South) { // Make sure that the combobox gets updated. Since we changed the values of the entries, // same index doesn't mean same value, though it will think so. Solution: Select no entry first - d->ui.alignment->blockSignals( true ); - d->ui.alignment->setCurrentIndex( -1 ); - d->ui.alignment->blockSignals( false ); + d->ui.alignment->blockSignals(true); + d->ui.alignment->setCurrentIndex(-1); + d->ui.alignment->blockSignals(false); - d->ui.alignment->setCurrentIndex( d->lastHorizontalAlignment ); + d->ui.alignment->setCurrentIndex(d->lastHorizontalAlignment); } - } else if ( position == KDChart::Position::East - || position == KDChart::Position::West ) { - d->ui.alignment->setEnabled( true ); - d->ui.alignment->setItemText( 0, i18n( "Top" ) ); - d->ui.alignment->setItemData( 0, Qt::AlignTop ); - d->ui.alignment->setItemData( 1, Qt::AlignCenter ); - d->ui.alignment->setItemText( 2, i18n( "Bottom" ) ); - d->ui.alignment->setItemData( 2, Qt::AlignBottom ); + } else if ( position == KDChart::Position::East + || position == KDChart::Position::West) { + d->ui.alignment->setEnabled(true); + d->ui.alignment->setItemText(0, i18n("Top")); + d->ui.alignment->setItemData(0, Qt::AlignTop); + d->ui.alignment->setItemData(1, Qt::AlignCenter); + d->ui.alignment->setItemText(2, i18n("Bottom")); + d->ui.alignment->setItemData(2, Qt::AlignBottom); // Set the alignment to the one last used for vertical legend alignment - if ( d->lastFixedPosition != KDChart::Position::East - && d->lastFixedPosition != KDChart::Position::West ) { + if ( d->lastFixedPosition != KDChart::Position::East + && d->lastFixedPosition != KDChart::Position::West) { // Make sure that the combobox gets updated. Since we changed the values of the entries, // same index doesn't mean same value, though it will think so. Solution: Select no entry first - d->ui.alignment->blockSignals( true ); - d->ui.alignment->setCurrentIndex( -1 ); - d->ui.alignment->blockSignals( false ); + d->ui.alignment->blockSignals(true); + d->ui.alignment->setCurrentIndex(-1); + d->ui.alignment->blockSignals(false); - d->ui.alignment->setCurrentIndex( d->lastVerticalAlignment ); + d->ui.alignment->setCurrentIndex(d->lastVerticalAlignment); } } else { - d->ui.alignment->setEnabled( false ); + d->ui.alignment->setEnabled(false); } - for( int i = 0; i < NUM_FIXED_POSITIONS; i++ ) { - if( position == buttonIndexToFixedPosition[i] ) { - if ( d->positionButtonGroup->checkedId() != i ) - d->positionButtonGroup->button( i )->setChecked( true ); + for(int i = 0; i < NUM_FIXED_POSITIONS; i++) { + if(position == buttonIndexToFixedPosition[i]) { + if (d->positionButtonGroup->checkedId() != i) + d->positionButtonGroup->button(i)->setChecked(true); break; } } @@ -1145,120 +1150,121 @@ void ChartConfigWidget::setupDialogs() { // Adding/removing axes - connect( d->ui.addAxis, SIGNAL( clicked() ), - this, SLOT( ui_addAxisClicked() ) ); - connect( d->ui.removeAxis, SIGNAL( clicked() ), - this, SLOT( ui_removeAxisClicked() ) ); - connect( &d->newAxisDialog, SIGNAL( accepted() ), - this, SLOT( ui_axisAdded() ) ); + connect(d->ui.addAxis, SIGNAL(clicked()), + this, SLOT(ui_addAxisClicked())); + connect(d->ui.removeAxis, SIGNAL(clicked()), + this, SLOT(ui_removeAxisClicked())); + connect(&d->newAxisDialog, SIGNAL(accepted()), + this, SLOT(ui_axisAdded())); // Axis scaling - connect( d->ui.axisScalingButton, SIGNAL( clicked() ), - this, SLOT( ui_axisScalingButtonClicked() ) ); - connect( d->axisScalingDialog.logarithmicScaling, SIGNAL( toggled( bool ) ), - this, SLOT( ui_axisUseLogarithmicScalingChanged( bool ) ) ); - connect( d->axisScalingDialog.stepWidth, SIGNAL( valueChanged( double ) ), - this, SLOT( ui_axisStepWidthChanged( double ) ) ); - connect ( d->axisScalingDialog.automaticStepWidth, SIGNAL( toggled( bool ) ), - this, SLOT( ui_axisUseAutomaticStepWidthChanged( bool ) ) ); - connect( d->axisScalingDialog.subStepWidth, SIGNAL( valueChanged( double ) ), - this, SLOT( ui_axisSubStepWidthChanged( double ) ) ); - connect ( d->axisScalingDialog.automaticSubStepWidth, SIGNAL( toggled( bool ) ), - this, SLOT( ui_axisUseAutomaticSubStepWidthChanged( bool ) ) ); + connect(d->ui.axisScalingButton, SIGNAL(clicked()), + this, SLOT(ui_axisScalingButtonClicked())); + connect(d->axisScalingDialog.logarithmicScaling, SIGNAL(toggled(bool)), + this, SLOT(ui_axisUseLogarithmicScalingChanged(bool))); + connect(d->axisScalingDialog.stepWidth, SIGNAL(valueChanged(double)), + this, SLOT(ui_axisStepWidthChanged(double))); + connect (d->axisScalingDialog.automaticStepWidth, SIGNAL(toggled(bool)), + this, SLOT(ui_axisUseAutomaticStepWidthChanged(bool))); + connect(d->axisScalingDialog.subStepWidth, SIGNAL(valueChanged(double)), + this, SLOT(ui_axisSubStepWidthChanged(double))); + connect (d->axisScalingDialog.automaticSubStepWidth, SIGNAL(toggled(bool)), + this, SLOT(ui_axisUseAutomaticSubStepWidthChanged(bool))); } void ChartConfigWidget::createActions() { } -void ChartConfigWidget::setLegendOrientationIsVertical( bool b ) +void ChartConfigWidget::setLegendOrientationIsVertical(bool b) { - if ( b ) - emit legendOrientationChanged( Qt::Vertical ); + if (b) + emit legendOrientationChanged(Qt::Vertical); else - emit legendOrientationChanged( Qt::Horizontal ); + emit legendOrientationChanged(Qt::Horizontal); } -void ChartConfigWidget::ui_axisSelectionChanged( int index ) +void ChartConfigWidget::ui_axisSelectionChanged(int index) { // Check for valid index - if ( index < 0 || index >= d->axes.size() ) + if (index < 0 || index >= d->axes.size()) return; - Axis *axis = d->axes[ index ]; + Axis *axis = d->axes[index]; // Count how many axes there are of the same dimension int numAxesOfSameDimension = 0; - foreach ( Axis *a, d->axes ) - if ( axis->dimension() == a->dimension() ) - numAxesOfSameDimension++; + foreach (Axis *a, d->axes) { + if (axis->dimension() == a->dimension()) + ++numAxesOfSameDimension; + } // Don't let the user remove the last axis of a particular dimension - d->ui.removeAxis->setEnabled( numAxesOfSameDimension > 1 ); + d->ui.removeAxis->setEnabled(numAxesOfSameDimension > 1); - d->ui.axisTitle->blockSignals( true ); - d->ui.axisTitle->setText( axis->titleText() ); - d->ui.axisTitle->blockSignals( false ); - d->ui.axisShowTitle->blockSignals( true ); - d->ui.axisShowTitle->setChecked( axis->title()->isVisible() ); - d->ui.axisShowTitle->blockSignals( false ); - d->ui.axisShowGridLines->blockSignals( true ); - d->ui.axisShowGridLines->setChecked( axis->showMajorGrid() || axis->showMinorGrid() ); - d->ui.axisShowGridLines->blockSignals( false ); - - d->axisScalingDialog.logarithmicScaling->blockSignals( true ); - if ( axis->dimension() == YAxisDimension ) - d->axisScalingDialog.logarithmicScaling->setEnabled( true ); + d->ui.axisTitle->blockSignals(true); + d->ui.axisTitle->setText(axis->titleText()); + d->ui.axisTitle->blockSignals(false); + d->ui.axisShowTitle->blockSignals(true); + d->ui.axisShowTitle->setChecked(axis->title()->isVisible()); + d->ui.axisShowTitle->blockSignals(false); + d->ui.axisShowGridLines->blockSignals(true); + d->ui.axisShowGridLines->setChecked(axis->showMajorGrid() || axis->showMinorGrid()); + d->ui.axisShowGridLines->blockSignals(false); + + d->axisScalingDialog.logarithmicScaling->blockSignals(true); + if (axis->dimension() == YAxisDimension) + d->axisScalingDialog.logarithmicScaling->setEnabled(true); else - d->axisScalingDialog.logarithmicScaling->setEnabled( false ); - d->axisScalingDialog.logarithmicScaling->blockSignals( false ); + d->axisScalingDialog.logarithmicScaling->setEnabled(false); + d->axisScalingDialog.logarithmicScaling->blockSignals(false); - d->axisScalingDialog.stepWidth->blockSignals( true ); - d->axisScalingDialog.stepWidth->setValue( axis->majorInterval() ); - d->axisScalingDialog.stepWidth->blockSignals( false ); - - d->axisScalingDialog.subStepWidth->blockSignals( true ); - d->axisScalingDialog.subStepWidth->setValue( axis->minorInterval() ); - d->axisScalingDialog.subStepWidth->blockSignals( false ); - - d->axisScalingDialog.automaticStepWidth->blockSignals( true ); - d->axisScalingDialog.automaticStepWidth->setChecked( axis->useAutomaticMajorInterval() ); - d->axisScalingDialog.stepWidth->setEnabled( !axis->useAutomaticMajorInterval() ); - d->axisScalingDialog.automaticStepWidth->blockSignals( false ); - - d->axisScalingDialog.automaticSubStepWidth->blockSignals( true ); - d->axisScalingDialog.automaticSubStepWidth->setChecked( axis->useAutomaticMinorInterval() ); - d->axisScalingDialog.subStepWidth->setEnabled( !axis->useAutomaticMinorInterval() ); - d->axisScalingDialog.automaticSubStepWidth->blockSignals( false ); + d->axisScalingDialog.stepWidth->blockSignals(true); + d->axisScalingDialog.stepWidth->setValue(axis->majorInterval()); + d->axisScalingDialog.stepWidth->blockSignals(false); + + d->axisScalingDialog.subStepWidth->blockSignals(true); + d->axisScalingDialog.subStepWidth->setValue(axis->minorInterval()); + d->axisScalingDialog.subStepWidth->blockSignals(false); + + d->axisScalingDialog.automaticStepWidth->blockSignals(true); + d->axisScalingDialog.automaticStepWidth->setChecked(axis->useAutomaticMajorInterval()); + d->axisScalingDialog.stepWidth->setEnabled(!axis->useAutomaticMajorInterval()); + d->axisScalingDialog.automaticStepWidth->blockSignals(false); + + d->axisScalingDialog.automaticSubStepWidth->blockSignals(true); + d->axisScalingDialog.automaticSubStepWidth->setChecked(axis->useAutomaticMinorInterval()); + d->axisScalingDialog.subStepWidth->setEnabled(!axis->useAutomaticMinorInterval()); + d->axisScalingDialog.automaticSubStepWidth->blockSignals(false); } void ChartConfigWidget::ui_dataSetXDataRegionChanged() { // Check for valid index - if ( d->selectedDataSet_CellRegionDialog < 0 ) + if (d->selectedDataSet_CellRegionDialog < 0) return; const QString regionString = d->cellRegionDialog.xDataRegion->text(); - const CellRegion region( d->tableSource, regionString ); + const CellRegion region(d->tableSource, regionString); - DataSet *dataSet = d->dataSets[ d->selectedDataSet_CellRegionDialog ]; + DataSet *dataSet = d->dataSets[d->selectedDataSet_CellRegionDialog]; - emit dataSetXDataRegionChanged( dataSet, region ); + emit dataSetXDataRegionChanged(dataSet, region); } void ChartConfigWidget::ui_dataSetYDataRegionChanged() { // Check for valid index - if ( d->selectedDataSet_CellRegionDialog < 0 ) + if (d->selectedDataSet_CellRegionDialog < 0) return; const QString regionString = d->cellRegionDialog.yDataRegion->text(); - const CellRegion region( d->tableSource, regionString ); + const CellRegion region(d->tableSource, regionString); - DataSet *dataSet = d->dataSets[ d->selectedDataSet_CellRegionDialog ]; + DataSet *dataSet = d->dataSets[d->selectedDataSet_CellRegionDialog]; - emit dataSetYDataRegionChanged( dataSet, region ); + emit dataSetYDataRegionChanged(dataSet, region); } void ChartConfigWidget::ui_dataSetCustomDataRegionChanged() @@ -1269,183 +1275,183 @@ /* // Check for valid index - if ( d->selectedDataSet_CellRegionDialog < 0 ) + if (d->selectedDataSet_CellRegionDialog < 0) return; const QString region = d->cellRegionDialog.customDataRegion->text(); - DataSet *dataSet = d->dataSets[ d->selectedDataSet_CellRegionDialog ]; + DataSet *dataSet = d->dataSets[d->selectedDataSet_CellRegionDialog]; - emit dataSetCustomDataRegionChanged( dataSet, region ); + emit dataSetCustomDataRegionChanged(dataSet, region); */ } void ChartConfigWidget::ui_dataSetCategoryDataRegionChanged() { // Check for valid index - if ( d->selectedDataSet_CellRegionDialog < 0 ) + if (d->selectedDataSet_CellRegionDialog < 0) return; const QString regionString = d->cellRegionDialog.categoryDataRegion->text(); - const CellRegion region( d->tableSource, regionString ); + const CellRegion region(d->tableSource, regionString); - DataSet *dataSet = d->dataSets[ d->selectedDataSet_CellRegionDialog ]; + DataSet *dataSet = d->dataSets[d->selectedDataSet_CellRegionDialog]; - emit dataSetCategoryDataRegionChanged( dataSet, region ); + emit dataSetCategoryDataRegionChanged(dataSet, region); } void ChartConfigWidget::ui_dataSetLabelDataRegionChanged() { // Check for valid index - if ( d->selectedDataSet_CellRegionDialog < 0 ) + if (d->selectedDataSet_CellRegionDialog < 0) return; const QString regionString = d->cellRegionDialog.labelDataRegion->text(); - const CellRegion region( d->tableSource, regionString ); + const CellRegion region(d->tableSource, regionString); - DataSet *dataSet = d->dataSets[ d->selectedDataSet_CellRegionDialog ]; + DataSet *dataSet = d->dataSets[d->selectedDataSet_CellRegionDialog]; - emit dataSetLabelDataRegionChanged( dataSet, region ); + emit dataSetLabelDataRegionChanged(dataSet, region); } -void ChartConfigWidget::ui_dataSetSelectionChanged_CellRegionDialog( int index ) +void ChartConfigWidget::ui_dataSetSelectionChanged_CellRegionDialog(int index) { // Check for valid index - if ( index < 0 || index >= d->dataSets.size() ) + if (index < 0 || index >= d->dataSets.size()) return; - DataSet *dataSet = d->dataSets[ index ]; + DataSet *dataSet = d->dataSets[index]; const int dimensions = dataSet->dimension(); - d->cellRegionDialog.labelDataRegion->setText( dataSet->labelDataRegion().toString() ); - if ( dimensions > 1 ) + d->cellRegionDialog.labelDataRegion->setText(dataSet->labelDataRegion().toString()); + if (dimensions > 1) { - d->cellRegionDialog.xDataRegion->setEnabled( true ); - d->cellRegionDialog.xDataRegion->setText( dataSet->xDataRegion().toString() ); + d->cellRegionDialog.xDataRegion->setEnabled(true); + d->cellRegionDialog.xDataRegion->setText(dataSet->xDataRegion().toString()); } else - d->cellRegionDialog.xDataRegion->setEnabled( false ); - d->cellRegionDialog.yDataRegion->setText( dataSet->yDataRegion().toString() ); - d->cellRegionDialog.categoryDataRegion->setText( dataSet->categoryDataRegion().toString() ); + d->cellRegionDialog.xDataRegion->setEnabled(false); + d->cellRegionDialog.yDataRegion->setText(dataSet->yDataRegion().toString()); + d->cellRegionDialog.categoryDataRegion->setText(dataSet->categoryDataRegion().toString()); d->selectedDataSet_CellRegionDialog = index; } -void ChartConfigWidget::ui_dataSetSelectionChanged( int index ) +void ChartConfigWidget::ui_dataSetSelectionChanged(int index) { // Check for valid index - if ( index < 0 || index >= d->dataSets.size() ) + if (index < 0 || index >= d->dataSets.size()) return; - DataSet *dataSet = d->dataSets[ index ]; - //d->ui.datasetColor->setText( axis->titleText() ); - d->ui.dataSetAxes->blockSignals( true ); - d->ui.dataSetAxes->setCurrentIndex( d->dataSetAxes.indexOf( dataSet->attachedAxis() ) ); - d->ui.dataSetAxes->blockSignals( false ); - - d->ui.datasetBrush->blockSignals( true ); - d->ui.datasetBrush->setColor( dataSet->brush().color() ); - d->ui.datasetBrush->blockSignals( false ); - - d->ui.datasetPen->blockSignals( true ); - d->ui.datasetPen->setColor( dataSet->pen().color() ); - d->ui.datasetPen->blockSignals( false ); - - d->ui.datasetShowCategory->blockSignals( true ); - d->ui.datasetShowCategory->setChecked( dataSet->valueLabelType().category ); - d->ui.datasetShowCategory->blockSignals( false ); - - d->ui.dataSetShowNumber->blockSignals( true ); - d->ui.dataSetShowNumber->setChecked( dataSet->valueLabelType().number ); - d->ui.dataSetShowNumber->blockSignals( false ); - - d->ui.datasetShowPercent->blockSignals( true ); - d->ui.datasetShowPercent->setChecked( dataSet->valueLabelType().percentage ); - d->ui.datasetShowPercent->blockSignals( false ); - - d->ui.datasetShowSymbol->blockSignals( true ); - d->ui.datasetShowSymbol->setChecked( dataSet->valueLabelType().symbol ); - d->ui.datasetShowSymbol->blockSignals( false ); - - if ( dataSet->chartType() != LastChartType ) { - d->ui.dataSetHasChartType->blockSignals( true ); - d->ui.dataSetHasChartType->setChecked( true ); - d->ui.dataSetHasChartType->blockSignals( false ); - d->ui.dataSetChartTypeMenu->setEnabled( true ); + DataSet *dataSet = d->dataSets[index]; + //d->ui.datasetColor->setText(axis->titleText()); + d->ui.dataSetAxes->blockSignals(true); + d->ui.dataSetAxes->setCurrentIndex(d->dataSetAxes.indexOf(dataSet->attachedAxis())); + d->ui.dataSetAxes->blockSignals(false); + + d->ui.datasetBrush->blockSignals(true); + d->ui.datasetBrush->setColor(dataSet->brush().color()); + d->ui.datasetBrush->blockSignals(false); + + d->ui.datasetPen->blockSignals(true); + d->ui.datasetPen->setColor(dataSet->pen().color()); + d->ui.datasetPen->blockSignals(false); + + d->ui.datasetShowCategory->blockSignals(true); + d->ui.datasetShowCategory->setChecked(dataSet->valueLabelType().category); + d->ui.datasetShowCategory->blockSignals(false); + + d->ui.dataSetShowNumber->blockSignals(true); + d->ui.dataSetShowNumber->setChecked(dataSet->valueLabelType().number); + d->ui.dataSetShowNumber->blockSignals(false); + + d->ui.datasetShowPercent->blockSignals(true); + d->ui.datasetShowPercent->setChecked(dataSet->valueLabelType().percentage); + d->ui.datasetShowPercent->blockSignals(false); + + d->ui.datasetShowSymbol->blockSignals(true); + d->ui.datasetShowSymbol->setChecked(dataSet->valueLabelType().symbol); + d->ui.datasetShowSymbol->blockSignals(false); + + if (dataSet->chartType() != LastChartType) { + d->ui.dataSetHasChartType->blockSignals(true); + d->ui.dataSetHasChartType->setChecked(true); + d->ui.dataSetHasChartType->blockSignals(false); + d->ui.dataSetChartTypeMenu->setEnabled(true); } else { - d->ui.dataSetHasChartType->blockSignals( true ); - d->ui.dataSetHasChartType->setChecked( false ); - d->ui.dataSetHasChartType->blockSignals( false ); - d->ui.dataSetChartTypeMenu->setEnabled( false ); + d->ui.dataSetHasChartType->blockSignals(true); + d->ui.dataSetHasChartType->setChecked(false); + d->ui.dataSetHasChartType->blockSignals(false); + d->ui.dataSetChartTypeMenu->setEnabled(false); } - Q_ASSERT( d->ui.dataSetChartTypeMenu->menu() ); + Q_ASSERT(d->ui.dataSetChartTypeMenu->menu()); - if ( dataSet->chartType() == LastChartType ) { - d->ui.dataSetChartTypeMenu->setIcon( QIcon() ); + if (dataSet->chartType() == LastChartType) { + d->ui.dataSetChartTypeMenu->setIcon(QIcon()); } else { - switch ( dataSet->chartType() ) { + switch (dataSet->chartType()) { case BarChartType: - switch ( dataSet->chartSubType() ) { + switch (dataSet->chartSubType()) { case StackedChartSubtype: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_bar_stacked" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-bar-stacked")); break; case PercentChartSubtype: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_bar_layer" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-bar-percentage")); break; default: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_bar_beside" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-bar")); } break; case LineChartType: - switch ( dataSet->chartSubType() ) { + switch (dataSet->chartSubType()) { case StackedChartSubtype: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_line_stacked" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-line-stacked")); break; case PercentChartSubtype: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_line_percent" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-line-percentage")); break; default: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_line_normal" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-line")); } break; case AreaChartType: - switch ( dataSet->chartSubType() ) { + switch (dataSet->chartSubType()) { case StackedChartSubtype: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_area_stacked" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-area-stacked")); break; case PercentChartSubtype: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_area_percent" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-area-percentage")); break; default: - d->ui.dataSetChartTypeMenu->setIcon( KIcon( "chart_area_normal" ) ); + d->ui.dataSetChartTypeMenu->setIcon(KIcon("office-chart-area")); } break; case CircleChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_circle_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_circle_normal")); break; case RingChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_ring_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_ring_normal")); break; case ScatterChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_scatter_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_scatter_normal")); break; case RadarChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_radar_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_radar_normal")); break; case StockChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_stock_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_stock_normal")); break; case BubbleChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_bubble_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_bubble_normal")); break; case SurfaceChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_surface_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_surface_normal")); break; case GanttChartType: - d->ui.dataSetChartTypeMenu->menu()->setIcon( KIcon( "chart_gantt_normal" ) ); + d->ui.dataSetChartTypeMenu->menu()->setIcon(KIcon("chart_gantt_normal")); break; // Fixes a warning that LastChartType isn't handled. @@ -1457,67 +1463,67 @@ d->selectedDataSet = index; } -void ChartConfigWidget::ui_dataSetAxisSelectionChanged( int index ) +void ChartConfigWidget::ui_dataSetAxisSelectionChanged(int index) { - if ( d->ui.dataSets->currentIndex() < 0 || d->ui.dataSets->currentIndex() >= d->dataSets.count() ) + if (d->ui.dataSets->currentIndex() < 0 || d->ui.dataSets->currentIndex() >= d->dataSets.count()) return; - DataSet *dataSet = d->dataSets[ d->ui.dataSets->currentIndex() ]; + DataSet *dataSet = d->dataSets[d->ui.dataSets->currentIndex()]; - if ( index < 0 || index >= d->dataSetAxes.count() ) + if (index < 0 || index >= d->dataSetAxes.count()) return; - Axis *axis = d->dataSetAxes[ index ]; + Axis *axis = d->dataSetAxes[index]; - emit dataSetAxisChanged( dataSet, axis ); + emit dataSetAxisChanged(dataSet, axis); } -void ChartConfigWidget::ui_axisTitleChanged( const QString& title ) +void ChartConfigWidget::ui_axisTitleChanged(const QString& title) { - if( d->ui.axes->currentIndex() < 0 || d->ui.axes->currentIndex() >= d->axes.size() ) + if (d->ui.axes->currentIndex() < 0 || d->ui.axes->currentIndex() >= d->axes.size()) return; const int index = d->ui.axes->currentIndex(); Axis *axis = d->axes[index]; - emit axisTitleChanged( axis, title ); + emit axisTitleChanged(axis, title); - QString nonEmptyTitle = nonEmptyAxisTitle( axis, index ); + QString nonEmptyTitle = nonEmptyAxisTitle(axis, index); // TODO: This can surely be done better - int dataSetAxisIndex = d->dataSetAxes.indexOf( axis ); - d->ui.dataSetAxes->setItemText( dataSetAxisIndex, nonEmptyTitle ); - d->ui.axes->setItemText( index, nonEmptyTitle ); + int dataSetAxisIndex = d->dataSetAxes.indexOf(axis); + d->ui.dataSetAxes->setItemText(dataSetAxisIndex, nonEmptyTitle); + d->ui.axes->setItemText(index, nonEmptyTitle); } -void ChartConfigWidget::ui_axisShowTitleChanged( bool b ) +void ChartConfigWidget::ui_axisShowTitleChanged(bool b) { - if( d->ui.axes->currentIndex() < 0 || d->ui.axes->currentIndex() >= d->axes.size() ) + if(d->ui.axes->currentIndex() < 0 || d->ui.axes->currentIndex() >= d->axes.size()) return; // To hide the axis title, we pass an empty string - emit axisShowTitleChanged( d->axes[ d->ui.axes->currentIndex() ], b ); + emit axisShowTitleChanged(d->axes[d->ui.axes->currentIndex()], b); } -void ChartConfigWidget::ui_axisShowGridLinesChanged( bool b ) +void ChartConfigWidget::ui_axisShowGridLinesChanged(bool b) { - if( d->ui.axes->currentIndex() < 0 || d->ui.axes->currentIndex() >= d->axes.size() ) + if(d->ui.axes->currentIndex() < 0 || d->ui.axes->currentIndex() >= d->axes.size()) return; - emit axisShowGridLinesChanged( d->axes[ d->ui.axes->currentIndex() ], b ); + emit axisShowGridLinesChanged(d->axes[d->ui.axes->currentIndex()], b); } void ChartConfigWidget::ui_axisAdded() { AxisDimension dimension; - if ( d->newAxisDialog.dimensionIsX->isChecked() ) + if (d->newAxisDialog.dimensionIsX->isChecked()) dimension = XAxisDimension; else dimension = YAxisDimension; - emit axisAdded( dimension, d->newAxisDialog.title->text() ); + emit axisAdded(dimension, d->newAxisDialog.title->text()); update(); - if( d->ui.axes->count() > 0 ) - d->ui.axes->setCurrentIndex( d->ui.axes->count() - 1 ); + if(d->ui.axes->count() > 0) + d->ui.axes->setCurrentIndex(d->ui.axes->count() - 1); } void ChartConfigWidget::ui_addAxisClicked() @@ -1529,72 +1535,72 @@ { int index = d->ui.axes->currentIndex(); // Check for valid index - if ( index < 0 || index >= d->axes.size() ) + if (index < 0 || index >= d->axes.size()) return; - if ( KMessageBox::questionYesNo( this, - i18n("Are you sure you want to remove this axis? All settings specific to this axis will be lost."), - i18n("Axis Removal Confirmation") ) != KMessageBox::Yes ) + if (KMessageBox::questionYesNo(this, + i18n("Are you sure you want to remove this axis? All settings specific to this axis will be lost."), + i18n("Axis Removal Confirmation")) != KMessageBox::Yes) return; - emit axisRemoved( d->axes[ index ] ); + emit axisRemoved(d->axes[index]); update(); // Select the axis after the current selection, if possible - if ( d->ui.axes->count() > 0 ) { - index = qMin( index, d->ui.axes->count() - 1 ); - d->ui.axes->setCurrentIndex( index ); + if (d->ui.axes->count() > 0) { + index = qMin(index, d->ui.axes->count() - 1); + d->ui.axes->setCurrentIndex(index); } } -void ChartConfigWidget::ui_axisUseLogarithmicScalingChanged( bool b ) +void ChartConfigWidget::ui_axisUseLogarithmicScalingChanged(bool b) { int index = d->ui.axes->currentIndex(); // Check for valid index - if ( index < 0 || index >= d->axes.size() ) + if (index < 0 || index >= d->axes.size()) return; - emit axisUseLogarithmicScalingChanged( d->axes[ index ], b ); + emit axisUseLogarithmicScalingChanged(d->axes[index], b); } -void ChartConfigWidget::ui_axisStepWidthChanged( double width ) +void ChartConfigWidget::ui_axisStepWidthChanged(double width) { int index = d->ui.axes->currentIndex(); // Check for valid index - if ( index < 0 || index >= d->axes.size() ) + if (index < 0 || index >= d->axes.size()) return; - emit axisStepWidthChanged( d->axes[ index ], width ); + emit axisStepWidthChanged(d->axes[index], width); } -void ChartConfigWidget::ui_axisSubStepWidthChanged( double width ) +void ChartConfigWidget::ui_axisSubStepWidthChanged(double width) { int index = d->ui.axes->currentIndex(); // Check for valid index - if ( index < 0 || index >= d->axes.size() ) + if (index < 0 || index >= d->axes.size()) return; - emit axisSubStepWidthChanged( d->axes[ index ], width ); + emit axisSubStepWidthChanged(d->axes[index], width); } -void ChartConfigWidget::ui_axisUseAutomaticStepWidthChanged( bool b ) +void ChartConfigWidget::ui_axisUseAutomaticStepWidthChanged(bool b) { int index = d->ui.axes->currentIndex(); // Check for valid index - if ( index < 0 || index >= d->axes.size() ) + if (index < 0 || index >= d->axes.size()) return; - emit axisUseAutomaticStepWidthChanged( d->axes[ index ], b ); + emit axisUseAutomaticStepWidthChanged(d->axes[index], b); } -void ChartConfigWidget::ui_axisUseAutomaticSubStepWidthChanged( bool b ) +void ChartConfigWidget::ui_axisUseAutomaticSubStepWidthChanged(bool b) { int index = d->ui.axes->currentIndex(); // Check for valid index - if ( index < 0 || index >= d->axes.size() ) + if (index < 0 || index >= d->axes.size()) return; - emit axisUseAutomaticSubStepWidthChanged( d->axes[ index ], b ); + emit axisUseAutomaticSubStepWidthChanged(d->axes[index], b); } void ChartConfigWidget::ui_axisScalingButtonClicked() @@ -1602,36 +1608,36 @@ d->axisScalingDialog.show(); } -void ChartConfigWidget::ui_datasetShowCategoryChanged( bool b ) +void ChartConfigWidget::ui_datasetShowCategoryChanged(bool b) { - if ( d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count() ) + if (d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count()) return; - emit datasetShowCategoryChanged( d->dataSets[ d->selectedDataSet ], b ); + emit datasetShowCategoryChanged(d->dataSets[d->selectedDataSet], b); } -void ChartConfigWidget::ui_dataSetShowNumberChanged( bool b ) +void ChartConfigWidget::ui_dataSetShowNumberChanged(bool b) { - if ( d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count() ) + if (d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count()) return; - emit dataSetShowNumberChanged( d->dataSets[ d->selectedDataSet ], b ); + emit dataSetShowNumberChanged(d->dataSets[d->selectedDataSet], b); } -void ChartConfigWidget::ui_datasetShowPercentChanged( bool b ) +void ChartConfigWidget::ui_datasetShowPercentChanged(bool b) { - if ( d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count() ) + if (d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count()) return; - emit datasetShowPercentChanged( d->dataSets[ d->selectedDataSet ], b ); + emit datasetShowPercentChanged(d->dataSets[d->selectedDataSet], b); } -void ChartConfigWidget::ui_datasetShowSymbolChanged( bool b ) +void ChartConfigWidget::ui_datasetShowSymbolChanged(bool b) { - if ( d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count() ) + if (d->selectedDataSet < 0 || d->selectedDataSet >= d->dataSets.count()) return; - emit datasetShowSymbolChanged( d->dataSets[ d->selectedDataSet ], b ); + emit datasetShowSymbolChanged(d->dataSets[d->selectedDataSet], b); } #include "ChartConfigWidget.moc" diff -Nru calligra-2.4.0/plugins/chartshape/ChartConfigWidget.h calligra-2.4.3/plugins/chartshape/ChartConfigWidget.h --- calligra-2.4.0/plugins/chartshape/ChartConfigWidget.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartConfigWidget.h 2012-06-26 04:21:31.000000000 +0000 @@ -55,7 +55,7 @@ ChartConfigWidget(); ~ChartConfigWidget(); - void open( KoShape* shape ); + void open(KoShape* shape); void save(); KAction* createAction(); @@ -67,115 +67,115 @@ void deleteSubDialogs(); public slots: - void chartSubTypeSelected( int type ); - void chartTypeSelected( QAction *action ); - void setThreeDMode( bool threeD ); + void chartSubTypeSelected(int type); + void chartTypeSelected(QAction *action); + void setThreeDMode(bool threeD); void update(); void slotShowTableEditor(); void slotShowCellRegionDialog(); - void dataSetChartTypeSelected( QAction *action ); - void datasetBrushSelected( const QColor& color ); - void datasetPenSelected( const QColor& color ); - void ui_datasetShowCategoryChanged( bool b ); - void ui_dataSetShowNumberChanged( bool b ); - void ui_datasetShowPercentChanged( bool b ); - void ui_datasetShowSymbolChanged( bool b ); - void ui_dataSetSelectionChanged( int index ); - void ui_dataSetAxisSelectionChanged( int index ); + void dataSetChartTypeSelected(QAction *action); + void datasetBrushSelected(const QColor& color); + void datasetPenSelected(const QColor& color); + void ui_datasetShowCategoryChanged(bool b); + void ui_dataSetShowNumberChanged(bool b); + void ui_datasetShowPercentChanged(bool b); + void ui_datasetShowSymbolChanged(bool b); + void ui_dataSetSelectionChanged(int index); + void ui_dataSetAxisSelectionChanged(int index); void ui_dataSetXDataRegionChanged(); void ui_dataSetYDataRegionChanged(); void ui_dataSetCustomDataRegionChanged(); void ui_dataSetLabelDataRegionChanged(); void ui_dataSetCategoryDataRegionChanged(); - void ui_dataSetSelectionChanged_CellRegionDialog( int index ); - void ui_dataSetHasChartTypeChanged( bool b ); - void ui_dataSetPieExplodeFactorChanged( int percent ); - - void setLegendOrientationIsVertical( bool ); - void setLegendOrientation( int boxEntryIndex ); - void setLegendAlignment( int boxEntryIndex ); - void setLegendFixedPosition( int buttonGroupIndex ); - //void setLegendShowTitle( bool toggled ); - void updateFixedPosition( Position position ); - - void ui_axisSelectionChanged( int index ); - void ui_axisTitleChanged( const QString& title ); - void ui_axisShowTitleChanged( bool b ); - void ui_axisShowGridLinesChanged( bool b ); - void ui_axisUseLogarithmicScalingChanged( bool b ); - void ui_axisStepWidthChanged( double width ); - void ui_axisUseAutomaticStepWidthChanged( bool b ); - void ui_axisSubStepWidthChanged( double width ); - void ui_axisUseAutomaticSubStepWidthChanged( bool b ); + void ui_dataSetSelectionChanged_CellRegionDialog(int index); + void ui_dataSetHasChartTypeChanged(bool b); + void ui_dataSetPieExplodeFactorChanged(int percent); + + void setLegendOrientationIsVertical(bool); + void setLegendOrientation(int boxEntryIndex); + void setLegendAlignment(int boxEntryIndex); + void setLegendFixedPosition(int buttonGroupIndex); + //void setLegendShowTitle(bool toggled); + void updateFixedPosition(Position position); + + void ui_axisSelectionChanged(int index); + void ui_axisTitleChanged(const QString& title); + void ui_axisShowTitleChanged(bool b); + void ui_axisShowGridLinesChanged(bool b); + void ui_axisUseLogarithmicScalingChanged(bool b); + void ui_axisStepWidthChanged(double width); + void ui_axisUseAutomaticStepWidthChanged(bool b); + void ui_axisSubStepWidthChanged(double width); + void ui_axisUseAutomaticSubStepWidthChanged(bool b); void ui_axisScalingButtonClicked(); void ui_axisAdded(); void ui_addAxisClicked(); void ui_removeAxisClicked(); signals: - void chartTypeChanged( ChartType type ); - void chartSubTypeChanged( ChartSubtype subType ); - void dataSetChartTypeChanged( DataSet *dataSet, ChartType type ); - void dataSetChartSubTypeChanged( DataSet *dataSet, ChartSubtype subType ); - void threeDModeToggled( bool threeD ); - void showTitleChanged( bool ); - void showSubTitleChanged( bool ); - void showFooterChanged( bool ); - - void showVerticalLinesChanged( bool b ); - void showHorizontalLinesChanged( bool b ); - - void dataSetXDataRegionChanged( DataSet *dataSet, const CellRegion ®ion ); - void dataSetYDataRegionChanged( DataSet *dataSet, const CellRegion ®ion ); - void dataSetCustomDataRegionChanged( DataSet *dataSet, const CellRegion ®ion ); - void dataSetCategoryDataRegionChanged( DataSet *dataSet, const CellRegion ®ion ); - void dataSetLabelDataRegionChanged( DataSet *dataSet, const CellRegion ®ion ); - - void datasetPenChanged( DataSet *dataSet, const QColor& color ); - void datasetBrushChanged( DataSet *dataSet, const QColor& color ); - void datasetShowCategoryChanged( DataSet *dataSet, bool b ); - void dataSetShowNumberChanged( DataSet *dataSet, bool b ); - void datasetShowPercentChanged( DataSet *dataSet, bool b ); - void datasetShowSymbolChanged( DataSet *dataSet, bool b ); - void dataSetAxisChanged( DataSet *dataSet, Axis *axis ); - void gapBetweenBarsChanged( int percent ); - void gapBetweenSetsChanged( int percent ); - void pieExplodeFactorChanged( DataSet *dataSet, int percent ); - - void showLegendChanged( bool b ); - - void axisAdded( AxisDimension, const QString& title ); - void axisRemoved( Axis *axis ); - void axisShowTitleChanged( Axis *axis, bool b ); - void axisTitleChanged( Axis *axis, const QString& title ); - void axisShowGridLinesChanged( Axis *axis, bool b ); - void axisUseLogarithmicScalingChanged( Axis *axis, bool b ); - void axisStepWidthChanged( Axis *axis, qreal width ); - void axisSubStepWidthChanged( Axis *axis, qreal width ); - void axisUseAutomaticStepWidthChanged( Axis *axis, bool automatic ); - void axisUseAutomaticSubStepWidthChanged( Axis *axis, bool automatic ); - - void legendTitleChanged( const QString& ); - void legendFontChanged( const QFont& font ); - void legendTitleFontChanged( const QFont& font ); - void legendFontSizeChanged( int size ); - void legendSpacingChanged( int spacing ); - void legendShowLinesToggled( bool toggled ); - void legendOrientationChanged( Qt::Orientation orientation ); - void legendAlignmentChanged( Qt::Alignment alignment ); - void legendFixedPositionChanged( Position position ); - void legendBackgroundColorChanged( const QColor& color ); - void legendFrameColorChanged( const QColor& color ); - void legendShowFrameChanged( bool show ); + void chartTypeChanged(ChartType type); + void chartSubTypeChanged(ChartSubtype subType); + void dataSetChartTypeChanged(DataSet *dataSet, ChartType type); + void dataSetChartSubTypeChanged(DataSet *dataSet, ChartSubtype subType); + void threeDModeToggled(bool threeD); + void showTitleChanged(bool); + void showSubTitleChanged(bool); + void showFooterChanged(bool); + + void showVerticalLinesChanged(bool b); + void showHorizontalLinesChanged(bool b); + + void dataSetXDataRegionChanged(DataSet *dataSet, const CellRegion ®ion); + void dataSetYDataRegionChanged(DataSet *dataSet, const CellRegion ®ion); + void dataSetCustomDataRegionChanged(DataSet *dataSet, const CellRegion ®ion); + void dataSetCategoryDataRegionChanged(DataSet *dataSet, const CellRegion ®ion); + void dataSetLabelDataRegionChanged(DataSet *dataSet, const CellRegion ®ion); + + void datasetPenChanged(DataSet *dataSet, const QColor& color); + void datasetBrushChanged(DataSet *dataSet, const QColor& color); + void datasetShowCategoryChanged(DataSet *dataSet, bool b); + void dataSetShowNumberChanged(DataSet *dataSet, bool b); + void datasetShowPercentChanged(DataSet *dataSet, bool b); + void datasetShowSymbolChanged(DataSet *dataSet, bool b); + void dataSetAxisChanged(DataSet *dataSet, Axis *axis); + void gapBetweenBarsChanged(int percent); + void gapBetweenSetsChanged(int percent); + void pieExplodeFactorChanged(DataSet *dataSet, int percent); + + void showLegendChanged(bool b); + + void axisAdded(AxisDimension, const QString& title); + void axisRemoved(Axis *axis); + void axisShowTitleChanged(Axis *axis, bool b); + void axisTitleChanged(Axis *axis, const QString& title); + void axisShowGridLinesChanged(Axis *axis, bool b); + void axisUseLogarithmicScalingChanged(Axis *axis, bool b); + void axisStepWidthChanged(Axis *axis, qreal width); + void axisSubStepWidthChanged(Axis *axis, qreal width); + void axisUseAutomaticStepWidthChanged(Axis *axis, bool automatic); + void axisUseAutomaticSubStepWidthChanged(Axis *axis, bool automatic); + + void legendTitleChanged(const QString&); + void legendFontChanged(const QFont& font); + void legendTitleFontChanged(const QFont& font); + void legendFontSizeChanged(int size); + void legendSpacingChanged(int spacing); + void legendShowLinesToggled(bool toggled); + void legendOrientationChanged(Qt::Orientation orientation); + void legendAlignmentChanged(Qt::Alignment alignment); + void legendFixedPositionChanged(Position position); + void legendBackgroundColorChanged(const QColor& color); + void legendFrameColorChanged(const QColor& color); + void legendShowFrameChanged(bool show); private: void setupDialogs(); void createActions(); - void setPolarChartTypesEnabled( bool enabled ); - void setCartesianChartTypesEnabled( bool enabled ); + void setPolarChartTypesEnabled(bool enabled); + void setCartesianChartTypesEnabled(bool enabled); class Private; Private * const d; diff -Nru calligra-2.4.0/plugins/chartshape/ChartDocument.cpp calligra-2.4.3/plugins/chartshape/ChartDocument.cpp --- calligra-2.4.0/plugins/chartshape/ChartDocument.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartDocument.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -66,15 +66,15 @@ { } -ChartDocument::ChartDocument( ChartShape *parent ) - : KoDocument( 0, 0 ) - , d ( new Private ) +ChartDocument::ChartDocument(ChartShape *parent) + : KoDocument(0, 0) + , d (new Private) { d->parent = parent; // Needed by KoDocument::nativeOasisMimeType(). // KoEmbeddedDocumentSaver uses that method to // get the mimetype of the embedded document. - setComponentData( KComponentData( "kchart" ) ); + setComponentData(KComponentData("kchart")); } ChartDocument::~ChartDocument() @@ -83,93 +83,93 @@ } -bool ChartDocument::loadOdf( KoOdfReadStore &odfStore ) +bool ChartDocument::loadOdf(KoOdfReadStore &odfStore) { KoXmlDocument doc = odfStore.contentDoc(); - KoXmlNode bodyNode = doc.documentElement().namedItemNS( KoXmlNS::office, "body" ); - if ( bodyNode.isNull() ) { + KoXmlNode bodyNode = doc.documentElement().namedItemNS(KoXmlNS::office, "body"); + if (bodyNode.isNull()) { kError(35001) << "No element found."; return false; } - KoXmlNode chartElementParentNode = bodyNode.namedItemNS( KoXmlNS::office, "chart" ); - if ( chartElementParentNode.isNull() ) { + KoXmlNode chartElementParentNode = bodyNode.namedItemNS(KoXmlNS::office, "chart"); + if (chartElementParentNode.isNull()) { kError(35001) << "No element found."; return false; } - KoXmlElement chartElement = chartElementParentNode.namedItemNS( KoXmlNS::chart, "chart" ).toElement(); - if ( chartElement.isNull() ) { + KoXmlElement chartElement = chartElementParentNode.namedItemNS(KoXmlNS::chart, "chart").toElement(); + if (chartElement.isNull()) { kError(35001) << "No element found."; return false; } - KoOdfLoadingContext odfLoadingContext( odfStore.styles(), odfStore.store() ); + KoOdfLoadingContext odfLoadingContext(odfStore.styles(), odfStore.store()); KoShapeLoadingContext context(odfLoadingContext, d->parent->resourceManager()); - return d->parent->loadOdfChartElement( chartElement, context ); + return d->parent->loadOdfChartElement(chartElement, context); } -bool ChartDocument::loadXML( const KoXmlDocument &doc, KoStore *) +bool ChartDocument::loadXML(const KoXmlDocument &doc, KoStore *) { - Q_UNUSED( doc ); + Q_UNUSED(doc); // We don't support the old XML format any more. return false; } -bool ChartDocument::saveOdf( SavingContext &context ) +bool ChartDocument::saveOdf(SavingContext &context) { KoOdfWriteStore &odfStore = context.odfStore; KoStore *store = odfStore.store(); KoXmlWriter *manifestWriter = odfStore.manifestWriter(); KoXmlWriter *contentWriter = odfStore.contentWriter(); - if ( !contentWriter ) + if (!contentWriter) return false; KoGenStyles mainStyles; KoXmlWriter *bodyWriter = odfStore.bodyWriter(); - if ( !bodyWriter ) + if (!bodyWriter) return false; KoEmbeddedDocumentSaver& embeddedSaver = context.embeddedSaver; - KoShapeSavingContext savingContext( *bodyWriter, mainStyles, embeddedSaver ); + KoShapeSavingContext savingContext(*bodyWriter, mainStyles, embeddedSaver); - bodyWriter->startElement( "office:body" ); - bodyWriter->startElement( "office:chart" ); + bodyWriter->startElement("office:body"); + bodyWriter->startElement("office:chart"); - d->parent->saveOdf( savingContext ); + d->parent->saveOdf(savingContext); bodyWriter->endElement(); // office:chart bodyWriter->endElement(); // office:body - mainStyles.saveOdfStyles( KoGenStyles::DocumentAutomaticStyles, contentWriter ); + mainStyles.saveOdfStyles(KoGenStyles::DocumentAutomaticStyles, contentWriter); odfStore.closeContentWriter(); // Add manifest line for content.xml and styles.xml - manifestWriter->addManifestEntry( url().path() + "/content.xml", "text/xml" ); - manifestWriter->addManifestEntry( url().path() + "/styles.xml", "text/xml" ); + manifestWriter->addManifestEntry(url().path() + "/content.xml", "text/xml"); + manifestWriter->addManifestEntry(url().path() + "/styles.xml", "text/xml"); // save the styles.xml - if ( !mainStyles.saveOdfStylesDotXml( store, manifestWriter ) ) + if (!mainStyles.saveOdfStylesDotXml(store, manifestWriter)) return false; - if ( !savingContext.saveDataCenter( store, manifestWriter ) ) { + if (!savingContext.saveDataCenter(store, manifestWriter)) { return false; } return true; } -KoView *ChartDocument::createViewInstance( QWidget *parent ) +KoView *ChartDocument::createViewInstance(QWidget *parent) { - Q_UNUSED( parent ); + Q_UNUSED(parent); return 0; } -void ChartDocument::paintContent( QPainter &painter, const QRect &rect ) +void ChartDocument::paintContent(QPainter &painter, const QRect &rect) { - Q_UNUSED( painter ); - Q_UNUSED( rect ); + Q_UNUSED(painter); + Q_UNUSED(rect); } } // namespace KChart diff -Nru calligra-2.4.0/plugins/chartshape/ChartDocument.h calligra-2.4.3/plugins/chartshape/ChartDocument.h --- calligra-2.4.0/plugins/chartshape/ChartDocument.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartDocument.h 2012-06-26 04:18:01.000000000 +0000 @@ -40,16 +40,16 @@ class ChartDocument : public KoDocument { public: - ChartDocument( ChartShape *parent ); + ChartDocument(ChartShape *parent); ~ChartDocument(); - bool loadOdf( KoOdfReadStore &odfStore ); - bool loadXML( const KoXmlDocument &doc, KoStore *store ); + bool loadOdf(KoOdfReadStore &odfStore); + bool loadXML(const KoXmlDocument &doc, KoStore *store); - bool saveOdf( SavingContext &context ); - KoView *createViewInstance( QWidget *parent ); + bool saveOdf(SavingContext &context); + KoView *createViewInstance(QWidget *parent); - void paintContent( QPainter &painter, const QRect &rect ); + void paintContent(QPainter &painter, const QRect &rect); private: class Private; diff -Nru calligra-2.4.0/plugins/chartshape/ChartLayout.cpp calligra-2.4.3/plugins/chartshape/ChartLayout.cpp --- calligra-2.4.0/plugins/chartshape/ChartLayout.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartLayout.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -32,73 +32,74 @@ // Static helper methods (defined at end of file) -static QPointF itemPosition( KoShape *shape ); -static QSizeF itemSize( KoShape *shape ); -static void setItemPosition( KoShape *shape, const QPointF& pos ); +static QPointF itemPosition(KoShape *shape); +static QSizeF itemSize(KoShape *shape); +static void setItemPosition(KoShape *shape, const QPointF& pos); class ChartLayout::LayoutData { public: Position pos; - int weight; + int weight; bool clipped; bool inheritsTransform; - LayoutData( Position _pos, int _weight ) - : pos( _pos ), - weight( _weight ), - clipped( true ), - inheritsTransform(true) {} + LayoutData(Position _pos, int _weight) + : pos(_pos) + , weight(_weight) + , clipped(true) + , inheritsTransform(true) + {} }; ChartLayout::ChartLayout() - : m_doingLayout( false ) - , m_relayoutScheduled( false ) - , m_hMargin( 5 ) - , m_vMargin( 5 ) + : m_doingLayout(false) + , m_relayoutScheduled(false) + , m_hMargin(5) + , m_vMargin(5) { } ChartLayout::~ChartLayout() { - foreach( LayoutData *data, m_layoutItems.values() ) + foreach(LayoutData *data, m_layoutItems.values()) delete data; } -void ChartLayout::add( KoShape *shape ) +void ChartLayout::add(KoShape *shape) { - Q_ASSERT( !m_layoutItems.contains( shape ) ); - m_layoutItems.insert( shape, new LayoutData( FloatingPosition, 0 ) ); + Q_ASSERT(!m_layoutItems.contains(shape)); + m_layoutItems.insert(shape, new LayoutData(FloatingPosition, 0)); scheduleRelayout(); } -void ChartLayout::add( KoShape *shape, Position pos, int weight ) +void ChartLayout::add(KoShape *shape, Position pos, int weight) { - Q_ASSERT( !m_layoutItems.contains( shape ) ); - m_layoutItems.insert( shape, new LayoutData( pos, weight ) ); + Q_ASSERT(!m_layoutItems.contains(shape)); + m_layoutItems.insert(shape, new LayoutData(pos, weight)); scheduleRelayout(); } -void ChartLayout::remove( KoShape *shape ) +void ChartLayout::remove(KoShape *shape) { - if ( m_layoutItems.contains( shape ) ) { + if (m_layoutItems.contains(shape)) { // delete LayoutData - delete m_layoutItems.value( shape ); - m_layoutItems.remove( shape ); + delete m_layoutItems.value(shape); + m_layoutItems.remove(shape); scheduleRelayout(); } } -void ChartLayout::setClipped( const KoShape *shape, bool clipping ) +void ChartLayout::setClipped(const KoShape *shape, bool clipping) { - Q_ASSERT( m_layoutItems.contains( const_cast(shape) ) ); - m_layoutItems.value( const_cast(shape) )->clipped = clipping; + Q_ASSERT(m_layoutItems.contains(const_cast(shape))); + m_layoutItems.value(const_cast(shape))->clipped = clipping; } -bool ChartLayout::isClipped( const KoShape *shape ) const +bool ChartLayout::isClipped(const KoShape *shape) const { - Q_ASSERT( m_layoutItems.contains( const_cast(shape) ) ); - return m_layoutItems.value( const_cast(shape) )->clipped; + Q_ASSERT(m_layoutItems.contains(const_cast(shape))); + return m_layoutItems.value(const_cast(shape))->clipped; } void ChartLayout::setInheritsTransform(const KoShape *shape, bool inherit) @@ -121,9 +122,9 @@ return m_layoutItems.keys(); } -void ChartLayout::containerChanged( KoShapeContainer *container, KoShape::ChangeType type ) +void ChartLayout::containerChanged(KoShapeContainer *container, KoShape::ChangeType type) { - switch( type ) { + switch(type) { case KoShape::SizeChanged: m_containerSize = container->size(); scheduleRelayout(); @@ -133,31 +134,31 @@ } } -bool ChartLayout::isChildLocked( const KoShape *shape ) const +bool ChartLayout::isChildLocked(const KoShape *shape) const { return shape->isGeometryProtected(); } -void ChartLayout::setPosition( const KoShape *shape, Position pos, int weight ) +void ChartLayout::setPosition(const KoShape *shape, Position pos, int weight) { - Q_ASSERT( m_layoutItems.contains( const_cast(shape) ) ); - LayoutData *data = m_layoutItems.value( const_cast(shape) ); + Q_ASSERT(m_layoutItems.contains(const_cast(shape))); + LayoutData *data = m_layoutItems.value(const_cast(shape)); data->pos = pos; data->weight = weight; scheduleRelayout(); } -void ChartLayout::childChanged( KoShape *shape, KoShape::ChangeType type ) +void ChartLayout::childChanged(KoShape *shape, KoShape::ChangeType type) { - Q_UNUSED( shape ); + Q_UNUSED(shape); // Do not relayout again if we're currently in the process of a relayout. // Repositioning a layout item or resizing it will result in a cull of this method. - if ( m_doingLayout ) + if (m_doingLayout) return; // This can be fine-tuned, but right now, simply everything will be re-layouted. - switch ( type ) { + switch (type) { case KoShape::PositionChanged: case KoShape::SizeChanged: scheduleRelayout(); @@ -175,39 +176,39 @@ void ChartLayout::layout() { - Q_ASSERT( !m_doingLayout ); + Q_ASSERT(!m_doingLayout); - if ( !m_relayoutScheduled ) + if (!m_relayoutScheduled) return; m_doingLayout = true; QMap top, bottom, start, end; - KoShape *topStart = 0, - *bottomStart = 0, - *topEnd = 0, - *bottomEnd = 0, - *p = 0; + KoShape *topStart = 0; + KoShape *bottomStart = 0; + KoShape *topEnd = 0; + KoShape *bottomEnd = 0; + KoShape *p = 0; - QMapIterator it( m_layoutItems ); - while ( it.hasNext() ) { + QMapIterator it(m_layoutItems); + while (it.hasNext()) { it.next(); KoShape *shape = it.key(); - if ( !shape->isVisible() ) + if (!shape->isVisible()) continue; LayoutData *data = it.value(); - switch ( data->pos ) { + switch (data->pos) { case TopPosition: - top.insert( data->weight, shape ); + top.insert(data->weight, shape); break; case BottomPosition: - bottom.insert( data->weight, shape ); + bottom.insert(data->weight, shape); break; case StartPosition: - start.insert( data->weight, shape ); + start.insert(data->weight, shape); break; case EndPosition: - end.insert( data->weight, shape ); + end.insert(data->weight, shape); break; case TopStartPosition: topStart = shape; @@ -230,19 +231,19 @@ } } - qreal topY = layoutTop( top ); - qreal bottomY = layoutBottom( bottom ); - qreal startX = layoutStart( start ); - qreal endX = layoutEnd( end ); - if ( p ) { - setItemPosition( p, QPointF( startX, topY ) ); - p->setSize( QSizeF( endX - startX, bottomY - topY ) ); + qreal topY = layoutTop(top); + qreal bottomY = layoutBottom(bottom); + qreal startX = layoutStart(start); + qreal endX = layoutEnd(end); + if (p) { + setItemPosition(p, QPointF(startX, topY)); + p->setSize(QSizeF(endX - startX, bottomY - topY)); } - layoutTopStart( topStart ); - layoutBottomStart( bottomStart ); - layoutTopEnd( topEnd ); - layoutBottomEnd( bottomEnd ); + layoutTopStart(topStart); + layoutBottomStart(bottomStart); + layoutTopEnd(topEnd); + layoutBottomEnd(bottomEnd); m_doingLayout = false; m_relayoutScheduled = false; @@ -254,85 +255,85 @@ -qreal ChartLayout::layoutTop( const QMap& shapes ) +qreal ChartLayout::layoutTop(const QMap& shapes) { qreal top = m_vMargin; qreal pX = m_containerSize.width() / 2.0; - foreach( KoShape *shape, shapes ) { - QSizeF size = itemSize( shape ); - setItemPosition( shape, QPointF( pX - size.width() / 2.0, top ) ); + foreach(KoShape *shape, shapes) { + QSizeF size = itemSize(shape); + setItemPosition(shape, QPointF(pX - size.width() / 2.0, top)); top += size.height() + m_vMargin; } return top + m_vMargin; } -qreal ChartLayout::layoutBottom( const QMap& shapes ) +qreal ChartLayout::layoutBottom(const QMap& shapes) { qreal bottom = m_containerSize.height(); qreal pX = m_containerSize.width() / 2.0; - foreach( KoShape *shape, shapes ) { - QSizeF size = itemSize( shape ); + foreach(KoShape *shape, shapes) { + QSizeF size = itemSize(shape); bottom -= size.height() + m_vMargin; - setItemPosition( shape, QPointF( pX - size.width() / 2.0, bottom ) ); + setItemPosition(shape, QPointF(pX - size.width() / 2.0, bottom)); } return bottom - m_vMargin; } -qreal ChartLayout::layoutStart( const QMap& shapes ) +qreal ChartLayout::layoutStart(const QMap& shapes) { qreal start = m_hMargin; qreal pY = m_containerSize.height() / 2.0; - foreach( KoShape *shape, shapes ) { - QSizeF size = itemSize( shape ); - setItemPosition( shape, QPointF( start, pY - size.height() / 2.0 ) ); + foreach(KoShape *shape, shapes) { + QSizeF size = itemSize(shape); + setItemPosition(shape, QPointF(start, pY - size.height() / 2.0)); start += size.width() + m_hMargin; } return start + m_hMargin; } -qreal ChartLayout::layoutEnd( const QMap& shapes ) +qreal ChartLayout::layoutEnd(const QMap& shapes) { qreal end = m_containerSize.width(); qreal pY = m_containerSize.height() / 2.0; - foreach( KoShape *shape, shapes ) { - QSizeF size = itemSize( shape ); + foreach(KoShape *shape, shapes) { + QSizeF size = itemSize(shape); end -= size.width() + m_hMargin; - setItemPosition( shape, QPointF( end, pY - size.height() / 2.0 ) ); + setItemPosition(shape, QPointF(end, pY - size.height() / 2.0)); } return end - m_hMargin; } -void ChartLayout::layoutTopStart( KoShape *shape ) +void ChartLayout::layoutTopStart(KoShape *shape) { - if ( !shape ) + if (!shape) return; - setItemPosition( shape, QPointF( 0, 0 ) ); + setItemPosition(shape, QPointF(0, 0)); } -void ChartLayout::layoutBottomStart( KoShape *shape ) +void ChartLayout::layoutBottomStart(KoShape *shape) { - if ( !shape ) + if (!shape) return; - setItemPosition( shape, QPointF( 0, m_containerSize.height() - itemSize( shape ).height() ) ); + setItemPosition(shape, QPointF(0, m_containerSize.height() - itemSize(shape).height())); } -void ChartLayout::layoutTopEnd( KoShape *shape ) +void ChartLayout::layoutTopEnd(KoShape *shape) { - if ( !shape ) + if (!shape) return; - setItemPosition( shape, QPointF( m_containerSize.width() - itemSize( shape ).width(), 0 ) ); + setItemPosition(shape, QPointF(m_containerSize.width() - itemSize(shape).width(), 0)); } -void ChartLayout::layoutBottomEnd( KoShape *shape ) +void ChartLayout::layoutBottomEnd(KoShape *shape) { - if ( !shape ) + if (!shape) return; - const QSizeF size = itemSize( shape ); - setItemPosition( shape, QPointF( m_containerSize.width() - size.width(), - m_containerSize.height() - size.height() ) ); + const QSizeF size = itemSize(shape); + setItemPosition(shape, QPointF(m_containerSize.width() - size.width(), + m_containerSize.height() - size.height())); } -void ChartLayout::setMargins( qreal hMargin, qreal vMargin ) +void ChartLayout::setMargins(qreal hMargin, qreal vMargin) { m_vMargin = vMargin; m_hMargin = hMargin; @@ -341,20 +342,20 @@ /// Static Helper Methods -static QPointF itemPosition( KoShape *shape ) +static QPointF itemPosition(KoShape *shape) { - const QRectF boundingRect = QRectF( QPointF( 0, 0 ), shape->size() ); - return shape->transformation().mapRect( boundingRect ).topLeft(); + const QRectF boundingRect = QRectF(QPointF(0, 0), shape->size()); + return shape->transformation().mapRect(boundingRect).topLeft(); } -static QSizeF itemSize( KoShape *shape ) +static QSizeF itemSize(KoShape *shape) { - const QRectF boundingRect = QRectF( QPointF( 0, 0 ), shape->size() ); - return shape->transformation().mapRect( boundingRect ).size(); + const QRectF boundingRect = QRectF(QPointF(0, 0), shape->size()); + return shape->transformation().mapRect(boundingRect).size(); } -static void setItemPosition( KoShape *shape, const QPointF& pos ) +static void setItemPosition(KoShape *shape, const QPointF& pos) { - const QPointF offset = shape->position() - itemPosition( shape ); - shape->setPosition( pos + offset ); + const QPointF offset = shape->position() - itemPosition(shape); + shape->setPosition(pos + offset); } diff -Nru calligra-2.4.0/plugins/chartshape/ChartLayout.h calligra-2.4.3/plugins/chartshape/ChartLayout.h --- calligra-2.4.0/plugins/chartshape/ChartLayout.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartLayout.h 2012-06-26 04:18:01.000000000 +0000 @@ -73,7 +73,7 @@ /** * Adds a floating shape to the layout. */ - void add( KoShape *shape ); + void add(KoShape *shape); /** * Adds a shape to the layout. @@ -84,22 +84,22 @@ * A shape with a higher weight will be placed more towards * the center (i.e., it "sinks" due to its higher weight) */ - void add( KoShape *shape, Position pos, int weight = 0 ); + void add(KoShape *shape, Position pos, int weight = 0); /** * Removes a shape from the layout. */ - void remove( KoShape *shape ); + void remove(KoShape *shape); /** * Turns clipping of a shape on or off. */ - void setClipped( const KoShape *shape, bool clipping ); + void setClipped(const KoShape *shape, bool clipping); /** * @see setClipping */ - bool isClipped( const KoShape *shape ) const; + bool isClipped(const KoShape *shape) const; /// reimplemented virtual void setInheritsTransform(const KoShape *shape, bool inherit); @@ -119,25 +119,25 @@ /** * Called whenever a property of the container (i.e. the ChartShape) is changed. */ - void containerChanged( KoShapeContainer *container, KoShape::ChangeType type ); + void containerChanged(KoShapeContainer *container, KoShape::ChangeType type); /** * Returns whether a shape is locked for user modifications. */ - bool isChildLocked( const KoShape *shape ) const; + bool isChildLocked(const KoShape *shape) const; /** * Changes the layout position of a shape that is already contained * in this layout. */ - void setPosition( const KoShape *shape, Position pos, int weight = 0 ); + void setPosition(const KoShape *shape, Position pos, int weight = 0); /** * Called whenever a property of a shape in this layout has changed. * * All layout items effected by this change will be re-layouted. */ - void childChanged( KoShape *shape, KoShape::ChangeType type ); + void childChanged(KoShape *shape, KoShape::ChangeType type); /** * Does the layouting of shapes that have changed its size or position or @@ -159,37 +159,37 @@ /** * Sets the horizontal and vertical margin that will be applied during layout */ - void setMargins ( qreal hMargin, qreal vMargin ); + void setMargins (qreal hMargin, qreal vMargin); private: /** * Lays out all items in TopPosition, and returns the y value of * the bottom-most item's bottom. */ - qreal layoutTop( const QMap& shapes ); + qreal layoutTop(const QMap& shapes); /** * Lays out all items in BottomPosition, and returns the y value of * the top-most item's top. */ - qreal layoutBottom( const QMap& shapes ); + qreal layoutBottom(const QMap& shapes); /** * Lays out all items in StartPosition, and returns the x value of * the right-most item's right. */ - qreal layoutStart( const QMap& shapes ); + qreal layoutStart(const QMap& shapes); /** * Lays out all items in EndPosition, and returns the x value of * the left-most item's left. */ - qreal layoutEnd( const QMap& shapes ); + qreal layoutEnd(const QMap& shapes); - void layoutTopStart( KoShape *shape ); - void layoutBottomStart( KoShape *shape ); - void layoutTopEnd( KoShape *shape ); - void layoutBottomEnd( KoShape *shape ); + void layoutTopStart(KoShape *shape); + void layoutBottomStart(KoShape *shape); + void layoutTopEnd(KoShape *shape); + void layoutBottomEnd(KoShape *shape); class LayoutData; bool m_doingLayout; diff -Nru calligra-2.4.0/plugins/chartshape/ChartProxyModel.cpp calligra-2.4.3/plugins/chartshape/ChartProxyModel.cpp --- calligra-2.4.0/plugins/chartshape/ChartProxyModel.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartProxyModel.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -58,7 +58,7 @@ class ChartProxyModel::Private { public: - Private( ChartProxyModel *parent, ChartShape *shape, TableSource *source ); + Private(ChartProxyModel *parent, ChartShape *shape, TableSource *source); ~Private(); ChartProxyModel *const q; @@ -98,15 +98,15 @@ * As a side effect, this method sets d->categoryDataRegion if * overrideCategories is true. */ - QList createDataSetsFromRegion( QList *dataSetsToRecycle, - bool overrideCategories = true ); + QList createDataSetsFromRegion(QList *dataSetsToRecycle, + bool overrideCategories = true); }; -ChartProxyModel::Private::Private( ChartProxyModel *parent, ChartShape *shape, TableSource *source ) - : q( parent ) - , shape( shape ) - , tableSource( source ) - , isLoading( false ) +ChartProxyModel::Private::Private(ChartProxyModel *parent, ChartShape *shape, TableSource *source) + : q(parent) + , shape(shape) + , tableSource(source) + , isLoading(false) { firstRowIsLabel = false; firstColumnIsLabel = false; @@ -122,8 +122,8 @@ ChartProxyModel::Private::~Private() { - qDeleteAll( dataSets ); - qDeleteAll( removedDataSets ); + qDeleteAll(dataSets); + qDeleteAll(removedDataSets); } @@ -131,14 +131,14 @@ // Class ChartProxyModel -ChartProxyModel::ChartProxyModel( ChartShape *shape, TableSource *source ) +ChartProxyModel::ChartProxyModel(ChartShape *shape, TableSource *source) : QAbstractTableModel(), - d( new Private( this, shape, source ) ) + d(new Private(this, shape, source)) { - connect( source, SIGNAL( tableAdded( Table* ) ), - this, SLOT( addTable( Table* ) ) ); - connect( source, SIGNAL( tableRemoved( Table* ) ), - this, SLOT( removeTable( Table* ) ) ); + connect(source, SIGNAL(tableAdded(Table*)), + this, SLOT(addTable(Table*))); + connect(source, SIGNAL(tableRemoved(Table*)), + this, SLOT(removeTable(Table*))); } ChartProxyModel::~ChartProxyModel() @@ -146,7 +146,7 @@ delete d; } -void ChartProxyModel::reset( const CellRegion& region ) +void ChartProxyModel::reset(const CellRegion& region) { d->selection = region; d->rebuildDataMap(); @@ -163,34 +163,34 @@ // method only once in endLoading(), however the approach is actually // incorrect as it would potentially override a data set's regions // set by "somebody" else in the meantime. - // if ( isLoading ) + // if (isLoading) // return; q->beginResetModel(); q->invalidateDataSets(); - dataSets = createDataSetsFromRegion( &removedDataSets ); + dataSets = createDataSetsFromRegion(&removedDataSets); q->endResetModel(); } -void ChartProxyModel::addTable( Table *table ) +void ChartProxyModel::addTable(Table *table) { QAbstractItemModel *model = table->model(); - connect( model, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), - this, SLOT( dataChanged( QModelIndex, QModelIndex ) ) ); + connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), + this, SLOT(dataChanged(QModelIndex, QModelIndex))); } -void ChartProxyModel::removeTable( Table *table ) +void ChartProxyModel::removeTable(Table *table) { QAbstractItemModel *model = table->model(); - model->disconnect( this ); + model->disconnect(this); } /** * Returns a row of a given region (i.e. a part of it with height 1), cutting * off the first @a colOffset cells in that row. * - * Examples: extractRow( A1:C2, 0, 0 ) --> A1:C1 - * extractRow( A1:C2, 1, 0 ) --> A2:C2 - * extractRow( A1:C2, 0, 1 ) --> B1:C1 + * Examples: extractRow(A1:C2, 0, 0) --> A1:C1 + * extractRow(A1:C2, 1, 0) --> A2:C2 + * extractRow(A1:C2, 0, 1) --> B1:C1 * * See notes in createDataSetsFromRegion() for further details. * @@ -198,21 +198,22 @@ * @param row The number of the row, starting with 0 * @param colOffset How many of the first columns to cut from the resulting row */ -static QVector extractRow( const QVector &rects, int colOffset, bool extractLabel ) +static QVector extractRow(const QVector &rects, int colOffset, bool extractLabel) { if (colOffset == 0) return extractLabel ? QVector() : rects; QVector result; - foreach( const QRect &rect, rects ) { + foreach(const QRect &rect, rects) { if (extractLabel) { - QRect r( rect.topLeft(), QSize(colOffset, rect.height()) ); - result.append( r ); - } else { -//Q_ASSERT( rect.width() > colOffset ); - if ( rect.width() > colOffset ) { + QRect r(rect.topLeft(), QSize(colOffset, rect.height())); + result.append(r); + } + else { +//Q_ASSERT(rect.width() > colOffset); + if (rect.width() > colOffset) { QPoint topLeft = rect.topLeft() + QPoint(colOffset, 0); - QRect r( topLeft, QSize(rect.width() - colOffset, rect.height()) ); - result.append( r ); + QRect r(topLeft, QSize(rect.width() - colOffset, rect.height())); + result.append(r); } } } @@ -223,8 +224,8 @@ * Returns a column of a given region, cutting off the first @a rowOffset * rows in that column. * - * Examples: extractColumn( A1:C2, 0, 0 ) --> A1:A2 - * extractColumn( A1:C2;D1;F2, 0, 0 ) --> A1:A2;D1:D2 + * Examples: extractColumn(A1:C2, 0, 0) --> A1:A2 + * extractColumn(A1:C2;D1;F2, 0, 0) --> A1:A2;D1:D2 * * See notes in createDataSetsFromRegion() for further details. * @@ -232,21 +233,22 @@ * @param col The number of the column, starting with 0 * @param rowOffset How many of the first rows to cut from the resulting column */ -static QVector extractColumn( const QVector &rects, int rowOffset, bool extractLabel ) +static QVector extractColumn(const QVector &rects, int rowOffset, bool extractLabel) { if (rowOffset == 0) return extractLabel ? QVector() : rects; QVector result; - foreach( const QRect &rect, rects ) { + foreach(const QRect &rect, rects) { if (extractLabel) { - QRect r( rect.topLeft(), QSize(rect.width(), rowOffset) ); - result.append( r ); - } else { -//Q_ASSERT( rect.height() > rowOffset ); - if ( rect.height() > rowOffset ) { + QRect r(rect.topLeft(), QSize(rect.width(), rowOffset)); + result.append(r); + } + else { +//Q_ASSERT(rect.height() > rowOffset); + if (rect.height() > rowOffset) { QPoint topLeft = rect.topLeft() + QPoint(0, rowOffset); - QRect r( topLeft, QSize(rect.width(), rect.height() - rowOffset) ); - result.append( r ); + QRect r(topLeft, QSize(rect.width(), rect.height() - rowOffset)); + result.append(r); } } } @@ -281,70 +283,72 @@ QMap > sortDataRegions(Qt::Orientation dataDirection, QVector dataRegions) { QMap > sortedDataRegions; - if ( dataDirection == Qt::Horizontal ) { + if (dataDirection == Qt::Horizontal) { // Split up region in horizontal rectangles that are sorted from top to bottom QMap > rows; - foreach ( const QRect &rect, dataRegions ) { + foreach (const QRect &rect, dataRegions) { int x = rect.topLeft().x(); - for ( int y = rect.topLeft().y(); y <= rect.bottomLeft().y(); y++ ) { - QRect dataRect = QRect( QPoint( x, y ), QSize( rect.width(), 1 ) ); - if ( !rows.contains( y ) ) - rows.insert( y, QVector() ); - rows[y].append( dataRect ); + for (int y = rect.topLeft().y(); y <= rect.bottomLeft().y(); y++) { + QRect dataRect = QRect(QPoint(x, y), QSize(rect.width(), 1)); + if (!rows.contains(y)) + rows.insert(y, QVector()); + rows[y].append(dataRect); } } + // Sort rectangles in each row from left to right. - QMapIterator > i( rows ); - while ( i.hasNext() ) { + QMapIterator > i(rows); + while (i.hasNext()) { i.next(); int row = i.key(); QVector unsortedRects = i.value(); QVector sortedRects; - foreach ( const QRect &rect, unsortedRects ) { + foreach (const QRect &rect, unsortedRects) { int index; - for ( index = 0; index < sortedRects.size(); index++ ) - if ( rect.topLeft().x() <= sortedRects[ index ].topLeft().x() ) + for (index = 0; index < sortedRects.size(); index++) + if (rect.topLeft().x() <= sortedRects[index].topLeft().x()) break; - sortedRects.insert( index, rect ); + sortedRects.insert(index, rect); } - sortedDataRegions.insert( row, sortedRects ); + sortedDataRegions.insert(row, sortedRects); } } else { // Split up region in horizontal rectangles that are sorted from top to bottom QMap > columns; - foreach ( const QRect &rect, dataRegions ) { + foreach (const QRect &rect, dataRegions) { int y = rect.topLeft().y(); - for ( int x = rect.topLeft().x(); x <= rect.topRight().x(); ++x ) { - QRect dataRect = QRect( QPoint( x, y ), QSize( 1, rect.height() ) ); - if ( !columns.contains( x ) ) - columns.insert( x, QVector() ); - columns[x].append( dataRect ); + for (int x = rect.topLeft().x(); x <= rect.topRight().x(); ++x) { + QRect dataRect = QRect(QPoint(x, y), QSize(1, rect.height())); + if (!columns.contains(x)) + columns.insert(x, QVector()); + columns[x].append(dataRect); } } + // Sort rectangles in each column from top to bottom - QMapIterator > i( columns ); - while ( i.hasNext() ) { + QMapIterator > i(columns); + while (i.hasNext()) { i.next(); int col = i.key(); QVector unsortedRects = i.value(); QVector sortedRects; - foreach ( const QRect &rect, unsortedRects ) { + foreach (const QRect &rect, unsortedRects) { int index; - for ( index = 0; index < sortedRects.size(); ++index ) - if ( rect.topLeft().y() <= sortedRects[ index ].topLeft().y() ) + for (index = 0; index < sortedRects.size(); ++index) + if (rect.topLeft().y() <= sortedRects[index].topLeft().y()) break; - sortedRects.insert( index, rect ); + sortedRects.insert(index, rect); } - sortedDataRegions.insert( col, sortedRects ); + sortedDataRegions.insert(col, sortedRects); } } return sortedDataRegions; } -QList ChartProxyModel::Private::createDataSetsFromRegion( QList *dataSetsToRecycle, - bool overrideCategories ) +QList ChartProxyModel::Private::createDataSetsFromRegion(QList *dataSetsToRecycle, + bool overrideCategories) { - if ( !selection.isValid() ) + if (!selection.isValid()) return QList(); // First prepare the dataRegions to have them @@ -356,10 +360,10 @@ // The resulting map is build up depending on the dataDirection; // - Qt::Horizontal: key is the row and values are the columns in the row. // - Qt::Vertical: key is the column and values are the rows in the column. - QMap > sortedDataRegions = sortDataRegions( dataDirection, selection.rects() ); + QMap > sortedDataRegions = sortDataRegions(dataDirection, selection.rects()); // In the end, the contents of this list will look something like this: - // ( Category-Data, X-Data, Y-Data, Y-Data, Y-Data ) + // (Category-Data, X-Data, Y-Data, Y-Data, Y-Data) // Semantic seperation of the regions will follow later. QList dataRegions; // This region exlusively contains (global) data set labels, i.e. @@ -375,7 +379,7 @@ // Determines how many individual rows/columns will be assigned per data set. // It is at least one, but if there's more than one data dimension, the x // data is shared among all data sets, thus - 1. - int regionsPerDataSet = qMax( 1, dataDimensions - 1 ); + int regionsPerDataSet = qMax(1, dataDimensions - 1); // Determinate the number of rows and maximum number of columns used. // FIXME this logic is rather buggy. We better should use our sortedDataRegions @@ -385,9 +389,9 @@ // there x-values then this foreach-logic here is very likely the reason. int rows = 0; int cols = 0; - foreach( const QRect &rect, selection.rects() ) { + foreach(const QRect &rect, selection.rects()) { rows += rect.height(); - cols = qMax( cols, rect.width() ); + cols = qMax(cols, rect.width()); } bool extractXData = dataDimensions > 1 && @@ -396,12 +400,13 @@ // for bubble charts, (the only case of regionsPerDataSet == 2), so // skipping x data will allow the last data set to also be assigned // a bubble width region. This is exactly what OOo does. - (dataDirection == Qt::Horizontal ? rows - 1 - rowOffset : cols - 1 -colOffset ) % regionsPerDataSet == 0; + (dataDirection == Qt::Horizontal ? rows - 1 - rowOffset + : cols - 1 -colOffset) % regionsPerDataSet == 0; // When x data is present, it occupies the first non-header row/column - if ( extractXData && dataDirection == Qt::Horizontal ) + if (extractXData && dataDirection == Qt::Horizontal) ++rowOffset; - if ( extractXData && dataDirection == Qt::Vertical ) + if (extractXData && dataDirection == Qt::Vertical) ++colOffset; // This is the logic that extracts all the subregions from selection @@ -413,26 +418,29 @@ QVector rects = sortedDataRegions[key]; QVector dataRects; CellRegion labelRegion; - if ( dataDirection == Qt::Horizontal ) { - if ( firstColumnIsLabel ) { + if (dataDirection == Qt::Horizontal) { + if (firstColumnIsLabel) { QVector labelRects = extractRow(rects, colOffset, true); labelRegion = labelRects.isEmpty() ? CellRegion() : CellRegion(selection.table(), labelRects); - } else { + } + else { labelRegion = internalTable ? CellRegion(internalTable, QPoint(1, key)) : CellRegion(); } dataRects = extractRow(rects, colOffset, false); - } else { - if ( firstRowIsLabel ) { + } + else { + if (firstRowIsLabel) { QVector labelRects = extractColumn(rects, rowOffset, true); labelRegion = labelRects.isEmpty() ? CellRegion() : CellRegion(selection.table(), labelRects); - } else { + } + else { labelRegion = internalTable ? CellRegion(internalTable, QPoint(key, 1)) : CellRegion(); } dataRects = extractColumn(rects, rowOffset, false); } - labelRegions.append( labelRegion ); - dataRegions.append( dataRects.isEmpty() ? CellRegion() : CellRegion(selection.table(), dataRects) ); + labelRegions.append(labelRegion); + dataRegions.append(dataRects.isEmpty() ? CellRegion() : CellRegion(selection.table(), dataRects)); } bool useCategories = @@ -455,17 +463,17 @@ //the categoryLabelRegion (which we need to introduce and use). if(overrideCategories) categoryDataRegion = CellRegion(); - if ( !dataRegions.isEmpty() ) { + if (!dataRegions.isEmpty()) { // Q_ASSERT(label.isValid()); // Q_ASSERT(data.isValid()); - if ( useCategories ) { + if (useCategories) { labelRegions.takeFirst(); categoryDataRegion = dataRegions.takeFirst(); } } CellRegion xData; - if ( !dataRegions.isEmpty() && extractXData ) { + if (!dataRegions.isEmpty() && extractXData) { labelRegions.removeFirst(); xData = dataRegions.takeFirst(); } @@ -474,30 +482,30 @@ int dataSetNumber = 0; // Now assign all dataRegions to a number of data sets. // Here they're semantically seperated into x data, y data, etc. - Q_ASSERT( dataRegions.count() == labelRegions.count() ); - while ( !dataRegions.isEmpty() ) { + Q_ASSERT(dataRegions.count() == labelRegions.count()); + while (!dataRegions.isEmpty()) { // Get a data set instance we can use DataSet *dataSet; - if ( !dataSetsToRecycle->isEmpty() ) + if (!dataSetsToRecycle->isEmpty()) dataSet = dataSetsToRecycle->takeFirst(); else - dataSet = new DataSet( dataSetNumber ); + dataSet = new DataSet(dataSetNumber); // category and x data are "global" regions shared among all data sets - dataSet->setCategoryDataRegion( categoryDataRegion ); - dataSet->setXDataRegion( xData ); + dataSet->setCategoryDataRegion(categoryDataRegion); + dataSet->setXDataRegion(xData); // the name-value used for e.g. the legend label - dataSet->setLabelDataRegion( labelRegions.takeFirst() ); + dataSet->setLabelDataRegion(labelRegions.takeFirst()); // the range for y-values - dataSet->setYDataRegion( dataRegions.takeFirst() ); + dataSet->setYDataRegion(dataRegions.takeFirst()); // the custom data (e.g. bubble width) - if ( !dataRegions.isEmpty() && dataDimensions > 2 ) - dataSet->setCustomDataRegion( dataRegions.takeFirst() ); + if (!dataRegions.isEmpty() && dataDimensions > 2) + dataSet->setCustomDataRegion(dataRegions.takeFirst()); else - dataSet->setCustomDataRegion( CellRegion() ); + dataSet->setCustomDataRegion(CellRegion()); /* kDebug(35001) << "xDataRegion=" << dataSet->xDataRegion().toString(); @@ -507,7 +515,7 @@ kDebug(35001) << "customDataRegion=" << dataSet->customDataRegion().toString(); */ - createdDataSets.append( dataSet ); + createdDataSets.append(dataSet); // Increment number at the very end! dataSetNumber++; @@ -516,24 +524,24 @@ return createdDataSets; } -void ChartProxyModel::saveOdf( KoShapeSavingContext &context ) const +void ChartProxyModel::saveOdf(KoShapeSavingContext &context) const { - foreach ( DataSet *dataSet, d->dataSets ) - dataSet->saveOdf( context ); + foreach (DataSet *dataSet, d->dataSets) + dataSet->saveOdf(context); } // This loads the properties of the datasets (chart:series). // FIXME: This is a strange place to load them (the proxy model) -bool ChartProxyModel::loadOdf( const KoXmlElement &element, - KoShapeLoadingContext &context, int seriesPerDataset, ChartType type ) +bool ChartProxyModel::loadOdf(const KoXmlElement &element, + KoShapeLoadingContext &context, int seriesPerDataset, ChartType type) { - Q_ASSERT( d->isLoading ); + Q_ASSERT(d->isLoading); -// PlotArea* plotArea = dynamic_cast< PlotArea* >( QObject::parent() ); +// PlotArea* plotArea = dynamic_cast< PlotArea* >(QObject::parent()); -// const bool stockChart = element.attributeNS( KoXmlNS::chart, "class", QString() ) == "chart:stock"; +// const bool stockChart = element.attributeNS(KoXmlNS::chart, "class", QString()) == "chart:stock"; - OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData( OdfLoadingHelperId ); + OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData(OdfLoadingHelperId); bool ignoreCellRanges = helper->chartUsesInternalModelOnly; // Some OOo documents save incorrect cell ranges. For those this fix was intended. // Find out which documents exactly and only use fix for as few cases as possible. @@ -546,18 +554,18 @@ beginResetModel(); - if ( element.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + if (element.hasAttributeNS(KoXmlNS::chart, "style-name")) { KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); styleStack.clear(); - context.odfLoadingContext().fillStyleStack( element, KoXmlNS::chart, "style-name", "chart" ); + context.odfLoadingContext().fillStyleStack(element, KoXmlNS::chart, "style-name", "chart"); // Data direction: It's in the plotarea style. - if ( styleStack.hasProperty( KoXmlNS::chart, "series-source" ) ) { - QString seriesSource = styleStack.property( KoXmlNS::chart, "series-source" ); + if (styleStack.hasProperty(KoXmlNS::chart, "series-source")) { + QString seriesSource = styleStack.property(KoXmlNS::chart, "series-source"); // Check if the direction for data series is vertical or horizontal. - if ( seriesSource == "rows" ) + if (seriesSource == "rows") d->dataDirection = Qt::Horizontal; - else if ( seriesSource == "columns" ) + else if (seriesSource == "columns") d->dataDirection = Qt::Vertical; // Otherwise leave our default value } @@ -574,14 +582,14 @@ // will automatically be set on every data set attached to that // axis. See Axis::attachDataSet(). const QString dataSourceHasLabels - = element.attributeNS( KoXmlNS::chart, "data-source-has-labels" ); - if ( dataSourceHasLabels == "both" ) { + = element.attributeNS(KoXmlNS::chart, "data-source-has-labels"); + if (dataSourceHasLabels == "both") { d->firstRowIsLabel = true; d->firstColumnIsLabel = true; - } else if ( dataSourceHasLabels == "row" ) { + } else if (dataSourceHasLabels == "row") { d->firstRowIsLabel = true; d->firstColumnIsLabel = false; - } else if ( dataSourceHasLabels == "column" ) { + } else if (dataSourceHasLabels == "column") { d->firstRowIsLabel = false; d->firstColumnIsLabel = true; } else { @@ -600,28 +608,28 @@ // data series, they'll be overwritten by these values. // Note: In case ignoreCellRanges is true, ChartShape::loadOdf() has // already made sure the proxy is reset with data from the internal model. - if ( !ignoreCellRanges && - element.hasAttributeNS( KoXmlNS::table, "cell-range-address" ) ) + if (!ignoreCellRanges + && element.hasAttributeNS(KoXmlNS::table, "cell-range-address")) { - QString cellRangeAddress = element.attributeNS( KoXmlNS::table, "cell-range-address" ); - d->selection = CellRegion( d->tableSource, cellRangeAddress ); + QString cellRangeAddress = element.attributeNS(KoXmlNS::table, "cell-range-address"); + d->selection = CellRegion(d->tableSource, cellRangeAddress); // Otherwise use all data from internal table - } else if ( helper->chartUsesInternalModelOnly ) { + } else if (helper->chartUsesInternalModelOnly) { QList tables = helper->tableSource->tableMap().values(); - Q_ASSERT( tables.count() == 1 ); + Q_ASSERT(tables.count() == 1); Table *internalTable = tables.first(); - Q_ASSERT( internalTable->model() ); + Q_ASSERT(internalTable->model()); int rowCount = internalTable->model()->rowCount(); int colCount = internalTable->model()->columnCount(); - d->selection = CellRegion( internalTable, QRect( 1, 1, colCount, rowCount ) ); + d->selection = CellRegion(internalTable, QRect(1, 1, colCount, rowCount)); } // This is what we'll use as basis for the data sets we "produce" from ODF. // This might be data sets that were "instantiated" from the internal // table or from an arbitrary selection of other tables as specified // in the PlotArea's table:cell-range-address attribute (parsed above). - QList createdDataSets = d->createDataSetsFromRegion( &d->removedDataSets, - !helper->categoryRegionSpecifiedInXAxis ); + QList createdDataSets = d->createDataSetsFromRegion(&d->removedDataSets, + !helper->categoryRegionSpecifiedInXAxis); bool isBubble = d->shape->plotArea()->chartType() == BubbleChartType; bool isScatter = d->shape->plotArea()->chartType() == ScatterChartType; @@ -634,108 +642,107 @@ bool penLoaded = false; bool brushLoaded = false; int stockSeriesCounter = 0; - forEachElement ( n, element ) { - if ( n.namespaceURI() != KoXmlNS::chart ) + forEachElement (n, element) { + if (n.namespaceURI() != KoXmlNS::chart) continue; - if ( n.localName() == "series" ) { - if ( stockSeriesCounter == 0 ) - { + if (n.localName() == "series") { + if (stockSeriesCounter == 0) { DataSet *dataSet; - if ( loadedDataSetCount < createdDataSets.size() ) { + if (loadedDataSetCount < createdDataSets.size()) { dataSet = createdDataSets[loadedDataSetCount]; - } else { + } + else { // the datasetnumber needs to be known at construction time, to ensure // default colors are set correctly - dataSet = new DataSet( d->dataSets.size() ); + dataSet = new DataSet(d->dataSets.size()); // add the newly created dataSet to the createdDataSets list so our // stockSeriesCounter != 0 condition below is able to pick it up. createdDataSets.append(dataSet); } - dataSet->setChartType( type ); - d->dataSets.append( dataSet ); - if ( d->categoryDataRegion.isValid() ) - { - dataSet->setCategoryDataRegion( d->categoryDataRegion ); + dataSet->setChartType(type); + d->dataSets.append(dataSet); + if (d->categoryDataRegion.isValid()) { + dataSet->setCategoryDataRegion(d->categoryDataRegion); } - dataSet->loadOdf( n, context ); + dataSet->loadOdf(n, context); - if ( isBubble || isScatter ) { + if (isBubble || isScatter) { // bubble- and scatter-charts have chart:domain's that define the // x- and y-data. But if they are not defined in the series then // a previous defined one needs to be used. - if ( dataSet->xDataRegion().isValid() ) { + if (dataSet->xDataRegion().isValid()) { prevXData = dataSet->xDataRegion(); - } else { + } + else { dataSet->setXDataRegion(prevXData); } - if ( isBubble ) { - if ( dataSet->yDataRegion().isValid() ) { + if (isBubble) { + if (dataSet->yDataRegion().isValid()) { prevYData = dataSet->yDataRegion(); - } else { + } + else { dataSet->setYDataRegion(prevYData); } } } - if ( penLoaded ) - dataSet->setPen( p ); - if ( brushLoaded ) - dataSet->setBrush( brush ); + if (penLoaded) + dataSet->setPen(p); + if (brushLoaded) + dataSet->setBrush(brush); } - else - { + else { DataSet *dataSet; - if ( loadedDataSetCount < createdDataSets.size() ) + if (loadedDataSetCount < createdDataSets.size()) dataSet = createdDataSets[loadedDataSetCount]; else { Q_ASSERT_X(false, __FUNCTION__, "Unexpected series. Is the document broken?"); continue; // be sure we don't crash in release-mode if that happens } - dataSet->loadSeriesIntoDataset( n, context ); + dataSet->loadSeriesIntoDataset(n, context); } - stockSeriesCounter = ( stockSeriesCounter + 1 ) % seriesPerDataset; - if ( stockSeriesCounter == 0 ) + stockSeriesCounter = (stockSeriesCounter + 1) % seriesPerDataset; + if (stockSeriesCounter == 0) ++loadedDataSetCount; - } else if ( n.localName() == "stock-range-line" ) { + } else if (n.localName() == "stock-range-line") { KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); styleStack.clear(); - context.odfLoadingContext().fillStyleStack( n, KoXmlNS::chart, "style-name", "chart" ); - if ( n.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + context.odfLoadingContext().fillStyleStack(n, KoXmlNS::chart, "style-name", "chart"); + if (n.hasAttributeNS(KoXmlNS::chart, "style-name")) { KoOdfLoadingContext &odfLoadingContext = context.odfLoadingContext(); brushLoaded = false; penLoaded = false; - styleStack.setTypeProperties( "graphic" ); + styleStack.setTypeProperties("graphic"); - if ( styleStack.hasProperty( KoXmlNS::svg, "stroke-color" ) ) { - QString stroke = "solid";/*styleStack.property( KoXmlNS::svg, "stroke-color" );*/ - p = KoOdfGraphicStyles::loadOdfStrokeStyle( styleStack, stroke, odfLoadingContext.stylesReader() ); + if (styleStack.hasProperty(KoXmlNS::svg, "stroke-color")) { + QString stroke = "solid";/*styleStack.property(KoXmlNS::svg, "stroke-color");*/ + p = KoOdfGraphicStyles::loadOdfStrokeStyle(styleStack, stroke, odfLoadingContext.stylesReader()); penLoaded = true; - Q_FOREACH( DataSet* set, d->dataSets ) - { - set->setPen( p ); - set->setBrush( p.color() ); + Q_FOREACH(DataSet* set, d->dataSets) { + set->setPen(p); + set->setBrush(p.color()); } } - if ( styleStack.hasProperty( KoXmlNS::draw, "fill" ) ) { - QString fill = styleStack.property( KoXmlNS::draw, "fill" ); - if ( fill == "solid" || fill == "hatch" ) { - brush = KoOdfGraphicStyles::loadOdfFillStyle( styleStack, fill, odfLoadingContext.stylesReader() ); + if (styleStack.hasProperty(KoXmlNS::draw, "fill")) { + QString fill = styleStack.property(KoXmlNS::draw, "fill"); + if (fill == "solid" || fill == "hatch") { + brush = KoOdfGraphicStyles::loadOdfFillStyle(styleStack, fill, odfLoadingContext.stylesReader()); brushLoaded = true; - } else if ( fill == "gradient" ) { - brush = KoOdfGraphicStyles::loadOdfGradientStyle( styleStack, odfLoadingContext.stylesReader(), QSizeF( 5.0, 60.0 ) ); + } else if (fill == "gradient") { + brush = KoOdfGraphicStyles::loadOdfGradientStyle(styleStack, odfLoadingContext.stylesReader(), QSizeF(5.0, 60.0)); brushLoaded = true; } - Q_FOREACH( DataSet* set, d->dataSets ) - { - set->setBrush( brush ); + Q_FOREACH(DataSet* set, d->dataSets) { + set->setBrush(brush); } } } - } else { + } + else { qWarning() << "ChartProxyModel::loadOdf(): Unknown tag name \"" << n.localName() << "\""; } } @@ -747,87 +754,87 @@ } -QVariant ChartProxyModel::data( const QModelIndex &index, - int role ) const +QVariant ChartProxyModel::data(const QModelIndex &index, + int role) const { - Q_UNUSED( index ); - Q_UNUSED( role ); - Q_ASSERT( "To be implemented" ); + Q_UNUSED(index); + Q_UNUSED(role); + Q_ASSERT("To be implemented"); return QVariant(); } -void ChartProxyModel::dataChanged( const QModelIndex& topLeft, const QModelIndex& bottomRight ) +void ChartProxyModel::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) { - QPoint topLeftPoint( topLeft.column() + 1, topLeft.row() + 1 ); + QPoint topLeftPoint(topLeft.column() + 1, topLeft.row() + 1); // Excerpt from the Qt reference for QRect::bottomRight() which is // used for calculating bottomRight. Note that for historical // reasons this function returns // QPoint(left() + width() -1, top() + height() - 1). - QPoint bottomRightPoint( bottomRight.column() + 1, bottomRight.row() + 1 ); - QRect dataChangedRect = QRect( topLeftPoint, - QSize( bottomRightPoint.x() - topLeftPoint.x() + 1, - bottomRightPoint.y() - topLeftPoint.y() + 1 ) ); + QPoint bottomRightPoint(bottomRight.column() + 1, bottomRight.row() + 1); + QRect dataChangedRect = QRect(topLeftPoint, + QSize(bottomRightPoint.x() - topLeftPoint.x() + 1, + bottomRightPoint.y() - topLeftPoint.y() + 1)); // Precisely determine what data in what table changed so that we don't // do unnecessary, expensive updates. - Table *table = d->tableSource->get( topLeft.model() ); - CellRegion dataChangedRegion( table, dataChangedRect ); + Table *table = d->tableSource->get(topLeft.model()); + CellRegion dataChangedRegion(table, dataChangedRect); - foreach ( DataSet *dataSet, d->dataSets ) { - if ( dataSet->xDataRegion().intersects( dataChangedRegion ) ) - dataSet->xDataChanged( QRect() ); + foreach (DataSet *dataSet, d->dataSets) { + if (dataSet->xDataRegion().intersects(dataChangedRegion)) + dataSet->xDataChanged(QRect()); - if ( dataSet->yDataRegion().intersects( dataChangedRegion ) ) - dataSet->yDataChanged( QRect() ); + if (dataSet->yDataRegion().intersects(dataChangedRegion)) + dataSet->yDataChanged(QRect()); - if ( dataSet->categoryDataRegion().intersects( dataChangedRegion ) ) - dataSet->categoryDataChanged( QRect() ); + if (dataSet->categoryDataRegion().intersects(dataChangedRegion)) + dataSet->categoryDataChanged(QRect()); - if ( dataSet->labelDataRegion().intersects( dataChangedRegion ) ) - dataSet->labelDataChanged( QRect() ); + if (dataSet->labelDataRegion().intersects(dataChangedRegion)) + dataSet->labelDataChanged(QRect()); - if ( dataSet->customDataRegion().intersects( dataChangedRegion ) ) - dataSet->customDataChanged( QRect() ); + if (dataSet->customDataRegion().intersects(dataChangedRegion)) + dataSet->customDataChanged(QRect()); } emit dataChanged(); } -QVariant ChartProxyModel::headerData( int section, - Qt::Orientation orientation, - int role /* = Qt::DisplayRole */ ) const -{ - Q_UNUSED( section ); - Q_UNUSED( orientation ); - Q_UNUSED( role ); - Q_ASSERT( "To be implemented" ); +QVariant ChartProxyModel::headerData(int section, + Qt::Orientation orientation, + int role /* = Qt::DisplayRole */) const +{ + Q_UNUSED(section); + Q_UNUSED(orientation); + Q_UNUSED(role); + Q_ASSERT("To be implemented"); return QVariant(); } -QModelIndex ChartProxyModel::parent( const QModelIndex &index ) const +QModelIndex ChartProxyModel::parent(const QModelIndex &index) const { - Q_UNUSED( index ); + Q_UNUSED(index); return QModelIndex(); } -int ChartProxyModel::rowCount( const QModelIndex &/*parent = QModelIndex() */ ) const +int ChartProxyModel::rowCount(const QModelIndex &/*parent = QModelIndex() */) const { return d->dataSets.count(); } -int ChartProxyModel::columnCount( const QModelIndex &/*parent = QModelIndex() */ ) const +int ChartProxyModel::columnCount(const QModelIndex &/*parent = QModelIndex() */) const { // FIXME: Replace this by the actual column count once the proxy is properly being used. return INT_MAX; } -void ChartProxyModel::setFirstRowIsLabel( bool b ) +void ChartProxyModel::setFirstRowIsLabel(bool b) { - if ( b == d->firstRowIsLabel ) + if (b == d->firstRowIsLabel) return; d->firstRowIsLabel = b; @@ -835,9 +842,9 @@ } -void ChartProxyModel::setFirstColumnIsLabel( bool b ) +void ChartProxyModel::setFirstColumnIsLabel(bool b) { - if ( b == d->firstColumnIsLabel ) + if (b == d->firstColumnIsLabel) return; d->firstColumnIsLabel = b; @@ -857,7 +864,7 @@ void ChartProxyModel::beginLoading() { - Q_ASSERT( !d->isLoading ); + Q_ASSERT(!d->isLoading); beginResetModel(); @@ -870,7 +877,7 @@ void ChartProxyModel::endLoading() { - Q_ASSERT( d->isLoading ); + Q_ASSERT(d->isLoading); d->isLoading = false; // Doing this here is wrong, the data set's cell regions set in @@ -885,18 +892,18 @@ return d->isLoading; } -void ChartProxyModel::setDataDirection( Qt::Orientation orientation ) +void ChartProxyModel::setDataDirection(Qt::Orientation orientation) { - if ( d->dataDirection == orientation ) + if (d->dataDirection == orientation) return; d->dataDirection = orientation; d->rebuildDataMap(); } -void ChartProxyModel::setDataDimensions( int dimensions ) +void ChartProxyModel::setDataDimensions(int dimensions) { - if ( d->dataDimensions == dimensions ) + if (d->dataDimensions == dimensions) return; d->dataDimensions = dimensions; @@ -918,7 +925,7 @@ return d->categoryDataRegion; } -void ChartProxyModel::setCategoryDataRegion( const CellRegion ®ion ) +void ChartProxyModel::setCategoryDataRegion(const CellRegion ®ion) { d->categoryDataRegion = region; } diff -Nru calligra-2.4.0/plugins/chartshape/ChartProxyModel.h calligra-2.4.3/plugins/chartshape/ChartProxyModel.h --- calligra-2.4.0/plugins/chartshape/ChartProxyModel.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartProxyModel.h 2012-06-26 04:18:01.000000000 +0000 @@ -55,7 +55,7 @@ Q_OBJECT public: - ChartProxyModel( ChartShape *shape, TableSource *source ); + ChartProxyModel(ChartShape *shape, TableSource *source); ~ChartProxyModel(); /** @@ -79,7 +79,7 @@ * The ProxyModel will not react on insertions or removals in one of * these models. */ - void reset( const CellRegion ®ion ); + void reset(const CellRegion ®ion); /** * The CellRegion that data in this proxy model is taken from. @@ -94,8 +94,9 @@ /** * Load series from ODF */ - bool loadOdf( const KoXmlElement &element, KoShapeLoadingContext &context, int seriesPerDataset, ChartType type ); - void saveOdf( KoShapeSavingContext &context ) const; + bool loadOdf(const KoXmlElement &element, KoShapeLoadingContext &context, + int seriesPerDataset, ChartType type); + void saveOdf(KoShapeSavingContext &context) const; /** * Returns data or properties of a data point. @@ -103,7 +104,7 @@ * TODO: Not implemented yet. At the moment, DataSet's data and attribute * getter are used instead. */ - virtual QVariant data( const QModelIndex &index, int role ) const; + virtual QVariant data(const QModelIndex &index, int role) const; /** * Returns properties that are global to either a data set or a category, @@ -117,25 +118,25 @@ * TODO: Not implemented yet. At the moment, DataSet's data and attribute * getter are used instead. */ - virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const; + virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const; - virtual QModelIndex parent( const QModelIndex &index ) const; + virtual QModelIndex parent(const QModelIndex &index) const; /** * Returns the number of data sets in this model. */ - virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const; + virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; /** * Returns maximum the number of data points the data sets have. */ - virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const; + virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; // The following methods are specific to the chart - void setFirstRowIsLabel( bool b ); - void setFirstColumnIsLabel( bool b ); - void setDataDirection( Qt::Orientation orientation ); - void setDataDimensions( int dimensions ); + void setFirstRowIsLabel(bool b); + void setFirstColumnIsLabel(bool b); + void setDataDirection(Qt::Orientation orientation); + void setDataDimensions(int dimensions); bool firstRowIsLabel() const; bool firstColumnIsLabel() const; @@ -152,7 +153,7 @@ * on the x axis in a cartesian chart and what will be used as legend * items in a polar chart. */ - void setCategoryDataRegion( const CellRegion ®ion ); + void setCategoryDataRegion(const CellRegion ®ion); /** * A list of all data sets that are currently being used in the chart. @@ -195,7 +196,7 @@ /** * Connected to dataChanged() signal of source models in TableSource. */ - virtual void dataChanged( const QModelIndex& topLeft, const QModelIndex& bottomRight ); + virtual void dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight); /** * Called by the TableSource whenever a table is added to it. @@ -204,12 +205,12 @@ * they are really in use. That is not necessarily the case if they * are in the TableSource. */ - void addTable( Table *table ); + void addTable(Table *table); /** * Called by the TableSource whenever a table is removed from it. */ - void removeTable( Table *table ); + void removeTable(Table *table); signals: void dataChanged(); diff -Nru calligra-2.4.0/plugins/chartshape/ChartShape.cpp calligra-2.4.3/plugins/chartshape/ChartShape.cpp --- calligra-2.4.0/plugins/chartshape/ChartShape.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartShape.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -119,7 +119,7 @@ /// @see ChartShape::setEnableUserInteraction() static bool ENABLE_USER_INTERACTION = true; -static const char *ODF_CHARTTYPES[ NUM_CHARTTYPES ] = { +static const char *ODF_CHARTTYPES[NUM_CHARTTYPES] = { "chart:bar", "chart:line", "chart:area", @@ -134,7 +134,7 @@ "chart:gantt" }; -static const ChartSubtype defaultSubtypes[ NUM_CHARTTYPES ] = { +static const ChartSubtype defaultSubtypes[NUM_CHARTTYPES] = { NormalChartSubtype, // Bar NormalChartSubtype, // Line NormalChartSubtype, // Area @@ -156,46 +156,55 @@ style.addPropertyPt("fo:font-size", font.pointSize(), KoGenStyle::TextType); style.addProperty("fo:color", color.isValid() ? color.name() : "#000000", KoGenStyle::TextType); int w = font.weight(); - style.addProperty("fo:font-weight", w == 50 ? "normal" : w == 75 ? "bold" : QString::number( qRound( w / 10 ) * 100 ), KoGenStyle::TextType); + style.addProperty("fo:font-weight", w == 50 ? "normal" : w == 75 ? "bold" : QString::number(qRound(w / 10) * 100), KoGenStyle::TextType); style.addProperty("fo:font-style", font.italic() ? "italic" : "normal", KoGenStyle::TextType); } -QString saveOdfFont( KoGenStyles& mainStyles, - const QFont& font, - const QColor& color ) +QString saveOdfFont(KoGenStyles& mainStyles, + const QFont& font, + const QColor& color) { KoGenStyle autoStyle(KoGenStyle::ParagraphAutoStyle, "chart", 0); saveOdfFont(autoStyle, font, color); - return mainStyles.insert( autoStyle, "ch" ); + return mainStyles.insert(autoStyle, "ch"); } -void saveOdfLabel( KoShape *label, KoXmlWriter &bodyWriter, - KoGenStyles &mainStyles, LabelType labelType ) +void saveOdfLabel(KoShape *label, KoXmlWriter &bodyWriter, + KoGenStyles &mainStyles, LabelType labelType) { // Don't save hidden labels, as that's the way of removing them // from a chart. - if ( !label->isVisible() ) + if (!label->isVisible()) return; - TextLabelData *labelData = qobject_cast( label->userData() ); - if ( !labelData ) + TextLabelData *labelData = qobject_cast(label->userData()); + if (!labelData) return; - if ( labelType == FooterLabelType ) - bodyWriter.startElement( "chart:footer" ); - else if ( labelType == SubTitleLabelType ) - bodyWriter.startElement( "chart:subtitle" ); - else // if ( labelType == TitleLabelType ) - bodyWriter.startElement( "chart:title" ); + if (labelType == FooterLabelType) + bodyWriter.startElement("chart:footer"); + else if (labelType == SubTitleLabelType) + bodyWriter.startElement("chart:subtitle"); + else // if (labelType == TitleLabelType) + bodyWriter.startElement("chart:title"); + + bodyWriter.addAttributePt("svg:x", label->position().x()); + bodyWriter.addAttributePt("svg:y", label->position().y()); + bodyWriter.addAttributePt("svg:width", label->size().width()); + bodyWriter.addAttributePt("svg:height", label->size().height()); - bodyWriter.addAttributePt( "svg:x", label->position().x() ); - bodyWriter.addAttributePt( "svg:y", label->position().y() ); // TODO: Save text label color - bodyWriter.addAttribute( "chart:style-name", saveOdfFont( mainStyles, labelData->document()->defaultFont(), QColor() ) ); + QTextCursor cursor(labelData->document()); + QFont labelFont = cursor.charFormat().font(); - bodyWriter.startElement( "text:p" ); - bodyWriter.addTextNode( labelData->document()->toPlainText() ); + KoGenStyle autoStyle(KoGenStyle::ChartAutoStyle, "chart", 0); + autoStyle.addPropertyPt("style:rotation-angle", 360 - label->rotation()); + saveOdfFont(autoStyle, labelFont, QColor()); + bodyWriter.addAttribute("chart:style-name", mainStyles.insert(autoStyle, "ch")); + + bodyWriter.startElement("text:p"); + bodyWriter.addTextNode(labelData->document()->toPlainText()); bodyWriter.endElement(); // text:p bodyWriter.endElement(); // chart:title/subtitle/footer } @@ -229,10 +238,10 @@ "#0084d1", }; -QColor defaultDataSetColor( int dataSetNum ) +QColor defaultDataSetColor(int dataSetNum) { dataSetNum %= NUM_DEFAULT_DATASET_COLORS; - return QColor( defaultDataSetColors[ dataSetNum ] ); + return QColor(defaultDataSetColors[dataSetNum]); } // ================================================================ @@ -242,11 +251,11 @@ class ChartShape::Private { public: - Private( ChartShape *shape ); + Private(ChartShape *shape); ~Private(); - bool loadOdfLabel( KoShape *label, KoXmlElement &labelElement ); - void setChildVisible( KoShape *label, bool doShow ); + bool loadOdfLabel(KoShape *label, KoXmlElement &labelElement, KoShapeLoadingContext &context); + void setChildVisible(KoShape *label, bool doShow); // The components of a chart KoShape *title; @@ -271,9 +280,9 @@ }; -ChartShape::Private::Private( ChartShape *shape ) +ChartShape::Private::Private(ChartShape *shape) : internalModel(0) - , internalModelHelper( 0 ) + , internalModelHelper(0) , resourceManager(0) { @@ -300,46 +309,82 @@ { } -bool ChartShape::Private::loadOdfLabel( KoShape *label, KoXmlElement &labelElement ) +bool ChartShape::Private::loadOdfLabel(KoShape *label, KoXmlElement &labelElement, KoShapeLoadingContext &context) { - TextLabelData *labelData = qobject_cast( label->userData() ); - if ( !labelData ) + TextLabelData *labelData = qobject_cast(label->userData()); + if (!labelData) return false; // Following will always return false cause KoTextShapeData::loadOdf will try to load // a frame while our text:p is not within a frame. So, let's just not call loadOdf then... - //label->loadOdf( labelElement, context ); + //label->loadOdf(labelElement, context); // 1. set the text - KoXmlElement pElement = KoXml::namedItemNS( labelElement, - KoXmlNS::text, "p" ); + KoXmlElement pElement = KoXml::namedItemNS(labelElement, KoXmlNS::text, "p"); QTextDocument* doc = labelData->document(); - doc->setPlainText( pElement.text() ); + doc->setPlainText(pElement.text()); // 2. set the position QPointF pos = label->position(); bool posChanged = false; - if ( labelElement.hasAttributeNS( KoXmlNS::svg, "x" ) ) { - pos.setX( KoUnit::parseValue( labelElement.attributeNS( KoXmlNS::svg, "x", QString() ) ) ); + if (labelElement.hasAttributeNS(KoXmlNS::svg, "x")) { + pos.setX(KoUnit::parseValue(labelElement.attributeNS(KoXmlNS::svg, "x", QString()))); posChanged = true; } - if ( labelElement.hasAttributeNS( KoXmlNS::svg, "y" ) ) { - pos.setY( KoUnit::parseValue( labelElement.attributeNS( KoXmlNS::svg, "y", QString() ) ) ); + if (labelElement.hasAttributeNS(KoXmlNS::svg, "y")) { + pos.setY(KoUnit::parseValue(labelElement.attributeNS(KoXmlNS::svg, "y", QString()))); posChanged = true; } - if ( posChanged ) { - label->setPosition( pos ); + if (posChanged) { + label->setPosition(pos); } - // 3. set the size - QSizeF size = shape->size(); - QRect r = QFontMetrics( doc->defaultFont() ).boundingRect( - labelData->shapeMargins().left, labelData->shapeMargins().top, - qMax( CM_TO_POINT( 5 ), qreal(size.width() - pos.x() * 2.0 - labelData->shapeMargins().right) ), - qMax( CM_TO_POINT( 0.6 ), qreal(size.height() - labelData->shapeMargins().bottom) ), - Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, doc->toPlainText() ); - label->setSize( r.size() ); + // 3. set the styles + if (labelElement.hasAttributeNS(KoXmlNS::chart, "style-name")) { + KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); + styleStack.clear(); + context.odfLoadingContext().fillStyleStack(labelElement, KoXmlNS::chart, "style-name", "chart"); + + styleStack.setTypeProperties("chart"); + if (styleStack.hasProperty(KoXmlNS::style, "rotation-angle")) { + qreal rotationAngle = 360 - KoUnit::parseValue(styleStack.property(KoXmlNS::style, "rotation-angle")); + label->rotate(rotationAngle); + } + + styleStack.setTypeProperties("text"); + + if (styleStack.hasProperty(KoXmlNS::fo, "font-size")) { + const qreal fontSize = KoUnit::parseValue(styleStack.property(KoXmlNS::fo, "font-size")); + QFont font = doc->defaultFont(); + font.setPointSizeF(fontSize); + doc->setDefaultFont(font); + } + + if (styleStack.hasProperty(KoXmlNS::fo, "font-family")) { + const QString fontFamily = styleStack.property(KoXmlNS::fo, "font-family"); + QFont font = doc->defaultFont(); + font.setFamily(fontFamily); + doc->setDefaultFont(font); + } + } + + // 4. set the size + if (labelElement.hasAttributeNS(KoXmlNS::svg, "width") + && labelElement.hasAttributeNS(KoXmlNS::svg, "height")) + { + const qreal width = KoUnit::parseValue(labelElement.attributeNS(KoXmlNS::svg, "width")); + const qreal height = KoUnit::parseValue(labelElement.attributeNS(KoXmlNS::svg, "height")); + label->setSize(QSizeF(width, height)); + } else { + QSizeF size = shape->size(); + QRect r = QFontMetrics(doc->defaultFont()).boundingRect( + labelData->shapeMargins().left, labelData->shapeMargins().top, + qMax(CM_TO_POINT(5), qreal(size.width() - pos.x() * 2.0 - labelData->shapeMargins().right)), + qMax(CM_TO_POINT(0.6), qreal(size.height() - labelData->shapeMargins().bottom)), + Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, doc->toPlainText()); + label->setSize(r.size()); + } return true; } @@ -349,14 +394,14 @@ // // If there is too little room, then make space by shrinking the Plotarea. // -void ChartShape::Private::setChildVisible( KoShape *child, bool doShow ) +void ChartShape::Private::setChildVisible(KoShape *child, bool doShow) { - Q_ASSERT( child ); + Q_ASSERT(child); - if ( child->isVisible() == doShow ) + if (child->isVisible() == doShow) return; - child->setVisible( doShow ); + child->setVisible(doShow); // FIXME: Shouldn't there be a KoShape::VisibilityChanged for KoShape::shapeChanged()? shape->layout()->scheduleRelayout(); } @@ -368,156 +413,161 @@ ChartShape::ChartShape(KoDocumentResourceManager *resourceManager) - : KoFrameShape( KoXmlNS::draw, "object" ) - , KoShapeContainer( new ChartLayout ) - , d ( new Private( this ) ) + : KoFrameShape(KoXmlNS::draw, "object") + , KoShapeContainer(new ChartLayout) + , d (new Private(this)) { d->resourceManager = resourceManager; - setShapeId( ChartShapeId ); + setShapeId(ChartShapeId); // Instantiated all children first - d->proxyModel = new ChartProxyModel( this, &d->tableSource ); + d->proxyModel = new ChartProxyModel(this, &d->tableSource); - d->plotArea = new PlotArea( this ); - d->document = new ChartDocument( this ); - d->legend = new Legend( this ); + d->plotArea = new PlotArea(this); + d->document = new ChartDocument(this); + d->legend = new Legend(this); // Configure the plotarea. // We need this as the very first step, because some methods // here rely on the d->plotArea pointer. addShape(d->plotArea); d->plotArea->plotAreaInit(); - d->plotArea->setZIndex( 0 ); - setClipped( d->plotArea, true ); + d->plotArea->setZIndex(0); + setClipped(d->plotArea, true); setInheritsTransform(d->plotArea, true); // Configure the legend. - d->legend->setVisible( true ); - d->legend->setZIndex( 1 ); - setClipped( d->legend, true ); + d->legend->setVisible(true); + d->legend->setZIndex(1); + setClipped(d->legend, true); setInheritsTransform(d->legend, true); // A few simple defaults (chart type and subtype in this case) - setChartType( BarChartType ); - setChartSubType( NormalChartSubtype ); + setChartType(BarChartType); + setChartSubType(NormalChartSubtype); // Create the Title, which is a standard TextShape. - KoShapeFactoryBase *textShapeFactory = KoShapeRegistry::instance()->value( TextShapeId ); - if ( textShapeFactory ) - d->title = textShapeFactory->createDefaultShape( resourceManager ); + KoShapeFactoryBase *textShapeFactory = KoShapeRegistry::instance()->value(TextShapeId); + if (textShapeFactory) + d->title = textShapeFactory->createDefaultShape(resourceManager); // Potential problem 1) No TextShape installed - if ( !d->title ) { + if (!d->title) { d->title = new TextLabelDummy; - if ( ENABLE_USER_INTERACTION ) - KMessageBox::error( 0, i18n( "The plugin needed for displaying text labels in a chart is not available." ), - i18n( "Plugin Missing" ) ); + if (ENABLE_USER_INTERACTION) + KMessageBox::error(0, i18n("The plugin needed for displaying text labels in a chart is not available."), + i18n("Plugin Missing")); // Potential problem 2) TextShape incompatible - } else if ( dynamic_cast( d->title->userData() ) == 0 && - ENABLE_USER_INTERACTION ) - KMessageBox::error( 0, i18n( "The plugin needed for displaying text labels is not compatible with the current version of the chart Flake shape." ), - i18n( "Plugin Incompatible" ) ); + } else if (dynamic_cast(d->title->userData()) == 0 && + ENABLE_USER_INTERACTION) + KMessageBox::error(0, i18n("The plugin needed for displaying text labels is not compatible with the current version of the chart Flake shape."), + i18n("Plugin Incompatible")); // In both cases we need a KoTextShapeData instance to function. This is // enough for unit tests, so there has to be no TextShape plugin doing the // actual text rendering, we just need KoTextShapeData which is in the libs. - if ( dynamic_cast( d->title->userData() ) == 0 ) { + if (dynamic_cast(d->title->userData()) == 0) { TextLabelData *dataDummy = new TextLabelData; - KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout( dataDummy->document() ); - dataDummy->document()->setDocumentLayout( documentLayout ); - d->title->setUserData( dataDummy ); + KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout(dataDummy->document()); + dataDummy->document()->setDocumentLayout(documentLayout); + d->title->setUserData(dataDummy); } // Start with a reasonable default size that we can base all following relative // positions of chart elements on. - setSize( QSizeF( CM_TO_POINT( 8 ), CM_TO_POINT( 5 ) ) ); + setSize(QSizeF(CM_TO_POINT(8), CM_TO_POINT(5))); // Add the title to the shape addShape(d->title); QFont font = titleData()->document()->defaultFont(); - font.setPointSizeF( 12.0 ); - titleData()->document()->setDefaultFont( font ); - titleData()->document()->setHtml( "
" + i18n( "Title" ) + "
" ); + font.setPointSizeF(12.0); + titleData()->document()->setDefaultFont(font); + titleData()->document()->setHtml("
" + i18n("Title") + "
"); // Position the title center at the very top. - d->title->setSize( QSizeF( CM_TO_POINT( 5 ), CM_TO_POINT( 0.7 ) ) ); - d->title->setPosition( QPointF( size().width() / 2.0 - d->title->size().width() / 2.0, 0.0 ) ); - d->title->setVisible( false ); - d->title->setZIndex( 2 ); - setClipped( d->title, true ); + d->title->setSize(QSizeF(CM_TO_POINT(5), CM_TO_POINT(0.7))); + d->title->setPosition(QPointF(size().width() / 2.0 - d->title->size().width() / 2.0, 0.0)); + d->title->setVisible(false); + d->title->setZIndex(2); + setClipped(d->title, true); setInheritsTransform(d->title, true); // Create the Subtitle and add it to the shape. - if ( textShapeFactory) - d->subTitle = textShapeFactory->createDefaultShape( resourceManager ); - if ( !d->subTitle ) { + if (textShapeFactory) + d->subTitle = textShapeFactory->createDefaultShape(resourceManager); + if (!d->subTitle) { d->subTitle = new TextLabelDummy; } - if ( dynamic_cast( d->subTitle->userData() ) == 0 ) { + if (dynamic_cast(d->subTitle->userData()) == 0) { TextLabelData *dataDummy = new TextLabelData; - KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout( dataDummy->document() ); - dataDummy->document()->setDocumentLayout( documentLayout ); - d->subTitle->setUserData( dataDummy ); + KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout(dataDummy->document()); + dataDummy->document()->setDocumentLayout(documentLayout); + d->subTitle->setUserData(dataDummy); } addShape(d->subTitle); font = subTitleData()->document()->defaultFont(); - font.setPointSizeF( 10.0 ); - subTitleData()->document()->setDefaultFont( font ); - subTitleData()->document()->setHtml( "
" + i18n( "Subtitle" ) + "
" ); + font.setPointSizeF(10.0); + subTitleData()->document()->setDefaultFont(font); + subTitleData()->document()->setHtml("
" + i18n("Subtitle") + "
"); // Position it in the center, just below the title. - d->subTitle->setSize( QSizeF( CM_TO_POINT( 5 ), CM_TO_POINT( 0.6 ) ) ); - d->subTitle->setPosition( QPointF( size().width() / 2.0 - d->title->size().width() / 2.0, - d->title->size().height() ) ); - d->subTitle->setVisible( false ); - d->subTitle->setZIndex( 3 ); - setClipped( d->subTitle, true ); + d->subTitle->setSize(QSizeF(CM_TO_POINT(5), CM_TO_POINT(0.6))); + d->subTitle->setPosition(QPointF(size().width() / 2.0 - d->title->size().width() / 2.0, + d->title->size().height())); + d->subTitle->setVisible(false); + d->subTitle->setZIndex(3); + setClipped(d->subTitle, true); setInheritsTransform(d->subTitle, true); // Create the Footer and add it to the shape. - if ( textShapeFactory ) - d->footer = textShapeFactory->createDefaultShape( resourceManager ); - if ( !d->footer ) { + if (textShapeFactory) + d->footer = textShapeFactory->createDefaultShape(resourceManager); + if (!d->footer) { d->footer = new TextLabelDummy; } - if ( dynamic_cast( d->footer->userData() ) == 0 ) { + if (dynamic_cast(d->footer->userData()) == 0) { TextLabelData *dataDummy = new TextLabelData; - KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout( dataDummy->document() ); - dataDummy->document()->setDocumentLayout( documentLayout ); - d->footer->setUserData( dataDummy ); + KoTextDocumentLayout *documentLayout = new KoTextDocumentLayout(dataDummy->document()); + dataDummy->document()->setDocumentLayout(documentLayout); + d->footer->setUserData(dataDummy); } addShape(d->footer); font = footerData()->document()->defaultFont(); - font.setPointSizeF( 10.0 ); - footerData()->document()->setDefaultFont( font ); - footerData()->document()->setHtml( "
" + i18n( "Footer" ) + "
" ); + font.setPointSizeF(10.0); + footerData()->document()->setDefaultFont(font); + footerData()->document()->setHtml("
" + i18n("Footer") + "
"); // Position the footer in the center, at the bottom. - d->footer->setSize( QSizeF( CM_TO_POINT( 5 ), CM_TO_POINT( 0.6 ) ) ); - d->footer->setPosition( QPointF( size().width() / 2.0 - d->footer->size().width() / 2.0, - size().height() - d->footer->size().height() ) ); - d->footer->setVisible( false ); - d->footer->setZIndex( 4 ); - setClipped( d->footer, true ); + d->footer->setSize(QSizeF(CM_TO_POINT(5), CM_TO_POINT(0.6))); + d->footer->setPosition(QPointF(size().width() / 2.0 - d->footer->size().width() / 2.0, + size().height() - d->footer->size().height())); + d->footer->setVisible(false); + d->footer->setZIndex(4); + setClipped(d->footer, true); setInheritsTransform(d->footer, true); +#if 0 + // Set default contour (for how text run around is done around this shape) + // to prevent a crash in LO + setTextRunAroundContour(KoShape::ContourBox); +#endif // Enable auto-resizing of chart labels - foreach( KoShape *label, labels() ) { - TextLabelData *labelData = qobject_cast( label->userData() ); - KoTextDocument doc( labelData->document() ); -//FIXME doc.setResizeMethod( KoTextDocument::AutoResize ); + foreach(KoShape *label, labels()) { + TextLabelData *labelData = qobject_cast(label->userData()); + KoTextDocument doc(labelData->document()); +//FIXME doc.setResizeMethod(KoTextDocument::AutoResize); } - KoColorBackground *background = new KoColorBackground( Qt::white ); - setBackground( background ); + KoColorBackground *background = new KoColorBackground(Qt::white); + setBackground(background); - KoLineBorder *border = new KoLineBorder( 0, Qt::black ); - setBorder( border ); + KoLineBorder *stroke = new KoLineBorder(0, Qt::black); + setBorder(stroke); ChartLayout *l = layout(); - l->setPosition( d->plotArea, CenterPosition ); - l->setPosition( d->title, TopPosition, 0 ); - l->setPosition( d->subTitle, TopPosition, 1 ); - l->setPosition( d->footer, BottomPosition, 1 ); - l->setPosition( d->legend, d->legend->legendPosition() ); + l->setPosition(d->plotArea, CenterPosition); + l->setPosition(d->title, TopPosition, 0); + l->setPosition(d->subTitle, TopPosition, 1); + l->setPosition(d->footer, BottomPosition, 1); + l->setPosition(d->legend, d->legend->legendPosition()); l->layout(); requestRepaint(); @@ -551,7 +601,7 @@ TextLabelData *ChartShape::titleData() const { - TextLabelData *data = qobject_cast( d->title->userData() ); + TextLabelData *data = qobject_cast(d->title->userData()); return data; } @@ -563,7 +613,7 @@ TextLabelData *ChartShape::subTitleData() const { - TextLabelData *data = qobject_cast( d->subTitle->userData() ); + TextLabelData *data = qobject_cast(d->subTitle->userData()); return data; } @@ -574,18 +624,18 @@ TextLabelData *ChartShape::footerData() const { - TextLabelData *data = qobject_cast( d->footer->userData() ); + TextLabelData *data = qobject_cast(d->footer->userData()); return data; } QList ChartShape::labels() const { QList labels; - labels.append( d->title ); - labels.append( d->footer ); - labels.append( d->subTitle ); - foreach( Axis *axis, plotArea()->axes() ) { - labels.append( axis->title() ); + labels.append(d->title); + labels.append(d->footer); + labels.append(d->subTitle); + foreach(Axis *axis, plotArea()->axes()) { + labels.append(axis->title()); } return labels; } @@ -593,7 +643,7 @@ Legend *ChartShape::legend() const { // There has to be a valid legend even, if it's hidden. - Q_ASSERT( d->legend ); + Q_ASSERT(d->legend); return d->legend; } @@ -605,24 +655,24 @@ ChartLayout *ChartShape::layout() const { ChartLayout *l = dynamic_cast(KoShapeContainer::model()); - Q_ASSERT( l ); + Q_ASSERT(l); return l; } void ChartShape::showTitle(bool doShow) { - d->setChildVisible( d->title, doShow ); + d->setChildVisible(d->title, doShow); } void ChartShape::showSubTitle(bool doShow) { - d->setChildVisible( d->subTitle, doShow ); + d->setChildVisible(d->subTitle, doShow); } void ChartShape::showFooter(bool doShow) { - d->setChildVisible( d->footer, doShow ); + d->setChildVisible(d->footer, doShow); } QAbstractItemModel *ChartShape::internalModel() const @@ -630,14 +680,14 @@ return d->internalModel; } -void ChartShape::setInternalModel( QAbstractItemModel *model ) +void ChartShape::setInternalModel(QAbstractItemModel *model) { - Table *table = d->tableSource.get( model ); - Q_ASSERT( table ); + Table *table = d->tableSource.get(model); + Q_ASSERT(table); delete d->internalModelHelper; delete d->internalModel; d->internalModel = model; - d->internalModelHelper = new SingleModelHelper( table, d->proxyModel ); + d->internalModelHelper = new SingleModelHelper(table, d->proxyModel); } TableSource *ChartShape::tableSource() const @@ -650,7 +700,7 @@ return d->usesInternalModelOnly; } -void ChartShape::setUsesInternalModelOnly( bool doesSo ) +void ChartShape::setUsesInternalModelOnly(bool doesSo) { d->usesInternalModelOnly = doesSo; } @@ -662,103 +712,103 @@ ChartType ChartShape::chartType() const { - Q_ASSERT( d->plotArea ); + Q_ASSERT(d->plotArea); return d->plotArea->chartType(); } ChartSubtype ChartShape::chartSubType() const { - Q_ASSERT( d->plotArea ); + Q_ASSERT(d->plotArea); return d->plotArea->chartSubType(); } bool ChartShape::isThreeD() const { - Q_ASSERT( d->plotArea ); + Q_ASSERT(d->plotArea); return d->plotArea->isThreeD(); } -void ChartShape::setSheetAccessModel( QAbstractItemModel *model ) +void ChartShape::setSheetAccessModel(QAbstractItemModel *model) { - d->tableSource.setSheetAccessModel( model ); + d->tableSource.setSheetAccessModel(model); } -void ChartShape::reset( const QString ®ion, - bool firstRowIsLabel, - bool firstColumnIsLabel, - Qt::Orientation dataDirection ) +void ChartShape::reset(const QString ®ion, + bool firstRowIsLabel, + bool firstColumnIsLabel, + Qt::Orientation dataDirection) { // This method is provided via KoChartInterface, which is // used by embedding applications. d->usesInternalModelOnly = false; - d->proxyModel->setFirstRowIsLabel( firstRowIsLabel ); - d->proxyModel->setFirstColumnIsLabel( firstColumnIsLabel ); - d->proxyModel->setDataDirection( dataDirection ); - d->proxyModel->reset( CellRegion( &d->tableSource, region ) ); + d->proxyModel->setFirstRowIsLabel(firstRowIsLabel); + d->proxyModel->setFirstColumnIsLabel(firstColumnIsLabel); + d->proxyModel->setDataDirection(dataDirection); + d->proxyModel->reset(CellRegion(&d->tableSource, region)); } -void ChartShape::setChartType( ChartType type ) +void ChartShape::setChartType(ChartType type) { - Q_ASSERT( d->plotArea ); - d->proxyModel->setDataDimensions( numDimensions( type ) ); - d->plotArea->setChartType( type ); - emit chartTypeChanged( type ); + Q_ASSERT(d->plotArea); + d->proxyModel->setDataDimensions(numDimensions(type)); + d->plotArea->setChartType(type); + emit chartTypeChanged(type); } -void ChartShape::setChartSubType( ChartSubtype subType ) +void ChartShape::setChartSubType(ChartSubtype subType) { - Q_ASSERT( d->plotArea ); - d->plotArea->setChartSubType( subType ); + Q_ASSERT(d->plotArea); + d->plotArea->setChartSubType(subType); } -void ChartShape::setThreeD( bool threeD ) +void ChartShape::setThreeD(bool threeD) { - Q_ASSERT( d->plotArea ); - d->plotArea->setThreeD( threeD ); + Q_ASSERT(d->plotArea); + d->plotArea->setThreeD(threeD); } // ---------------------------------------------------------------- -void ChartShape::paintComponent( QPainter &painter, - const KoViewConverter &converter, KoShapePaintingContext &) +void ChartShape::paintComponent(QPainter &painter, + const KoViewConverter &converter, KoShapePaintingContext &) { // Only does a relayout if scheduled layout()->layout(); // Paint the background - if ( background() ) { - applyConversion( painter, converter ); + if (background()) { + applyConversion(painter, converter); // Calculate the clipping rect - QRectF paintRect = QRectF( QPointF( 0, 0 ), size() ); - painter.setClipRect( paintRect, Qt::IntersectClip ); + QRectF paintRect = QRectF(QPointF(0, 0), size()); + painter.setClipRect(paintRect, Qt::IntersectClip); QPainterPath p; - p.addRect( paintRect ); - background()->paint( painter, p ); + p.addRect(paintRect); + background()->paint(painter, p); } } -void ChartShape::paintDecorations( QPainter &painter, - const KoViewConverter &converter, - const KoCanvasBase *canvas ) +void ChartShape::paintDecorations(QPainter &painter, + const KoViewConverter &converter, + const KoCanvasBase *canvas) { // This only is a helper decoration, do nothing if we're already // painting handles anyway. - Q_ASSERT( canvas ); - if ( canvas->shapeManager()->selection()->selectedShapes().contains( this ) ) + Q_ASSERT(canvas); + if (canvas->shapeManager()->selection()->selectedShapes().contains(this)) return; - if ( border() ) + if (border()) return; - QRectF border = QRectF( QPointF( -1.5, -1.5 ), - converter.documentToView( size() ) + QSizeF( 1.5, 1.5 ) ); + QRectF border = QRectF(QPointF(-1.5, -1.5), + converter.documentToView(size()) + QSizeF(1.5, 1.5)); - painter.setPen( QPen( Qt::lightGray, 0 ) ); - painter.drawRect( border ); + painter.setPen(QPen(Qt::lightGray, 0)); + painter.drawRect(border); } @@ -766,131 +816,131 @@ // Loading and Saving -bool ChartShape::loadEmbeddedDocument( KoStore *store, - const KoXmlElement &objectElement, - const KoOdfLoadingContext &loadingContext ) +bool ChartShape::loadEmbeddedDocument(KoStore *store, + const KoXmlElement &objectElement, + const KoOdfLoadingContext &loadingContext) { - if ( !objectElement.hasAttributeNS( KoXmlNS::xlink, "href" ) ) { + if (!objectElement.hasAttributeNS(KoXmlNS::xlink, "href")) { kError() << "Object element has no valid xlink:href attribute"; return false; } - QString url = objectElement.attributeNS( KoXmlNS::xlink, "href" ); + QString url = objectElement.attributeNS(KoXmlNS::xlink, "href"); // It can happen that the url is empty e.g. when it is a // presentation:placeholder. - if ( url.isEmpty() ) { + if (url.isEmpty()) { return true; } QString tmpURL; - if ( url[0] == '#' ) - url = url.mid( 1 ); + if (url[0] == '#') + url = url.mid(1); - if (KUrl::isRelativeUrl( url )) { - if ( url.startsWith( "./" ) ) - tmpURL = QString( INTERNAL_PROTOCOL ) + ":/" + url.mid( 2 ); + if (KUrl::isRelativeUrl(url)) { + if (url.startsWith("./")) + tmpURL = QString(INTERNAL_PROTOCOL) + ":/" + url.mid(2); else - tmpURL = QString( INTERNAL_PROTOCOL ) + ":/" + url; + tmpURL = QString(INTERNAL_PROTOCOL) + ":/" + url; } else tmpURL = url; QString path = tmpURL; - if ( tmpURL.startsWith( INTERNAL_PROTOCOL ) ) { + if (tmpURL.startsWith(INTERNAL_PROTOCOL)) { path = store->currentDirectory(); - if ( !path.isEmpty() && !path.endsWith( '/' ) ) + if (!path.isEmpty() && !path.endsWith('/')) path += '/'; - QString relPath = KUrl( tmpURL ).path(); - path += relPath.mid( 1 ); // remove leading '/' + QString relPath = KUrl(tmpURL).path(); + path += relPath.mid(1); // remove leading '/' } - if ( !path.endsWith( '/' ) ) + if (!path.endsWith('/')) path += '/'; - const QString mimeType = loadingContext.mimeTypeForPath( path ); + const QString mimeType = loadingContext.mimeTypeForPath(path); //kDebug(35001) << "path for manifest file=" << path << "mimeType=" << mimeType; - if ( mimeType.isEmpty() ) { + if (mimeType.isEmpty()) { //kDebug(35001) << "Manifest doesn't have media-type for" << path; return false; } - const bool isOdf = mimeType.startsWith( "application/vnd.oasis.opendocument" ); - if ( !isOdf ) { + const bool isOdf = mimeType.startsWith("application/vnd.oasis.opendocument"); + if (!isOdf) { tmpURL += "/maindoc.xml"; //kDebug(35001) << "tmpURL adjusted to" << tmpURL; } //kDebug(35001) << "tmpURL=" << tmpURL; QString errorMsg; - KoDocumentEntry e = KoDocumentEntry::queryByMimeType( mimeType ); - if ( e.isEmpty() ) { + KoDocumentEntry e = KoDocumentEntry::queryByMimeType(mimeType); + if (e.isEmpty()) { return false; } bool res = true; - if ( tmpURL.startsWith( STORE_PROTOCOL ) - || tmpURL.startsWith( INTERNAL_PROTOCOL ) - || KUrl::isRelativeUrl( tmpURL ) ) + if (tmpURL.startsWith(STORE_PROTOCOL) + || tmpURL.startsWith(INTERNAL_PROTOCOL) + || KUrl::isRelativeUrl(tmpURL)) { - if ( isOdf ) { + if (isOdf) { store->pushDirectory(); - Q_ASSERT( tmpURL.startsWith( INTERNAL_PROTOCOL ) ); - QString relPath = KUrl( tmpURL ).path().mid( 1 ); - store->enterDirectory( relPath ); - res = d->document->loadOasisFromStore( store ); + Q_ASSERT(tmpURL.startsWith(INTERNAL_PROTOCOL)); + QString relPath = KUrl(tmpURL).path().mid(1); + store->enterDirectory(relPath); + res = d->document->loadOasisFromStore(store); store->popDirectory(); } else { - if ( tmpURL.startsWith( INTERNAL_PROTOCOL ) ) - tmpURL = KUrl( tmpURL ).path().mid( 1 ); - res = d->document->loadFromStore( store, tmpURL ); + if (tmpURL.startsWith(INTERNAL_PROTOCOL)) + tmpURL = KUrl(tmpURL).path().mid(1); + res = d->document->loadFromStore(store, tmpURL); } - d->document->setStoreInternal( true ); + d->document->setStoreInternal(true); } else { // Reference to an external document. Hmmm... - d->document->setStoreInternal( false ); - KUrl url( tmpURL ); - if ( !url.isLocalFile() ) { + d->document->setStoreInternal(false); + KUrl url(tmpURL); + if (!url.isLocalFile()) { //QApplication::restoreOverrideCursor(); // For security reasons we need to ask confirmation if the // url is remote. int result = KMessageBox::warningYesNoCancel( - 0, i18n( "This document contains an external link to a remote document\n%1", tmpURL ), - i18n( "Confirmation Required" ), KGuiItem( i18n( "Download" ) ), KGuiItem( i18n( "Skip" ) ) ); + 0, i18n("This document contains an external link to a remote document\n%1", tmpURL), + i18n("Confirmation Required"), KGuiItem(i18n("Download")), KGuiItem(i18n("Skip"))); - if ( result == KMessageBox::Cancel ) { + if (result == KMessageBox::Cancel) { //d->m_parent->setErrorMessage("USER_CANCELED"); return false; } - if ( result == KMessageBox::Yes ) - res = d->document->openUrl( url ); + if (result == KMessageBox::Yes) + res = d->document->openUrl(url); // and if == No, res will still be false so we'll use a kounavail below } else - res = d->document->openUrl( url ); + res = d->document->openUrl(url); } - if ( !res ) { + if (!res) { QString errorMessage = d->document->errorMessage(); return false; } // Still waiting... - //QApplication::setOverrideCursor( Qt::WaitCursor ); + //QApplication::setOverrideCursor(Qt::WaitCursor); tmpURL.clear(); // see KoDocument::insertChild for an explanation what's going on // now :-) - /*if ( parentDocument() ) { + /*if (parentDocument()) { KoDocument *parent = parentDocument(); KParts::PartManager* manager = parent->manager(); - if ( manager && !manager->parts().isEmpty() ) + if (manager && !manager->parts().isEmpty()) { - if ( !manager->parts().contains( d->document ) && - !parent->isSingleViewMode() ) - manager->addPart( d->document, false ); + if (!manager->parts().contains(d->document) + && !parent->isSingleViewMode()) + manager->addPart(d->document, false); } }*/ @@ -899,33 +949,33 @@ return res; } -bool ChartShape::loadOdf( const KoXmlElement &element, - KoShapeLoadingContext &context ) +bool ChartShape::loadOdf(const KoXmlElement &element, + KoShapeLoadingContext &context) { //struct Timer{QTime t;Timer(){t.start();} ~Timer(){qDebug()<<">>>>>"<"; return false; } -bool ChartShape::loadOdfChartElement( const KoXmlElement &chartElement, - KoShapeLoadingContext &context ) +bool ChartShape::loadOdfChartElement(const KoXmlElement &chartElement, + KoShapeLoadingContext &context) { // Use a helper-class created on the stack to be sure a we always leave // this method with a call to endLoading proxyModel()->endLoading() @@ -944,137 +994,131 @@ // Get access to sheets in KSpread QAbstractItemModel *sheetAccessModel = 0; - if ( resourceManager() && - resourceManager()->hasResource( 75751149 ) ) { // duplicated from kspread - QVariant var = resourceManager()->resource( 75751149 ); - sheetAccessModel = static_cast( var.value() ); - if ( sheetAccessModel ) { + if (resourceManager() && + resourceManager()->hasResource(75751149)) { // duplicated from kspread + QVariant var = resourceManager()->resource(75751149); + sheetAccessModel = static_cast(var.value()); + if (sheetAccessModel) { // We're embedded in KSpread, which means KSpread provides the data d->usesInternalModelOnly = false; - d->tableSource.setSheetAccessModel( sheetAccessModel ); + d->tableSource.setSheetAccessModel(sheetAccessModel); helper->chartUsesInternalModelOnly = d->usesInternalModelOnly; } } - context.addSharedData( OdfLoadingHelperId, helper ); + context.addSharedData(OdfLoadingHelperId, helper); KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); styleStack.clear(); - if ( chartElement.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { - context.odfLoadingContext().fillStyleStack( chartElement, KoXmlNS::chart, "style-name", "chart" ); - styleStack.setTypeProperties( "graphic" ); + if (chartElement.hasAttributeNS(KoXmlNS::chart, "style-name")) { + context.odfLoadingContext().fillStyleStack(chartElement, KoXmlNS::chart, "style-name", "chart"); + styleStack.setTypeProperties("graphic"); } // Also load the size here as it, if specified here, overwrites the frame's size, // See ODF specs for chart:chart element for more details. - loadOdfAttributes( chartElement, context, - OdfAdditionalAttributes | OdfMandatories | OdfCommonChildElements | OdfStyle | OdfSize ); + loadOdfAttributes(chartElement, context, + OdfAdditionalAttributes | OdfMandatories | OdfCommonChildElements | OdfStyle | OdfSize); #ifndef NWORKAROUND_ODF_BUGS - if ( !background() ) { - const QColor color = KoOdfWorkaround::fixMissingFillColor( chartElement, context ); + if (!background()) { + const QColor color = KoOdfWorkaround::fixMissingFillColor(chartElement, context); if (color.isValid()) // invalid color means do not set KoColorBackground but be transparent instead - setBackground( new KoColorBackground( color ) ); + setBackground(new KoColorBackground(color)); } #endif // Check if we're loading an embedded document - if ( !chartElement.hasAttributeNS( KoXmlNS::chart, "class" ) ) { + if (!chartElement.hasAttributeNS(KoXmlNS::chart, "class")) { kDebug(35001) << "Error: Embedded document has no chart:class attribute."; return false; } - Q_ASSERT( d->plotArea ); + Q_ASSERT(d->plotArea); // 1. Load the chart type. - const QString chartClass = chartElement.attributeNS( KoXmlNS::chart, - "class", QString() ); + const QString chartClass = chartElement.attributeNS(KoXmlNS::chart, "class", QString()); KChart::ChartType chartType = KChart::BarChartType; // Find out what charttype the chart class corresponds to. bool knownType = false; - for ( int type = 0; type < (int)LastChartType; ++type ) { - if ( chartClass == ODF_CHARTTYPES[ (ChartType)type ] ) { + for (int type = 0; type < (int)LastChartType; ++type) { + if (chartClass == ODF_CHARTTYPES[(ChartType)type]) { //kDebug(35001) <<"found chart of type" << chartClass; chartType = (ChartType)type; // Set the dimensionality of the data points, we can not call // setType here as we bubble charts requires that the datasets already exist - proxyModel()->setDataDimensions( numDimensions( chartType ) ); + proxyModel()->setDataDimensions(numDimensions(chartType)); knownType = true; break; } } // If we can't find out what charttype it is, we might as well end here. - if ( !knownType ) { + if (!knownType) { // FIXME: Find out what the equivalent of // KoDocument::setErrorMessage() is for KoShape. - //setErrorMessage( i18n( "Unknown chart type %1" ,chartClass ) ); + //setErrorMessage(i18n("Unknown chart type %1" ,chartClass)); return false; } // 2. Load the data -// int dimensions = numDimensions( chartType ); +// int dimensions = numDimensions(chartType); // qDebug() << "DIMENSIONS" << dimensions; -// d->proxyModel->setDataDimensions( dimensions ); +// d->proxyModel->setDataDimensions(dimensions); // qDebug() << d->proxyModel->dataSets().count(); - KoXmlElement dataElem = KoXml::namedItemNS( chartElement, - KoXmlNS::table, "table" ); - if ( !dataElem.isNull() ) { - if ( !loadOdfData( dataElem, context ) ) + KoXmlElement dataElem = KoXml::namedItemNS(chartElement, KoXmlNS::table, "table"); + if (!dataElem.isNull()) { + if (!loadOdfData(dataElem, context)) return false; } // 3. Load the plot area (this is where the meat is!). - KoXmlElement plotareaElem = KoXml::namedItemNS( chartElement, - KoXmlNS::chart, "plot-area" ); + KoXmlElement plotareaElem = KoXml::namedItemNS(chartElement, KoXmlNS::chart, "plot-area"); - if ( !plotareaElem.isNull() ) { - d->plotArea->setChartType( chartType ); - d->plotArea->setChartSubType( chartSubType() ); - if ( !d->plotArea->loadOdf( plotareaElem, context ) ) + if (!plotareaElem.isNull()) { + d->plotArea->setChartType(chartType); + d->plotArea->setChartSubType(chartSubType()); + if (!d->plotArea->loadOdf(plotareaElem, context)) return false; -// d->plotArea->setChartType( chartType ); -// d->plotArea->setChartSubType( chartSubType() ); +// d->plotArea->setChartType(chartType); +// d->plotArea->setChartSubType(chartSubType()); } // 4. Load the title. - KoXmlElement titleElem = KoXml::namedItemNS( chartElement, - KoXmlNS::chart, "title" ); - d->setChildVisible( d->title, !titleElem.isNull() ); - if ( !titleElem.isNull() ) { - if ( !d->loadOdfLabel( d->title, titleElem ) ) + KoXmlElement titleElem = KoXml::namedItemNS(chartElement, + KoXmlNS::chart, "title"); + d->setChildVisible(d->title, !titleElem.isNull()); + if (!titleElem.isNull()) { + if (!d->loadOdfLabel(d->title, titleElem, context)) return false; } // 5. Load the subtitle. - KoXmlElement subTitleElem = KoXml::namedItemNS( chartElement, - KoXmlNS::chart, "subtitle" ); - d->setChildVisible( d->subTitle, !subTitleElem.isNull() ); - if ( !subTitleElem.isNull() ) { - if ( !d->loadOdfLabel( d->subTitle, subTitleElem ) ) + KoXmlElement subTitleElem = KoXml::namedItemNS(chartElement, KoXmlNS::chart, "subtitle"); + d->setChildVisible(d->subTitle, !subTitleElem.isNull()); + if (!subTitleElem.isNull()) { + if (!d->loadOdfLabel(d->subTitle, subTitleElem, context)) return false; } // 6. Load the footer. - KoXmlElement footerElem = KoXml::namedItemNS( chartElement, - KoXmlNS::chart, "footer" ); - d->setChildVisible( d->footer, !footerElem.isNull() ); - if ( !footerElem.isNull() ) { - if ( !d->loadOdfLabel( d->footer, footerElem ) ) + KoXmlElement footerElem = KoXml::namedItemNS(chartElement, KoXmlNS::chart, "footer"); + d->setChildVisible(d->footer, !footerElem.isNull()); + if (!footerElem.isNull()) { + if (!d->loadOdfLabel(d->footer, footerElem, context)) return false; } // 7. Load the legend. - KoXmlElement legendElem = KoXml::namedItemNS( chartElement, KoXmlNS::chart, - "legend" ); - d->setChildVisible( d->legend, !legendElem.isNull() ); - if ( !legendElem.isNull() ) { - if ( !d->legend->loadOdf( legendElem, context ) ) + KoXmlElement legendElem = KoXml::namedItemNS(chartElement, KoXmlNS::chart, "legend"); + d->setChildVisible(d->legend, !legendElem.isNull()); + if (!legendElem.isNull()) { + if (!d->legend->loadOdf(legendElem, context)) return false; } // 8. Sets the chart type - setChartType( chartType ); + setChartType(chartType); d->legend->update(); @@ -1083,37 +1127,37 @@ return true; } -bool ChartShape::loadOdfData( const KoXmlElement &tableElement, - KoShapeLoadingContext &context ) +bool ChartShape::loadOdfData(const KoXmlElement &tableElement, + KoShapeLoadingContext &context) { // There is no table element to load - if ( tableElement.isNull() || !tableElement.isElement() ) + if (tableElement.isNull() || !tableElement.isElement()) return true; // An internal model might have been set before in ChartShapeFactory. - if ( d->internalModel ) { - Table *oldInternalTable = d->tableSource.get( d->internalModel ); - Q_ASSERT( oldInternalTable ); - d->tableSource.remove( oldInternalTable->name() ); + if (d->internalModel) { + Table *oldInternalTable = d->tableSource.get(d->internalModel); + Q_ASSERT(oldInternalTable); + d->tableSource.remove(oldInternalTable->name()); } // FIXME: Make model->loadOdf() return a bool, and use it here. // Create a table with data from document, add it as table source // and reset the proxy only with data from this new table. ChartTableModel *internalModel = new ChartTableModel; - internalModel->loadOdf( tableElement, context ); + internalModel->loadOdf(tableElement, context); - QString tableName = tableElement.attributeNS( KoXmlNS::table, "name" ); - d->tableSource.add( tableName, internalModel ); - // TODO: d->tableSource.setAvoidNameClash( tableName ) - setInternalModel( internalModel ); + QString tableName = tableElement.attributeNS(KoXmlNS::table, "name"); + d->tableSource.add(tableName, internalModel); + // TODO: d->tableSource.setAvoidNameClash(tableName) + setInternalModel(internalModel); return true; } -void ChartShape::saveOdf( KoShapeSavingContext & context ) const +void ChartShape::saveOdf(KoShapeSavingContext & context) const { - Q_ASSERT( d->plotArea ); + Q_ASSERT(d->plotArea); KoXmlWriter& bodyWriter = context.xmlWriter(); @@ -1132,67 +1176,77 @@ // if it works there too. // QList tagHierarchy = bodyWriter.tagHierarchy(); - if ( tagHierarchy.isEmpty() - || QString( tagHierarchy.last() ) != "office:chart" ) + if (tagHierarchy.isEmpty() + || QString(tagHierarchy.last()) != "office:chart") { - bodyWriter.startElement( "draw:frame" ); + bodyWriter.startElement("draw:frame"); // See also loadOdf() in loadOdfAttributes. - saveOdfAttributes( context, OdfAllAttributes ); + saveOdfAttributes(context, OdfAllAttributes); - bodyWriter.startElement( "draw:object" ); - context.embeddedSaver().embedDocument( bodyWriter, d->document ); + bodyWriter.startElement("draw:object"); + context.embeddedSaver().embedDocument(bodyWriter, d->document); bodyWriter.endElement(); // draw:object bodyWriter.endElement(); // draw:frame return; } - KoGenStyles& mainStyles( context.mainStyles() ); + KoGenStyles& mainStyles(context.mainStyles()); - bodyWriter.startElement( "chart:chart" ); + bodyWriter.startElement("chart:chart"); - saveOdfAttributes( context, OdfSize ); + saveOdfAttributes(context, OdfSize); KoGenStyle style(KoGenStyle::GraphicAutoStyle, "chart"); - bodyWriter.addAttribute( "chart:style-name", saveStyle( style, context ) ); + bodyWriter.addAttribute("chart:style-name", saveStyle(style, context)); // 1. Write the chart type. - bodyWriter.addAttribute( "chart:class", ODF_CHARTTYPES[ d->plotArea->chartType() ] ); + bodyWriter.addAttribute("chart:class", ODF_CHARTTYPES[d->plotArea->chartType() ]); // 2. Write the title. - saveOdfLabel( d->title, bodyWriter, mainStyles, TitleLabelType ); + if (d->title->isVisible()) + saveOdfLabel(d->title, bodyWriter, mainStyles, TitleLabelType); // 3. Write the subtitle. - saveOdfLabel( d->subTitle, bodyWriter, mainStyles, SubTitleLabelType ); + if (d->subTitle->isVisible()) + saveOdfLabel(d->subTitle, bodyWriter, mainStyles, SubTitleLabelType); // 4. Write the footer. - saveOdfLabel( d->footer, bodyWriter, mainStyles, FooterLabelType ); + if (d->footer->isVisible()) + saveOdfLabel(d->footer, bodyWriter, mainStyles, FooterLabelType); // 5. Write the legend. - d->legend->saveOdf( context ); + if (d->legend->isVisible()) + d->legend->saveOdf(context); // 6. Write the plot area (this is where the real action is!). - d->plotArea->saveOdf( context ); + d->plotArea->saveOdf(context); // 7. Save the data - saveOdfData( bodyWriter, mainStyles ); + saveOdfData(bodyWriter, mainStyles); bodyWriter.endElement(); // chart:chart } -static void saveOdfDataRow( KoXmlWriter &bodyWriter, QAbstractItemModel *table, int row ) +static void saveOdfDataRow(KoXmlWriter &bodyWriter, QAbstractItemModel *table, int row) { - bodyWriter.startElement( "table:table-row" ); + bodyWriter.startElement("table:table-row"); const int cols = table->columnCount(); - for ( int col = 0; col < cols; ++col ) { - //QVariant value( internalModel.cellVal( row, col ) ); - QModelIndex index = table->index( row, col ); - QVariant value = table->data( index ); + for (int col = 0; col < cols; ++col) { + //QVariant value(internalModel.cellVal(row, col)); + QModelIndex index = table->index(row, col); + QVariant value = table->data(index); + + bool ok; + double val = value.toDouble(&ok); + if (ok) { + value = val; + } QString valType; QString valStr; - switch ( value.type() ) { + switch (value.type()) { case QVariant::Invalid: break; case QVariant::String: @@ -1201,7 +1255,7 @@ break; case QVariant::Double: valType = "float"; - valStr = QString::number( value.toDouble(), 'g', DBL_DIG ); + valStr = QString::number(value.toDouble(), 'g', DBL_DIG); break; case QVariant::DateTime: @@ -1214,14 +1268,14 @@ } // Add the value type and the string to the XML tree. - bodyWriter.startElement( "table:table-cell" ); - if ( !valType.isEmpty() ) { - bodyWriter.addAttribute( "office:value-type", valType ); - if ( value.type() == QVariant::Double ) - bodyWriter.addAttribute( "office:value", valStr ); + bodyWriter.startElement("table:table-cell"); + if (!valType.isEmpty()) { + bodyWriter.addAttribute("office:value-type", valType); + if (value.type() == QVariant::Double) + bodyWriter.addAttribute("office:value", valStr); - bodyWriter.startElement( "text:p" ); - bodyWriter.addTextNode( valStr ); + bodyWriter.startElement("text:p"); + bodyWriter.addTextNode(valStr); bodyWriter.endElement(); // text:p } @@ -1231,50 +1285,50 @@ bodyWriter.endElement(); // table:table-row } -void ChartShape::saveOdfData( KoXmlWriter &bodyWriter, KoGenStyles &mainStyles ) const +void ChartShape::saveOdfData(KoXmlWriter &bodyWriter, KoGenStyles &mainStyles) const { - Q_UNUSED( mainStyles ); + Q_UNUSED(mainStyles); // FIXME: Move this method to a sane place QAbstractItemModel *internalModel = d->internalModel; - Table *internalTable = d->tableSource.get( internalModel ); - Q_ASSERT( internalTable ); + Table *internalTable = d->tableSource.get(internalModel); + Q_ASSERT(internalTable); // Only save the data if we actually have some. - if ( !internalModel ) + if (!internalModel) return; const int rows = internalModel->rowCount(); const int cols = internalModel->columnCount(); - bodyWriter.startElement( "table:table" ); - bodyWriter.addAttribute( "table:name", internalTable->name() ); + bodyWriter.startElement("table:table"); + bodyWriter.addAttribute("table:name", internalTable->name()); // Exactly one header column, always. - bodyWriter.startElement( "table:table-header-columns" ); - bodyWriter.startElement( "table:table-column" ); + bodyWriter.startElement("table:table-header-columns"); + bodyWriter.startElement("table:table-column"); bodyWriter.endElement(); // table:table-column bodyWriter.endElement(); // table:table-header-columns // Then "cols" columns - bodyWriter.startElement( "table:table-columns" ); - bodyWriter.startElement( "table:table-column" ); - bodyWriter.addAttribute( "table:number-columns-repeated", cols ); + bodyWriter.startElement("table:table-columns"); + bodyWriter.startElement("table:table-column"); + bodyWriter.addAttribute("table:number-columns-repeated", cols); bodyWriter.endElement(); // table:table-column bodyWriter.endElement(); // table:table-columns int row = 0; - bodyWriter.startElement( "table:table-header-rows" ); - if ( rows > 0 ) - saveOdfDataRow( bodyWriter, internalModel, row++ ); + bodyWriter.startElement("table:table-header-rows"); + if (rows > 0) + saveOdfDataRow(bodyWriter, internalModel, row++); bodyWriter.endElement(); // table:table-header-rows // Here start the actual data rows. - bodyWriter.startElement( "table:table-rows" ); + bodyWriter.startElement("table:table-rows"); //QStringList::const_iterator rowLabelIt = m_rowLabels.begin(); - for ( ; row < rows ; ++row ) - saveOdfDataRow( bodyWriter, internalModel, row ); + for (; row < rows ; ++row) + saveOdfDataRow(bodyWriter, internalModel, row); bodyWriter.endElement(); // table:table-rows bodyWriter.endElement(); // table:table @@ -1287,14 +1341,14 @@ void ChartShape::relayout() const { - Q_ASSERT( d->plotArea ); + Q_ASSERT(d->plotArea); d->plotArea->relayout(); KoShape::update(); } void ChartShape::requestRepaint() const { - Q_ASSERT( d->plotArea ); + Q_ASSERT(d->plotArea); d->plotArea->requestRepaint(); } @@ -1303,7 +1357,7 @@ return d->resourceManager; } -void ChartShape::setEnableUserInteraction( bool enable ) +void ChartShape::setEnableUserInteraction(bool enable) { ENABLE_USER_INTERACTION = enable; } diff -Nru calligra-2.4.0/plugins/chartshape/chartshape.desktop calligra-2.4.3/plugins/chartshape/chartshape.desktop --- calligra-2.4.0/plugins/chartshape/chartshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/chartshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Chart Shape Name[bg]=Форма на диаграмата Name[ca]=Forma del diagrama +Name[ca@valencia]=Forma del diagrama Name[cs]=Tvar grafu Name[da]=Diagram-form Name[de]=Diagramm-Objekt @@ -28,7 +29,7 @@ Name[nl]=Grafiekvorm Name[pl]=Kształt wykresu Name[pt]=Forma do Gráfico -Name[pt_BR]=Forma do Gráfico +Name[pt_BR]=Forma do gráfico Name[ru]=Диаграмма Name[sk]=Tvar grafu Name[sl]=Oblika grafikona diff -Nru calligra-2.4.0/plugins/chartshape/ChartShapeFactory.cpp calligra-2.4.3/plugins/chartshape/ChartShapeFactory.cpp --- calligra-2.4.0/plugins/chartshape/ChartShapeFactory.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartShapeFactory.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -52,30 +52,30 @@ K_PLUGIN_FACTORY(ChartShapePluginFactory, registerPlugin();) K_EXPORT_PLUGIN(ChartShapePluginFactory("ChartShape")) -ChartShapePlugin::ChartShapePlugin( QObject * parent, const QVariantList& ) +ChartShapePlugin::ChartShapePlugin(QObject * parent, const QVariantList&) { // Register the chart shape factory. - KoShapeRegistry::instance()->add( new ChartShapeFactory() ); + KoShapeRegistry::instance()->add(new ChartShapeFactory()); // Register all tools for the chart shape. - KoToolRegistry::instance()->add( new ChartToolFactory() ); + KoToolRegistry::instance()->add(new ChartToolFactory()); } ChartShapeFactory::ChartShapeFactory() - : KoShapeFactoryBase(ChartShapeId, i18n( "Chart" ) ) + : KoShapeFactoryBase(ChartShapeId, i18n("Chart")) { - setXmlElementNames( "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", QStringList( "object" ) ); - setToolTip( i18n( "Business charts" ) ); + setXmlElementNames("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", QStringList("object")); + setToolTip(i18n("Business charts")); KIconLoader::global()->addAppDir("kchart"); - setIcon( "kchart" ); + setIcon("kchart"); // Default 'app specific' config pages i.e. unless an app defines // other config pages, these are used. QList panelFactories; - // panelFactories.append( new ChartDataConfigFactory() ); - setOptionPanels( panelFactories ); + // panelFactories.append(new ChartDataConfigFactory()); + setOptionPanels(panelFactories); } @@ -86,7 +86,8 @@ && element.tagName() == "object"; } -KoShape *ChartShapeFactory::createShapeFromOdf(const KoXmlElement &element, KoShapeLoadingContext &context) +KoShape *ChartShapeFactory::createShapeFromOdf(const KoXmlElement &element, + KoShapeLoadingContext &context) { ChartShape* shape = new ChartShape(context.documentResourceManager()); @@ -112,88 +113,88 @@ // Fill cells with data. QStandardItemModel *m_chartData = new QStandardItemModel(); - Table *internalTable = shape->tableSource()->add( "internal-model", m_chartData ); - Q_ASSERT( !shape->internalModel() ); + Table *internalTable = shape->tableSource()->add("internal-model", m_chartData); + Q_ASSERT(!shape->internalModel()); // setInternalModel() assumes that m_chartData has already been added to shape->tableSource(). - shape->setInternalModel( m_chartData ); + shape->setInternalModel(m_chartData); // TODO (not implemented yet) - // shape->tableSource()->setRenameOnNameClash( internalTable ); - m_chartData->setRowCount( 4 ); - m_chartData->setColumnCount( 5 ); + // shape->tableSource()->setRenameOnNameClash(internalTable); + m_chartData->setRowCount(4); + m_chartData->setColumnCount(5); // Vertical header data - m_chartData->setData( m_chartData->index( 1, 0 ), i18n( "January" ) ); - m_chartData->setData( m_chartData->index( 2, 0 ), i18n( "July" ) ); - m_chartData->setData( m_chartData->index( 3, 0 ), i18n( "December" ) ); + m_chartData->setData(m_chartData->index(1, 0), i18n("January")); + m_chartData->setData(m_chartData->index(2, 0), i18n("July")); + m_chartData->setData(m_chartData->index(3, 0), i18n("December")); // Horizontal header data - m_chartData->setData( m_chartData->index( 0, 1 ), i18n( "Column %1", 1 ) ); - m_chartData->setData( m_chartData->index( 0, 2 ), i18n( "Column %1", 2 ) ); - m_chartData->setData( m_chartData->index( 0, 3 ), i18n( "Column %1", 3 ) ); - m_chartData->setData( m_chartData->index( 0, 4 ), i18n( "Column %1", 4 ) ); + m_chartData->setData(m_chartData->index(0, 1), i18n("Column %1", 1)); + m_chartData->setData(m_chartData->index(0, 2), i18n("Column %1", 2)); + m_chartData->setData(m_chartData->index(0, 3), i18n("Column %1", 3)); + m_chartData->setData(m_chartData->index(0, 4), i18n("Column %1", 4)); // First row - m_chartData->setData( m_chartData->index( 1, 1 ), 5.7 ); - m_chartData->setData( m_chartData->index( 1, 2 ), 3.4 ); - m_chartData->setData( m_chartData->index( 1, 3 ), 1.2 ); - m_chartData->setData( m_chartData->index( 1, 4 ), 8.4 ); + m_chartData->setData(m_chartData->index(1, 1), 5.7); + m_chartData->setData(m_chartData->index(1, 2), 3.4); + m_chartData->setData(m_chartData->index(1, 3), 1.2); + m_chartData->setData(m_chartData->index(1, 4), 8.4); // Second row - m_chartData->setData( m_chartData->index( 2, 1 ), 2.1 ); - m_chartData->setData( m_chartData->index( 2, 2 ), 6.5 ); - m_chartData->setData( m_chartData->index( 2, 3 ), 0.9 ); - m_chartData->setData( m_chartData->index( 2, 4 ), 1.5 ); + m_chartData->setData(m_chartData->index(2, 1), 2.1); + m_chartData->setData(m_chartData->index(2, 2), 6.5); + m_chartData->setData(m_chartData->index(2, 3), 0.9); + m_chartData->setData(m_chartData->index(2, 4), 1.5); // Third row - m_chartData->setData( m_chartData->index( 3, 1 ), 7.9 ); - m_chartData->setData( m_chartData->index( 3, 2 ), 3.5 ); - m_chartData->setData( m_chartData->index( 3, 3 ), 8.6 ); - m_chartData->setData( m_chartData->index( 3, 4 ), 4.3 ); - - proxyModel->setFirstRowIsLabel( true ); - proxyModel->setFirstColumnIsLabel( true ); - proxyModel->reset( CellRegion( internalTable, QRect( 1, 1, 5, 4 ) ) ); + m_chartData->setData(m_chartData->index(3, 1), 7.9); + m_chartData->setData(m_chartData->index(3, 2), 3.5); + m_chartData->setData(m_chartData->index(3, 3), 8.6); + m_chartData->setData(m_chartData->index(3, 4), 4.3); + + proxyModel->setFirstRowIsLabel(true); + proxyModel->setFirstColumnIsLabel(true); + proxyModel->reset(CellRegion(internalTable, QRect(1, 1, 5, 4))); const QSizeF shapeSize = shape->size(); - QPointF plotAreaPos( 0.0, 0.0 ); - QSizeF plotAreaSize( shapeSize ); + QPointF plotAreaPos(0.0, 0.0); + QSizeF plotAreaSize(shapeSize); Legend *legend = shape->legend(); legend->rebuild(); // Implies update() - QPointF legendPos( 0.0, 0.0 ); + QPointF legendPos(0.0, 0.0); QSizeF legendSize = legend->size(); legendPos.ry() = shapeSize.height() / 2.0 - legendSize.height() / 2.0; plotAreaSize.rwidth() -= legendSize.width(); Axis *xAxis = shape->plotArea()->xAxis(); KoShape *xAxisTitle = xAxis->title(); - if ( xAxisTitle ) { - xAxis->setTitleText( i18n( "Month" ) ); - xAxisTitle->setPosition( QPointF( shapeSize.width() / 2.0 - xAxisTitle->size().width() / 2.0, - shapeSize.height() - xAxisTitle->size().height() ) ); + if (xAxisTitle) { + xAxis->setTitleText(i18n("Month")); + xAxisTitle->setPosition(QPointF(shapeSize.width() / 2.0 - xAxisTitle->size().width() / 2.0, + shapeSize.height() - xAxisTitle->size().height())); plotAreaSize.rheight() -= xAxisTitle->size().height(); } Axis *yAxis = shape->plotArea()->yAxis(); KoShape *yAxisTitle = yAxis->title(); - if ( yAxisTitle ) { - yAxis->setTitleText( i18n( "Growth in %") ); - yAxisTitle->setPosition( QPointF( -yAxisTitle->size().width() / 2.0 + yAxisTitle->size().height() / 2.0, - shapeSize.height() / 2.0 - yAxisTitle->size().height() / 2.0 ) ); + if (yAxisTitle) { + yAxis->setTitleText(i18n("Growth in %")); + yAxisTitle->setPosition(QPointF(-yAxisTitle->size().width() / 2.0 + yAxisTitle->size().height() / 2.0, + shapeSize.height() / 2.0 - yAxisTitle->size().height() / 2.0)); plotAreaPos.rx() += yAxisTitle->size().height(); legendPos.rx() += yAxisTitle->size().height(); plotAreaSize.rwidth() -= yAxisTitle->size().height(); } - if ( legend ) { + if (legend) { legendPos.rx() += plotAreaSize.width(); - legend->setPosition( legendPos ); + legend->setPosition(legendPos); } - shape->plotArea()->setPosition( plotAreaPos ); - shape->plotArea()->setSize( plotAreaSize ); + shape->plotArea()->setPosition(plotAreaPos); + shape->plotArea()->setSize(plotAreaSize ); return shape; } diff -Nru calligra-2.4.0/plugins/chartshape/ChartShapeFactory.h calligra-2.4.3/plugins/chartshape/ChartShapeFactory.h --- calligra-2.4.0/plugins/chartshape/ChartShapeFactory.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartShapeFactory.h 2012-06-26 04:18:01.000000000 +0000 @@ -41,7 +41,7 @@ Q_OBJECT public: - ChartShapePlugin( QObject * parent, const QVariantList & ); + ChartShapePlugin(QObject *parent, const QVariantList&); ~ChartShapePlugin() {} }; diff -Nru calligra-2.4.0/plugins/chartshape/ChartShape.h calligra-2.4.3/plugins/chartshape/ChartShape.h --- calligra-2.4.0/plugins/chartshape/ChartShape.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartShape.h 2012-06-26 04:18:01.000000000 +0000 @@ -89,7 +89,7 @@ class TableSource; void saveOdfFont(KoGenStyle &style, const QFont& font, const QColor& color); -QString saveOdfFont( KoGenStyles& mainStyles, const QFont& font, const QColor& color ); +QString saveOdfFont(KoGenStyles& mainStyles, const QFont& font, const QColor& color); QColor defaultDataSetColor(int dataSetNum); const char * odfCharttype(int charttype); @@ -119,7 +119,7 @@ TextLabelData *footerData() const; Legend *legend() const; PlotArea *plotArea() const; - ChartLayout *layout() const; + ChartLayout *layout() const; /** * Returns a list of all labels in this chart, visible and hidden. @@ -144,7 +144,7 @@ * This method will assume that @a model has already been added to this * chart's TableSource. */ - void setInternalModel( QAbstractItemModel *model ); + void setInternalModel(QAbstractItemModel *model); /** * Returns a "map" containing all tables that are being used, @@ -163,7 +163,7 @@ * For the first case, this method returns false, for the latter true. */ bool usesInternalModelOnly() const; - void setUsesInternalModelOnly( bool doesSo ); + void setUsesInternalModelOnly(bool doesSo); ChartType chartType() const; ChartSubtype chartSubType() const; @@ -178,7 +178,7 @@ * * See kspread/SheetAccessModel.h for details. */ - void setSheetAccessModel( QAbstractItemModel* model ); + void setSheetAccessModel(QAbstractItemModel* model); /** * Re-initializes the chart with data from an arbitrary region. @@ -191,36 +191,37 @@ * * @see ChartProxyModel::init() */ - void reset( const QString& region, - bool firstRowIsLabel, - bool firstColumnIsLabel, - Qt::Orientation dataDirection ); - - void setChartType( ChartType type ); - void setChartSubType( ChartSubtype subType ); - void setThreeD( bool threeD ); + void reset(const QString& region, + bool firstRowIsLabel, + bool firstColumnIsLabel, + Qt::Orientation dataDirection); + + void setChartType(ChartType type); + void setChartSubType(ChartSubtype subType); + void setThreeD(bool threeD); /// reimplemented - void paintComponent( QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &paintcontext); - void paintDecorations( QPainter &painter, const KoViewConverter &converter, - const KoCanvasBase *canvas ); + void paintComponent(QPainter &painter, const KoViewConverter &converter, + KoShapePaintingContext &paintcontext); + void paintDecorations(QPainter &painter, const KoViewConverter &converter, + const KoCanvasBase *canvas); /// reimplemented - bool loadOdf( const KoXmlElement &element, KoShapeLoadingContext &context ); - bool loadOdfFrameElement( const KoXmlElement &element, KoShapeLoadingContext &context ); - bool loadOdfData( const KoXmlElement &tableElement, KoShapeLoadingContext &context ); + bool loadOdf(const KoXmlElement &element, KoShapeLoadingContext &context); + bool loadOdfFrameElement(const KoXmlElement &element, KoShapeLoadingContext &context); + bool loadOdfData(const KoXmlElement &tableElement, KoShapeLoadingContext &context); - bool loadOdfChartElement( const KoXmlElement &chartElement, KoShapeLoadingContext &context ); + bool loadOdfChartElement(const KoXmlElement &chartElement, KoShapeLoadingContext &context); /// reimplemented - void saveOdf( KoShapeSavingContext &context ) const; - void saveOdfData( KoXmlWriter &bodyWriter, KoGenStyles &mainStyles ) const; + void saveOdf(KoShapeSavingContext &context) const; + void saveOdfData(KoXmlWriter &bodyWriter, KoGenStyles &mainStyles) const; /** * Used by unit tests to disable popping up of message boxes. * * User interaction is enabled by default. */ - static void setEnableUserInteraction( bool enable ); + static void setEnableUserInteraction(bool enable); using KoShapeContainer::update; /// reimplemented @@ -233,11 +234,11 @@ KoDocumentResourceManager *resourceManager() const; signals: - void chartTypeChanged( ChartType ); + void chartTypeChanged(ChartType); private: - bool loadEmbeddedDocument( KoStore *store, const KoXmlElement &objectElement, const KoOdfLoadingContext &loadingContext ); - + bool loadEmbeddedDocument(KoStore *store, const KoXmlElement &objectElement, + const KoOdfLoadingContext &loadingContext); class Private; Private *const d; diff -Nru calligra-2.4.0/plugins/chartshape/ChartTableModel.cpp calligra-2.4.3/plugins/chartshape/ChartTableModel.cpp --- calligra-2.4.0/plugins/chartshape/ChartTableModel.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartTableModel.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -49,7 +49,7 @@ namespace KChart { -ChartTableModel::ChartTableModel( QObject *parent /* = 0 */) +ChartTableModel::ChartTableModel(QObject *parent /* = 0 */) : QStandardItemModel(parent) { } @@ -65,15 +65,15 @@ return QHash >(); } -bool ChartTableModel::setCellRegion( const QString& /*regionName*/ ) +bool ChartTableModel::setCellRegion(const QString& /*regionName*/) { #if 0 // FIXME: What does this code do? int result = 0; const int size = regionName.size(); - for ( int i = 0; i < size; i++ ) { - result += ( CellRegion::rangeCharToInt( regionName[i].toAscii() ) - * std::pow( 10.0, ( size - i - 1 ) ) ); + for (int i = 0; i < size; i++) { + result += (CellRegion::rangeCharToInt(regionName[i].toAscii()) + * std::pow(10.0, (size - i - 1))); } return result; @@ -81,46 +81,44 @@ return true; } -bool ChartTableModel::isCellRegionValid( const QString& regionName ) const +bool ChartTableModel::isCellRegionValid(const QString& regionName) const { - Q_UNUSED( regionName ); + Q_UNUSED(regionName); return true; } -bool ChartTableModel::loadOdf( const KoXmlElement &tableElement, - KoShapeLoadingContext &context ) +bool ChartTableModel::loadOdf(const KoXmlElement &tableElement, + KoShapeLoadingContext &context) { - Q_UNUSED( context ); + Q_UNUSED(context); - setRowCount( 0 ); - setColumnCount( 0 ); + setRowCount(0); + setColumnCount(0); //QDomDocument doc; - //KoXml::asQDomElement( doc, tableElement ); + //KoXml::asQDomElement(doc, tableElement); //QTextStream stream(stdout); //stream << doc.documentElement(); int row = 0; KoXmlElement n; - forEachElement ( n, tableElement ) { - if ( n.namespaceURI() != KoXmlNS::table ) + forEachElement (n, tableElement) { + if (n.namespaceURI() != KoXmlNS::table) continue; - if ( n.localName() == "table-columns" || n.localName() == "table-header-columns" ) - { + if (n.localName() == "table-columns" || n.localName() == "table-header-columns") { int column = 0; KoXmlElement _n; - forEachElement ( _n, n ) { - if ( _n.namespaceURI() != KoXmlNS::table || _n.localName() != "table-column" ) + forEachElement (_n, n) { + if (_n.namespaceURI() != KoXmlNS::table || _n.localName() != "table-column") continue; - column += qMax( 1, _n.attributeNS( KoXmlNS::table, "number-columns-repeated" ).toInt() ); - if ( column > columnCount() ) - setColumnCount( column ); + column += qMax(1, _n.attributeNS(KoXmlNS::table, "number-columns-repeated").toInt()); + if (column > columnCount()) + setColumnCount(column); } } - else if ( n.localName() == "table-rows" || n.localName() == "table-header-rows" ) - { + else if (n.localName() == "table-rows" || n.localName() == "table-header-rows") { if (n.localName() == "table-header-rows") { if (row >= 1) { // There can only be one header-row and only at the very beginning. @@ -131,18 +129,18 @@ } KoXmlElement _n; - forEachElement ( _n, n ) { - if ( _n.namespaceURI() != KoXmlNS::table || _n.localName() != "table-row" ) + forEachElement (_n, n) { + if (_n.namespaceURI() != KoXmlNS::table || _n.localName() != "table-row") continue; // Add a row to the internal representation. - setRowCount( row + 1 ); + setRowCount(row + 1); // Loop through all cells in a table row. int column = 0; KoXmlElement __n; - forEachElement ( __n, _n ) { - if ( __n.namespaceURI() != KoXmlNS::table || __n.localName() != "table-cell" ) + forEachElement (__n, _n) { + if (__n.namespaceURI() != KoXmlNS::table || __n.localName() != "table-cell") continue; // We have a cell so be sure our column-counter is increased right now so @@ -151,27 +149,27 @@ ++column; // If this row is wider than any previous one, then add another column. - if ( column > columnCount() ) - setColumnCount( column ); + if (column > columnCount()) + setColumnCount(column); - const QString valueType = __n.attributeNS( KoXmlNS::office, "value-type" ); - QString valueString = __n.attributeNS( KoXmlNS::office, "value" ); - const KoXmlElement valueElement = __n.namedItemNS( KoXmlNS::text, "p" ).toElement(); - if ( ( valueElement.isNull() || !valueElement.isElement() ) && valueString.isEmpty() ) + const QString valueType = __n.attributeNS(KoXmlNS::office, "value-type"); + QString valueString = __n.attributeNS(KoXmlNS::office, "value"); + const KoXmlElement valueElement = __n.namedItemNS(KoXmlNS::text, "p").toElement(); + if ((valueElement.isNull() || !valueElement.isElement()) && valueString.isEmpty()) continue; // Read the actual value in the cell. QVariant value; - if ( valueString.isEmpty() ) + if (valueString.isEmpty()) valueString = valueElement.text().trimmed(); - if ( valueType == "float" ) + if (valueType == "float") value = valueString.toDouble(); - else if ( valueType == "boolean" ) + else if (valueType == "boolean") value = (bool)valueString.toInt(); - else // if ( valueType == "string" ) + else // if (valueType == "string") value = valueString; - setData( index( row, column - 1 ), value ); + setData(index(row, column - 1), value); } // foreach table:table-cell ++row; @@ -182,7 +180,7 @@ return true; } -bool ChartTableModel::saveOdf( KoXmlWriter &bodyWriter, KoGenStyles &mainStyles ) const +bool ChartTableModel::saveOdf(KoXmlWriter &bodyWriter, KoGenStyles &mainStyles ) const { Q_UNUSED(bodyWriter); Q_UNUSED(mainStyles); diff -Nru calligra-2.4.0/plugins/chartshape/ChartTableModel.h calligra-2.4.3/plugins/chartshape/ChartTableModel.h --- calligra-2.4.0/plugins/chartshape/ChartTableModel.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartTableModel.h 2012-06-26 04:18:01.000000000 +0000 @@ -50,7 +50,7 @@ Q_INTERFACES(KoChart::ChartModel) public: - ChartTableModel( QObject *parent = 0 ); + ChartTableModel(QObject *parent = 0); ~ChartTableModel(); // KoChart::ChartModel interface @@ -61,9 +61,9 @@ // Load and save the contained data in an ODF DOM tree. // FIXME: Move saving/loading logic to helper class like TableLoaderAndSaver, // this class is outdated and should be removed. - bool loadOdf( const KoXmlElement &tableElement, - KoShapeLoadingContext &context ); - bool saveOdf( KoXmlWriter &bodyWriter, KoGenStyles &mainStyles ) const; + bool loadOdf(const KoXmlElement &tableElement, + KoShapeLoadingContext &context); + bool saveOdf(KoXmlWriter &bodyWriter, KoGenStyles &mainStyles) const; }; } diff -Nru calligra-2.4.0/plugins/chartshape/ChartTableView.cpp calligra-2.4.3/plugins/chartshape/ChartTableView.cpp --- calligra-2.4.0/plugins/chartshape/ChartTableView.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartTableView.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -25,8 +25,8 @@ using namespace KChart; -ChartTableView::ChartTableView( QWidget *parent /* = 0 */ ) - : QTableView( parent ) +ChartTableView::ChartTableView(QWidget *parent /* = 0 */) + : QTableView(parent) { } @@ -37,10 +37,10 @@ /** * \reimpl */ -void ChartTableView::currentChanged( const QModelIndex ¤t, - const QModelIndex &previous ) +void ChartTableView::currentChanged(const QModelIndex ¤t, + const QModelIndex &previous) { - Q_UNUSED( previous ); + Q_UNUSED(previous); - emit currentIndexChanged( current ); + emit currentIndexChanged(current); } diff -Nru calligra-2.4.0/plugins/chartshape/ChartTableView.h calligra-2.4.3/plugins/chartshape/ChartTableView.h --- calligra-2.4.0/plugins/chartshape/ChartTableView.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartTableView.h 2012-06-26 04:18:01.000000000 +0000 @@ -30,14 +30,14 @@ Q_OBJECT public: - ChartTableView( QWidget *parent = 0 ); + ChartTableView(QWidget *parent = 0); ~ChartTableView(); signals: - void currentIndexChanged( const QModelIndex &index ); + void currentIndexChanged(const QModelIndex &index); protected slots: - void currentChanged( const QModelIndex ¤t, const QModelIndex &previous ); + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous); }; } diff -Nru calligra-2.4.0/plugins/chartshape/ChartTool.cpp calligra-2.4.3/plugins/chartshape/ChartTool.cpp --- calligra-2.4.0/plugins/chartshape/ChartTool.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartTool.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -77,7 +77,7 @@ QPen datasetSelectionPen; QBrush datasetSelectionBrush; - void setDataSetShowLabel( DataSet *dataSet, bool *number, bool *percentage, bool *category, bool *symbol ); + void setDataSetShowLabel(DataSet *dataSet, bool *number, bool *percentage, bool *category, bool *symbol); }; ChartTool::Private::Private() @@ -89,9 +89,9 @@ { } -ChartTool::ChartTool( KoCanvasBase *canvas ) - : KoToolBase( canvas ), - d( new Private() ) +ChartTool::ChartTool(KoCanvasBase *canvas) + : KoToolBase(canvas), + d(new Private()) { // Create QActions here. #if 0 @@ -99,16 +99,16 @@ m_foo = new QAction(KIcon("this-action"), i18n("Do something"), this); m_foo->setCheckable(true); group->addAction(m_foo); - connect( m_foo, SIGNAL(toggled(bool)), this, SLOT(catchFoo(bool)) ); + connect(m_foo, SIGNAL(toggled(bool)), this, SLOT(catchFoo(bool))); m_bar = new QAction(KIcon("that-action"), i18n("Do something else"), this); m_bar->setCheckable(true); group->addAction(m_bar); - connect( m_foo, SIGNAL(toggled(bool)), this, SLOT(catchBar(bool)) ); + connect(m_foo, SIGNAL(toggled(bool)), this, SLOT(catchBar(bool))); #endif - connect( canvas->shapeManager()->selection(), SIGNAL( selectionChanged() ), - this, SLOT( shapeSelectionChanged() ) ); + connect(canvas->shapeManager()->selection(), SIGNAL(selectionChanged()), + this, SLOT(shapeSelectionChanged())); } ChartTool::~ChartTool() @@ -124,22 +124,22 @@ // Let d->shape point to it. d->shape = 0; // to be sure we don't deal with an old value if nothing is found KoSelection *selection = canvas()->shapeManager()->selection(); - foreach ( KoShape *shape, selection->selectedShapes() ) { + foreach (KoShape *shape, selection->selectedShapes()) { // Find out which type of shape that the user clicked on. // We support several here, since the chart shape is comprised // of several subshapes (plotarea, legend) - d->shape = dynamic_cast( shape ); - if ( !d->shape ) { - PlotArea *plotArea = dynamic_cast( shape ); - if ( plotArea ) { + d->shape = dynamic_cast(shape); + if (!d->shape) { + PlotArea *plotArea = dynamic_cast(shape); + if (plotArea) { selectedShape = plotArea; d->shape = plotArea->parent(); } else { - Legend *legend = dynamic_cast( shape ); - if ( legend ) { + Legend *legend = dynamic_cast(shape); + if (legend) { selectedShape = legend; - d->shape = dynamic_cast( shape->parent() ); + d->shape = dynamic_cast(shape->parent()); } } // The selected shape is the chart @@ -149,12 +149,12 @@ // Insert the values from the selected shape (note: not only // chart shape, but also plotarea or legend) into the tool // option widget. - if ( selectedShape ) { - foreach ( QWidget *w, optionWidgets() ) { + if (selectedShape) { + foreach (QWidget *w, optionWidgets()) { KoShapeConfigWidgetBase *widget = dynamic_cast(w); - Q_ASSERT( widget ); - if ( widget ) - widget->open( selectedShape ); + Q_ASSERT(widget); + if (widget) + widget->open(selectedShape); } // We support only one selected chart at the time, so once @@ -165,64 +165,64 @@ } // If we couldn't determine a chart shape, then there is nothing to do. - if ( !d->shape ) { // none found + if (!d->shape) { // none found emit done(); return; } } -void ChartTool::paint( QPainter &painter, const KoViewConverter &converter) +void ChartTool::paint(QPainter &painter, const KoViewConverter &converter) { - Q_UNUSED( painter ); - Q_UNUSED( converter ); + Q_UNUSED(painter); + Q_UNUSED(converter); } -void ChartTool::mousePressEvent( KoPointerEvent *event ) +void ChartTool::mousePressEvent(KoPointerEvent *event) { #if 1 // disabled - Q_UNUSED( event ); + Q_UNUSED(event); return; #else // Select dataset - if ( !d->shape || !d->shape->kdChart() || ! d->shape->kdChart()->coordinatePlane() - || !d->shape->kdChart()->coordinatePlane()->diagram() ) + if ( !d->shape || !d->shape->kdChart() || ! d->shape->kdChart()->coordinatePlane() + || !d->shape->kdChart()->coordinatePlane()->diagram()) return; QPointF point = event->point - d->shape->position(); - QModelIndex selection = d->shape->kdChart()->coordinatePlane()->diagram()->indexAt( point.toPoint() ); + QModelIndex selection = d->shape->kdChart()->coordinatePlane()->diagram()->indexAt(point.toPoint()); // Note: the dataset will always stay column() due to the transformations being // done internally by the ChartProxyModel int dataset = selection.column(); - if ( d->datasetSelection.isValid() ) { - d->shape->kdChart()->coordinatePlane()->diagram()->setPen( d->datasetSelection.column(), d->datasetSelectionPen ); - //d->shape->kdChart()->coordinatePlane()->diagram()->setBrush( d->datasetSelection, d->datasetSelectionBrush ); + if (d->datasetSelection.isValid()) { + d->shape->kdChart()->coordinatePlane()->diagram()->setPen(d->datasetSelection.column(), d->datasetSelectionPen); + //d->shape->kdChart()->coordinatePlane()->diagram()->setBrush(d->datasetSelection, d->datasetSelectionBrush); } - if ( selection.isValid() ) { + if (selection.isValid()) { d->datasetSelection = selection; - QPen pen( Qt::DotLine ); - pen.setColor( Qt::darkGray ); - pen.setWidth( 1 ); + QPen pen(Qt::DotLine); + pen.setColor(Qt::darkGray); + pen.setWidth(1); - d->datasetSelectionBrush = d->shape->kdChart()->coordinatePlane()->diagram()->brush( selection ); - d->datasetSelectionPen = d->shape->kdChart()->coordinatePlane()->diagram()->pen( dataset ); + d->datasetSelectionBrush = d->shape->kdChart()->coordinatePlane()->diagram()->brush(selection); + d->datasetSelectionPen = d->shape->kdChart()->coordinatePlane()->diagram()->pen(dataset); - d->shape->kdChart()->coordinatePlane()->diagram()->setPen( dataset, pen ); - //d->shape->kdChart()->coordinatePlane()->diagram()->setBrush( selection, QBrush( Qt::lightGray ) ); + d->shape->kdChart()->coordinatePlane()->diagram()->setPen(dataset, pen); + //d->shape->kdChart()->coordinatePlane()->diagram()->setBrush(selection, QBrush(Qt::lightGray)); } - ((ChartConfigWidget*)optionWidget())->selectDataset( dataset ); + ((ChartConfigWidget*)optionWidget())->selectDataset(dataset); d->shape->update(); #endif } -void ChartTool::mouseMoveEvent( KoPointerEvent *event ) +void ChartTool::mouseMoveEvent(KoPointerEvent *event) { event->ignore(); } -void ChartTool::mouseReleaseEvent( KoPointerEvent *event ) +void ChartTool::mouseReleaseEvent(KoPointerEvent *event) { event->ignore(); } @@ -249,7 +249,7 @@ // chart shape is destructed. foreach (QWidget *w, optionWidgets()) { ChartConfigWidget *configWidget = dynamic_cast(w); - if ( configWidget ) + if (configWidget) configWidget->deleteSubDialogs(); } } @@ -259,112 +259,112 @@ { ChartConfigWidget *widget = new ChartConfigWidget(); - connect( widget, SIGNAL( dataSetXDataRegionChanged( DataSet*, const CellRegion& ) ), - this, SLOT( setDataSetXDataRegion( DataSet*, const CellRegion& ) ) ); - connect( widget, SIGNAL( dataSetYDataRegionChanged( DataSet*, const CellRegion& ) ), - this, SLOT( setDataSetYDataRegion( DataSet*, const CellRegion& ) ) ); - connect( widget, SIGNAL( dataSetCustomDataRegionChanged( DataSet*, const CellRegion& ) ), - this, SLOT( setDataSetCustomDataRegion( DataSet*, const CellRegion& ) ) ); - connect( widget, SIGNAL( dataSetLabelDataRegionChanged( DataSet*, const CellRegion& ) ), - this, SLOT( setDataSetLabelDataRegion( DataSet*, const CellRegion& ) ) ); - connect( widget, SIGNAL( dataSetCategoryDataRegionChanged( DataSet*, const CellRegion& ) ), - this, SLOT( setDataSetCategoryDataRegion( DataSet*, const CellRegion& ) ) ); - connect( widget, SIGNAL( dataSetChartTypeChanged( DataSet*, ChartType ) ), - this, SLOT( setDataSetChartType( DataSet*, ChartType ) ) ); - connect( widget, SIGNAL( dataSetChartSubTypeChanged( DataSet*, ChartSubtype ) ), - this, SLOT( setDataSetChartSubType( DataSet*, ChartSubtype ) ) ); - connect( widget, SIGNAL( datasetBrushChanged( DataSet*, const QColor& ) ), - this, SLOT( setDataSetBrush( DataSet*, const QColor& ) ) ); - connect( widget, SIGNAL( datasetPenChanged( DataSet*, const QColor& ) ), - this, SLOT( setDataSetPen( DataSet*, const QColor& ) ) ); - connect( widget, SIGNAL( datasetShowCategoryChanged( DataSet*, bool ) ), - this, SLOT( setDataSetShowCategory( DataSet*, bool ) ) ); - connect( widget, SIGNAL( dataSetShowNumberChanged( DataSet*, bool ) ), - this, SLOT( setDataSetShowNumber( DataSet*, bool ) ) ); - connect( widget, SIGNAL( datasetShowPercentChanged( DataSet*, bool ) ), - this, SLOT( setDataSetShowPercent( DataSet*, bool ) ) ); - connect( widget, SIGNAL( datasetShowSymbolChanged( DataSet*, bool ) ), - this, SLOT( setDataSetShowSymbol( DataSet*, bool ) ) ); - connect( widget, SIGNAL( dataSetAxisChanged( DataSet*, Axis* ) ), - this, SLOT( setDataSetAxis( DataSet*, Axis* ) ) ); - connect( widget, SIGNAL( gapBetweenBarsChanged( int ) ), - this, SLOT( setGapBetweenBars( int ) ) ); - connect( widget, SIGNAL( gapBetweenSetsChanged( int ) ), - this, SLOT( setGapBetweenSets( int ) ) ); - connect( widget, SIGNAL( pieExplodeFactorChanged( DataSet*, int ) ), - this, SLOT( setPieExplodeFactor( DataSet*, int ) ) ); + connect(widget, SIGNAL(dataSetXDataRegionChanged(DataSet*, const CellRegion&)), + this, SLOT(setDataSetXDataRegion(DataSet*, const CellRegion&))); + connect(widget, SIGNAL(dataSetYDataRegionChanged(DataSet*, const CellRegion&)), + this, SLOT(setDataSetYDataRegion(DataSet*, const CellRegion&))); + connect(widget, SIGNAL(dataSetCustomDataRegionChanged(DataSet*, const CellRegion&)), + this, SLOT(setDataSetCustomDataRegion(DataSet*, const CellRegion&))); + connect(widget, SIGNAL(dataSetLabelDataRegionChanged(DataSet*, const CellRegion&)), + this, SLOT(setDataSetLabelDataRegion(DataSet*, const CellRegion&))); + connect(widget, SIGNAL(dataSetCategoryDataRegionChanged(DataSet*, const CellRegion&)), + this, SLOT(setDataSetCategoryDataRegion(DataSet*, const CellRegion&))); + connect(widget, SIGNAL(dataSetChartTypeChanged(DataSet*, ChartType)), + this, SLOT(setDataSetChartType(DataSet*, ChartType))); + connect(widget, SIGNAL(dataSetChartSubTypeChanged(DataSet*, ChartSubtype)), + this, SLOT(setDataSetChartSubType(DataSet*, ChartSubtype))); + connect(widget, SIGNAL(datasetBrushChanged(DataSet*, const QColor&)), + this, SLOT(setDataSetBrush(DataSet*, const QColor&))); + connect(widget, SIGNAL(datasetPenChanged(DataSet*, const QColor&)), + this, SLOT(setDataSetPen(DataSet*, const QColor&))); + connect(widget, SIGNAL(datasetShowCategoryChanged(DataSet*, bool)), + this, SLOT(setDataSetShowCategory(DataSet*, bool))); + connect(widget, SIGNAL(dataSetShowNumberChanged(DataSet*, bool)), + this, SLOT(setDataSetShowNumber(DataSet*, bool))); + connect(widget, SIGNAL(datasetShowPercentChanged(DataSet*, bool)), + this, SLOT(setDataSetShowPercent(DataSet*, bool))); + connect(widget, SIGNAL(datasetShowSymbolChanged(DataSet*, bool)), + this, SLOT(setDataSetShowSymbol(DataSet*, bool))); + connect(widget, SIGNAL(dataSetAxisChanged(DataSet*, Axis*)), + this, SLOT(setDataSetAxis(DataSet*, Axis*))); + connect(widget, SIGNAL(gapBetweenBarsChanged(int)), + this, SLOT(setGapBetweenBars(int))); + connect(widget, SIGNAL(gapBetweenSetsChanged(int)), + this, SLOT(setGapBetweenSets(int))); + connect(widget, SIGNAL(pieExplodeFactorChanged(DataSet*, int)), + this, SLOT(setPieExplodeFactor(DataSet*, int))); - connect( widget, SIGNAL( showLegendChanged( bool ) ), - this, SLOT( setShowLegend( bool ) )); + connect(widget, SIGNAL(showLegendChanged(bool)), + this, SLOT(setShowLegend(bool))); - connect( widget, SIGNAL( chartTypeChanged( ChartType ) ), - this, SLOT( setChartType( ChartType ) ) ); - connect( widget, SIGNAL( chartSubTypeChanged( ChartSubtype ) ), - this, SLOT( setChartSubType( ChartSubtype ) ) ); - connect( widget, SIGNAL( threeDModeToggled( bool ) ), - this, SLOT( setThreeDMode( bool ) ) ); - connect( widget, SIGNAL( showTitleChanged( bool ) ), - this, SLOT( setShowTitle( bool ) ) ); - connect( widget, SIGNAL( showSubTitleChanged( bool ) ), - this, SLOT( setShowSubTitle( bool ) ) ); - connect( widget, SIGNAL( showFooterChanged( bool ) ), - this, SLOT( setShowFooter( bool ) ) ); - - connect( widget, SIGNAL( axisAdded( AxisDimension, const QString& ) ), - this, SLOT( addAxis( AxisDimension, const QString& ) ) ); - connect( widget, SIGNAL( axisRemoved( Axis* ) ), - this, SLOT( removeAxis( Axis* ) ) ); - connect( widget, SIGNAL( axisTitleChanged( Axis*, const QString& ) ), - this, SLOT( setAxisTitle( Axis*, const QString& ) ) ); - connect( widget, SIGNAL( axisShowTitleChanged( Axis*, bool ) ), - this, SLOT( setAxisShowTitle( Axis*, bool ) ) ); - connect( widget, SIGNAL( axisShowGridLinesChanged( Axis*, bool ) ), - this, SLOT( setAxisShowGridLines( Axis*, bool ) ) ); - connect( widget, SIGNAL( axisUseLogarithmicScalingChanged( Axis*, bool ) ), - this, SLOT( setAxisUseLogarithmicScaling( Axis*, bool ) ) ); - connect( widget, SIGNAL( axisStepWidthChanged( Axis*, qreal ) ), - this, SLOT( setAxisStepWidth( Axis*, qreal ) ) ); - connect( widget, SIGNAL( axisSubStepWidthChanged( Axis*, qreal ) ), - this, SLOT( setAxisSubStepWidth( Axis*, qreal ) ) ); - connect( widget, SIGNAL( axisUseAutomaticStepWidthChanged( Axis*, bool ) ), - this, SLOT( setAxisUseAutomaticStepWidth( Axis*, bool ) ) ); - connect( widget, SIGNAL( axisUseAutomaticSubStepWidthChanged( Axis*, bool ) ), - this, SLOT( setAxisUseAutomaticSubStepWidth( Axis*, bool ) ) ); - - connect( widget, SIGNAL( legendTitleChanged( const QString& ) ), - this, SLOT( setLegendTitle( const QString& ) ) ); - connect( widget, SIGNAL( legendFontChanged( const QFont& ) ), - this, SLOT( setLegendFont( const QFont& ) ) ); - connect( widget, SIGNAL( legendFontSizeChanged( int ) ), - this, SLOT( setLegendFontSize( int ) ) ); - - connect( widget, SIGNAL( legendOrientationChanged( Qt::Orientation ) ), - this, SLOT( setLegendOrientation( Qt::Orientation ) ) ); - connect( widget, SIGNAL( legendAlignmentChanged( Qt::Alignment ) ), - this, SLOT( setLegendAlignment( Qt::Alignment ) ) ); + connect(widget, SIGNAL(chartTypeChanged(ChartType)), + this, SLOT(setChartType(ChartType))); + connect(widget, SIGNAL(chartSubTypeChanged(ChartSubtype)), + this, SLOT(setChartSubType(ChartSubtype))); + connect(widget, SIGNAL(threeDModeToggled(bool)), + this, SLOT(setThreeDMode(bool))); + connect(widget, SIGNAL(showTitleChanged(bool)), + this, SLOT(setShowTitle(bool))); + connect(widget, SIGNAL(showSubTitleChanged(bool)), + this, SLOT(setShowSubTitle(bool))); + connect(widget, SIGNAL(showFooterChanged(bool)), + this, SLOT(setShowFooter(bool))); + + connect(widget, SIGNAL(axisAdded(AxisDimension, const QString&)), + this, SLOT(addAxis(AxisDimension, const QString&))); + connect(widget, SIGNAL(axisRemoved(Axis*)), + this, SLOT(removeAxis(Axis*))); + connect(widget, SIGNAL(axisTitleChanged(Axis*, const QString&)), + this, SLOT(setAxisTitle(Axis*, const QString&))); + connect(widget, SIGNAL(axisShowTitleChanged(Axis*, bool)), + this, SLOT(setAxisShowTitle(Axis*, bool))); + connect(widget, SIGNAL(axisShowGridLinesChanged(Axis*, bool)), + this, SLOT(setAxisShowGridLines(Axis*, bool))); + connect(widget, SIGNAL(axisUseLogarithmicScalingChanged(Axis*, bool)), + this, SLOT(setAxisUseLogarithmicScaling(Axis*, bool))); + connect(widget, SIGNAL(axisStepWidthChanged(Axis*, qreal)), + this, SLOT(setAxisStepWidth(Axis*, qreal))); + connect(widget, SIGNAL(axisSubStepWidthChanged(Axis*, qreal)), + this, SLOT(setAxisSubStepWidth(Axis*, qreal))); + connect(widget, SIGNAL(axisUseAutomaticStepWidthChanged(Axis*, bool)), + this, SLOT(setAxisUseAutomaticStepWidth(Axis*, bool))); + connect(widget, SIGNAL(axisUseAutomaticSubStepWidthChanged(Axis*, bool)), + this, SLOT(setAxisUseAutomaticSubStepWidth(Axis*, bool))); + + connect(widget, SIGNAL(legendTitleChanged(const QString&)), + this, SLOT(setLegendTitle(const QString&))); + connect(widget, SIGNAL(legendFontChanged(const QFont&)), + this, SLOT(setLegendFont(const QFont&))); + connect(widget, SIGNAL(legendFontSizeChanged(int)), + this, SLOT(setLegendFontSize(int))); + + connect(widget, SIGNAL(legendOrientationChanged(Qt::Orientation)), + this, SLOT(setLegendOrientation(Qt::Orientation))); + connect(widget, SIGNAL(legendAlignmentChanged(Qt::Alignment)), + this, SLOT(setLegendAlignment(Qt::Alignment))); - connect( widget, SIGNAL( legendFixedPositionChanged( Position ) ), - this, SLOT( setLegendFixedPosition( Position ) ) ); + connect(widget, SIGNAL(legendFixedPositionChanged(Position)), + this, SLOT(setLegendFixedPosition(Position))); - connect( widget, SIGNAL( legendBackgroundColorChanged( const QColor& ) ) , - this, SLOT( setLegendBackgroundColor( const QColor& ) ) ); - connect( widget, SIGNAL( legendFrameColorChanged( const QColor& ) ) , - this, SLOT( setLegendFrameColor( const QColor& ) ) ); - connect( widget, SIGNAL( legendShowFrameChanged( bool ) ) , - this, SLOT( setLegendShowFrame( bool ) ) ); + connect(widget, SIGNAL(legendBackgroundColorChanged(const QColor&)) , + this, SLOT(setLegendBackgroundColor(const QColor&))); + connect(widget, SIGNAL(legendFrameColorChanged(const QColor&)) , + this, SLOT(setLegendFrameColor(const QColor&))); + connect(widget, SIGNAL(legendShowFrameChanged(bool)) , + this, SLOT(setLegendShowFrame(bool))); return widget; } -void ChartTool::setChartType( ChartType type, ChartSubtype subtype ) +void ChartTool::setChartType(ChartType type, ChartSubtype subtype) { - Q_ASSERT( d->shape ); - if ( !d->shape ) + Q_ASSERT(d->shape); + if (!d->shape) return; - d->shape->setChartType( type ); - d->shape->setChartSubType( subtype ); + d->shape->setChartType(type); + d->shape->setChartSubType(subtype); d->shape->update(); d->shape->legend()->update(); @@ -373,392 +373,392 @@ } -void ChartTool::setChartSubType( ChartSubtype subtype ) +void ChartTool::setChartSubType(ChartSubtype subtype) { - Q_ASSERT( d->shape ); - if ( !d->shape ) + Q_ASSERT(d->shape); + if (!d->shape) return; - d->shape->setChartSubType( subtype ); + d->shape->setChartSubType(subtype); d->shape->update(); } -void ChartTool::setDataSetXDataRegion( DataSet *dataSet, const CellRegion ®ion ) +void ChartTool::setDataSetXDataRegion(DataSet *dataSet, const CellRegion ®ion) { - if ( !dataSet ) + if (!dataSet) return; - dataSet->setXDataRegion( region ); + dataSet->setXDataRegion(region); } -void ChartTool::setDataSetYDataRegion( DataSet *dataSet, const CellRegion ®ion ) +void ChartTool::setDataSetYDataRegion(DataSet *dataSet, const CellRegion ®ion) { - if ( !dataSet ) + if (!dataSet) return; - dataSet->setYDataRegion( region ); + dataSet->setYDataRegion(region); } -void ChartTool::setDataSetCustomDataRegion( DataSet *dataSet, const CellRegion ®ion ) +void ChartTool::setDataSetCustomDataRegion(DataSet *dataSet, const CellRegion ®ion) { - if ( !dataSet ) + if (!dataSet) return; - dataSet->setCustomDataRegion( region ); + dataSet->setCustomDataRegion(region); } -void ChartTool::setDataSetLabelDataRegion( DataSet *dataSet, const CellRegion ®ion ) +void ChartTool::setDataSetLabelDataRegion(DataSet *dataSet, const CellRegion ®ion) { - if ( !dataSet ) + if (!dataSet) return; - dataSet->setLabelDataRegion( region ); + dataSet->setLabelDataRegion(region); } -void ChartTool::setDataSetCategoryDataRegion( DataSet *dataSet, const CellRegion ®ion ) +void ChartTool::setDataSetCategoryDataRegion(DataSet *dataSet, const CellRegion ®ion) { - if ( !dataSet ) + if (!dataSet) return; - dataSet->setCategoryDataRegion( region ); + dataSet->setCategoryDataRegion(region); } -void ChartTool::setDataSetChartType( DataSet *dataSet, ChartType type ) +void ChartTool::setDataSetChartType(DataSet *dataSet, ChartType type) { - Q_ASSERT( d->shape ); - Q_ASSERT( dataSet ); - if ( dataSet ) - dataSet->setChartType( type ); + Q_ASSERT(d->shape); + Q_ASSERT(dataSet); + if (dataSet) + dataSet->setChartType(type); d->shape->update(); d->shape->legend()->update(); } -void ChartTool::setDataSetChartSubType( DataSet *dataSet, ChartSubtype subType ) +void ChartTool::setDataSetChartSubType(DataSet *dataSet, ChartSubtype subType) { - Q_ASSERT( dataSet ); - if ( dataSet ) - dataSet->setChartSubType( subType ); + Q_ASSERT(dataSet); + if (dataSet) + dataSet->setChartSubType(subType); d->shape->update(); } -void ChartTool::setDataSetBrush( DataSet *dataSet, const QColor& color ) +void ChartTool::setDataSetBrush(DataSet *dataSet, const QColor& color) { - Q_ASSERT( d->shape ); - if ( !dataSet ) + Q_ASSERT(d->shape); + if (!dataSet) return; - dataSet->setBrush( QBrush( color ) ); + dataSet->setBrush(QBrush(color)); d->shape->update(); } -void ChartTool::setDataSetPen( DataSet *dataSet, const QColor& color ) +void ChartTool::setDataSetPen(DataSet *dataSet, const QColor& color) { - Q_ASSERT( d->shape ); - if ( !dataSet ) + Q_ASSERT(d->shape); + if (!dataSet) return; - dataSet->setPen( QPen( color ) ); + dataSet->setPen(QPen(color)); d->shape->update(); } -void ChartTool::setDataSetAxis( DataSet *dataSet, Axis *axis ) +void ChartTool::setDataSetAxis(DataSet *dataSet, Axis *axis) { - Q_ASSERT( d->shape ); - if ( !dataSet || !axis ) + Q_ASSERT(d->shape); + if (!dataSet || !axis) return; - dataSet->attachedAxis()->detachDataSet( dataSet ); - axis->attachDataSet( dataSet ); + dataSet->attachedAxis()->detachDataSet(dataSet); + axis->attachDataSet(dataSet); d->shape->update(); } -void ChartTool::Private::setDataSetShowLabel( DataSet *dataSet, bool *number, bool *percentage, bool *category, bool *symbol ) +void ChartTool::Private::setDataSetShowLabel(DataSet *dataSet, bool *number, bool *percentage, bool *category, bool *symbol) { - Q_ASSERT( shape ); - if ( !dataSet ) + Q_ASSERT(shape); + if (!dataSet) return; DataSet::ValueLabelType type = dataSet->valueLabelType(); - if ( number ) type.number = *number; - if ( percentage ) type.percentage = *percentage; - if ( category ) type.category = *category; - if ( symbol ) type.symbol = *symbol; - dataSet->setValueLabelType( type ); + if (number) type.number = *number; + if (percentage) type.percentage = *percentage; + if (category) type.category = *category; + if (symbol) type.symbol = *symbol; + dataSet->setValueLabelType(type); // its necessary to set this for all data value //TODO we need to allow to differ in the UI between the datasets vs // the global setting and then allow to edit them separatly. - for ( int i = 0; i < dataSet->size(); ++i ) { - DataSet::ValueLabelType type = dataSet->valueLabelType( i ); - if ( number ) type.number = *number; - if ( percentage ) type.percentage = *percentage; - if ( category ) type.category = *category; - if ( symbol ) type.symbol = *symbol; - dataSet->setValueLabelType( type, i ); + for (int i = 0; i < dataSet->size(); ++i) { + DataSet::ValueLabelType type = dataSet->valueLabelType(i); + if (number) type.number = *number; + if (percentage) type.percentage = *percentage; + if (category) type.category = *category; + if (symbol) type.symbol = *symbol; + dataSet->setValueLabelType(type, i); } shape->update(); } -void ChartTool::setDataSetShowCategory( DataSet *dataSet, bool b ) +void ChartTool::setDataSetShowCategory(DataSet *dataSet, bool b) { - d->setDataSetShowLabel( dataSet, 0, 0, &b, 0 ); + d->setDataSetShowLabel(dataSet, 0, 0, &b, 0); } -void ChartTool::setDataSetShowNumber( DataSet *dataSet, bool b ) +void ChartTool::setDataSetShowNumber(DataSet *dataSet, bool b) { - d->setDataSetShowLabel( dataSet, &b, 0, 0, 0 ); + d->setDataSetShowLabel(dataSet, &b, 0, 0, 0); } -void ChartTool::setDataSetShowPercent( DataSet *dataSet, bool b ) +void ChartTool::setDataSetShowPercent(DataSet *dataSet, bool b) { - d->setDataSetShowLabel( dataSet, 0, &b, 0, 0 ); + d->setDataSetShowLabel(dataSet, 0, &b, 0, 0); } -void ChartTool::setDataSetShowSymbol( DataSet *dataSet, bool b ) +void ChartTool::setDataSetShowSymbol(DataSet *dataSet, bool b) { - d->setDataSetShowLabel( dataSet, 0, 0, 0, &b ); + d->setDataSetShowLabel(dataSet, 0, 0, 0, &b); } -void ChartTool::setThreeDMode( bool threeD ) +void ChartTool::setThreeDMode(bool threeD) { - Q_ASSERT( d->shape ); - if ( !d->shape ) + Q_ASSERT(d->shape); + if (!d->shape) return; - d->shape->setThreeD( threeD ); + d->shape->setThreeD(threeD); d->shape->update(); } -void ChartTool::setShowTitle( bool show ) +void ChartTool::setShowTitle(bool show) { - Q_ASSERT( d->shape ); - if ( !d->shape ) + Q_ASSERT(d->shape); + if (!d->shape) return; d->shape->showTitle(show); d->shape->update(); } -void ChartTool::setShowSubTitle( bool show ) +void ChartTool::setShowSubTitle(bool show) { - Q_ASSERT( d->shape ); - if ( !d->shape ) + Q_ASSERT(d->shape); + if (!d->shape) return; d->shape->showSubTitle(show); d->shape->update(); } -void ChartTool::setShowFooter( bool show ) +void ChartTool::setShowFooter(bool show) { - Q_ASSERT( d->shape ); - if ( !d->shape ) + Q_ASSERT(d->shape); + if (!d->shape) return; d->shape->showFooter(show); d->shape->update(); } -void ChartTool::setDataDirection( Qt::Orientation direction ) +void ChartTool::setDataDirection(Qt::Orientation direction) { - Q_ASSERT( d->shape ); - if ( !d->shape ) + Q_ASSERT(d->shape); + if (!d->shape) return; - d->shape->proxyModel()->setDataDirection( direction ); + d->shape->proxyModel()->setDataDirection(direction); d->shape->relayout(); } -void ChartTool::setLegendTitle( const QString &title ) +void ChartTool::setLegendTitle(const QString &title) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setTitle( title ); + d->shape->legend()->setTitle(title); d->shape->legend()->update(); } -void ChartTool::setLegendFont( const QFont &font ) +void ChartTool::setLegendFont(const QFont &font) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); // There only is a general font, for the legend items and the legend title - d->shape->legend()->setFont( font ); + d->shape->legend()->setFont(font); d->shape->legend()->update(); } -void ChartTool::setLegendFontSize( int size ) +void ChartTool::setLegendFontSize(int size) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setFontSize( size ); + d->shape->legend()->setFontSize(size); d->shape->legend()->update(); } -void ChartTool::setLegendOrientation( Qt::Orientation orientation ) +void ChartTool::setLegendOrientation(Qt::Orientation orientation) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setExpansion( QtOrientationToLegendExpansion( orientation ) ); + d->shape->legend()->setExpansion(QtOrientationToLegendExpansion(orientation)); d->shape->legend()->update(); } -void ChartTool::setLegendAlignment( Qt::Alignment alignment ) +void ChartTool::setLegendAlignment(Qt::Alignment alignment) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setAlignment( alignment ); + d->shape->legend()->setAlignment(alignment); d->shape->legend()->update(); } -void ChartTool::setLegendFixedPosition( Position position ) +void ChartTool::setLegendFixedPosition(Position position) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setLegendPosition( position ); + d->shape->legend()->setLegendPosition(position); foreach (QWidget *w, optionWidgets()) { - ( ( ChartConfigWidget* ) w )->updateFixedPosition( position ); + ((ChartConfigWidget*) w)->updateFixedPosition(position); } d->shape->legend()->update(); } -void ChartTool::setLegendBackgroundColor( const QColor& color ) +void ChartTool::setLegendBackgroundColor(const QColor& color) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setBackgroundColor( color ); + d->shape->legend()->setBackgroundColor(color); d->shape->legend()->update(); } -void ChartTool::setLegendFrameColor( const QColor& color ) +void ChartTool::setLegendFrameColor(const QColor& color) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setFrameColor( color ); + d->shape->legend()->setFrameColor(color); d->shape->legend()->update(); } -void ChartTool::setLegendShowFrame( bool show ) +void ChartTool::setLegendShowFrame(bool show) { - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->legend() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->legend()); - d->shape->legend()->setShowFrame( show ); + d->shape->legend()->setShowFrame(show); d->shape->legend()->update(); } -void ChartTool::addAxis( AxisDimension dimension, const QString& title ) +void ChartTool::addAxis(AxisDimension dimension, const QString& title) { - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); - Axis *axis = new Axis( d->shape->plotArea(), dimension ); - axis->setTitleText( title ); + Axis *axis = new Axis(d->shape->plotArea(), dimension); + axis->setTitleText(title); d->shape->update(); } -void ChartTool::removeAxis( Axis *axis ) +void ChartTool::removeAxis(Axis *axis) { - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); - d->shape->plotArea()->removeAxis( axis ); + d->shape->plotArea()->removeAxis(axis); d->shape->update(); } -void ChartTool::setAxisTitle( Axis *axis, const QString& title ) +void ChartTool::setAxisTitle(Axis *axis, const QString& title) { - axis->setTitleText( title ); + axis->setTitleText(title); d->shape->update(); } -void ChartTool::setAxisShowTitle( Axis *axis, bool show ) +void ChartTool::setAxisShowTitle(Axis *axis, bool show) { - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); - axis->title()->setVisible( show ); + axis->title()->setVisible(show); d->shape->update(); } -void ChartTool::setAxisShowGridLines( Axis *axis, bool b ) +void ChartTool::setAxisShowGridLines(Axis *axis, bool b) { - axis->setShowMajorGrid( b ); - axis->setShowMinorGrid( b ); + axis->setShowMajorGrid(b); + axis->setShowMinorGrid(b); d->shape->update(); } -void ChartTool::setAxisUseLogarithmicScaling( Axis *axis, bool b ) +void ChartTool::setAxisUseLogarithmicScaling(Axis *axis, bool b) { - axis->setScalingLogarithmic( b ); + axis->setScalingLogarithmic(b); d->shape->update(); } -void ChartTool::setAxisStepWidth( Axis *axis, qreal width ) +void ChartTool::setAxisStepWidth(Axis *axis, qreal width) { - axis->setMajorInterval( width ); + axis->setMajorInterval(width); d->shape->update(); } -void ChartTool::setAxisSubStepWidth( Axis *axis, qreal width ) +void ChartTool::setAxisSubStepWidth(Axis *axis, qreal width) { - axis->setMinorInterval( width ); + axis->setMinorInterval(width); d->shape->update(); } -void ChartTool::setAxisUseAutomaticStepWidth( Axis *axis, bool automatic ) +void ChartTool::setAxisUseAutomaticStepWidth(Axis *axis, bool automatic) { - axis->setUseAutomaticMajorInterval( automatic ); + axis->setUseAutomaticMajorInterval(automatic); d->shape->update(); } -void ChartTool::setAxisUseAutomaticSubStepWidth( Axis *axis, bool automatic ) +void ChartTool::setAxisUseAutomaticSubStepWidth(Axis *axis, bool automatic) { - axis->setUseAutomaticMinorInterval( automatic ); + axis->setUseAutomaticMinorInterval(automatic); d->shape->update(); } -void ChartTool::setGapBetweenBars( int percent ) +void ChartTool::setGapBetweenBars(int percent) { - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); - d->shape->plotArea()->setGapBetweenBars( percent ); + d->shape->plotArea()->setGapBetweenBars(percent); d->shape->update(); } -void ChartTool::setGapBetweenSets( int percent ) +void ChartTool::setGapBetweenSets(int percent) { - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); - d->shape->plotArea()->setGapBetweenSets( percent ); + d->shape->plotArea()->setGapBetweenSets(percent); d->shape->update(); } -void ChartTool::setPieExplodeFactor( DataSet *dataSet, int percent ) +void ChartTool::setPieExplodeFactor(DataSet *dataSet, int percent) { - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); - dataSet->setPieExplodeFactor( percent ); + dataSet->setPieExplodeFactor(percent); d->shape->update(); } -void ChartTool::setShowLegend( bool b ) +void ChartTool::setShowLegend(bool b) { - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); - d->shape->legend()->setVisible( b ); + d->shape->legend()->setVisible(b); d->shape->legend()->update(); } diff -Nru calligra-2.4.0/plugins/chartshape/ChartToolFactory.cpp calligra-2.4.3/plugins/chartshape/ChartToolFactory.cpp --- calligra-2.4.0/plugins/chartshape/ChartToolFactory.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartToolFactory.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -35,20 +35,20 @@ ChartToolFactory::ChartToolFactory() : KoToolFactoryBase("ChartToolFactory_ID") { - setToolTip ( i18n( "Chart Editing Tool" ) ); - setToolType ( dynamicToolType() ); - setIcon ( "kchart" ); - setPriority ( 1 ); - setActivationShapeId ( ChartShapeId ); + setToolTip (i18n("Chart Editing Tool")); + setToolType (dynamicToolType()); + setIcon ("kchart"); + setPriority (1); + setActivationShapeId (ChartShapeId); } ChartToolFactory::~ChartToolFactory() { } -KoToolBase *ChartToolFactory::createTool( KoCanvasBase *canvas ) +KoToolBase *ChartToolFactory::createTool(KoCanvasBase *canvas) { - return new ChartTool( canvas ); + return new ChartTool(canvas); } diff -Nru calligra-2.4.0/plugins/chartshape/ChartToolFactory.h calligra-2.4.3/plugins/chartshape/ChartToolFactory.h --- calligra-2.4.0/plugins/chartshape/ChartToolFactory.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartToolFactory.h 2012-06-26 04:18:01.000000000 +0000 @@ -34,7 +34,7 @@ ChartToolFactory(); ~ChartToolFactory(); - KoToolBase * createTool( KoCanvasBase *canvas ); + KoToolBase * createTool(KoCanvasBase *canvas); }; } // namespace KChart diff -Nru calligra-2.4.0/plugins/chartshape/ChartTool.h calligra-2.4.3/plugins/chartshape/ChartTool.h --- calligra-2.4.0/plugins/chartshape/ChartTool.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ChartTool.h 2012-06-26 04:18:01.000000000 +0000 @@ -48,14 +48,14 @@ ~ChartTool(); /// reimplemented from superclass - virtual void paint( QPainter &painter, const KoViewConverter &converter ); + virtual void paint(QPainter &painter, const KoViewConverter &converter); /// reimplemented from superclass - virtual void mousePressEvent( KoPointerEvent *event ) ; + virtual void mousePressEvent(KoPointerEvent *event) ; /// reimplemented from superclass - virtual void mouseMoveEvent( KoPointerEvent *event ); + virtual void mouseMoveEvent(KoPointerEvent *event); /// reimplemented from superclass - virtual void mouseReleaseEvent( KoPointerEvent *event ); + virtual void mouseReleaseEvent(KoPointerEvent *event); /// reimplemented from superclass virtual void activate(ToolActivation toolActivation, const QSet &shapes); /// reimplemented from superclass @@ -64,61 +64,61 @@ virtual QWidget *createOptionWidget(); private slots: - void setChartType( ChartType type, ChartSubtype subtype = NoChartSubtype ); - void setChartSubType( ChartSubtype subtype ); - void setThreeDMode( bool threeD ); - void setDataDirection( Qt::Orientation ); - void setShowTitle( bool show ); - void setShowSubTitle( bool show ); - void setShowFooter( bool show ); + void setChartType(ChartType type, ChartSubtype subtype = NoChartSubtype); + void setChartSubType(ChartSubtype subtype); + void setThreeDMode(bool threeD); + void setDataDirection(Qt::Orientation); + void setShowTitle(bool show); + void setShowSubTitle(bool show); + void setShowFooter(bool show); // Datasets - void setDataSetXDataRegion( DataSet *dataSet, const CellRegion ®ion ); - void setDataSetYDataRegion( DataSet *dataSet, const CellRegion ®ion ); - void setDataSetCustomDataRegion( DataSet *dataSet, const CellRegion ®ion ); - void setDataSetLabelDataRegion( DataSet *dataSet, const CellRegion ®ion ); - void setDataSetCategoryDataRegion( DataSet *dataSet, const CellRegion ®ion ); + void setDataSetXDataRegion(DataSet *dataSet, const CellRegion ®ion); + void setDataSetYDataRegion(DataSet *dataSet, const CellRegion ®ion); + void setDataSetCustomDataRegion(DataSet *dataSet, const CellRegion ®ion); + void setDataSetLabelDataRegion(DataSet *dataSet, const CellRegion ®ion); + void setDataSetCategoryDataRegion(DataSet *dataSet, const CellRegion ®ion); - void setDataSetChartType( DataSet *dataSet, ChartType type ); - void setDataSetChartSubType( DataSet *dataSet, ChartSubtype subType ); + void setDataSetChartType(DataSet *dataSet, ChartType type); + void setDataSetChartSubType(DataSet *dataSet, ChartSubtype subType); - void setDataSetShowCategory( DataSet *dataSet, bool b ); - void setDataSetShowNumber( DataSet *dataSet, bool b ); - void setDataSetShowPercent( DataSet *dataSet, bool b ); - void setDataSetShowSymbol( DataSet *dataSet, bool b ); - - void setDataSetPen( DataSet *dataSet, const QColor& color ); - void setDataSetBrush( DataSet *dataSet, const QColor& color ); - void setDataSetAxis( DataSet *dataSet, Axis *axis ); + void setDataSetShowCategory(DataSet *dataSet, bool b); + void setDataSetShowNumber(DataSet *dataSet, bool b); + void setDataSetShowPercent(DataSet *dataSet, bool b); + void setDataSetShowSymbol(DataSet *dataSet, bool b); + + void setDataSetPen(DataSet *dataSet, const QColor& color); + void setDataSetBrush(DataSet *dataSet, const QColor& color); + void setDataSetAxis(DataSet *dataSet, Axis *axis); // Plot Area - void setGapBetweenBars( int percent ); - void setGapBetweenSets( int percent ); - void setPieExplodeFactor( DataSet *dataSet, int percent ); + void setGapBetweenBars(int percent); + void setGapBetweenSets(int percent); + void setPieExplodeFactor(DataSet *dataSet, int percent); // Axes - void addAxis( AxisDimension, const QString& title = "" ); - void removeAxis( Axis *axis ); - void setAxisShowTitle( Axis *axis, bool show ); - void setAxisTitle( Axis *axis, const QString& title ); - void setAxisShowGridLines( Axis *axis, bool b = true ); - void setAxisUseLogarithmicScaling(Axis *axis, bool b = true ); - void setAxisStepWidth( Axis *axis, qreal width ); - void setAxisSubStepWidth( Axis *axis, qreal width ); - void setAxisUseAutomaticStepWidth( Axis *axis, bool automatic); - void setAxisUseAutomaticSubStepWidth( Axis *axis, bool automatic ); + void addAxis(AxisDimension, const QString& title = ""); + void removeAxis(Axis *axis); + void setAxisShowTitle(Axis *axis, bool show); + void setAxisTitle(Axis *axis, const QString& title); + void setAxisShowGridLines(Axis *axis, bool b = true); + void setAxisUseLogarithmicScaling(Axis *axis, bool b = true); + void setAxisStepWidth(Axis *axis, qreal width); + void setAxisSubStepWidth(Axis *axis, qreal width); + void setAxisUseAutomaticStepWidth(Axis *axis, bool automatic); + void setAxisUseAutomaticSubStepWidth(Axis *axis, bool automatic); // Legend - void setShowLegend( bool b ); - void setLegendTitle( const QString& title ); - void setLegendFont( const QFont& font ); - void setLegendFontSize( int size ); - void setLegendOrientation( Qt::Orientation ); - void setLegendAlignment( Qt::Alignment ); - void setLegendFixedPosition( Position position ); - void setLegendBackgroundColor( const QColor& color ); - void setLegendFrameColor( const QColor& color ); - void setLegendShowFrame( bool show ); + void setShowLegend(bool b); + void setLegendTitle(const QString& title); + void setLegendFont(const QFont& font); + void setLegendFontSize(int size); + void setLegendOrientation(Qt::Orientation); + void setLegendAlignment(Qt::Alignment); + void setLegendFixedPosition(Position position); + void setLegendBackgroundColor(const QColor& color); + void setLegendFrameColor(const QColor& color); + void setLegendShowFrame(bool show); // Called upon shape manager's selectionChanged() signal void shapeSelectionChanged(); diff -Nru calligra-2.4.0/plugins/chartshape/CMakeLists.txt calligra-2.4.3/plugins/chartshape/CMakeLists.txt --- calligra-2.4.0/plugins/chartshape/CMakeLists.txt 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/CMakeLists.txt 2012-06-26 04:21:31.000000000 +0000 @@ -26,8 +26,6 @@ ChartProxyModel.cpp KDChartModel.cpp Surface.cpp - ThreeDScene.cpp - ThreeDTransformation.cpp ChartDocument.cpp ChartShape.cpp ChartTool.cpp diff -Nru calligra-2.4.0/plugins/chartshape/commands/ChartTypeCommand.cpp calligra-2.4.3/plugins/chartshape/commands/ChartTypeCommand.cpp --- calligra-2.4.0/plugins/chartshape/commands/ChartTypeCommand.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/commands/ChartTypeCommand.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -41,10 +41,10 @@ ChartTypeCommand::ChartTypeCommand(ChartShape* chart) : m_chart(chart) - , m_oldType( BarChartType ) - , m_newType( BarChartType ) - , m_oldSubtype( NormalChartSubtype ) - , m_newSubtype( NormalChartSubtype ) + , m_oldType(BarChartType) + , m_newType(BarChartType) + , m_oldSubtype(NormalChartSubtype) + , m_newSubtype(NormalChartSubtype) { } @@ -59,22 +59,22 @@ // save the old type m_oldType = m_chart->chartType(); m_oldSubtype = m_chart->chartSubType(); - if ( m_oldType == m_newType && m_oldSubtype == m_newSubtype ) + if (m_oldType == m_newType && m_oldSubtype == m_newSubtype) return; // Actually do the work - m_chart->setChartType( m_newType ); - m_chart->setChartSubType( m_newSubtype ); + m_chart->setChartType(m_newType); + m_chart->setChartSubType(m_newSubtype); } void ChartTypeCommand::undo() { - if ( m_oldType == m_newType && m_oldSubtype == m_newSubtype ) + if (m_oldType == m_newType && m_oldSubtype == m_newSubtype) return; //kDebug(35001) << m_oldType; - m_chart->setChartType( m_oldType ); - m_chart->setChartSubType( m_oldSubtype ); + m_chart->setChartType(m_oldType); + m_chart->setChartSubType(m_oldSubtype); } diff -Nru calligra-2.4.0/plugins/chartshape/DataSet.cpp calligra-2.4.3/plugins/chartshape/DataSet.cpp --- calligra-2.4.0/plugins/chartshape/DataSet.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/DataSet.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -82,18 +82,18 @@ class DataSet::Private { public: - Private( DataSet *parent, int dataSetNr ); + Private(DataSet *parent, int dataSetNr); ~Private(); void updateSize(); bool hasOwnChartType() const; ChartType effectiveChartType() const; - bool isValidDataPoint( const QPoint &point ) const; - QVariant data( const CellRegion ®ion, int index, int role ) const; - QString formatData( const CellRegion ®ion, int index, int role ) const; + bool isValidDataPoint(const QPoint &point) const; + QVariant data(const CellRegion ®ion, int index, int role) const; + QString formatData(const CellRegion ®ion, int index, int role) const; QBrush defaultBrush() const; - QBrush defaultBrush( int section ) const; + QBrush defaultBrush(int section) const; KDChart::MarkerAttributes defaultMarkerAttributes() const; @@ -102,7 +102,7 @@ KDChart::DataValueAttributes defaultDataValueAttributes() const; /// Copies Private::dataValueAttributes to this section if it doesn't /// have its own DataValueAttributes copy yet. - void insertDataValueAttributeSectionIfNecessary( int section ); + void insertDataValueAttributeSectionIfNecessary(int section); /** * FIXME: Refactor (post-2.3) @@ -121,7 +121,7 @@ QPen defaultPen() const; - void dataChanged( KDChartModel::DataRole role, const QRect &rect ) const; + void dataChanged(KDChartModel::DataRole role, const QRect &rect) const; void setAttributesAccordingToType(); DataSet *parent; @@ -151,7 +151,7 @@ KDChart::PieAttributes pieAttributes; KDChart::DataValueAttributes dataValueAttributes; - void readValueLabelType( KoStyleStack &styleStack, int section = -1 ); + void readValueLabelType(KoStyleStack &styleStack, int section = -1); // Note: Set section-specific attributes only if really necessary. // They will override the respective global attributes. @@ -187,31 +187,31 @@ KoOdfNumberStyles::NumericStyleFormat *numericStyleFormat; }; -DataSet::Private::Private( DataSet *parent, int dataSetNr ) : - parent( parent ), - chartType( LastChartType ), - chartSubType( NoChartSubtype ), - attachedAxis( 0 ), - showMeanValue( false ), - showLowerErrorIndicator( false ), - showUpperErrorIndicator( false ), - errorPercentage( 0.0 ), - errorMargin( 0.0 ), - lowerErrorLimit( 0.0 ), - upperErrorLimit( 0.0 ), - penIsSet( false ), - brushIsSet( false ), - pen( QPen( Qt::black ) ), - brush( QColor( Qt::white ) ), - dataValueAttributes( defaultDataValueAttributes() ), - num( dataSetNr ), - kdChartModel( 0 ), - size( 0 ), - defaultLabel( i18n( "Series %1", dataSetNr + 1 ) ), - symbolsActivated( true ), - symbolID( 0 ), - loadedDimensions( 0 ), - numericStyleFormat( 0 ) +DataSet::Private::Private(DataSet *parent, int dataSetNr) : + parent(parent), + chartType(LastChartType), + chartSubType(NoChartSubtype), + attachedAxis(0), + showMeanValue(false), + showLowerErrorIndicator(false), + showUpperErrorIndicator(false), + errorPercentage(0.0), + errorMargin(0.0), + lowerErrorLimit(0.0), + upperErrorLimit(0.0), + penIsSet(false), + brushIsSet(false), + pen(QPen(Qt::black)), + brush(QColor(Qt::white)), + dataValueAttributes(defaultDataValueAttributes()), + num(dataSetNr), + kdChartModel(0), + size(0), + defaultLabel(i18n("Series %1", dataSetNr + 1)), + symbolsActivated(true), + symbolID(0), + loadedDimensions(0), + numericStyleFormat(0) { } @@ -224,9 +224,9 @@ { KDChart::MarkerAttributes ma; // Don't show markers unless we turn them on - ma.setVisible( false ); + ma.setVisible(false); // The marker size is specified in pixels, but scaled by the painter's zoom level - ma.setMarkerSizeMode( KDChart::MarkerAttributes::AbsoluteSizeScaled ); + ma.setMarkerSizeMode(KDChart::MarkerAttributes::AbsoluteSizeScaled); return ma; } @@ -235,86 +235,82 @@ KDChart::DataValueAttributes attr; KDChart::TextAttributes textAttr = attr.textAttributes(); // Don't show value labels by default - textAttr.setVisible( false ); + textAttr.setVisible(false); KDChart::Measure fontSize = textAttr.fontSize(); - attr.setMarkerAttributes( defaultMarkerAttributes() ); - fontSize.setValue( 10 ); + attr.setMarkerAttributes(defaultMarkerAttributes()); + fontSize.setValue(10); // Don't change font size with chart size - fontSize.setCalculationMode( KDChartEnums::MeasureCalculationModeAbsolute ); - textAttr.setFontSize( fontSize ); + fontSize.setCalculationMode(KDChartEnums::MeasureCalculationModeAbsolute); + textAttr.setFontSize(fontSize); // Draw text horizontally - textAttr.setRotation( 0 ); - attr.setTextAttributes( textAttr ); + textAttr.setRotation(0); + attr.setTextAttributes(textAttr); // Set positive value position KDChart::RelativePosition positivePosition = attr.positivePosition(); - if ( chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype ) - { - positivePosition.setAlignment( Qt::AlignCenter ); - positivePosition.setReferencePosition( KDChartEnums::PositionCenter ); - } - else if ( chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype ) - { - positivePosition.setAlignment( Qt::AlignHCenter | Qt::AlignTop ); - positivePosition.setReferencePosition( KDChartEnums::PositionNorth ); + if (chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype) { + positivePosition.setAlignment(Qt::AlignCenter); + positivePosition.setReferencePosition(KDChartEnums::PositionCenter); + } + else if (chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype) { + positivePosition.setAlignment(Qt::AlignHCenter | Qt::AlignTop); + positivePosition.setReferencePosition(KDChartEnums::PositionNorth); } - else - { - positivePosition.setAlignment( Qt::AlignHCenter | Qt::AlignTop ); - positivePosition.setReferencePosition( KDChartEnums::PositionNorthWest ); + else { + positivePosition.setAlignment(Qt::AlignHCenter | Qt::AlignTop); + positivePosition.setReferencePosition(KDChartEnums::PositionNorthWest); } - positivePosition.setHorizontalPadding( 0.0 ); - positivePosition.setVerticalPadding( -100.0 ); - attr.setPositivePosition( positivePosition ); + positivePosition.setHorizontalPadding(0.0); + positivePosition.setVerticalPadding(-100.0); + attr.setPositivePosition(positivePosition); + // Set negative value position KDChart::RelativePosition negativePosition = attr.negativePosition(); - if ( chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype ) - { - negativePosition.setAlignment( Qt::AlignCenter ); - negativePosition.setReferencePosition( KDChartEnums::PositionCenter ); + if (chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype) { + negativePosition.setAlignment(Qt::AlignCenter); + negativePosition.setReferencePosition(KDChartEnums::PositionCenter); + } + else if (chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype) { + negativePosition.setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + negativePosition.setReferencePosition(KDChartEnums::PositionSouth); } - else if ( chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype ) - { - negativePosition.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); - negativePosition.setReferencePosition( KDChartEnums::PositionSouth ); - } - else - { - negativePosition.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); - negativePosition.setReferencePosition( KDChartEnums::PositionSouthWest ); + else { + negativePosition.setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + negativePosition.setReferencePosition(KDChartEnums::PositionSouthWest); } - negativePosition.setHorizontalPadding( 0.0 ); - negativePosition.setVerticalPadding( 100.0 ); - attr.setNegativePosition( negativePosition ); + negativePosition.setHorizontalPadding(0.0); + negativePosition.setVerticalPadding(100.0); + attr.setNegativePosition(negativePosition); + // No decimal digits by default - attr.setDecimalDigits( 0 ); + attr.setDecimalDigits(0); // Show all values, even if they overlap - attr.setShowOverlappingDataLabels( true ); + attr.setShowOverlappingDataLabels(true); // Yes, data point labels can repeatedly have the same text. (e.g. the same value) - attr.setShowRepetitiveDataLabels( true ); + attr.setShowRepetitiveDataLabels(true); - attr.setVisible( true ); + attr.setVisible(true); return attr; } -void DataSet::Private::insertDataValueAttributeSectionIfNecessary( int section ) +void DataSet::Private::insertDataValueAttributeSectionIfNecessary(int section) { - if ( !sectionsDataValueAttributes.contains( section ) ) - sectionsDataValueAttributes[ section ] = dataValueAttributes; + if (!sectionsDataValueAttributes.contains(section)) + sectionsDataValueAttributes[section] = dataValueAttributes; } void DataSet::Private::updateSize() { int newSize = 0; - newSize = qMax( newSize, xDataRegion.cellCount() ); - newSize = qMax( newSize, yDataRegion.cellCount() ); - newSize = qMax( newSize, customDataRegion.cellCount() ); - newSize = qMax( newSize, categoryDataRegion.cellCount() ); + newSize = qMax(newSize, xDataRegion.cellCount()); + newSize = qMax(newSize, yDataRegion.cellCount()); + newSize = qMax(newSize, customDataRegion.cellCount()); + newSize = qMax(newSize, categoryDataRegion.cellCount()); - if ( size != newSize ) { + if (size != newSize) { size = newSize; - if ( kdChartModel ) - kdChartModel->dataSetSizeChanged( parent, size ); + if (kdChartModel) + kdChartModel->dataSetSizeChanged(parent, size); } } @@ -332,51 +328,51 @@ */ ChartType DataSet::Private::effectiveChartType() const { - if ( hasOwnChartType() ) + if (hasOwnChartType()) return chartType; - Q_ASSERT( attachedAxis ); + Q_ASSERT(attachedAxis); return attachedAxis->plotArea()->chartType(); } -bool DataSet::Private::isValidDataPoint( const QPoint &point ) const +bool DataSet::Private::isValidDataPoint(const QPoint &point) const { - if ( point.y() < 0 || point.x() < 0 ) + if (point.y() < 0 || point.x() < 0) return false; // We can't point to horizontal and vertical header data at the same time - if ( point.x() == 0 && point.y() == 0 ) + if (point.x() == 0 && point.y() == 0) return false; return true; } -QVariant DataSet::Private::data( const CellRegion ®ion, int index, int role ) const +QVariant DataSet::Private::data(const CellRegion ®ion, int index, int role) const { - if ( !region.isValid() ) + if (!region.isValid()) return QVariant(); - if ( !region.hasPointAtIndex( index ) ) + if (!region.hasPointAtIndex(index)) return QVariant(); // Convert the given index in this dataset to a data point in the // source model. - QPoint dataPoint = region.pointAtIndex( index ); + QPoint dataPoint = region.pointAtIndex(index); Table *table = region.table(); - Q_ASSERT( table ); + Q_ASSERT(table); QAbstractItemModel *model = table->model(); // This means the table the region lies in has been removed, but nobody // has changed the region in the meantime. That is a perfectly valid // scenario, so just return invalid data. - if ( !model ) + if (!model) return QVariant(); // Check if the data point is valid - const bool validDataPoint = isValidDataPoint( dataPoint ); + const bool validDataPoint = isValidDataPoint(dataPoint); // Remove, since it makes kspread crash when inserting a chart for // a 1x1 cell region. - //Q_ASSERT( validDataPoint ); - if ( !validDataPoint ) + //Q_ASSERT(validDataPoint); + if (!validDataPoint) return QVariant(); // The top-left point is (1,1). (0,y) or (x,0) refers to header data. @@ -386,24 +382,24 @@ const int col = dataPoint.x() - 1; QVariant data; - if ( verticalHeaderData ) - data = model->headerData( row, Qt::Vertical, role ); - else if ( horizontalHeaderData ) - data = model->headerData( col, Qt::Horizontal, role ); + if (verticalHeaderData) + data = model->headerData(row, Qt::Vertical, role); + else if (horizontalHeaderData) + data = model->headerData(col, Qt::Horizontal, role); else { - const QModelIndex &index = model->index( row, col ); - //Q_ASSERT( index.isValid() ); - if ( index.isValid() ) - data = model->data( index, role ); + const QModelIndex &index = model->index(row, col); + //Q_ASSERT(index.isValid()); + if (index.isValid()) + data = model->data(index, role); } return data; } -QString DataSet::Private::formatData( const CellRegion ®ion, int index, int role ) const +QString DataSet::Private::formatData(const CellRegion ®ion, int index, int role) const { QVariant v = data(region, index, role); QString s; - if ( v.type() == QVariant::Double ) { + if (v.type() == QVariant::Double) { // Don't use v.toString() else a double/float would lose precision // and something like "36.5207" would become "36.520660888888912". QTextStream ts(&s); @@ -422,46 +418,46 @@ // A data set-wide default brush only makes sense if the legend shows // data set labels, not the category data. See notes on data directions // in KDChartModel.h for details. - if ( modelDataDirection == Qt::Vertical ) - return defaultDataSetColor( num ); + if (modelDataDirection == Qt::Vertical) + return defaultDataSetColor(num); // FIXME: What to return in the other case? return QBrush(); } -QBrush DataSet::Private::defaultBrush( int section ) const +QBrush DataSet::Private::defaultBrush(int section) const { Qt::Orientation modelDataDirection = kdChartModel->dataDirection(); // Horizontally aligned diagrams have a specific color per category // See for example pie or ring charts. A pie chart contains a single // data set, but the slices default to different brushes. - if ( modelDataDirection == Qt::Horizontal ) - return defaultDataSetColor( section ); + if (modelDataDirection == Qt::Horizontal) + return defaultDataSetColor(section); // Vertically aligned diagrams default to one brush per data set return defaultBrush(); } QPen DataSet::Private::defaultPen() const { - QPen pen( Qt::black ); + QPen pen(Qt::black); ChartType chartType = effectiveChartType(); - if ( chartType == LineChartType || - chartType == ScatterChartType ) - pen = QPen( defaultDataSetColor( num ) ); + if (chartType == LineChartType || + chartType == ScatterChartType) + pen = QPen(defaultDataSetColor(num)); return pen; } -DataSet::DataSet( int dataSetNr ) - : d( new Private( this, dataSetNr ) ) +DataSet::DataSet(int dataSetNr) + : d(new Private(this, dataSetNr)) { - Q_ASSERT( dataSetNr >= 0 ); + Q_ASSERT(dataSetNr >= 0); } DataSet::~DataSet() { - if ( d->attachedAxis ) - d->attachedAxis->detachDataSet( this, true ); + if (d->attachedAxis) + d->attachedAxis->detachDataSet(this, true); delete d; } @@ -537,124 +533,114 @@ { KDChart::DataValueAttributes attr = dataValueAttributes; KDChart::RelativePosition positivePosition = attr.positivePosition(); - if ( chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype ) - { - positivePosition.setAlignment( Qt::AlignCenter ); - positivePosition.setReferencePosition( KDChartEnums::PositionCenter ); - } - else if ( chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype ) - { - positivePosition.setAlignment( Qt::AlignHCenter | Qt::AlignTop ); - positivePosition.setReferencePosition( KDChartEnums::PositionNorth ); + if (chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype) { + positivePosition.setAlignment(Qt::AlignCenter); + positivePosition.setReferencePosition(KDChartEnums::PositionCenter); + } + else if (chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype) { + positivePosition.setAlignment(Qt::AlignHCenter | Qt::AlignTop); + positivePosition.setReferencePosition(KDChartEnums::PositionNorth); } - else - { - positivePosition.setAlignment( Qt::AlignHCenter | Qt::AlignTop ); - positivePosition.setReferencePosition( KDChartEnums::PositionNorthWest ); + else { + positivePosition.setAlignment(Qt::AlignHCenter | Qt::AlignTop); + positivePosition.setReferencePosition(KDChartEnums::PositionNorthWest); } - positivePosition.setHorizontalPadding( 0.0 ); - positivePosition.setVerticalPadding( -100.0 ); - attr.setPositivePosition( positivePosition ); + positivePosition.setHorizontalPadding(0.0); + positivePosition.setVerticalPadding(-100.0); + attr.setPositivePosition(positivePosition); + // Set negative value position KDChart::RelativePosition negativePosition = attr.negativePosition(); - if ( chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype ) - { - negativePosition.setAlignment( Qt::AlignCenter ); - negativePosition.setReferencePosition( KDChartEnums::PositionCenter ); + if (chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype) { + negativePosition.setAlignment(Qt::AlignCenter); + negativePosition.setReferencePosition(KDChartEnums::PositionCenter); + } + else if (chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype) { + negativePosition.setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + negativePosition.setReferencePosition(KDChartEnums::PositionSouth); } - else if ( chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype ) - { - negativePosition.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); - negativePosition.setReferencePosition( KDChartEnums::PositionSouth ); - } - else - { - negativePosition.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); - negativePosition.setReferencePosition( KDChartEnums::PositionSouthWest ); + else { + negativePosition.setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + negativePosition.setReferencePosition(KDChartEnums::PositionSouthWest); } - negativePosition.setHorizontalPadding( 0.0 ); - negativePosition.setVerticalPadding( 100.0 ); - attr.setNegativePosition( negativePosition ); + negativePosition.setHorizontalPadding(0.0); + negativePosition.setVerticalPadding(100.0); + attr.setNegativePosition(negativePosition); dataValueAttributes = attr; - for ( int i = 0; i < sectionsDataValueAttributes.count(); ++i ) - { - KDChart::DataValueAttributes attr = sectionsDataValueAttributes[ i ]; + + for (int i = 0; i < sectionsDataValueAttributes.count(); ++i) { + KDChart::DataValueAttributes attr = sectionsDataValueAttributes[i]; KDChart::RelativePosition positivePosition = attr.positivePosition(); - if ( chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype ) - { - positivePosition.setAlignment( Qt::AlignCenter ); - positivePosition.setReferencePosition( KDChartEnums::PositionCenter ); - } - else if ( chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype ) - { - positivePosition.setAlignment( Qt::AlignHCenter | Qt::AlignTop ); - positivePosition.setReferencePosition( KDChartEnums::PositionNorth ); - } - else - { - positivePosition.setAlignment( Qt::AlignHCenter | Qt::AlignTop ); - positivePosition.setReferencePosition( KDChartEnums::PositionNorthWest ); - } - positivePosition.setHorizontalPadding( 0.0 ); - positivePosition.setVerticalPadding( -100.0 ); - attr.setPositivePosition( positivePosition ); + if (chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype) { + positivePosition.setAlignment(Qt::AlignCenter); + positivePosition.setReferencePosition(KDChartEnums::PositionCenter); + } + else if (chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype) { + positivePosition.setAlignment(Qt::AlignHCenter | Qt::AlignTop); + positivePosition.setReferencePosition(KDChartEnums::PositionNorth); + } + else { + positivePosition.setAlignment(Qt::AlignHCenter | Qt::AlignTop); + positivePosition.setReferencePosition(KDChartEnums::PositionNorthWest); + } + positivePosition.setHorizontalPadding(0.0); + positivePosition.setVerticalPadding(-100.0); + attr.setPositivePosition(positivePosition); + // Set negative value position KDChart::RelativePosition negativePosition = attr.negativePosition(); - if ( chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype ) - { - negativePosition.setAlignment( Qt::AlignCenter ); - negativePosition.setReferencePosition( KDChartEnums::PositionCenter ); - } - else if ( chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype ) - { - negativePosition.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); - negativePosition.setReferencePosition( KDChartEnums::PositionSouth ); + if (chartType == KChart::BarChartType && chartSubType != KChart::NormalChartSubtype) { + negativePosition.setAlignment(Qt::AlignCenter); + negativePosition.setReferencePosition(KDChartEnums::PositionCenter); } - else - { - negativePosition.setAlignment( Qt::AlignHCenter | Qt::AlignBottom ); - negativePosition.setReferencePosition( KDChartEnums::PositionSouthWest ); + else if (chartType == KChart::BarChartType && chartSubType == KChart::NormalChartSubtype) { + negativePosition.setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + negativePosition.setReferencePosition(KDChartEnums::PositionSouth); + } + else { + negativePosition.setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + negativePosition.setReferencePosition(KDChartEnums::PositionSouthWest); } - negativePosition.setHorizontalPadding( 0.0 ); - negativePosition.setVerticalPadding( 100.0 ); - attr.setNegativePosition( negativePosition ); - sectionsDataValueAttributes[ i ] = attr; + negativePosition.setHorizontalPadding(0.0); + negativePosition.setVerticalPadding(100.0); + attr.setNegativePosition(negativePosition); + sectionsDataValueAttributes[i] = attr; } } -void DataSet::setChartType( ChartType type ) +void DataSet::setChartType(ChartType type) { - if ( type == d->chartType ) + if (type == d->chartType) return; Axis *axis = d->attachedAxis; - if ( axis ) - axis->detachDataSet( this ); + if (axis) + axis->detachDataSet(this); d->chartType = type; d->setAttributesAccordingToType(); - if ( axis ) - axis->attachDataSet( this ); + if (axis) + axis->attachDataSet(this); } -void DataSet::setChartSubType( ChartSubtype subType ) +void DataSet::setChartSubType(ChartSubtype subType) { - if ( subType == d->chartSubType ) + if (subType == d->chartSubType) return; Axis *axis = d->attachedAxis; - axis->detachDataSet( this ); + axis->detachDataSet(this); d->chartSubType = subType; d->setAttributesAccordingToType(); - axis->attachDataSet( this ); + axis->attachDataSet(this); } -void DataSet::setAttachedAxis( Axis *axis ) +void DataSet::setAttachedAxis(Axis *axis) { d->attachedAxis = axis; } @@ -669,10 +655,10 @@ return d->brushIsSet ? d->brush : d->defaultBrush(); } -QPen DataSet::pen( int section ) const +QPen DataSet::pen(int section) const { - if ( d->pens.contains( section ) ) - return d->pens[ section ]; + if (d->pens.contains(section)) + return d->pens[section]; return pen(); } @@ -681,206 +667,212 @@ return d->pieAttributes; } -QBrush DataSet::brush( int section ) const +QBrush DataSet::brush(int section) const { - if ( d->brushes.contains( section ) ) - return d->brushes[ section ]; - if ( d->brushIsSet ) - return brush(); - return d->defaultBrush( section ); + Qt::Orientation modelDataDirection = d->kdChartModel->dataDirection(); + // Horizontally aligned diagrams have a specific color per category + // See for example pie or ring charts. A pie chart contains a single + // data set, but the slices must have different brushes. + if (modelDataDirection == Qt::Horizontal) { + if (d->brushes.contains(section)) { + return d->brushes[section]; + } + return d->defaultBrush(section); + } + // Vertically aligned diagrams only have one brush per data set + return brush(); } -KDChart::PieAttributes DataSet::pieAttributes( int section ) const +KDChart::PieAttributes DataSet::pieAttributes(int section) const { - if( d->sectionsPieAttributes.contains( section ) ) - return d->sectionsPieAttributes[ section ]; + if(d->sectionsPieAttributes.contains(section)) + return d->sectionsPieAttributes[section]; return pieAttributes(); } qreal DataSet::Private::maxBubbleSize() const { // TODO: Improve performance by caching. This is currently O(n^2). - // this is not in O( n^2 ), its quite linear on the number of datapoints + // this is not in O(n^2), its quite linear on the number of datapoints // hoever it could be constant for any then the first case by implementing // cashing qreal max = 0.0; - Q_ASSERT( kdChartModel ); + Q_ASSERT(kdChartModel); QList dataSets = kdChartModel->dataSets(); - foreach( DataSet *dataSet, dataSets ) - for ( int i = 0; i < dataSet->size(); i++ ) - max = qMax( max, dataSet->customData( i ).toReal() ); + foreach(DataSet *dataSet, dataSets) + for (int i = 0; i < dataSet->size(); i++) + max = qMax(max, dataSet->customData(i).toReal()); return max; } -KDChart::DataValueAttributes DataSet::dataValueAttributes( int section /* = -1 */ ) const +KDChart::DataValueAttributes DataSet::dataValueAttributes(int section /* = -1 */) const { - KDChart::DataValueAttributes attr( d->dataValueAttributes ); - Q_ASSERT( attr.isVisible() == d->dataValueAttributes.isVisible() ); - if ( d->sectionsDataValueAttributes.contains( section ) ) - attr = d->sectionsDataValueAttributes[ section ]; + KDChart::DataValueAttributes attr(d->dataValueAttributes); + Q_ASSERT(attr.isVisible() == d->dataValueAttributes.isVisible()); + if (d->sectionsDataValueAttributes.contains(section)) + attr = d->sectionsDataValueAttributes[section]; /* * Update attributes that are related to properties out of the data * sets's reach and thus might have changed in the meanwhile. */ - KDChart::MarkerAttributes ma( attr.markerAttributes() ); + KDChart::MarkerAttributes ma(attr.markerAttributes()); // The chart type is a property of the plot area, check that. - switch ( d->effectiveChartType() ) { + switch (d->effectiveChartType()) { // case ScatterChartType: // // TODO: Marker type should be customizable // // TODO: Marker size should be customizable -// ma.setMarkerStyle( defaultMarkerTypes[ number() % numDefaultMarkerTypes ] ); -// ma.setVisible( true ); +// ma.setMarkerStyle(defaultMarkerTypes[number() % numDefaultMarkerTypes]); +// ma.setVisible(true); // break; case BubbleChartType: { - Q_ASSERT( attachedAxis() ); - Q_ASSERT( attachedAxis()->plotArea() ); - ma.setMarkerStyle( KDChart::MarkerAttributes::MarkerCircle ); - ma.setThreeD( attachedAxis()->plotArea()->isThreeD() ); + Q_ASSERT(attachedAxis()); + Q_ASSERT(attachedAxis()->plotArea()); + ma.setMarkerStyle(KDChart::MarkerAttributes::MarkerCircle); + ma.setThreeD(attachedAxis()->plotArea()->isThreeD()); qreal maxSize = d->maxBubbleSize(); - if ( section >= 0 ) { - qreal bubbleWidth = customData( section ).toReal(); + if (section >= 0) { + qreal bubbleWidth = customData(section).toReal(); // All bubble sizes are relative to the maximum bubble size - if ( maxSize != 0.0 ) + if (maxSize != 0.0) bubbleWidth /= maxSize; // Whereas the maximum size is relative to 1/4 * min(dw, dh), // with dw, dh being the width and height of the diagram bubbleWidth *= 0.25; - ma.setMarkerSizeMode( KDChart::MarkerAttributes::RelativeToDiagramWidthHeightMin ); - ma.setMarkerSize( QSizeF( bubbleWidth, bubbleWidth ) ); + ma.setMarkerSizeMode(KDChart::MarkerAttributes::RelativeToDiagramWidthHeightMin); + ma.setMarkerSize(QSizeF(bubbleWidth, bubbleWidth)); } - ma.setVisible( true ); + ma.setVisible(true); break; } default: // TODO: Make markers customizable even for other types - if ( d->symbolsActivated ) - { - Q_ASSERT( attr.isVisible() ); - ma.setMarkerStyle( defaultMarkerTypes[ d->symbolID ] ); - ma.setMarkerSize( QSize( 10, 10 ) ); - ma.setVisible( true ); -// attr.setVisible( true ); + if (d->symbolsActivated) { + Q_ASSERT(attr.isVisible()); + ma.setMarkerStyle(defaultMarkerTypes[d->symbolID]); + ma.setMarkerSize(QSize(10, 10)); + ma.setVisible(true); +// attr.setVisible(true); } // Do not overwrite visiblity in this case. It could very well have // been set to 'visible' on purpose by e.g. loadOdf(). //else - // ma.setVisible( false ); + // ma.setVisible(false); break; } - ma.setMarkerColor( brush( section ).color() ); - ma.setPen( pen( section ) ); + ma.setMarkerColor(brush(section).color()); + ma.setPen(pen(section)); QString dataLabel = ""; // initialize with empty and NOT null! - ValueLabelType type = valueLabelType( section ); - if ( type.symbol ) { + ValueLabelType type = valueLabelType(section); + if (type.symbol) { //TODO is that correct? - ma.setVisible( true ); + ma.setVisible(true); } - if ( type.category ) { - QString s = categoryData( section, Qt::DisplayRole ).toString().trimmed(); - if ( !s.isEmpty() ) dataLabel += s + " "; + if (type.category) { + QString s = categoryData(section, Qt::DisplayRole).toString().trimmed(); + if (!s.isEmpty()) dataLabel += s + " "; } - if ( type.number ) { - QString s = d->formatData( d->yDataRegion, section, Qt::DisplayRole ); - if ( !s.isEmpty() ) dataLabel += s + " "; + if (type.number) { + QString s = d->formatData(d->yDataRegion, section, Qt::DisplayRole); + if (!s.isEmpty()) dataLabel += s + " "; } - if ( type.percentage ) { + if (type.percentage) { bool ok; - qreal value = yData( section, Qt::EditRole ).toDouble(&ok); - if ( ok ) { + qreal value = yData(section, Qt::EditRole).toDouble(&ok); + if (ok) { qreal sum = 0.0; for(int i = 0; i < d->yDataRegion.cellCount(); ++i) { - sum += yData( i, Qt::EditRole ).toDouble(); + sum += yData(i, Qt::EditRole).toDouble(); } if (sum == 0.0) ok = false; else value = value / sum * 100.0; } - if ( ok ) + if (ok) dataLabel += QString::number(value, 'f', 0) + "% "; } - attr.setDataLabel( dataLabel.trimmed() ); + attr.setDataLabel(dataLabel.trimmed()); - attr.setMarkerAttributes( ma ); + attr.setMarkerAttributes(ma); return attr; } -void DataSet::setPen( const QPen &pen ) +void DataSet::setPen(const QPen &pen) { d->pen = pen; d->penIsSet = true; - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this ); -// KDChart::MarkerAttributes ma( d->dataValueAttributes.markerAttributes() ); -// ma.setPen( pen ); -// d->dataValueAttributes.setMarkerAttributes( ma ); -// for ( QMap< int, KDChart::DataValueAttributes >::iterator it = d->sectionsDataValueAttributes.begin(); -// it != d->sectionsDataValueAttributes.end(); ++it ){ -// KDChart::MarkerAttributes mattr( it->markerAttributes() ); -// mattr.setMarkerColor( pen.color() ); -// it->setMarkerAttributes( mattr ); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this); +// KDChart::MarkerAttributes ma(d->dataValueAttributes.markerAttributes()); +// ma.setPen(pen); +// d->dataValueAttributes.setMarkerAttributes(ma); +// for (QMap< int, KDChart::DataValueAttributes >::iterator it = d->sectionsDataValueAttributes.begin(); +// it != d->sectionsDataValueAttributes.end(); ++it){ +// KDChart::MarkerAttributes mattr(it->markerAttributes()); +// mattr.setMarkerColor(pen.color()); +// it->setMarkerAttributes(mattr); // } } -void DataSet::setBrush( const QBrush &brush ) +void DataSet::setBrush(const QBrush &brush) { d->brush = brush; d->brushIsSet = true; - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this ); -// KDChart::MarkerAttributes ma( d->dataValueAttributes.markerAttributes() ); -// ma.setMarkerColor( brush.color() ); -// d->dataValueAttributes.setMarkerAttributes( ma ); -// for ( QMap< int, KDChart::DataValueAttributes >::iterator it = d->sectionsDataValueAttributes.begin(); -// it != d->sectionsDataValueAttributes.end(); ++it ){ -// KDChart::MarkerAttributes mattr( it->markerAttributes() ); -// mattr.setMarkerColor( brush.color() ); -// it->setMarkerAttributes( mattr ); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this); +// KDChart::MarkerAttributes ma(d->dataValueAttributes.markerAttributes()); +// ma.setMarkerColor(brush.color()); +// d->dataValueAttributes.setMarkerAttributes(ma); +// for (QMap< int, KDChart::DataValueAttributes >::iterator it = d->sectionsDataValueAttributes.begin(); +// it != d->sectionsDataValueAttributes.end(); ++it){ +// KDChart::MarkerAttributes mattr(it->markerAttributes()); +// mattr.setMarkerColor(brush.color()); +// it->setMarkerAttributes(mattr); // } } -void DataSet::setPieExplodeFactor( int factor ) +void DataSet::setPieExplodeFactor(int factor) { - d->pieAttributes.setExplodeFactor( (qreal)factor / (qreal)100 ); - if( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this ); + d->pieAttributes.setExplodeFactor((qreal)factor / (qreal)100); + if(d->kdChartModel) + d->kdChartModel->dataSetChanged(this); } -void DataSet::setPen( int section, const QPen &pen ) +void DataSet::setPen(int section, const QPen &pen) { - d->pens[ section ] = pen; - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this, KDChartModel::PenDataRole, section ); - d->insertDataValueAttributeSectionIfNecessary( section ); -// KDChart::MarkerAttributes mas( d->sectionsDataValueAttributes[ section ].markerAttributes() ); -// mas.setPen( pen ); -// d->sectionsDataValueAttributes[ section ].setMarkerAttributes( mas ); + d->pens[section] = pen; + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this, KDChartModel::PenDataRole, section); + d->insertDataValueAttributeSectionIfNecessary(section); +// KDChart::MarkerAttributes mas(d->sectionsDataValueAttributes[section].markerAttributes()); +// mas.setPen(pen); +// d->sectionsDataValueAttributes[section].setMarkerAttributes(mas); } -void DataSet::setBrush( int section, const QBrush &brush ) +void DataSet::setBrush(int section, const QBrush &brush) { - d->brushes[ section ] = brush; - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this, KDChartModel::BrushDataRole, section ); - d->insertDataValueAttributeSectionIfNecessary( section ); -// KDChart::MarkerAttributes mas( d->sectionsDataValueAttributes[ section ].markerAttributes() ); -// mas.setMarkerColor( brush.color() ); -// d->sectionsDataValueAttributes[ section ].setMarkerAttributes( mas ); + d->brushes[section] = brush; + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this, KDChartModel::BrushDataRole, section); + d->insertDataValueAttributeSectionIfNecessary(section); +// KDChart::MarkerAttributes mas(d->sectionsDataValueAttributes[section].markerAttributes()); +// mas.setMarkerColor(brush.color()); +// d->sectionsDataValueAttributes[section].setMarkerAttributes(mas); } -void DataSet::setPieExplodeFactor( int section, int factor ) +void DataSet::setPieExplodeFactor(int section, int factor) { KDChart::PieAttributes &pieAttributes = d->sectionsPieAttributes[section]; - pieAttributes.setExplodeFactor( (qreal)factor / (qreal)100 ); - if( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this, KDChartModel::PieAttributesRole, section); + pieAttributes.setExplodeFactor((qreal)factor / (qreal)100); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this, KDChartModel::PieAttributesRole, section); } int DataSet::number() const @@ -888,111 +880,111 @@ return d->num; } -void DataSet::setShowMeanValue( bool show ) +void DataSet::setShowMeanValue(bool show) { d->showMeanValue = show; } -void DataSet::setMeanValuePen( const QPen &pen ) +void DataSet::setMeanValuePen(const QPen &pen) { d->meanValuePen = pen; } -void DataSet::setShowLowerErrorIndicator( bool show ) +void DataSet::setShowLowerErrorIndicator(bool show) { d->showLowerErrorIndicator = show; } -void DataSet::setShowUpperErrorIndicator( bool show ) +void DataSet::setShowUpperErrorIndicator(bool show) { d->showUpperErrorIndicator = show; } -void DataSet::setShowErrorIndicators( bool lower, bool upper ) +void DataSet::setShowErrorIndicators(bool lower, bool upper) { - setShowLowerErrorIndicator( lower ); - setShowUpperErrorIndicator( upper ); + setShowLowerErrorIndicator(lower); + setShowUpperErrorIndicator(upper); } -void DataSet::setErrorIndicatorPen( const QPen &pen ) +void DataSet::setErrorIndicatorPen(const QPen &pen) { d->errorIndicatorPen = pen; } -void DataSet::setErrorCategory( ErrorCategory category ) +void DataSet::setErrorCategory(ErrorCategory category) { d->errorCategory = category; } -void DataSet::setErrorPercentage( qreal percentage ) +void DataSet::setErrorPercentage(qreal percentage) { d->errorPercentage = percentage; } -void DataSet::setErrorMargin( qreal margin ) +void DataSet::setErrorMargin(qreal margin) { d->errorMargin = margin; } -void DataSet::setLowerErrorLimit( qreal limit ) +void DataSet::setLowerErrorLimit(qreal limit) { d->lowerErrorLimit = limit; } -void DataSet::setUpperErrorLimit( qreal limit ) +void DataSet::setUpperErrorLimit(qreal limit) { d->upperErrorLimit = limit; } -QVariant DataSet::xData( int index, int role ) const +QVariant DataSet::xData(int index, int role) const { // Sometimes a bubble chart is created with a table with 4 columns. // What we do here is assign the 2 columns per data set, so we have // 2 data sets in total afterwards. The first column is y data, the second // bubble width. Same for the second data set. So there is nothing left // for x data. Instead use a fall-back to the data points index. - QVariant data = d->data( d->xDataRegion, index, role ); - if ( data.isValid() && data.canConvert< double >() && data.convert( QVariant::Double ) ) + QVariant data = d->data(d->xDataRegion, index, role); + if (data.isValid() && data.canConvert< double >() && data.convert(QVariant::Double) ) return data; - return QVariant( index + 1 ); + return QVariant(index + 1); } -QVariant DataSet::yData( int index, int role ) const +QVariant DataSet::yData(int index, int role) const { // No fall-back necessary. y data region must be specified if needed. // (may also be part of 'domain' in ODF terms, but only in case of // scatter and bubble charts) - return d->data( d->yDataRegion, index, role ); + return d->data(d->yDataRegion, index, role); } -QVariant DataSet::customData( int index, int role ) const +QVariant DataSet::customData(int index, int role) const { // No fall-back necessary. ('custom' [1]) data region (part of 'domain' in // ODF terms) must be specified if needed. See ODF v1.1 §10.9.1 - return d->data( d->customDataRegion, index, role ); + return d->data(d->customDataRegion, index, role); // [1] In fact, 'custom' data only refers to the bubble width of bubble // charts at the moment. } -QVariant DataSet::categoryData( int index, int role ) const +QVariant DataSet::categoryData(int index, int role) const { // There's no cell that holds this category's data // (i.e., the region is either too short or simply empty) -// if ( !d->categoryDataRegion.hasPointAtIndex( index ) ) -// return QString::number( index + 1 ); +// if (!d->categoryDataRegion.hasPointAtIndex(index)) +// return QString::number(index + 1); - if ( d->categoryDataRegion.rects().isEmpty() ) { + if (d->categoryDataRegion.rects().isEmpty()) { // There's no cell that holds this category's data // (i.e., the region is either too short or simply empty) - return QString::number( index + 1 ); + return QString::number(index + 1); } - foreach ( const QRect &rect, d->categoryDataRegion.rects() ) { - if ( rect.width() == 1 || rect.height() == 1 ) { + foreach (const QRect &rect, d->categoryDataRegion.rects()) { + if (rect.width() == 1 || rect.height() == 1) { // Handle the clear case of either horizontal or vertical // ranges with only one row/column. - const QVariant data = d->data( d->categoryDataRegion, index, role ); - if ( data.isValid() ) + const QVariant data = d->data(d->categoryDataRegion, index, role); + if (data.isValid()) return data; } else { // Operate on the last row in the defined in the categoryDataRegion. @@ -1004,35 +996,35 @@ // line below the first line and so on. Since we don't support // multiple label lines for categories yet we only display the last // row aka the very first label line. - CellRegion c( d->categoryDataRegion.table(), QRect( rect.x(), rect.bottom(), rect.width(), 1 ) ); - const QVariant data = d->data( c, index, role ); - if ( data.isValid() /* && !data.toString().isEmpty() */ ) + CellRegion c(d->categoryDataRegion.table(), QRect(rect.x(), rect.bottom(), rect.width(), 1)); + const QVariant data = d->data(c, index, role); + if (data.isValid() /* && !data.toString().isEmpty() */) return data; } } // The cell is empty - return QString( "" ); + return QString(""); } QVariant DataSet::labelData() const { QString label; - if ( d->labelDataRegion.isValid() ) { + if (d->labelDataRegion.isValid()) { const int cellCount = d->labelDataRegion.cellCount(); - for ( int i = 0; i < cellCount; i++ ) { - QString s = d->data( d->labelDataRegion, i, Qt::EditRole ).toString(); - if ( !s.isEmpty() ) { - if ( !label.isEmpty() ) + for (int i = 0; i < cellCount; i++) { + QString s = d->data(d->labelDataRegion, i, Qt::EditRole).toString(); + if (!s.isEmpty()) { + if (!label.isEmpty()) label += " "; label += s; } } } - if ( label.isEmpty() ) { + if (label.isEmpty()) { label = d->defaultLabel; } - return QVariant( label ); + return QVariant(label); } QString DataSet::defaultLabelData() const @@ -1066,49 +1058,49 @@ } -void DataSet::setXDataRegion( const CellRegion ®ion ) +void DataSet::setXDataRegion(const CellRegion ®ion) { d->xDataRegion = region; d->updateSize(); - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this, KDChartModel::XDataRole ); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this, KDChartModel::XDataRole); } -void DataSet::setYDataRegion( const CellRegion ®ion ) +void DataSet::setYDataRegion(const CellRegion ®ion) { d->yDataRegion = region; d->updateSize(); - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this, KDChartModel::YDataRole ); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this, KDChartModel::YDataRole); } -void DataSet::setCustomDataRegion( const CellRegion ®ion ) +void DataSet::setCustomDataRegion(const CellRegion ®ion) { d->customDataRegion = region; d->updateSize(); - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this, KDChartModel::CustomDataRole ); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this, KDChartModel::CustomDataRole); } -void DataSet::setCategoryDataRegion( const CellRegion ®ion ) +void DataSet::setCategoryDataRegion(const CellRegion ®ion) { d->categoryDataRegion = region; d->updateSize(); - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this, KDChartModel::CategoryDataRole ); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this, KDChartModel::CategoryDataRole); } -void DataSet::setLabelDataRegion( const CellRegion ®ion ) +void DataSet::setLabelDataRegion(const CellRegion ®ion) { d->labelDataRegion = region; d->updateSize(); - if ( d->kdChartModel ) - d->kdChartModel->dataSetChanged( this ); + if (d->kdChartModel) + d->kdChartModel->dataSetChanged(this); } @@ -1117,49 +1109,49 @@ return qMax(1, d->size); } -void DataSet::Private::dataChanged( KDChartModel::DataRole role, const QRect &rect ) const +void DataSet::Private::dataChanged(KDChartModel::DataRole role, const QRect &rect) const { - if ( !kdChartModel ) + if (!kdChartModel) return; - Q_UNUSED( rect ); + Q_UNUSED(rect); // Stubbornly pretend like everything changed. This as well should be // refactored to be done in ChartProxyModel, then we can also fine-tune // it for performance. - kdChartModel->dataSetChanged( parent, role, 0, size - 1 ); + kdChartModel->dataSetChanged(parent, role, 0, size - 1); } -void DataSet::yDataChanged( const QRect ®ion ) const +void DataSet::yDataChanged(const QRect ®ion) const { - d->dataChanged( KDChartModel::YDataRole, region ); + d->dataChanged(KDChartModel::YDataRole, region); } -void DataSet::xDataChanged( const QRect ®ion ) const +void DataSet::xDataChanged(const QRect ®ion) const { - d->dataChanged( KDChartModel::XDataRole, region ); + d->dataChanged(KDChartModel::XDataRole, region); } -void DataSet::customDataChanged( const QRect ®ion ) const +void DataSet::customDataChanged(const QRect ®ion) const { - d->dataChanged( KDChartModel::CustomDataRole, region ); + d->dataChanged(KDChartModel::CustomDataRole, region); } -void DataSet::labelDataChanged( const QRect ®ion ) const +void DataSet::labelDataChanged(const QRect ®ion) const { - d->dataChanged( KDChartModel::LabelDataRole, region ); + d->dataChanged(KDChartModel::LabelDataRole, region); } -void DataSet::categoryDataChanged( const QRect ®ion ) const +void DataSet::categoryDataChanged(const QRect ®ion) const { - d->dataChanged( KDChartModel::CategoryDataRole, region ); + d->dataChanged(KDChartModel::CategoryDataRole, region); } int DataSet::dimension() const { - return numDimensions( d->effectiveChartType() ); + return numDimensions(d->effectiveChartType()); } -void DataSet::setKdChartModel( KDChartModel *model ) +void DataSet::setKdChartModel(KDChartModel *model) { d->kdChartModel = model; } @@ -1169,83 +1161,83 @@ return d->kdChartModel; } -void DataSet::setValueLabelType( const ValueLabelType &type, int section /* = -1 */ ) +void DataSet::setValueLabelType(const ValueLabelType &type, int section /* = -1 */) { - if ( section >= 0 ) - d->insertDataValueAttributeSectionIfNecessary( section ); + if (section >= 0) + d->insertDataValueAttributeSectionIfNecessary(section); d->valueLabelType[section] = type; // This is a reference, not a copy! KDChart::DataValueAttributes &attr = section >= 0 ? - d->sectionsDataValueAttributes[ section ] : + d->sectionsDataValueAttributes[section] : d->dataValueAttributes; - KDChart::TextAttributes ta ( attr.textAttributes() ); + KDChart::TextAttributes ta (attr.textAttributes()); - ta.setVisible( !type.noLabel() ); + ta.setVisible(!type.noLabel()); KDChart::Measure m = ta.fontSize(); - m.setValue( 8 ); // same small font the legend is using - ta.setFontSize( m ); + m.setValue(8); // same small font the legend is using + ta.setFontSize(m); - attr.setTextAttributes( ta ); + attr.setTextAttributes(ta); - if ( d->kdChartModel ) { - if ( section >= 0 ) - d->kdChartModel->dataSetChanged( this, KDChartModel::DataValueAttributesRole, section ); + if (d->kdChartModel) { + if (section >= 0) + d->kdChartModel->dataSetChanged(this, KDChartModel::DataValueAttributesRole, section); else - d->kdChartModel->dataSetChanged( this ); + d->kdChartModel->dataSetChanged(this); } } -DataSet::ValueLabelType DataSet::valueLabelType( int section /* = -1 */ ) const +DataSet::ValueLabelType DataSet::valueLabelType(int section /* = -1 */) const { - if ( d->valueLabelType.contains(section) ) + if (d->valueLabelType.contains(section)) return d->valueLabelType[section]; - if ( d->valueLabelType.contains(-1) ) + if (d->valueLabelType.contains(-1)) return d->valueLabelType[-1]; return ValueLabelType(); } -bool loadBrushAndPen( KoStyleStack &styleStack, KoShapeLoadingContext &context, - const KoXmlElement &n, QBrush& brush, bool& brushLoaded, QPen& pen, bool& penLoaded ) +bool loadBrushAndPen(KoStyleStack &styleStack, KoShapeLoadingContext &context, + const KoXmlElement &n, QBrush& brush, bool& brushLoaded, QPen& pen, bool& penLoaded) { - if ( n.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + if (n.hasAttributeNS(KoXmlNS::chart, "style-name")) { KoOdfLoadingContext &odfLoadingContext = context.odfLoadingContext(); brushLoaded = false; penLoaded = false; - styleStack.setTypeProperties( "graphic" ); + styleStack.setTypeProperties("graphic"); - if ( styleStack.hasProperty( KoXmlNS::draw, "stroke" ) ) { - QString stroke = styleStack.property( KoXmlNS::draw, "stroke" ); - pen = KoOdfGraphicStyles::loadOdfStrokeStyle( styleStack, stroke, odfLoadingContext.stylesReader() ); + if (styleStack.hasProperty(KoXmlNS::draw, "stroke")) { + QString stroke = styleStack.property(KoXmlNS::draw, "stroke"); + pen = KoOdfGraphicStyles::loadOdfStrokeStyle(styleStack, stroke, odfLoadingContext.stylesReader()); penLoaded = true; } - if ( styleStack.hasProperty( KoXmlNS::draw, "fill" ) ) { - QString fill = styleStack.property( KoXmlNS::draw, "fill" ); - if ( fill == "solid" || fill == "hatch" ) { - brush = KoOdfGraphicStyles::loadOdfFillStyle( styleStack, fill, odfLoadingContext.stylesReader() ); + if (styleStack.hasProperty(KoXmlNS::draw, "fill")) { + QString fill = styleStack.property(KoXmlNS::draw, "fill"); + if (fill == "solid" || fill == "hatch") { + brush = KoOdfGraphicStyles::loadOdfFillStyle(styleStack, fill, odfLoadingContext.stylesReader()); brushLoaded = true; - } else if ( fill == "gradient" ) { - brush = KoOdfGraphicStyles::loadOdfGradientStyle( styleStack, odfLoadingContext.stylesReader(), QSizeF( 5.0, 60.0 ) ); + } else if (fill == "gradient") { + brush = KoOdfGraphicStyles::loadOdfGradientStyle(styleStack, odfLoadingContext.stylesReader(), QSizeF(5.0, 60.0)); brushLoaded = true; - } else if ( fill == "bitmap" ) { - brush = Surface::loadOdfPatternStyle( styleStack, odfLoadingContext, QSizeF( 5.0, 60.0 ) ); + } else if (fill == "bitmap") { + brush = Surface::loadOdfPatternStyle(styleStack, odfLoadingContext, QSizeF(5.0, 60.0)); brushLoaded = true; } } } #ifndef NWORKAROUND_ODF_BUGS - if( ! penLoaded) { - penLoaded = KoOdfWorkaround::fixMissingStroke( pen, n, context ); + if(! penLoaded) { + penLoaded = KoOdfWorkaround::fixMissingStroke(pen, n, context); } - if( ! brushLoaded) { - QColor fixedColor = KoOdfWorkaround::fixMissingFillColor( n, context ); - if ( fixedColor.isValid() ) { + if(! brushLoaded) { + QColor fixedColor = KoOdfWorkaround::fixMissingFillColor(n, context); + if (fixedColor.isValid()) { brush = fixedColor; brushLoaded = true; } @@ -1271,38 +1263,38 @@ * available and it seems OO.org/LO just save redundant informations * here at least with pie-charts... */ -void DataSet::Private::readValueLabelType( KoStyleStack &styleStack, int section /* = -1 */ ) +void DataSet::Private::readValueLabelType(KoStyleStack &styleStack, int section /* = -1 */) { - DataSet::ValueLabelType type = parent->valueLabelType( section ); + DataSet::ValueLabelType type = parent->valueLabelType(section); - const QString number = styleStack.property( KoXmlNS::chart, "data-label-number" ); - if ( !number.isNull() ) { - type.number = ( number == "value" || number == "value-and-percentage" ); - type.percentage = ( number == "percentage" || number == "value-and-percentage" ); + const QString number = styleStack.property(KoXmlNS::chart, "data-label-number"); + if (!number.isNull()) { + type.number = (number == "value" || number == "value-and-percentage"); + type.percentage = (number == "percentage" || number == "value-and-percentage"); } - const QString text = styleStack.property( KoXmlNS::chart, "data-label-text" ); - if ( !text.isNull() ) { - type.category = ( text == "true" ); + const QString text = styleStack.property(KoXmlNS::chart, "data-label-text"); + if (!text.isNull()) { + type.category = (text == "true"); } - const QString symbol = styleStack.property( KoXmlNS::chart, "data-label-symbol" ); - if ( !symbol.isNull() ) { - type.symbol = ( symbol == "true" ); + const QString symbol = styleStack.property(KoXmlNS::chart, "data-label-symbol"); + if (!symbol.isNull()) { + type.symbol = (symbol == "true"); } - parent->setValueLabelType( type, section ); + parent->setValueLabelType(type, section); } -bool DataSet::loadOdf( const KoXmlElement &n, - KoShapeLoadingContext &context ) +bool DataSet::loadOdf(const KoXmlElement &n, + KoShapeLoadingContext &context) { d->symbolsActivated = false; KoOdfLoadingContext &odfLoadingContext = context.odfLoadingContext(); KoOdfStylesReader &stylesReader = odfLoadingContext.stylesReader(); KoStyleStack &styleStack = odfLoadingContext.styleStack(); styleStack.clear(); - odfLoadingContext.fillStyleStack( n, KoXmlNS::chart, "style-name", "chart" ); + odfLoadingContext.fillStyleStack(n, KoXmlNS::chart, "style-name", "chart"); QString styleName = n.attributeNS(KoXmlNS::chart, "style-name", QString()); const KoXmlElement *stylElement = stylesReader.findStyle(styleName, "chart"); @@ -1317,7 +1309,7 @@ } } - OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData( OdfLoadingHelperId ); + OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData(OdfLoadingHelperId); // OOo assumes that if we use an internal model only, the columns are // interpreted as consecutive data series. Thus we can (and must) ignore // any chart:cell-range-address attribute associated with a series or @@ -1329,7 +1321,7 @@ // Find out which documents exactly and only use fix for as few cases as possible. #if 0 #ifndef NWORKAROUND_ODF_BUGS - if ( context.odfLoadingContext().generatorType() == KoOdfLoadingContext::OpenOffice ) + if (context.odfLoadingContext().generatorType() == KoOdfLoadingContext::OpenOffice) ignoreCellRanges = helper->chartUsesInternalModelOnly; #endif #endif @@ -1339,20 +1331,20 @@ QPen pen(Qt::NoPen); bool brushLoaded = false; bool penLoaded = false; - loadBrushAndPen( styleStack, context, n, brush, brushLoaded, pen, penLoaded ); - if(penLoaded) - setPen( pen ); - if(brushLoaded) - setBrush( brush ); + loadBrushAndPen(styleStack, context, n, brush, brushLoaded, pen, penLoaded); + if (penLoaded) + setPen(pen); + if (brushLoaded) + setBrush(brush); styleStack.setTypeProperties("chart"); - if(styleStack.hasProperty(KoXmlNS::chart, "pie-offset")) - setPieExplodeFactor( styleStack.property( KoXmlNS::chart, "pie-offset" ).toInt() ); + if (styleStack.hasProperty(KoXmlNS::chart, "pie-offset")) + setPieExplodeFactor(styleStack.property(KoXmlNS::chart, "pie-offset").toInt()); } bool bubbleChart = false; bool scatterChart = false; - if ( n.hasAttributeNS( KoXmlNS::chart, "class" ) ) { - QString charttype = n.attributeNS( KoXmlNS::chart, "class", QString() ); + if (n.hasAttributeNS(KoXmlNS::chart, "class")) { + QString charttype = n.attributeNS(KoXmlNS::chart, "class", QString()); bubbleChart = charttype == "chart:bubble"; scatterChart = charttype == "chart:scatter"; } @@ -1366,76 +1358,84 @@ // At least one element of a given chart:class shall have the necessary // number of sub-elements. All other elements with the same // chart:class may omit the sub-elements and use the previously defined. - if ( ( scatterChart || bubbleChart ) && n.hasChildNodes() ) { + if ((scatterChart || bubbleChart) && n.hasChildNodes()) { int domainCount = 0; KoXmlNode cn = n.firstChild(); - while ( !cn.isNull() ){ + while (!cn.isNull()){ KoXmlElement elem = cn.toElement(); const QString name = elem.tagName(); - if ( name == "domain" && elem.hasAttributeNS( KoXmlNS::table, "cell-range-address") && !ignoreCellRanges ) { - if ( (domainCount == 0 && scatterChart) || (domainCount == 1 && bubbleChart) ) { - const QString region = elem.attributeNS( KoXmlNS::table, "cell-range-address", QString() ); - setXDataRegion( CellRegion( helper->tableSource, region ) ); - } else { - const QString region = elem.attributeNS( KoXmlNS::table, "cell-range-address", QString() ); - setYDataRegion( CellRegion( helper->tableSource, region ) ); + if (name == "domain" && elem.hasAttributeNS(KoXmlNS::table, "cell-range-address") && !ignoreCellRanges) { + if ((domainCount == 0 && scatterChart) || (domainCount == 1 && bubbleChart)) { + const QString region = elem.attributeNS(KoXmlNS::table, "cell-range-address", QString()); + setXDataRegion(CellRegion(helper->tableSource, region)); + } + else { + const QString region = elem.attributeNS(KoXmlNS::table, "cell-range-address", QString()); + setYDataRegion(CellRegion(helper->tableSource, region)); } ++domainCount; - if ( (bubbleChart && domainCount == 2) || scatterChart ) + if ((bubbleChart && domainCount == 2) || scatterChart) break; // We are finished and don't expect more domain's. } cn = cn.nextSibling(); } } - if ( n.hasAttributeNS( KoXmlNS::chart, "values-cell-range-address" ) && !ignoreCellRanges ) { - const QString regionString = n.attributeNS( KoXmlNS::chart, "values-cell-range-address", QString() ); - const CellRegion region( helper->tableSource, regionString ); - if ( bubbleChart ) - { - setCustomDataRegion( region ); + if (n.hasAttributeNS(KoXmlNS::chart, "values-cell-range-address") && !ignoreCellRanges) { + const QString regionString = n.attributeNS(KoXmlNS::chart, "values-cell-range-address", QString()); + const CellRegion region(helper->tableSource, regionString); + if (bubbleChart) { + setCustomDataRegion(region); } - else - { - setYDataRegion( region ); + else { + setYDataRegion(region); } - if ( !bubbleChart && d->loadedDimensions == 0 ) - { - setYDataRegion( region ); + + if (!bubbleChart && d->loadedDimensions == 0) { + setYDataRegion(region); ++d->loadedDimensions; } } - if ( n.hasAttributeNS( KoXmlNS::chart, "label-cell-address" ) && !ignoreCellRanges ) { - const QString region = n.attributeNS( KoXmlNS::chart, "label-cell-address", QString() ); - setLabelDataRegion( CellRegion( helper->tableSource, region ) ); + if (n.hasAttributeNS(KoXmlNS::chart, "label-cell-address") && !ignoreCellRanges) { + const QString region = n.attributeNS(KoXmlNS::chart, "label-cell-address", QString()); + setLabelDataRegion(CellRegion(helper->tableSource, region)); } - d->readValueLabelType( styleStack ); + if (n.hasAttributeNS(KoXmlNS::chart, "class") && !ignoreCellRanges) { + const QString chartClass = n.attributeNS(KoXmlNS::chart, "class", QString()); + KChart::ChartType chartType = KChart::BarChartType; + for (int type = 0; type < (int)LastChartType; ++type) { + if (chartClass == odfCharttype(type)) { + chartType = (ChartType)type; + setChartType(chartType); + break; + } + } + } - if ( styleStack.hasProperty( KoXmlNS::chart, "symbol-type" ) ) - { - const QString name = styleStack.property( KoXmlNS::chart, "symbol-type" ); - if ( name == "automatic" ) - { + d->readValueLabelType(styleStack); + + if (styleStack.hasProperty(KoXmlNS::chart, "symbol-type")) { + const QString name = styleStack.property(KoXmlNS::chart, "symbol-type"); + if (name == "automatic") { d->symbolsActivated = true; d->symbolID = d->num % numDefaultMarkerTypes; } - else if ( name == "named-symbol" ) - { + else if (name == "named-symbol") { d->symbolsActivated = true; - if ( styleStack.hasProperty( KoXmlNS::chart, "symbol-name" ) ) { - const QString type = styleStack.property( KoXmlNS::chart, "symbol-name" ); - if ( type == "square" ) + if (styleStack.hasProperty(KoXmlNS::chart, "symbol-name")) { + const QString type = styleStack.property(KoXmlNS::chart, "symbol-name"); + if (type == "square") d->symbolID = 0; - else if ( type == "diamond" ) + else if (type == "diamond") d->symbolID = 1; - else if ( type == "circle" ) + else if (type == "circle") d->symbolID = 5; - else if ( type == "x" ) + else if (type == "x") d->symbolID = 2; - else if ( type == "triangle" ) + else if (type == "triangle") d->symbolID = 0; - else if ( type == "plus" ) + else if (type == "plus") d->symbolID = 2; else d->symbolID = 0; @@ -1446,14 +1446,14 @@ // load data points KoXmlElement m; int loadedDataPointCount = 0; - forEachElement ( m, n ) { - if ( m.namespaceURI() != KoXmlNS::chart ) + forEachElement (m, n) { + if (m.namespaceURI() != KoXmlNS::chart) continue; - if ( m.localName() != "data-point" ) + if (m.localName() != "data-point") continue; styleStack.clear(); - odfLoadingContext.fillStyleStack( m, KoXmlNS::chart, "style-name", "chart" ); + odfLoadingContext.fillStyleStack(m, KoXmlNS::chart, "style-name", "chart"); QBrush brush(Qt::NoBrush); QPen pen(Qt::NoPen); @@ -1461,32 +1461,31 @@ bool penLoaded = false; loadBrushAndPen(styleStack, context, m, brush, brushLoaded, pen, penLoaded); if(penLoaded) - setPen( loadedDataPointCount, pen ); + setPen(loadedDataPointCount, pen); if(brushLoaded) - setBrush( loadedDataPointCount, brush ); + setBrush(loadedDataPointCount, brush); //load pie explode factor styleStack.setTypeProperties("chart"); - if(styleStack.hasProperty( KoXmlNS::chart, "pie-offset")) - setPieExplodeFactor( loadedDataPointCount, styleStack.property( KoXmlNS::chart, "pie-offset" ).toInt() ); + if(styleStack.hasProperty(KoXmlNS::chart, "pie-offset")) + setPieExplodeFactor(loadedDataPointCount, styleStack.property(KoXmlNS::chart, "pie-offset").toInt()); - d->readValueLabelType( styleStack, loadedDataPointCount ); + d->readValueLabelType(styleStack, loadedDataPointCount); ++loadedDataPointCount; } return true; } -bool DataSet::loadSeriesIntoDataset( const KoXmlElement &n, - KoShapeLoadingContext &context ) +bool DataSet::loadSeriesIntoDataset(const KoXmlElement &n, KoShapeLoadingContext &context) { d->symbolsActivated = false; KoOdfLoadingContext &odfLoadingContext = context.odfLoadingContext(); KoStyleStack &styleStack = odfLoadingContext.styleStack(); styleStack.clear(); - odfLoadingContext.fillStyleStack( n, KoXmlNS::chart, "style-name", "chart" ); + odfLoadingContext.fillStyleStack(n, KoXmlNS::chart, "style-name", "chart"); - OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData( OdfLoadingHelperId ); + OdfLoadingHelper *helper = (OdfLoadingHelper*)context.sharedData(OdfLoadingHelperId); // OOo assumes that if we use an internal model only, the columns are // interpreted as consecutive data series. Thus we can (and must) ignore // any chart:cell-range-address attribute associated with a series or @@ -1496,33 +1495,30 @@ bool ignoreCellRanges = false; styleStack.setTypeProperties("chart"); - if ( n.hasChildNodes() ){ + if (n.hasChildNodes()){ KoXmlNode cn = n.firstChild(); - while ( !cn.isNull() ){ + while (!cn.isNull()){ KoXmlElement elem = cn.toElement(); const QString name = elem.tagName(); - if ( name == "domain" && elem.hasAttributeNS( KoXmlNS::table, "cell-range-address") && !ignoreCellRanges ) { - Q_ASSERT( false ); - if ( d->loadedDimensions == 0 ) - { - const QString region = elem.attributeNS( KoXmlNS::table, "cell-range-address", QString() ); - setXDataRegion( CellRegion( helper->tableSource, region ) ); + if (name == "domain" && elem.hasAttributeNS(KoXmlNS::table, "cell-range-address") && !ignoreCellRanges) { + Q_ASSERT(false); + if (d->loadedDimensions == 0) { + const QString region = elem.attributeNS(KoXmlNS::table, "cell-range-address", QString()); + setXDataRegion(CellRegion(helper->tableSource, region)); ++d->loadedDimensions; } - else if ( d->loadedDimensions == 1 ) - { - const QString region = elem.attributeNS( KoXmlNS::table, "cell-range-address", QString() ); + else if (d->loadedDimensions == 1) { + const QString region = elem.attributeNS(KoXmlNS::table, "cell-range-address", QString()); // as long as there is not default table for missing data series the same region is used twice // to ensure the diagram is displayed, even if not as expected from o office or ms office - setYDataRegion( CellRegion( helper->tableSource, region ) ); + setYDataRegion(CellRegion(helper->tableSource, region)); ++d->loadedDimensions; } - else if ( d->loadedDimensions == 2 ) - { - const QString region = elem.attributeNS( KoXmlNS::table, "cell-range-address", QString() ); + else if (d->loadedDimensions == 2) { + const QString region = elem.attributeNS(KoXmlNS::table, "cell-range-address", QString()); // as long as there is not default table for missing data series the same region is used twice // to ensure the diagram is displayed, even if not as expected from o office or ms office - setCustomDataRegion( CellRegion( helper->tableSource, region ) ); + setCustomDataRegion(CellRegion(helper->tableSource, region)); ++d->loadedDimensions; } @@ -1531,76 +1527,122 @@ } } - if ( n.hasAttributeNS( KoXmlNS::chart, "values-cell-range-address" ) && !ignoreCellRanges ) { - const QString regionString = n.attributeNS( KoXmlNS::chart, "values-cell-range-address", QString() ); - const CellRegion region( helper->tableSource, regionString ); - if ( d->loadedDimensions == 0 ) - { - setYDataRegion( CellRegion( region ) ); - ++d->loadedDimensions; - } - else if ( d->loadedDimensions == 1 ) - { - // as long as there is not default table for missing data series the same region is used twice - // to ensure the diagram is displayed, even if not as expected from o office or ms office - setXDataRegion( CellRegion( region ) ); - ++d->loadedDimensions; - } - else if ( d->loadedDimensions == 2 ) - { - // as long as there is not default table for missing data series the same region is used twice - // to ensure the diagram is displayed, even if not as expected from o office or ms office - setCustomDataRegion( CellRegion( region ) ); - ++d->loadedDimensions; - } + if (n.hasAttributeNS(KoXmlNS::chart, "values-cell-range-address") && !ignoreCellRanges) { + const QString regionString = n.attributeNS(KoXmlNS::chart, "values-cell-range-address", QString()); + const CellRegion region(helper->tableSource, regionString); + if (d->loadedDimensions == 0) { + setYDataRegion(CellRegion(region)); + ++d->loadedDimensions; + } + else if (d->loadedDimensions == 1) { + // as long as there is not default table for missing data series the same region is used twice + // to ensure the diagram is displayed, even if not as expected from o office or ms office + setYDataRegion(CellRegion(region)); + ++d->loadedDimensions; + } + else if (d->loadedDimensions == 2) { + // As long as there is no default table for missing data + // series the same region is used twice to ensure the + // diagram is displayed, even if not as expected from open + // office or ms office. + setCustomDataRegion(CellRegion(region)); + ++d->loadedDimensions; + } } - if ( n.hasAttributeNS( KoXmlNS::chart, "label-cell-address" ) && !ignoreCellRanges ) { - const QString region = n.attributeNS( KoXmlNS::chart, "label-cell-address", QString() ); - setLabelDataRegion( CellRegion( helper->tableSource, region ) ); + //store the cell address corresponding to the label of the correct data series + if (d->loadedDimensions == 2 && n.hasAttributeNS(KoXmlNS::chart, "label-cell-address") && !ignoreCellRanges) { + const QString region = n.attributeNS(KoXmlNS::chart, "label-cell-address", QString()); + setLabelDataRegion(CellRegion(helper->tableSource, region)); } - d->readValueLabelType( styleStack ); + d->readValueLabelType(styleStack); return true; } -void DataSet::saveOdf( KoShapeSavingContext &context ) const +void DataSet::saveOdf(KoShapeSavingContext &context) const { KoXmlWriter &bodyWriter = context.xmlWriter(); KoGenStyles &mainStyles = context.mainStyles(); - bodyWriter.startElement( "chart:series" ); + bodyWriter.startElement("chart:series"); + + KoGenStyle style(KoGenStyle::ChartAutoStyle, "chart"); - KoGenStyle style( KoGenStyle::ChartAutoStyle, "chart" ); + if (pieAttributes().explode()) { + const int pieExplode = (int)(pieAttributes().explodeFactor()*100); + style.addProperty("chart:pie-offset", pieExplode, KoGenStyle::ChartType); + } DataSet::ValueLabelType type = valueLabelType(); - if ( type.number && type.percentage ) - style.addProperty( "chart:data-label-number", "value-and-percentage" ); - else if ( type.number ) - style.addProperty( "chart:data-label-number", "value" ); - else if ( type.percentage ) - style.addProperty( "chart:data-label-number", "percentage" ); - if ( type.category ) - style.addProperty( "chart:data-label-text", "true" ); - if ( type.symbol ) - style.addProperty( "chart:data-label-symbol", "true" ); + if (type.number && type.percentage) + style.addProperty("chart:data-label-number", "value-and-percentage"); + else if (type.number) + style.addProperty("chart:data-label-number", "value"); + else if (type.percentage) + style.addProperty("chart:data-label-number", "percentage"); + if (type.category) + style.addProperty("chart:data-label-text", "true"); + if (type.symbol) + style.addProperty("chart:data-label-symbol", "true"); - KoOdfGraphicStyles::saveOdfFillStyle( style, mainStyles, brush() ); - KoOdfGraphicStyles::saveOdfStrokeStyle( style, mainStyles, pen() ); + if (d->symbolsActivated) + { + QString symbolName = ""; + QString symbolType = "named-symbol"; - const QString styleName = mainStyles.insert( style, "ch" ); - bodyWriter.addAttribute( "chart:style-name", styleName ); + if (d->symbolID == 0) + symbolName = "square"; + else if (d->symbolID == 1) + symbolName = "diamond"; + else if (d->symbolID == 5) + symbolName = "circle"; + else if (d->symbolID == 2) + symbolName = "x"; + else + symbolType = "automatic"; + + style.addProperty("chart:symbol-type", symbolType, KoGenStyle::ChartType); + if (!symbolName.isEmpty()) + style.addProperty("chart:symbol-name", symbolName, KoGenStyle::ChartType); + } + + KoOdfGraphicStyles::saveOdfFillStyle(style, mainStyles, brush()); + KoOdfGraphicStyles::saveOdfStrokeStyle(style, mainStyles, pen()); + + const QString styleName = mainStyles.insert(style, "ch"); + bodyWriter.addAttribute("chart:style-name", styleName); // Save cell regions for values if defined. QString values = yDataRegion().toString(); if (!values.isEmpty()) - bodyWriter.addAttribute( "chart:values-cell-range-address", values ); + bodyWriter.addAttribute("chart:values-cell-range-address", values); // Save cell regions for labels if defined. If not defined then the internal // table:table "local-table" (the data is stored in the ChartTableModel) is used. QString label = labelDataRegion().toString(); if (!label.isEmpty()) - bodyWriter.addAttribute( "chart:label-cell-address", label ); + bodyWriter.addAttribute("chart:label-cell-address", label); + + int charttype = (chartType() < LastChartType) ? chartType() : 0; + QString chartClass = odfCharttype(charttype); + if (!chartClass.isEmpty()) + bodyWriter.addAttribute("chart:class", chartClass); + + if (chartType() == KChart::CircleChartType || chartType() == KChart::RingChartType) { + for (int j=0; jsetText( "X" ); - dimensionIsY->setText( "Y" ); + dimensionIsX->setText("X"); + dimensionIsY->setText("Y"); } NewAxisDialog::~NewAxisDialog() diff -Nru calligra-2.4.0/plugins/chartshape/dialogs/NewAxisDialog.h calligra-2.4.3/plugins/chartshape/dialogs/NewAxisDialog.h --- calligra-2.4.0/plugins/chartshape/dialogs/NewAxisDialog.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/dialogs/NewAxisDialog.h 2012-06-26 04:18:01.000000000 +0000 @@ -29,7 +29,7 @@ class NewAxisDialog : public QDialog, public Ui::NewAxisDialog { public: - NewAxisDialog( QWidget *parent = 0 ); + NewAxisDialog(QWidget *parent = 0); ~NewAxisDialog(); }; diff -Nru calligra-2.4.0/plugins/chartshape/dialogs/TableEditorDialog.cpp calligra-2.4.3/plugins/chartshape/dialogs/TableEditorDialog.cpp --- calligra-2.4.0/plugins/chartshape/dialogs/TableEditorDialog.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/dialogs/TableEditorDialog.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -56,10 +56,10 @@ { tableViewContainer->addWidget( m_tableView ); - KIcon insertRowIcon = KIcon( "insert_table_row" ); - KIcon deleteRowIcon = KIcon( "delete_table_row" ); - KIcon insertColIcon = KIcon( "insert_table_col" ); - KIcon deleteColIcon = KIcon( "delete_table_col" ); + const KIcon insertRowIcon = KIcon("edit-table-insert-row-above"); + const KIcon deleteRowIcon = KIcon("edit-table-delete-row"); + const KIcon insertColIcon = KIcon("edit-table-insert-column-left"); + const KIcon deleteColIcon = KIcon("edit-table-delete-column"); // Create actions. m_insertRowsAction = new QAction( insertRowIcon, i18n( "Insert Rows" ), m_tableView ); diff -Nru calligra-2.4.0/plugins/chartshape/dialogs/TableEditorDialog.h calligra-2.4.3/plugins/chartshape/dialogs/TableEditorDialog.h --- calligra-2.4.0/plugins/chartshape/dialogs/TableEditorDialog.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/dialogs/TableEditorDialog.h 2012-06-26 04:18:01.000000000 +0000 @@ -45,8 +45,8 @@ ~TableEditorDialog(); void init(); - void setProxyModel( ChartProxyModel *proxyModel ); - void setModel( QAbstractItemModel *model ); + void setProxyModel(ChartProxyModel *proxyModel); + void setModel(QAbstractItemModel *model); protected slots: void slotUpdateDialog(); @@ -55,9 +55,9 @@ void slotInsertColumnPressed(); void slotDeleteColumnPressed(); - void deleteSelectedRowsOrColumns( Qt::Orientation orientation ); - void slotCurrentIndexChanged( const QModelIndex &index ); - void slotDataSetsInRowsToggled( bool enabled ); + void deleteSelectedRowsOrColumns(Qt::Orientation orientation); + void slotCurrentIndexChanged(const QModelIndex &index); + void slotDataSetsInRowsToggled(bool enabled); private: ChartProxyModel *m_proxyModel; diff -Nru calligra-2.4.0/plugins/chartshape/kchart_global.cpp calligra-2.4.3/plugins/chartshape/kchart_global.cpp --- calligra-2.4.0/plugins/chartshape/kchart_global.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/kchart_global.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -22,9 +22,9 @@ namespace KChart { -bool isPolar( ChartType type ) +bool isPolar(ChartType type) { - switch ( type ) + switch (type) { case CircleChartType: case RingChartType: @@ -37,16 +37,16 @@ return false; } -bool isCartesian( ChartType type ) +bool isCartesian(ChartType type) { - return !isPolar( type ); + return !isPolar(type); } -int numDimensions( ChartType type ) +int numDimensions(ChartType type) { int dimensions = 1; - switch ( type ) { + switch (type) { case BarChartType: case LineChartType: case AreaChartType: diff -Nru calligra-2.4.0/plugins/chartshape/kchart_global.h calligra-2.4.3/plugins/chartshape/kchart_global.h --- calligra-2.4.0/plugins/chartshape/kchart_global.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/kchart_global.h 2012-06-26 04:21:31.000000000 +0000 @@ -41,11 +41,11 @@ GanttChartType, LastChartType // Not an actual type, just a place holder }; -const int NUM_CHARTTYPES = int ( LastChartType ); +const int NUM_CHARTTYPES = int (LastChartType); -bool isPolar( ChartType type ); -bool isCartesian( ChartType type ); -int numDimensions( ChartType type ); +bool isPolar(ChartType type); +bool isCartesian(ChartType type); +int numDimensions(ChartType type); // Chart subtypes, applicable to Bar, Line, Area, and Radar @@ -88,13 +88,13 @@ }; enum ErrorCategory { - NoErrorCategory, - VarianceErrorCategory, - StandardDeviationErrorCategory, - StandardErrorErrorCategory, - PercentageErrorCategory, - ErrorMarginErrorCategory, - ConstantErrorCategory + NoErrorCategory, + VarianceErrorCategory, + StandardDeviationErrorCategory, + StandardErrorErrorCategory, + PercentageErrorCategory, + ErrorMarginErrorCategory, + ConstantErrorCategory }; enum LabelType { diff -Nru calligra-2.4.0/plugins/chartshape/kchartpart.desktop calligra-2.4.3/plugins/chartshape/kchartpart.desktop --- calligra-2.4.0/plugins/chartshape/kchartpart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/kchartpart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Calligra Chart Component Name[bg]=Компонент за диаграми в Calligra Name[ca]=Component de diagrames del Calligra +Name[ca@valencia]=Component de diagrames del Calligra Name[cs]=Komponenta Calligra pro grafy Name[da]=Calligra-komponent til diagrammer Name[de]=Calligra-Komponente für Diagramme @@ -10,7 +11,9 @@ Name[et]=Calligra diagrammikomponent Name[fi]=Calligra Chart -osa Name[fr]=Composant gestion de projets de Calligra +Name[gl]=Compoñente de xestión de proxectos de Calligra Name[it]=Componente di Calligra Chart +Name[ja]=Calligra グラフコンポーネント Name[kk]=Calligra-ның диаграмма құру бағдарламасы Name[nb]=Calligra diagram-komponent Name[nl]=Grafiekencomponent van Calligra @@ -18,6 +21,7 @@ Name[pt]=Componente de Gráficos do Calligra Name[pt_BR]=Componente de gráfico do Calligra Name[ru]=Компонент диаграмм Calligra +Name[sk]=Komponent grafu Calligra Name[sv]=Calligra Chart-komponent Name[uk]=Компонент діаграм Calligra Name[x-test]=xxCalligra Chart Componentxx @@ -35,6 +39,7 @@ GenericName[bg]=Диаграма GenericName[br]=Treser grafoù GenericName[ca]=Diagrames +GenericName[ca@valencia]=Diagrames GenericName[cs]=Graf GenericName[cy]=Siart GenericName[da]=Diagram diff -Nru calligra-2.4.0/plugins/chartshape/kdchart/src/KDChartCartesianAxis.cpp calligra-2.4.3/plugins/chartshape/kdchart/src/KDChartCartesianAxis.cpp --- calligra-2.4.0/plugins/chartshape/kdchart/src/KDChartCartesianAxis.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/kdchart/src/KDChartCartesianAxis.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -941,7 +941,7 @@ QPointF secondPos = diagramIsVertical ? QPointF( i + labelDiff, 0.0 ) : QPointF( 0.0, i + labelDiff ); secondPos = plane->translate( secondPos ); - if ( labelItem->intersects( *labelItem2, firstPos, secondPos ) ) + if ( labelItem->intersects( *labelItem2, firstPos, secondPos ) && !diagram()->allowOverlappingDataValueTexts() ) { i = minValueX; labelDiff += labelDiff; diff -Nru calligra-2.4.0/plugins/chartshape/KDChartConvertions.cpp calligra-2.4.3/plugins/chartshape/KDChartConvertions.cpp --- calligra-2.4.0/plugins/chartshape/KDChartConvertions.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/KDChartConvertions.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -29,9 +29,9 @@ namespace KChart { -KDChart::CartesianAxis::Position PositionToKDChartAxisPosition( Position position ) +KDChart::CartesianAxis::Position PositionToKDChartAxisPosition(Position position) { - switch ( position ) { + switch (position) { case BottomPosition: return KDChart::CartesianAxis::Bottom; case TopPosition: @@ -42,43 +42,43 @@ return KDChart::CartesianAxis::Left; } - Q_ASSERT( "Unknown KDChart::CartesianAxis::Position!" ); + Q_ASSERT("Unknown KDChart::CartesianAxis::Position!"); return KDChart::CartesianAxis::Bottom; } // Used to save e.g. legend-position attribute to ODF. Do not change these strings. -QString PositionToString( Position position ) +QString PositionToString(Position position) { - switch ( position ) { + switch (position) { case StartPosition: - return QString( "start" ); + return QString("start"); case TopPosition: - return QString( "top" ); + return QString("top"); case BottomPosition: - return QString( "bottom" ); + return QString("bottom"); case TopStartPosition: - return QString( "top-start" ); + return QString("top-start"); case BottomStartPosition: - return QString( "bottom-start" ); + return QString("bottom-start"); case TopEndPosition: - return QString( "top-end" ); + return QString("top-end"); case BottomEndPosition: - return QString( "bottom-end" ); + return QString("bottom-end"); case EndPosition: - return QString( "end" ); + return QString("end"); case CenterPosition: - return QString( "center" ); + return QString("center"); case FloatingPosition: return QString(); } - Q_ASSERT( "Unknown Position!" ); + Q_ASSERT("Unknown Position!"); return QString(); } -KDChartEnums::PositionValue PositionToKDChartPositionValue( Position position ) +KDChartEnums::PositionValue PositionToKDChartPositionValue(Position position) { - switch ( position ) { + switch (position) { case StartPosition: return KDChartEnums::PositionWest; case TopPosition: @@ -101,13 +101,13 @@ return KDChartEnums::PositionFloating; } - Q_ASSERT( "Unknown Position!" ); + Q_ASSERT("Unknown Position!"); return KDChartEnums::PositionEast; } -Position KDChartPositionValueToPosition( KDChartEnums::PositionValue position ) +Position KDChartPositionValueToPosition(KDChartEnums::PositionValue position) { - switch ( position ) { + switch (position) { case KDChartEnums::PositionNorthWest: return TopStartPosition; case KDChartEnums::PositionNorth: @@ -134,13 +134,13 @@ return FloatingPosition; } - Q_ASSERT( "Unknown KDChartEnums::PositionValue!" ); + Q_ASSERT("Unknown KDChartEnums::PositionValue!"); return FloatingPosition; } -Qt::Orientation LegendExpansionToQtOrientation( LegendExpansion expansion ) +Qt::Orientation LegendExpansionToQtOrientation(LegendExpansion expansion) { - switch ( expansion ) { + switch (expansion) { case WideLegendExpansion: return Qt::Horizontal; case HighLegendExpansion: @@ -151,20 +151,20 @@ return Qt::Vertical; } - Q_ASSERT( "Unknown Qt::Orientation!" ); + Q_ASSERT("Unknown Qt::Orientation!"); return Qt::Vertical; } -LegendExpansion QtOrientationToLegendExpansion( Qt::Orientation orientation ) +LegendExpansion QtOrientationToLegendExpansion(Qt::Orientation orientation) { - switch ( orientation ) { + switch (orientation) { case Qt::Horizontal: return WideLegendExpansion; case Qt::Vertical: return HighLegendExpansion; } - Q_ASSERT( "Unknown LegendExpansion!" ); + Q_ASSERT("Unknown LegendExpansion!"); return HighLegendExpansion; } diff -Nru calligra-2.4.0/plugins/chartshape/KDChartConvertions.h calligra-2.4.3/plugins/chartshape/KDChartConvertions.h --- calligra-2.4.0/plugins/chartshape/KDChartConvertions.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/KDChartConvertions.h 2012-06-26 04:18:01.000000000 +0000 @@ -33,14 +33,14 @@ namespace KChart { -extern KDChart::CartesianAxis::Position PositionToKDChartAxisPosition( Position position ); +extern KDChart::CartesianAxis::Position PositionToKDChartAxisPosition(Position position); -extern QString PositionToString( Position position ); -extern KDChartEnums::PositionValue PositionToKDChartPositionValue( Position position ); -extern Position KDChartPositionValueToPosition( KDChartEnums::PositionValue position ); +extern QString PositionToString(Position position); +extern KDChartEnums::PositionValue PositionToKDChartPositionValue(Position position); +extern Position KDChartPositionValueToPosition(KDChartEnums::PositionValue position); -extern Qt::Orientation LegendExpansionToQtOrientation( LegendExpansion expansion ); -extern LegendExpansion QtOrientationToLegendExpansion( Qt::Orientation orientation ); +extern Qt::Orientation LegendExpansionToQtOrientation(LegendExpansion expansion); +extern LegendExpansion QtOrientationToLegendExpansion(Qt::Orientation orientation); } // Namespace KChart diff -Nru calligra-2.4.0/plugins/chartshape/KDChartModel.cpp calligra-2.4.3/plugins/chartshape/KDChartModel.cpp --- calligra-2.4.0/plugins/chartshape/KDChartModel.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/KDChartModel.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -42,7 +42,7 @@ class KDChartModel::Private { public: - Private( KDChartModel *parent, PlotArea *plotArea ); + Private(KDChartModel *parent, PlotArea *plotArea); ~Private(); KDChartModel *const q; @@ -53,7 +53,7 @@ * this model (i.e. not attached, thus not in dataSets), an index * is returned before which this dataSet should be inserted. */ - int dataSetIndex( DataSet *dataSet ) const; + int dataSetIndex(DataSet *dataSet) const; /** * Returns the cached (!) max size of all data sets in this model. @@ -63,7 +63,7 @@ /** * Calculates the maximum size of all data sets in the passed list. */ - int calcMaxDataSetSize( QList list ) const; + int calcMaxDataSetSize(QList list) const; /** * Only calculates the new size for the current data set list, @@ -75,18 +75,18 @@ * Returns the first model index a certain data point of a data occupies * in this model. * - * Note that dataPointFirstModelIndex( .. ) == dataPointLastModelIndex( .. ) + * Note that dataPointFirstModelIndex(..) == dataPointLastModelIndex(..) * in case we have only one data dimension. */ - QModelIndex dataPointFirstModelIndex( int dataSetNumber, int index ); + QModelIndex dataPointFirstModelIndex(int dataSetNumber, int index); /** * Returns the last model index a certain data point of a data occupies * in this model. */ - QModelIndex dataPointLastModelIndex( int dataSetNumber, int index ); + QModelIndex dataPointLastModelIndex(int dataSetNumber, int index); - bool isKnownDataRole( int role ) const; + bool isKnownDataRole(int role) const; int dataDimensions; int biggestDataSetSize; @@ -96,9 +96,9 @@ }; -KDChartModel::Private::Private( KDChartModel *parent, PlotArea *_plotArea ) - : q( parent ) - , plotArea( _plotArea ) +KDChartModel::Private::Private(KDChartModel *parent, PlotArea *_plotArea) + : q(parent) + , plotArea(_plotArea) { dataDimensions = 1; dataDirection = Qt::Vertical; @@ -114,25 +114,25 @@ return biggestDataSetSize; } -int KDChartModel::Private::calcMaxDataSetSize( QList list ) const +int KDChartModel::Private::calcMaxDataSetSize(QList list) const { int maxSize = 0; - foreach ( DataSet *dataSet, list ) - maxSize = qMax( maxSize, dataSet->size() ); + foreach (DataSet *dataSet, list) + maxSize = qMax(maxSize, dataSet->size()); return maxSize; } int KDChartModel::Private::calcMaxDataSetSize() const { - return calcMaxDataSetSize( dataSets ); + return calcMaxDataSetSize(dataSets); } -int KDChartModel::Private::dataSetIndex( DataSet *dataSet ) const +int KDChartModel::Private::dataSetIndex(DataSet *dataSet) const { // If data set is not in our list yet, find out where to insert it - if ( !dataSets.contains( dataSet ) ) { - for ( int i = 0; i < dataSets.size(); i++ ) { - if ( dataSet->number() < dataSets[ i ]->number() ) + if (!dataSets.contains(dataSet)) { + for (int i = 0; i < dataSets.size(); i++) { + if (dataSet->number() < dataSets[i]->number()) return i; } @@ -140,27 +140,27 @@ } // Otherwise simply return its index - return dataSets.indexOf( dataSet ); + return dataSets.indexOf(dataSet); } -QModelIndex KDChartModel::Private::dataPointFirstModelIndex( int dataSetNumber, int index ) +QModelIndex KDChartModel::Private::dataPointFirstModelIndex(int dataSetNumber, int index) { // Use the first row or column this data set occupies, assuming the data // direction is horizontal or vertical, respectively. int dataSetRowOrCol = dataSetNumber * dataDimensions; - if ( dataDirection == Qt::Vertical ) - return q->index( index, dataSetRowOrCol ); - return q->index( dataSetRowOrCol, index ); + if (dataDirection == Qt::Vertical) + return q->index(index, dataSetRowOrCol); + return q->index(dataSetRowOrCol, index); } -QModelIndex KDChartModel::Private::dataPointLastModelIndex( int dataSetNumber, int index ) +QModelIndex KDChartModel::Private::dataPointLastModelIndex(int dataSetNumber, int index) { // Use the last row or column this data set occupies, assuming the data // direction is horizontal or vertical, respectively. int dataSetRowOrCol = (dataSetNumber + 1) * dataDimensions - 1; - if ( dataDirection == Qt::Vertical ) - return q->index( index, dataSetRowOrCol ); - return q->index( dataSetRowOrCol, index ); + if (dataDirection == Qt::Vertical) + return q->index(index, dataSetRowOrCol); + return q->index(dataSetRowOrCol, index); } @@ -168,9 +168,9 @@ // class KDChartModel -KDChartModel::KDChartModel( PlotArea *plotArea, QObject *parent ) - : QAbstractItemModel( parent ), - d( new Private( this, plotArea ) ) +KDChartModel::KDChartModel(PlotArea *plotArea, QObject *parent) + : QAbstractItemModel(parent), + d(new Private(this, plotArea)) { } @@ -180,7 +180,7 @@ } -void KDChartModel::setDataDirection( Qt::Orientation direction ) +void KDChartModel::setDataDirection(Qt::Orientation direction) { d->dataDirection = direction; } @@ -195,11 +195,11 @@ return d->dataDirection == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal; } -QVariant KDChartModel::data( const QModelIndex &index, - int role /* = Qt::DisplayRole */ ) const +QVariant KDChartModel::data(const QModelIndex &index, + int role /* = Qt::DisplayRole */) const { - if ( !index.isValid() || - !d->isKnownDataRole( role ) ) { + if (!index.isValid() || + !d->isKnownDataRole(role)) { return QVariant(); } @@ -214,7 +214,7 @@ // x, y and some kind of custom data. Like the size of a bubble in a bubble chart. int dataSection; - if ( dataDirection() == Qt::Horizontal ) { + if (dataDirection() == Qt::Horizontal) { dataSetNumber = index.row() / d->dataDimensions; dataSection = index.row() % d->dataDimensions; section = index.column(); @@ -224,141 +224,143 @@ section = index.row(); } - if( dataSetNumber >= d->dataSets.size() ) + if (dataSetNumber >= d->dataSets.size()) return QVariant(); DataSet *dataSet = d->dataSets[ dataSetNumber ]; - switch ( role ) { + switch (role) { case Qt::DisplayRole: - if ( d->dataDimensions > 1 && dataSection == 0 ) - return dataSet->xData( section ); - else if ( d->dataDimensions > 2 && dataSection == 2 ) - return dataSet->customData( section ); + if (d->dataDimensions > 1 && dataSection == 0) + return dataSet->xData(section); + else if (d->dataDimensions > 2 && dataSection == 2) + return dataSet->customData(section); else - return dataSet->yData( section ); + return dataSet->yData(section); case KDChart::DatasetBrushRole: - return dataSet->brush( section ); + return dataSet->brush(section); case KDChart::DatasetPenRole: - return dataSet->pen( section ); + return dataSet->pen(section); case KDChart::PieAttributesRole: - return QVariant::fromValue( dataSet->pieAttributes( section ) ); + return QVariant::fromValue(dataSet->pieAttributes(section)); case KDChart::DataValueLabelAttributesRole: - return QVariant::fromValue( dataSet->dataValueAttributes( section ) ); + return QVariant::fromValue(dataSet->dataValueAttributes(section)); } // TODO (Johannes): Support for third data dimension // We need to implement zData in Dataset first. - Q_ASSERT( "Error: Known data role wasn't handled." ); + Q_ASSERT("Error: Known data role wasn't handled."); return QVariant(); } -void KDChartModel::dataSetChanged( DataSet *dataSet ) +void KDChartModel::dataSetChanged(DataSet *dataSet) { - Q_ASSERT( d->dataSets.contains( dataSet ) ); - if ( !d->dataSets.contains( dataSet ) ) + Q_ASSERT(d->dataSets.contains(dataSet)); + if (!d->dataSets.contains(dataSet)) return; - int dataSetNumber = d->dataSetIndex( dataSet ); + int dataSetNumber = d->dataSetIndex(dataSet); // Header data that belongs to this data set (e.g. label) int first = dataSetNumber * dataDimensions(); int last = first + dataDimensions() - 1; - emit headerDataChanged( dataDirection(), first, last ); + emit headerDataChanged(dataDirection(), first, last); } -void KDChartModel::dataSetChanged( DataSet *dataSet, DataRole /*role*/, int first /* = -1 */, int last /* = -1 */ ) +void KDChartModel::dataSetChanged(DataSet *dataSet, DataRole /*role*/, + int first /* = -1 */, int last /* = -1 */) { - Q_ASSERT( d->dataSets.contains( dataSet ) ); - if ( !d->dataSets.contains( dataSet ) ) + Q_ASSERT(d->dataSets.contains(dataSet)); + if (!d->dataSets.contains(dataSet)) return; const int lastIndex = d->biggestDataSetSize - 1; // be sure the 'first' and 'last' referenced rows are within our boundaries - first = qMin( first, lastIndex ); - last = qMin( last, lastIndex ); + first = qMin(first, lastIndex); + last = qMin(last, lastIndex); // 'first' defaults to -1, which means that all data points changed. - if ( first == -1 ) { + if (first == -1) { first = 0; last = lastIndex; } - // 'last' defaults to -1, which means only one column was changed - else if ( last == -1 ) + // 'last' defaults to -1, which means only one column was changed. + else if (last == -1) last = first; - // 'first' can be negative either cause rowCount()==0 or cause it still contains the default value of -1. In both cases we abort - // and don't progress the update-request future. Same is true for last which should at this point contain a valid row index too. - if ( first < 0 || last < 0 ) + // 'first' can be negative either cause rowCount()==0 or cause it + // still contains the default value of -1. In both cases we abort + // and don't progress the update-request future. Same is true for + // last which should at this point contain a valid row index too. + if (first < 0 || last < 0) return; // be sure we are not dealing with inverse order - if ( last < first ) - qSwap(first , last); + if (last < first) + qSwap(first, last); - int dataSetNumber = d->dataSetIndex( dataSet ); - emit dataChanged( d->dataPointFirstModelIndex( dataSetNumber, first ), - d->dataPointLastModelIndex( dataSetNumber, last ) ); + int dataSetNumber = d->dataSetIndex(dataSet); + emit dataChanged(d->dataPointFirstModelIndex(dataSetNumber, first), + d->dataPointLastModelIndex(dataSetNumber, last)); } -void KDChartModel::dataSetSizeChanged( DataSet *dataSet, int newSize ) +void KDChartModel::dataSetSizeChanged(DataSet *dataSet, int newSize) { - Q_UNUSED( newSize ); + Q_UNUSED(newSize); - int dataSetIndex = d->dataSets.indexOf( dataSet ); - if ( dataSetIndex < 0 ) { + int dataSetIndex = d->dataSets.indexOf(dataSet); + if (dataSetIndex < 0) { qWarning() << "KDChartModel::dataSetSizeChanged(): The data set is not assigned to this model."; return; } - // old max data set size is cached + // Old max data set size is cached. const int oldMaxSize = d->maxDataSetSize(); // Determine new max data set size (the size of dataSet has been changed already) const int newMaxSize = d->calcMaxDataSetSize(); // Columns/rows have been added - if ( newMaxSize > oldMaxSize ) { - if ( d->dataDirection == Qt::Horizontal ) - beginInsertColumns( QModelIndex(), oldMaxSize, newMaxSize - 1 ); + if (newMaxSize > oldMaxSize) { + if (d->dataDirection == Qt::Horizontal) + beginInsertColumns(QModelIndex(), oldMaxSize, newMaxSize - 1); else - beginInsertRows( QModelIndex(), oldMaxSize, newMaxSize - 1 ); + beginInsertRows(QModelIndex(), oldMaxSize, newMaxSize - 1); d->biggestDataSetSize = d->calcMaxDataSetSize(); - if ( d->dataDirection == Qt::Horizontal ) + if (d->dataDirection == Qt::Horizontal) endInsertColumns(); else endInsertRows(); // Columns/rows have been removed - } else if ( newMaxSize < oldMaxSize ) { - if ( d->dataDirection == Qt::Horizontal ) - beginRemoveColumns( QModelIndex(), newMaxSize, oldMaxSize - 1 ); + } else if (newMaxSize < oldMaxSize) { + if (d->dataDirection == Qt::Horizontal) + beginRemoveColumns(QModelIndex(), newMaxSize, oldMaxSize - 1); else - beginRemoveRows( QModelIndex(), newMaxSize, oldMaxSize - 1 ); + beginRemoveRows(QModelIndex(), newMaxSize, oldMaxSize - 1); d->biggestDataSetSize = d->calcMaxDataSetSize(); - if ( d->dataDirection == Qt::Horizontal ) + if (d->dataDirection == Qt::Horizontal) endRemoveColumns(); else endRemoveRows(); } } -void KDChartModel::slotColumnsInserted( const QModelIndex& parent, - int start, int end ) +void KDChartModel::slotColumnsInserted(const QModelIndex& parent, int start, int end) { - if ( d->dataDirection == Qt::Horizontal ) { - beginInsertColumns( parent, start, end ); + if (d->dataDirection == Qt::Horizontal) { + beginInsertColumns(parent, start, end); endInsertColumns(); } else { - beginInsertRows( parent, start, end ); + beginInsertRows(parent, start, end); endInsertRows(); } } -bool KDChartModel::Private::isKnownDataRole( int role ) const +bool KDChartModel::Private::isKnownDataRole(int role) const { - switch ( role ) { + switch (role) { case Qt::DisplayRole: case KDChart::DatasetPenRole: case KDChart::DatasetBrushRole: @@ -373,9 +375,9 @@ /** * Method for debugging purposes. */ -QString roleToString( int role ) +QString roleToString(int role) { - switch ( role ) { + switch (role) { case Qt::DisplayRole: return "Qt::DisplayRole"; case KDChart::DatasetBrushRole: @@ -388,29 +390,29 @@ return "Unknown DataRole"; } -QVariant KDChartModel::headerData( int section, - Qt::Orientation orientation, - int role /* = Qt::DisplayRole */ ) const +QVariant KDChartModel::headerData(int section, + Qt::Orientation orientation, + int role /* = Qt::DisplayRole */) const { - if ( !d->isKnownDataRole( role ) ) { + if (!d->isKnownDataRole(role)) { return QVariant(); } - if ( d->dataSets.isEmpty() ) { + if (d->dataSets.isEmpty()) { qWarning() << "KDChartModel::headerData(): Attempting to request header, but model has no datasets assigned to it."; return QVariant(); } - if ( orientation != d->dataDirection ) { + if (orientation != d->dataDirection) { int dataSetNumber = section / d->dataDimensions; - if ( d->dataSets.count() <= dataSetNumber || dataSetNumber < 0 ) { + if (d->dataSets.count() <= dataSetNumber || dataSetNumber < 0) { qWarning() << "KDChartModel::headerData(): trying to get more datasets than we have."; return QVariant(); } - DataSet *dataSet = d->dataSets[ dataSetNumber ]; + DataSet *dataSet = d->dataSets[dataSetNumber]; - switch ( role ) { + switch (role) { case Qt::DisplayRole: return dataSet->labelData(); case KDChart::DatasetBrushRole: @@ -420,23 +422,23 @@ case KDChart::PieAttributesRole: return QVariant::fromValue(dataSet->pieAttributes()); case KDChart::DataValueLabelAttributesRole: - return QVariant::fromValue( dataSet->dataValueAttributes() ); + return QVariant::fromValue(dataSet->dataValueAttributes()); } } - /* else if ( orientation == d->dataDirection ) { */ + /* else if (orientation == d->dataDirection) { */ // FIXME: Find a way to *not* use the first data set, but some method // to set category data (including category pen and brush) properly // (Setter methods in this class?) - DataSet *dataSet = d->dataSets[ 0 ]; - switch ( role ) { + DataSet *dataSet = d->dataSets[0]; + switch (role) { case Qt::DisplayRole: - return dataSet->categoryData( section ); + return dataSet->categoryData(section); case KDChart::DatasetBrushRole: - return dataSet->brush( section ); + return dataSet->brush(section); case KDChart::DatasetPenRole: - return dataSet->pen( section ); + return dataSet->pen(section); case KDChart::PieAttributesRole: - return QVariant::fromValue(dataSet->pieAttributes( section )); + return QVariant::fromValue(dataSet->pieAttributes(section)); } /* } */ @@ -444,44 +446,44 @@ return QVariant(); } -QModelIndex KDChartModel::index( int row, int column, - const QModelIndex &parent ) const +QModelIndex KDChartModel::index(int row, int column, + const QModelIndex &parent) const { - // Seems following can happen in which case we shouldn't return a QModelIndex with an invalid - // position cause else other things may go wrong. - if( row >= rowCount(parent) || column >= columnCount(parent) ) { + // Seems following can happen in which case we shouldn't return a + // QModelIndex with an invalid position cause else other things + // may go wrong. + if(row >= rowCount(parent) || column >= columnCount(parent)) { return QModelIndex(); } - return createIndex( row, column, 0 ); + return createIndex(row, column, 0); } -QModelIndex KDChartModel::parent( const QModelIndex &index ) const +QModelIndex KDChartModel::parent(const QModelIndex &index) const { - Q_UNUSED( index ); + Q_UNUSED(index); return QModelIndex(); } -int KDChartModel::rowCount( const QModelIndex &parent /* = QModelIndex() */ ) const +int KDChartModel::rowCount(const QModelIndex &parent /* = QModelIndex() */) const { - Q_UNUSED( parent ); + Q_UNUSED(parent); int rows; - if ( d->dataDirection == Qt::Vertical ) + if (d->dataDirection == Qt::Vertical) rows = d->maxDataSetSize(); else rows = d->dataSets.size() * d->dataDimensions; return rows; } -int KDChartModel::columnCount( const QModelIndex &parent /* = QModelIndex() */ ) const +int KDChartModel::columnCount(const QModelIndex &parent /* = QModelIndex() */) const { - Q_UNUSED( parent ); + Q_UNUSED(parent); int columns; - if ( d->dataDirection == Qt::Vertical ) - { + if (d->dataDirection == Qt::Vertical) { columns = d->dataSets.size() * d->dataDimensions; } else @@ -490,7 +492,7 @@ return columns; } -void KDChartModel::setDataDimensions( int dataDimensions ) +void KDChartModel::setDataDimensions(int dataDimensions) { d->dataDimensions = dataDimensions; } @@ -500,42 +502,42 @@ return d->dataDimensions; } -void KDChartModel::addDataSet( DataSet *dataSet ) +void KDChartModel::addDataSet(DataSet *dataSet) { - if ( d->dataSets.contains( dataSet ) ) { + if (d->dataSets.contains(dataSet)) { qWarning() << "KDChartModel::addDataSet(): Attempting to insert already-contained data set"; return; } - dataSet->setKdChartModel( this ); + dataSet->setKdChartModel(this); - int dataSetIndex = d->dataSetIndex( dataSet ); + int dataSetIndex = d->dataSetIndex(dataSet); - if ( !d->dataSets.isEmpty() ) { + if (!d->dataSets.isEmpty()) { const int columnAboutToBeInserted = dataSetIndex * d->dataDimensions; - if ( d->dataDirection == Qt::Vertical ) { - beginInsertColumns( QModelIndex(), columnAboutToBeInserted, - columnAboutToBeInserted + d->dataDimensions - 1 ); + if (d->dataDirection == Qt::Vertical) { + beginInsertColumns(QModelIndex(), columnAboutToBeInserted, + columnAboutToBeInserted + d->dataDimensions - 1); } else - beginInsertRows( QModelIndex(), columnAboutToBeInserted, - columnAboutToBeInserted + d->dataDimensions - 1 ); - d->dataSets.insert( dataSetIndex, dataSet ); + beginInsertRows(QModelIndex(), columnAboutToBeInserted, + columnAboutToBeInserted + d->dataDimensions - 1); + d->dataSets.insert(dataSetIndex, dataSet); - if ( d->dataDirection == Qt::Vertical ) + if (d->dataDirection == Qt::Vertical) endInsertColumns(); else endInsertRows(); const int dataSetSize = dataSet->size(); - if ( dataSetSize > d->maxDataSetSize() ) { - if ( d->dataDirection == Qt::Vertical ) - beginInsertRows( QModelIndex(), - d->maxDataSetSize(), dataSetSize - 1 ); + if (dataSetSize > d->maxDataSetSize()) { + if (d->dataDirection == Qt::Vertical) + beginInsertRows(QModelIndex(), + d->maxDataSetSize(), dataSetSize - 1); else - beginInsertColumns( QModelIndex(), - d->maxDataSetSize(), dataSetSize - 1 ); + beginInsertColumns(QModelIndex(), + d->maxDataSetSize(), dataSetSize - 1); d->biggestDataSetSize = d->calcMaxDataSetSize(); - if ( d->dataDirection == Qt::Vertical ) + if (d->dataDirection == Qt::Vertical) endInsertRows(); else endInsertColumns(); @@ -545,54 +547,54 @@ // If we had no datasets before, we haven't had a valid // structure yet. Thus, emit the modelReset() signal. beginResetModel(); - d->dataSets.append( dataSet ); + d->dataSets.append(dataSet); d->biggestDataSetSize = d->calcMaxDataSetSize(); endResetModel(); } } -void KDChartModel::removeDataSet( DataSet *dataSet, bool silent ) +void KDChartModel::removeDataSet(DataSet *dataSet, bool silent) { - const int dataSetIndex = d->dataSets.indexOf( dataSet ); - if ( dataSetIndex < 0 ) + const int dataSetIndex = d->dataSets.indexOf(dataSet); + if (dataSetIndex < 0) return; - if ( silent ) { - d->dataSets.removeAt( dataSetIndex ); + if (silent) { + d->dataSets.removeAt(dataSetIndex); d->biggestDataSetSize = d->calcMaxDataSetSize(); } else { // Simulate removing this dataSet without actually doing so // in order to calculate new max data set size - QList _dataSets( d->dataSets ); - _dataSets.removeAll( dataSet ); + QList _dataSets(d->dataSets); + _dataSets.removeAll(dataSet); // Cached size int oldMaxDataSetSize = d->maxDataSetSize(); // Max size for new list - int newMaxDataSetSize = d->calcMaxDataSetSize( _dataSets ); + int newMaxDataSetSize = d->calcMaxDataSetSize(_dataSets); - if ( newMaxDataSetSize < oldMaxDataSetSize ) { - if ( d->dataDirection == Qt::Horizontal ) - beginRemoveColumns( QModelIndex(), newMaxDataSetSize, oldMaxDataSetSize - 1 ); + if (newMaxDataSetSize < oldMaxDataSetSize) { + if (d->dataDirection == Qt::Horizontal) + beginRemoveColumns(QModelIndex(), newMaxDataSetSize, oldMaxDataSetSize - 1); else - beginRemoveRows( QModelIndex(), newMaxDataSetSize, oldMaxDataSetSize - 1 ); + beginRemoveRows(QModelIndex(), newMaxDataSetSize, oldMaxDataSetSize - 1); d->dataSets = _dataSets; d->biggestDataSetSize = newMaxDataSetSize; - if ( d->dataDirection == Qt::Horizontal ) + if (d->dataDirection == Qt::Horizontal) endRemoveColumns(); else endRemoveRows(); } int columnAboutToBeRemoved = dataSetIndex * d->dataDimensions; - if ( d->dataDirection == Qt::Horizontal ) - beginRemoveRows( QModelIndex(), columnAboutToBeRemoved, - columnAboutToBeRemoved + d->dataDimensions - 1 ); + if (d->dataDirection == Qt::Horizontal) + beginRemoveRows(QModelIndex(), columnAboutToBeRemoved, + columnAboutToBeRemoved + d->dataDimensions - 1); else - beginRemoveColumns( QModelIndex(), columnAboutToBeRemoved, - columnAboutToBeRemoved + d->dataDimensions - 1 ); - d->dataSets.removeAt( dataSetIndex ); - if ( d->dataDirection == Qt::Horizontal ) + beginRemoveColumns(QModelIndex(), columnAboutToBeRemoved, + columnAboutToBeRemoved + d->dataDimensions - 1); + d->dataSets.removeAt(dataSetIndex); + if (d->dataDirection == Qt::Horizontal) endRemoveRows(); else endRemoveColumns(); diff -Nru calligra-2.4.0/plugins/chartshape/KDChartModel.h calligra-2.4.3/plugins/chartshape/KDChartModel.h --- calligra-2.4.0/plugins/chartshape/KDChartModel.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/KDChartModel.h 2012-06-26 04:18:01.000000000 +0000 @@ -66,10 +66,10 @@ * * Since KDChart extracts the legend items from horizontal header data (the headers * in each column) data sets have to be inserted row-wise instead of column-wise for - * these charts. To do so, KDChartModel::setDataDirection( Qt::Horizontal ) is used. + * these charts. To do so, KDChartModel::setDataDirection(Qt::Horizontal) is used. * * In all other cases, we show the data set labels in the legend. Therefore we insert - * data sets column-wise, which is done by calling setDataDirection( Qt::Vertical ). + * data sets column-wise, which is done by calling setDataDirection(Qt::Vertical). */ class CHARTSHAPELIB_EXPORT KDChartModel : public QAbstractItemModel @@ -77,7 +77,7 @@ Q_OBJECT public: - KDChartModel( PlotArea *plotArea, QObject *parent = 0 ); + KDChartModel(PlotArea *plotArea, QObject *parent = 0); ~KDChartModel(); enum DataRole { @@ -100,7 +100,7 @@ * * See "Note on data directions in KDChart's models" above. */ - void setDataDirection( Qt::Orientation direction ); + void setDataDirection(Qt::Orientation direction); /** * See \a setDataDirection */ @@ -111,29 +111,29 @@ Qt::Orientation categoryDirection() const; public slots: - QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const; - QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - void slotColumnsInserted( const QModelIndex& parent, int start, int end ); + void slotColumnsInserted(const QModelIndex& parent, int start, int end); - QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const; - QModelIndex parent( const QModelIndex &index ) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; + QModelIndex parent(const QModelIndex &index) const; - int rowCount( const QModelIndex &parent = QModelIndex() ) const; - int columnCount( const QModelIndex &parent = QModelIndex() ) const; + int rowCount(const QModelIndex &parent = QModelIndex()) const; + int columnCount(const QModelIndex &parent = QModelIndex()) const; - void setDataDimensions( int dataDimensions ); + void setDataDimensions(int dataDimensions); int dataDimensions() const; - void addDataSet( DataSet *dataSet ); - void removeDataSet( DataSet *dataSet, bool silent = false ); + void addDataSet(DataSet *dataSet); + void removeDataSet(DataSet *dataSet, bool silent = false); QList dataSets() const; /** * Called by DataSet whenever a property that is global to all its data * points changes, e.g. its label or its pen */ - void dataSetChanged( DataSet *dataSet ); + void dataSetChanged(DataSet *dataSet); /** * Called by DataSet whenever one or more of its data points changes, @@ -141,19 +141,19 @@ * * FIXME: @a role doesn't make sense here, it's not needed for emitting * the dataChanged() signal. Removing it would conflict with - * dataSetChanged( DataSet* ), that's why it's still there. + * dataSetChanged(DataSet*), that's why it's still there. * * @param first First data point that changed. If -1 it is assumed that * all data points in this series changed. * @param last Last data point that changed. If -1 it is assumed that * only a single data point changed. */ - void dataSetChanged( DataSet *dataSet, DataRole role, int first = -1, int last = -1 ); + void dataSetChanged(DataSet *dataSet, DataRole role, int first = -1, int last = -1); /** * Called by DataSet when the total number of data points it has changed. */ - void dataSetSizeChanged( DataSet *dataSet, int newSize ); + void dataSetSizeChanged(DataSet *dataSet, int newSize); private: class Private; diff -Nru calligra-2.4.0/plugins/chartshape/Legend.cpp calligra-2.4.3/plugins/chartshape/Legend.cpp --- calligra-2.4.0/plugins/chartshape/Legend.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/Legend.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -94,7 +94,7 @@ Legend::Private::Private() { - lineBorder = new KoLineBorder( 0.5, Qt::black ); + lineBorder = new KoLineBorder(0.5, Qt::black); showFrame = true; framePen = QPen(); backgroundBrush = QBrush(); @@ -110,31 +110,31 @@ } -Legend::Legend( ChartShape *parent ) - : QObject( parent ) - , d( new Private() ) +Legend::Legend(ChartShape *parent) + : QObject(parent) + , d(new Private()) { - Q_ASSERT( parent ); + Q_ASSERT(parent); - setShapeId( ChartShapeId ); + setShapeId(ChartShapeId); d->shape = parent; d->kdLegend = new KDChart::Legend(); - d->kdLegend->setTextAlignment( Qt::AlignLeft | Qt::AlignVCenter ); + d->kdLegend->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter); - setTitleFontSize( 10 ); - setTitle( QString() ); - setFontSize( 8 ); + setTitleFontSize(10); + setTitle(QString()); + setFontSize(8); update(); - parent->addShape( this ); + parent->addShape(this); - connect ( d->kdLegend, SIGNAL( propertiesChanged() ), - this, SLOT( slotKdLegendChanged() ) ); - connect ( parent, SIGNAL( chartTypeChanged( ChartType ) ), - this, SLOT( slotChartTypeChanged( ChartType ) ) ); + connect (d->kdLegend, SIGNAL(propertiesChanged()), + this, SLOT(slotKdLegendChanged())); + connect (parent, SIGNAL(chartTypeChanged(ChartType)), + this, SLOT(slotChartTypeChanged(ChartType))); } Legend::~Legend() @@ -149,10 +149,10 @@ return d->title; } -void Legend::setTitle( const QString &title ) +void Legend::setTitle(const QString &title) { d->title = title; - d->kdLegend->setTitleText( title ); + d->kdLegend->setTitleText(title); d->pixmapRepaintRequested = true; } @@ -161,10 +161,10 @@ return d->showFrame; } -void Legend::setShowFrame( bool show ) +void Legend::setShowFrame(bool show) { d->showFrame = show; - setBorder( show ? d->lineBorder : 0 ); + setBorder(show ? d->lineBorder : 0); } QPen Legend::framePen() const @@ -172,14 +172,14 @@ return d->framePen; } -void Legend::setFramePen( const QPen &pen ) +void Legend::setFramePen(const QPen &pen) { d->framePen = pen; // KDChart KDChart::FrameAttributes attributes = d->kdLegend->frameAttributes(); - attributes.setPen( pen ); - d->kdLegend->setFrameAttributes( attributes ); + attributes.setPen(pen); + d->kdLegend->setFrameAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -189,17 +189,17 @@ return d->framePen.color(); } -void Legend::setFrameColor( const QColor &color ) +void Legend::setFrameColor(const QColor &color) { - d->framePen.setColor( color ); + d->framePen.setColor(color); // KDChart KDChart::FrameAttributes attributes = d->kdLegend->frameAttributes(); - attributes.setVisible( true ); + attributes.setVisible(true); QPen pen = attributes.pen(); - pen.setColor( color ); - attributes.setPen( pen ); - d->kdLegend->setFrameAttributes( attributes ); + pen.setColor(color); + attributes.setPen(pen); + d->kdLegend->setFrameAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -209,15 +209,15 @@ return d->backgroundBrush; } -void Legend::setBackgroundBrush( const QBrush &brush ) +void Legend::setBackgroundBrush(const QBrush &brush) { d->backgroundBrush = brush; // KDChart KDChart::BackgroundAttributes attributes = d->kdLegend->backgroundAttributes(); - attributes.setVisible( true ); - attributes.setBrush( brush ); - d->kdLegend->setBackgroundAttributes( attributes ); + attributes.setVisible(true); + attributes.setBrush(brush); + d->kdLegend->setBackgroundAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -227,17 +227,17 @@ return d->backgroundBrush.color(); } -void Legend::setBackgroundColor( const QColor &color ) +void Legend::setBackgroundColor(const QColor &color) { - d->backgroundBrush.setColor( color ); + d->backgroundBrush.setColor(color); // KDChart KDChart::BackgroundAttributes attributes = d->kdLegend->backgroundAttributes(); - attributes.setVisible( true ); + attributes.setVisible(true); QBrush brush = attributes.brush(); - brush.setColor( color ); - attributes.setBrush( brush ); - d->kdLegend->setBackgroundAttributes( attributes ); + brush.setColor(color); + attributes.setBrush(brush); + d->kdLegend->setBackgroundAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -247,14 +247,14 @@ return d->font; } -void Legend::setFont( const QFont &font ) +void Legend::setFont(const QFont &font) { d->font = font; // KDChart KDChart::TextAttributes attributes = d->kdLegend->textAttributes(); - attributes.setFont( font ); - d->kdLegend->setTextAttributes( attributes ); + attributes.setFont(font); + d->kdLegend->setTextAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -264,27 +264,27 @@ return d->font.pointSizeF(); } -void Legend::setFontSize( qreal size ) +void Legend::setFontSize(qreal size) { - d->font.setPointSizeF( size ); + d->font.setPointSizeF(size); // KDChart KDChart::TextAttributes attributes = d->kdLegend->textAttributes(); KDChart::Measure m = attributes.fontSize(); - m.setValue( size ); - attributes.setFontSize( m ); - d->kdLegend->setTextAttributes( attributes ); + m.setValue(size); + attributes.setFontSize(m); + d->kdLegend->setTextAttributes(attributes); d->pixmapRepaintRequested = true; } -void Legend::setFontColor( const QColor &color ) +void Legend::setFontColor(const QColor &color) { KDChart::TextAttributes attributes = d->kdLegend->textAttributes(); QPen pen = attributes.pen(); pen.setColor(color); attributes.setPen(pen); - d->kdLegend->setTextAttributes( attributes ); + d->kdLegend->setTextAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -301,14 +301,14 @@ return d->titleFont; } -void Legend::setTitleFont( const QFont &font ) +void Legend::setTitleFont(const QFont &font) { d->titleFont = font; // KDChart KDChart::TextAttributes attributes = d->kdLegend->titleTextAttributes(); - attributes.setFont( font ); - d->kdLegend->setTitleTextAttributes( attributes ); + attributes.setFont(font); + d->kdLegend->setTitleTextAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -318,14 +318,14 @@ return d->titleFont.pointSizeF(); } -void Legend::setTitleFontSize( qreal size ) +void Legend::setTitleFontSize(qreal size) { - d->titleFont.setPointSizeF( size ); + d->titleFont.setPointSizeF(size); // KDChart KDChart::TextAttributes attributes = d->kdLegend->titleTextAttributes(); - attributes.setFontSize( KDChart::Measure( size, KDChartEnums::MeasureCalculationModeAbsolute ) ); - d->kdLegend->setTitleTextAttributes( attributes ); + attributes.setFontSize(KDChart::Measure(size, KDChartEnums::MeasureCalculationModeAbsolute)); + d->kdLegend->setTitleTextAttributes(attributes); d->pixmapRepaintRequested = true; } @@ -335,10 +335,10 @@ return d->expansion; } -void Legend::setExpansion( LegendExpansion expansion ) +void Legend::setExpansion(LegendExpansion expansion) { d->expansion = expansion; - d->kdLegend->setOrientation( LegendExpansionToQtOrientation( expansion ) ); + d->kdLegend->setOrientation(LegendExpansionToQtOrientation(expansion)); d->pixmapRepaintRequested = true; } @@ -347,7 +347,7 @@ return d->alignment; } -void Legend::setAlignment( Qt::Alignment alignment ) +void Legend::setAlignment(Qt::Alignment alignment) { d->alignment = alignment; } @@ -357,58 +357,58 @@ return d->position; } -void Legend::setLegendPosition( Position position ) +void Legend::setLegendPosition(Position position) { d->position = position; d->pixmapRepaintRequested = true; - d->shape->layout()->setPosition( this, position ); + d->shape->layout()->setPosition(this, position); } -void Legend::setSize( const QSizeF &newSize ) +void Legend::setSize(const QSizeF &newSize) { - QSize newSizePx = ScreenConversions::scaleFromPtToPx( newSize ); - d->kdLegend->resize( newSizePx ); - d->kdLegend->resizeLayout( newSizePx ); - KoShape::setSize( newSize ); + QSize newSizePx = ScreenConversions::scaleFromPtToPx(newSize); + d->kdLegend->resize(newSizePx); + d->kdLegend->resizeLayout(newSizePx); + KoShape::setSize(newSize); } -void Legend::paintPixmap( QPainter &painter, const KoViewConverter &converter ) +void Legend::paintPixmap(QPainter &painter, const KoViewConverter &converter) { // Adjust the size of the painting area to the current zoom level - const QSize paintRectSize = converter.documentToView( d->lastSize ).toSize(); - d->image = QImage( paintRectSize, QImage::Format_ARGB32 ); + const QSize paintRectSize = converter.documentToView(d->lastSize).toSize(); + d->image = QImage(paintRectSize, QImage::Format_ARGB32); - QPainter pixmapPainter( &d->image ); - pixmapPainter.setRenderHints( painter.renderHints() ); - pixmapPainter.setRenderHint( QPainter::Antialiasing, false ); + QPainter pixmapPainter(&d->image); + pixmapPainter.setRenderHints(painter.renderHints()); + pixmapPainter.setRenderHint(QPainter::Antialiasing, false); // Scale the painter's coordinate system to fit the current zoom level. - applyConversion( pixmapPainter, converter ); - d->kdLegend->paint( &pixmapPainter ); + applyConversion(pixmapPainter, converter); + d->kdLegend->paint(&pixmapPainter); } -void Legend::paint( QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &) +void Legend::paint(QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &) { //painter.save(); // First of all, scale the painter's coordinate system to fit the current zoom level - applyConversion( painter, converter ); + applyConversion(painter, converter); // Calculate the clipping rect - QRectF paintRect = QRectF( QPointF( 0, 0 ), size() ); - //clipRect.intersect( paintRect ); - painter.setClipRect( paintRect, Qt::IntersectClip ); + QRectF paintRect = QRectF(QPointF(0, 0), size()); + //clipRect.intersect(paintRect); + painter.setClipRect(paintRect, Qt::IntersectClip); // Get the current zoom level QPointF zoomLevel; - converter.zoom( &zoomLevel.rx(), &zoomLevel.ry() ); + converter.zoom(&zoomLevel.rx(), &zoomLevel.ry()); // Only repaint the pixmap if it is scheduled, the zoom level changed or the shape was resized - /*if ( d->pixmapRepaintRequested + /*if ( d->pixmapRepaintRequested || d->lastZoomLevel != zoomLevel - || d->lastSize != size() ) { + || d->lastSize != size()) { // TODO: What if two zoom levels are constantly being requested? // At the moment, this *is* the case, due to the fact // that the shape is also rendered in the page overview @@ -420,117 +420,123 @@ d->lastZoomLevel = zoomLevel; d->lastSize = size(); - paintPixmap( painter, converter ); + paintPixmap(painter, converter); }*/ // Paint the background - if ( background() ) { + if (background()) { QPainterPath p; - p.addRect( paintRect ); - background()->paint( painter, p ); + p.addRect(paintRect); + background()->paint(painter, p); } // KDChart thinks in pixels, Calligra in pt - ScreenConversions::scaleFromPtToPx( painter ); + ScreenConversions::scaleFromPtToPx(painter); - d->kdLegend->paint( &painter ); + d->kdLegend->paint(&painter); //painter.restore(); // Paint the cached pixmap - //painter.drawImage( 0, 0, d->image ); + //painter.drawImage(0, 0, d->image); } -// Only reimplemented because pure virtual in KoShape, but not needed -bool Legend::loadOdf( const KoXmlElement &legendElement, - KoShapeLoadingContext &context ) +// ---------------------------------------------------------------- +// loading and saving + + +bool Legend::loadOdf(const KoXmlElement &legendElement, + KoShapeLoadingContext &context) { KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); styleStack.clear(); // FIXME: If the style isn't present we shouldn't care about it at all // and move everything related to the legend style in this if clause - if ( legendElement.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { - context.odfLoadingContext().fillStyleStack( legendElement, KoXmlNS::chart, "style-name", "chart" ); - styleStack.setTypeProperties( "graphic" ); + if (legendElement.hasAttributeNS(KoXmlNS::chart, "style-name")) { + context.odfLoadingContext().fillStyleStack(legendElement, KoXmlNS::chart, "style-name", "chart"); + styleStack.setTypeProperties("graphic"); } - if ( !legendElement.isNull() ) { + if (!legendElement.isNull()) { int attributesToLoad = OdfAllAttributes; - QString lp = legendElement.attributeNS( KoXmlNS::chart, "legend-position", QString() ); + QString lp = legendElement.attributeNS(KoXmlNS::chart, "legend-position", QString()); if (!lp.isEmpty()) { attributesToLoad ^= OdfPosition; } - // FIXME according to odf if legend-position is provided the x and y value should not be used - // FIXME also with and height are not supported at this place - if ( legendElement.hasAttributeNS( KoXmlNS::svg, "x" ) || - legendElement.hasAttributeNS( KoXmlNS::svg, "y" ) || - legendElement.hasAttributeNS( KoXmlNS::svg, "width" ) || - legendElement.hasAttributeNS( KoXmlNS::svg, "height" ) ) - d->shape->layout()->setPosition( this, FloatingPosition ); - - loadOdfAttributes( legendElement, context, attributesToLoad ); - - QString lalign = legendElement.attributeNS( KoXmlNS::chart, "legend-align", QString() ); - - if ( legendElement.hasAttributeNS( KoXmlNS::style, "legend-expansion" ) ) { - QString lexpansion = legendElement.attributeNS( KoXmlNS::style, "legend-expansion", QString() ); - if ( lexpansion == "wide" ) - setExpansion( WideLegendExpansion ); - else if ( lexpansion == "high" ) - setExpansion( HighLegendExpansion ); + // FIXME according to odf if legend-position is provided the x + // and y value should not be used. + // + // FIXME also width and height are not supported at this place + if (legendElement.hasAttributeNS(KoXmlNS::svg, "x") || + legendElement.hasAttributeNS(KoXmlNS::svg, "y") || + legendElement.hasAttributeNS(KoXmlNS::svg, "width") || + legendElement.hasAttributeNS(KoXmlNS::svg, "height")) + { + d->shape->layout()->setPosition(this, FloatingPosition); + } + + loadOdfAttributes(legendElement, context, attributesToLoad); + + QString lalign = legendElement.attributeNS(KoXmlNS::chart, "legend-align", QString()); + + if (legendElement.hasAttributeNS(KoXmlNS::style, "legend-expansion")) { + QString lexpansion = legendElement.attributeNS(KoXmlNS::style, "legend-expansion", QString()); + if (lexpansion == "wide") + setExpansion(WideLegendExpansion); + else if (lexpansion == "high") + setExpansion(HighLegendExpansion); else - setExpansion( BalancedLegendExpansion ); + setExpansion(BalancedLegendExpansion); } - if ( lalign == "start" ) { - setAlignment( Qt::AlignLeft ); + if (lalign == "start") { + setAlignment(Qt::AlignLeft); } - else if ( lalign == "end" ) { - setAlignment( Qt::AlignRight ); + else if (lalign == "end") { + setAlignment(Qt::AlignRight); } else { - setAlignment( Qt::AlignCenter ); + setAlignment(Qt::AlignCenter); } - if ( lp == "start" ) { - setLegendPosition( StartPosition ); + if (lp == "start") { + setLegendPosition(StartPosition); } - else if ( lp == "top" ) { - setLegendPosition( TopPosition ); + else if (lp == "top") { + setLegendPosition(TopPosition); } - else if ( lp == "bottom" ) { - setLegendPosition( BottomPosition ); + else if (lp == "bottom") { + setLegendPosition(BottomPosition); } - else if ( lp == "top-start" ) { - setLegendPosition( TopStartPosition ); + else if (lp == "top-start") { + setLegendPosition(TopStartPosition); } - else if ( lp == "bottom-start" ) { - setLegendPosition( BottomStartPosition ); + else if (lp == "bottom-start") { + setLegendPosition(BottomStartPosition); } - else if ( lp == "top-end" ) { - setLegendPosition( TopEndPosition ); + else if (lp == "top-end") { + setLegendPosition(TopEndPosition); } - else if ( lp == "bottom-end" ) { - setLegendPosition( BottomEndPosition ); + else if (lp == "bottom-end") { + setLegendPosition(BottomEndPosition); } else { - setLegendPosition( EndPosition ); + setLegendPosition(EndPosition); } - if ( legendElement.hasAttributeNS( KoXmlNS::calligra, "title" ) ) { - setTitle( legendElement.attributeNS( KoXmlNS::calligra, - "title", QString() ) ); + if (legendElement.hasAttributeNS(KoXmlNS::office, "title")) { + setTitle(legendElement.attributeNS(KoXmlNS::office, "title", QString())); } - styleStack.setTypeProperties( "text" ); + styleStack.setTypeProperties("text"); - if ( styleStack.hasProperty( KoXmlNS::fo, "font-size" ) ) { - setFontSize( KoUnit::parseValue( styleStack.property( KoXmlNS::fo, "font-size" ) ) ); + if (styleStack.hasProperty(KoXmlNS::fo, "font-size")) { + setFontSize(KoUnit::parseValue(styleStack.property(KoXmlNS::fo, "font-size"))); } - if ( styleStack.hasProperty( KoXmlNS::fo, "font-color" ) ) { - QColor color = styleStack.property( KoXmlNS::fo, "font-color" ); + if (styleStack.hasProperty(KoXmlNS::fo, "font-color")) { + QColor color = styleStack.property(KoXmlNS::fo, "font-color"); if (color.isValid()) { setFontColor(color); } @@ -539,65 +545,55 @@ else { // No legend element, use default legend. // FIXME: North?? Isn't that a bit strange as default? /IW - setLegendPosition( TopPosition ); - setAlignment( Qt::AlignCenter ); + setLegendPosition(TopPosition); + setAlignment(Qt::AlignCenter); } - //d->chart->replaceLegend( d->legend, oldLegend ); - d->pixmapRepaintRequested = true; return true; } -void Legend::saveOdf( KoShapeSavingContext &context ) const +void Legend::saveOdf(KoShapeSavingContext &context) const { KoXmlWriter &bodyWriter = context.xmlWriter(); - KoGenStyles &mainStyles = context.mainStyles(); - - bodyWriter.startElement( "chart:legend" ); - saveOdfAttributes( context, OdfPosition ); + bodyWriter.startElement("chart:legend"); + saveOdfAttributes(context, OdfPosition); - QString lp = PositionToString( d->position ); - - QString lalign; - - if ( !lp.isEmpty() ) { - bodyWriter.addAttribute( "chart:legend-position", lp ); + // Legend specific attributes + QString lp = PositionToString(d->position); + if (!lp.isEmpty()) { + bodyWriter.addAttribute("chart:legend-position", lp); } - if ( !lalign.isEmpty() ) { - bodyWriter.addAttribute( "chart:legend-align", lalign ); + QString lalign; // FIXME: This string is always empty. What gives? + if (!lalign.isEmpty()) { + bodyWriter.addAttribute("chart:legend-align", lalign); } + // Legend style FIXME: Check if more styling then just the font goes here. KoGenStyle style(KoGenStyle::ChartAutoStyle, "chart", 0); saveOdfFont(style, d->font, d->fontColor); - - bodyWriter.addAttribute( "chart:style-name", saveStyle(style, context) ); + bodyWriter.addAttribute("chart:style-name", saveStyle(style, context)); QString lexpansion; - switch ( expansion() ) { - case WideLegendExpansion: - lexpansion = "wide"; - break; - case HighLegendExpansion: - lexpansion = "high"; - break; - case BalancedLegendExpansion: - lexpansion = "balanced"; - break; + switch (expansion()) { + case WideLegendExpansion: lexpansion = "wide"; break; + case HighLegendExpansion: lexpansion = "high"; break; + case BalancedLegendExpansion: lexpansion = "balanced"; break; }; + bodyWriter.addAttribute("style:legend-expansion", lexpansion); + + if (!title().isEmpty()) + bodyWriter.addAttribute("office:title", title()); - bodyWriter.addAttribute( "style:legend-expansion", lexpansion ); - if ( !title().isEmpty() ) - bodyWriter.addAttribute( "office:title", title() ); bodyWriter.endElement(); // chart:legend } KDChart::Legend *Legend::kdLegend() const { // There has to be a valid KDChart instance of this legend - Q_ASSERT( d->kdLegend ); + Q_ASSERT(d->kdLegend); return d->kdLegend; } @@ -619,21 +615,21 @@ // in KDChartModel. Right now, only yDataChanged() is implemented. //d->kdLegend->forceRebuild(); QSize size = d->kdLegend->sizeHint(); - setSize( ScreenConversions::scaleFromPxToPt( size ) ); + setSize(ScreenConversions::scaleFromPxToPt(size)); update(); } -void Legend::slotChartTypeChanged( ChartType chartType ) +void Legend::slotChartTypeChanged(ChartType chartType) { // TODO: Once we support markers, this switch will have to be // more clever. - switch ( chartType ) { + switch (chartType) { case LineChartType: //case ScatterChartType: - d->kdLegend->setLegendStyle( KDChart::Legend::LinesOnly ); + d->kdLegend->setLegendStyle(KDChart::Legend::LinesOnly); break; default: - d->kdLegend->setLegendStyle( KDChart::Legend::MarkersOnly ); + d->kdLegend->setLegendStyle(KDChart::Legend::MarkersOnly); break; } } diff -Nru calligra-2.4.0/plugins/chartshape/Legend.h calligra-2.4.3/plugins/chartshape/Legend.h --- calligra-2.4.0/plugins/chartshape/Legend.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/Legend.h 2012-06-26 04:18:01.000000000 +0000 @@ -39,7 +39,7 @@ Q_OBJECT public: - Legend( ChartShape *parent ); + Legend(ChartShape *parent); ~Legend(); QString title() const; @@ -57,27 +57,27 @@ Qt::Alignment alignment() const; Position legendPosition() const; - void setTitle( const QString &title ); - void setShowFrame( bool show ); - void setFramePen( const QPen &pen ); - void setFrameColor( const QColor &color ); - void setBackgroundBrush( const QBrush &brush ); - void setBackgroundColor( const QColor &color ); - void setFont( const QFont &font ); - void setFontSize( qreal size ); - void setFontColor( const QColor &color ); - void setTitleFont( const QFont &font ); - void setTitleFontSize( qreal size ); - void setExpansion( LegendExpansion expansion ); - void setAlignment( Qt::Alignment alignment ); - void setLegendPosition( Position position ); - void setSize( const QSizeF &size ); + void setTitle(const QString &title); + void setShowFrame(bool show); + void setFramePen(const QPen &pen); + void setFrameColor(const QColor &color); + void setBackgroundBrush(const QBrush &brush); + void setBackgroundColor(const QColor &color); + void setFont(const QFont &font); + void setFontSize(qreal size); + void setFontColor(const QColor &color); + void setTitleFont(const QFont &font); + void setTitleFontSize(qreal size); + void setExpansion(LegendExpansion expansion); + void setAlignment(Qt::Alignment alignment); + void setLegendPosition(Position position); + void setSize(const QSizeF &size); - void paint( QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &paintcontext); - void paintPixmap( QPainter &painter, const KoViewConverter &converter ); + void paint(QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &paintcontext); + void paintPixmap(QPainter &painter, const KoViewConverter &converter); - bool loadOdf( const KoXmlElement &legendElement, KoShapeLoadingContext &context ); - void saveOdf( KoShapeSavingContext &context ) const; + bool loadOdf(const KoXmlElement &legendElement, KoShapeLoadingContext &context); + void saveOdf(KoShapeSavingContext &context) const; KDChart::Legend *kdLegend() const; @@ -86,7 +86,7 @@ void update() const; private slots: - void slotChartTypeChanged( ChartType chartType ); + void slotChartTypeChanged(ChartType chartType ); void slotKdLegendChanged(); private: diff -Nru calligra-2.4.0/plugins/chartshape/OdfLoadingHelper.cpp calligra-2.4.3/plugins/chartshape/OdfLoadingHelper.cpp --- calligra-2.4.0/plugins/chartshape/OdfLoadingHelper.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/OdfLoadingHelper.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -30,8 +30,8 @@ using namespace KChart; OdfLoadingHelper::OdfLoadingHelper() - : tableSource( 0 ) - , chartUsesInternalModelOnly( true ) - , categoryRegionSpecifiedInXAxis( false ) + : tableSource(0) + , chartUsesInternalModelOnly(true) + , categoryRegionSpecifiedInXAxis(false) { } diff -Nru calligra-2.4.0/plugins/chartshape/PlotArea.cpp calligra-2.4.3/plugins/chartshape/PlotArea.cpp --- calligra-2.4.0/plugins/chartshape/PlotArea.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/PlotArea.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -31,19 +31,20 @@ #include // Calligra +#include +#include #include #include +#include +#include +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include #include #include -#include // KDChart #include @@ -73,7 +74,6 @@ #include "Surface.h" #include "Axis.h" #include "DataSet.h" -#include "ThreeDScene.h" #include "ChartProxyModel.h" #include "ScreenConversions.h" #include "ChartLayout.h" @@ -82,17 +82,17 @@ const int MAX_PIXMAP_SIZE = 1000; -Q_DECLARE_METATYPE( QPointer ); +Q_DECLARE_METATYPE(QPointer); typedef QList CoordinatePlaneList; class PlotArea::Private { public: - Private( PlotArea *q, ChartShape *parent ); + Private(PlotArea *q, ChartShape *parent); ~Private(); void initAxes(); - CoordinatePlaneList coordinatePlanesForChartType( ChartType type ); + CoordinatePlaneList coordinatePlanesForChartType(ChartType type); PlotArea *q; // The parent chart shape @@ -112,8 +112,8 @@ QList automaticallyHiddenAxisTitles; // 3D properties - bool threeD; - ThreeDScene *threeDScene; + bool threeD; + Ko3dScene *threeDScene; // ---------------------------------------------------------------- // Data specific to each chart type @@ -150,68 +150,68 @@ mutable bool pixmapRepaintRequested; }; -PlotArea::Private::Private( PlotArea *q, ChartShape *parent ) +PlotArea::Private::Private(PlotArea *q, ChartShape *parent) : q(q) - , shape( parent ) + , shape(parent) // Default type: normal bar chart - ,chartType( BarChartType ) - ,chartSubtype( NormalChartSubtype ) - ,wall( 0 ) - ,floor( 0 ) - ,threeD( false ) - ,threeDScene( 0 ) + , chartType(BarChartType) + , chartSubtype(NormalChartSubtype) + , wall(0) + , floor(0) + , threeD(false) + , threeDScene(0) // By default, x and y axes are not swapped. - ,vertical( false ) + , vertical(false) // Data specific for bar charts - ,gapBetweenBars( 0 ) - ,gapBetweenSets( 100 ) + , gapBetweenBars(0) + , gapBetweenSets(100) // OpenOffice.org's default. It means the first pie slice starts at the // very top (and then going counter-clockwise). - ,pieAngleOffset( 90.0 ) + , pieAngleOffset(90.0) // KD Chart stuff - ,kdChart( new KDChart::Chart() ) - , kdCartesianPlanePrimary( new KDChart::CartesianCoordinatePlane( kdChart ) ) - , kdCartesianPlaneSecondary( new KDChart::CartesianCoordinatePlane( kdChart ) ) - , kdPolarPlane( new KDChart::PolarCoordinatePlane( kdChart ) ) - , kdRadarPlane( new KDChart::RadarCoordinatePlane( kdChart ) ) + , kdChart(new KDChart::Chart()) + , kdCartesianPlanePrimary(new KDChart::CartesianCoordinatePlane(kdChart)) + , kdCartesianPlaneSecondary(new KDChart::CartesianCoordinatePlane(kdChart)) + , kdPolarPlane(new KDChart::PolarCoordinatePlane(kdChart)) + , kdRadarPlane(new KDChart::RadarCoordinatePlane(kdChart)) // Cache - ,paintPixmap( true ) - ,pixmapRepaintRequested( true ) + , paintPixmap(true) + , pixmapRepaintRequested(true) { // --- Prepare Primary Cartesian Coordinate Plane --- KDChart::GridAttributes gridAttributes; - gridAttributes.setGridVisible( false ); - gridAttributes.setGridGranularitySequence( KDChartEnums::GranularitySequence_10_50 ); - kdCartesianPlanePrimary->setGlobalGridAttributes( gridAttributes ); + gridAttributes.setGridVisible(false); + gridAttributes.setGridGranularitySequence(KDChartEnums::GranularitySequence_10_50); + kdCartesianPlanePrimary->setGlobalGridAttributes(gridAttributes); // Disable odd default of (1, 1, -3, -3) which only produces weird offsets // between axes and plot area frame. - kdCartesianPlanePrimary->setDrawingAreaMargins( 0, 0, 0, 0 ); + kdCartesianPlanePrimary->setDrawingAreaMargins(0, 0, 0, 0); // --- Prepare Secondary Cartesian Coordinate Plane --- - kdCartesianPlaneSecondary->setGlobalGridAttributes( gridAttributes ); - kdCartesianPlaneSecondary->setDrawingAreaMargins( 0, 0, 0, 0 ); + kdCartesianPlaneSecondary->setGlobalGridAttributes(gridAttributes); + kdCartesianPlaneSecondary->setDrawingAreaMargins(0, 0, 0, 0); // --- Prepare Polar Coordinate Plane --- KDChart::GridAttributes polarGridAttributes; - polarGridAttributes.setGridVisible( false ); - kdPolarPlane->setGlobalGridAttributes( polarGridAttributes ); + polarGridAttributes.setGridVisible(false); + kdPolarPlane->setGlobalGridAttributes(polarGridAttributes); // --- Prepare Radar Coordinate Plane --- KDChart::GridAttributes radarGridAttributes; - polarGridAttributes.setGridVisible( true ); - kdRadarPlane->setGlobalGridAttributes( radarGridAttributes ); + polarGridAttributes.setGridVisible(true); + kdRadarPlane->setGlobalGridAttributes(radarGridAttributes); // By default we use a cartesian chart (bar chart), so the polar planes // are not needed yet. They will be added on demand in setChartType(). - kdChart->takeCoordinatePlane( kdPolarPlane ); - kdChart->takeCoordinatePlane( kdRadarPlane ); + kdChart->takeCoordinatePlane(kdPolarPlane); + kdChart->takeCoordinatePlane(kdRadarPlane); - shape->proxyModel()->setDataDimensions( 1 ); + shape->proxyModel()->setDataDimensions(1); } PlotArea::Private::~Private() { - qDeleteAll( axes ); + qDeleteAll(axes); delete kdCartesianPlanePrimary; delete kdCartesianPlaneSecondary; delete kdPolarPlane; @@ -226,48 +226,48 @@ { // The category data region is anchored to an axis and will be set on addAxis if the // axis defines the Axis::categoryDataRegion(). So, clear it now. - q->proxyModel()->setCategoryDataRegion( CellRegion() ); + q->proxyModel()->setCategoryDataRegion(CellRegion()); // Remove all old axes - while( !axes.isEmpty() ) { + while(!axes.isEmpty()) { Axis *axis = axes.takeLast(); - Q_ASSERT( axis ); - if ( axis->title() ) - automaticallyHiddenAxisTitles.removeAll( axis->title() ); + Q_ASSERT(axis); + if (axis->title()) + automaticallyHiddenAxisTitles.removeAll(axis->title()); delete axis; } // There need to be at least these two axes. Their constructor will // automatically add them to the plot area as child shape. - new Axis( q, XAxisDimension ); - Axis *yAxis = new Axis( q, YAxisDimension ); - yAxis->setShowMajorGrid( true ); + new Axis(q, XAxisDimension); + Axis *yAxis = new Axis(q, YAxisDimension); + yAxis->setShowMajorGrid(true); } -PlotArea::PlotArea( ChartShape *parent ) +PlotArea::PlotArea(ChartShape *parent) : QObject() , KoShape() - , d( new Private( this, parent ) ) + , d(new Private(this, parent)) { - setShapeId( ChartShapeId ); + setShapeId(ChartShapeId); - Q_ASSERT( d->shape ); - Q_ASSERT( d->shape->proxyModel() ); + Q_ASSERT(d->shape); + Q_ASSERT(d->shape->proxyModel()); - connect( d->shape->proxyModel(), SIGNAL( modelReset() ), - this, SLOT( proxyModelStructureChanged() ) ); - connect( d->shape->proxyModel(), SIGNAL( rowsInserted( const QModelIndex, int, int ) ), - this, SLOT( proxyModelStructureChanged() ) ); - connect( d->shape->proxyModel(), SIGNAL( rowsRemoved( const QModelIndex, int, int ) ), - this, SLOT( proxyModelStructureChanged() ) ); - connect( d->shape->proxyModel(), SIGNAL( columnsInserted( const QModelIndex, int, int ) ), - this, SLOT( proxyModelStructureChanged() ) ); - connect( d->shape->proxyModel(), SIGNAL( columnsRemoved( const QModelIndex, int, int ) ), - this, SLOT( proxyModelStructureChanged() ) ); - connect( d->shape->proxyModel(), SIGNAL( columnsInserted( const QModelIndex, int, int ) ), - this, SLOT( plotAreaUpdate() ) ); - connect( d->shape->proxyModel(), SIGNAL( columnsRemoved( const QModelIndex, int, int ) ), - this, SLOT( plotAreaUpdate() ) ); - connect( d->shape->proxyModel(), SIGNAL( dataChanged() ), - this, SLOT( plotAreaUpdate() ) ); + connect(d->shape->proxyModel(), SIGNAL(modelReset()), + this, SLOT(proxyModelStructureChanged())); + connect(d->shape->proxyModel(), SIGNAL(rowsInserted(const QModelIndex, int, int)), + this, SLOT(proxyModelStructureChanged())); + connect(d->shape->proxyModel(), SIGNAL(rowsRemoved(const QModelIndex, int, int)), + this, SLOT(proxyModelStructureChanged())); + connect(d->shape->proxyModel(), SIGNAL(columnsInserted(const QModelIndex, int, int)), + this, SLOT(proxyModelStructureChanged())); + connect(d->shape->proxyModel(), SIGNAL(columnsRemoved(const QModelIndex, int, int)), + this, SLOT(proxyModelStructureChanged())); + connect(d->shape->proxyModel(), SIGNAL(columnsInserted(const QModelIndex, int, int)), + this, SLOT(plotAreaUpdate())); + connect(d->shape->proxyModel(), SIGNAL(columnsRemoved(const QModelIndex, int, int)), + this, SLOT(plotAreaUpdate())); + connect(d->shape->proxyModel(), SIGNAL(dataChanged()), + this, SLOT(plotAreaUpdate())); } PlotArea::~PlotArea() @@ -278,16 +278,16 @@ void PlotArea::plotAreaInit() { - d->kdChart->resize( size().toSize() ); - d->kdChart->replaceCoordinatePlane( d->kdCartesianPlanePrimary ); - d->kdCartesianPlaneSecondary->setReferenceCoordinatePlane( d->kdCartesianPlanePrimary ); + d->kdChart->resize(size().toSize()); + d->kdChart->replaceCoordinatePlane(d->kdCartesianPlanePrimary); + d->kdCartesianPlaneSecondary->setReferenceCoordinatePlane(d->kdCartesianPlanePrimary); KDChart::FrameAttributes attr = d->kdChart->frameAttributes(); - attr.setVisible( false ); - d->kdChart->setFrameAttributes( attr ); + attr.setVisible(false); + d->kdChart->setFrameAttributes(attr); - d->wall = new Surface( this ); - //d->floor = new Surface( this ); + d->wall = new Surface(this); + //d->floor = new Surface(this); d->initAxes(); } @@ -297,28 +297,28 @@ if (proxyModel()->isLoading()) return; - Q_ASSERT( xAxis() ); - Q_ASSERT( yAxis() ); + Q_ASSERT(xAxis()); + Q_ASSERT(yAxis()); QMap attachedAxes; QList dataSets = proxyModel()->dataSets(); // Remember to what y axis each data set belongs - foreach( DataSet *dataSet, dataSets ) - attachedAxes.insert( dataSet, dataSet->attachedAxis() ); + foreach(DataSet *dataSet, dataSets) + attachedAxes.insert(dataSet, dataSet->attachedAxis()); // Proxy structure and thus data sets changed, drop old state and // clear all axes of data sets - foreach( Axis *axis, axes() ) + foreach(Axis *axis, axes()) axis->clearDataSets(); // Now add the new list of data sets to the axis they belong to - foreach( DataSet *dataSet, dataSets ) { - xAxis()->attachDataSet( dataSet ); + foreach(DataSet *dataSet, dataSets) { + xAxis()->attachDataSet(dataSet); // If they weren't assigned to a y axis before, use default y axis - if ( attachedAxes[dataSet] ) - attachedAxes[dataSet]->attachDataSet( dataSet ); + if (attachedAxes[dataSet]) + attachedAxes[dataSet]->attachDataSet(dataSet); else - yAxis()->attachDataSet( dataSet ); + yAxis()->attachDataSet(dataSet); } } @@ -340,8 +340,8 @@ Axis *PlotArea::xAxis() const { - foreach( Axis *axis, d->axes ) { - if ( axis->dimension() == XAxisDimension ) + foreach(Axis *axis, d->axes) { + if (axis->dimension() == XAxisDimension) return axis; } @@ -350,8 +350,8 @@ Axis *PlotArea::yAxis() const { - foreach( Axis *axis, d->axes ) { - if ( axis->dimension() == YAxisDimension ) + foreach(Axis *axis, d->axes) { + if (axis->dimension() == YAxisDimension) return axis; } @@ -362,9 +362,9 @@ { bool firstXAxisFound = false; - foreach( Axis *axis, d->axes ) { - if ( axis->orientation() == Qt::Horizontal ) { - if ( firstXAxisFound ) + foreach(Axis *axis, d->axes) { + if (axis->orientation() == Qt::Horizontal) { + if (firstXAxisFound) return axis; else firstXAxisFound = true; @@ -378,9 +378,9 @@ { bool firstYAxisFound = false; - foreach( Axis *axis, d->axes ) { - if ( axis->orientation() == Qt::Vertical ) { - if ( firstYAxisFound ) + foreach(Axis *axis, d->axes) { + if (axis->orientation() == Qt::Vertical) { + if (firstYAxisFound) return axis; else firstYAxisFound = true; @@ -410,7 +410,7 @@ return d->vertical; } -ThreeDScene *PlotArea::threeDScene() const +Ko3dScene *PlotArea::threeDScene() const { return d->threeDScene; } @@ -430,24 +430,24 @@ return d->pieAngleOffset; } -bool PlotArea::addAxis( Axis *axis ) +bool PlotArea::addAxis(Axis *axis) { - if ( d->axes.contains( axis ) ) { + if (d->axes.contains(axis)) { qWarning() << "PlotArea::addAxis(): Trying to add already added axis."; return false; } - if ( !axis ) { + if (!axis) { qWarning() << "PlotArea::addAxis(): Pointer to axis is NULL!"; return false; } - d->axes.append( axis ); + d->axes.append(axis); - if ( axis->dimension() == XAxisDimension ) { + if (axis->dimension() == XAxisDimension) { // let each axis know about the other axis - foreach ( Axis *_axis, d->axes ) { - if ( _axis->isVisible() ) - _axis->registerKdAxis( axis->kdAxis() ); + foreach (Axis *_axis, d->axes) { + if (_axis->isVisible()) + _axis->registerKdAxis(axis->kdAxis()); } } @@ -456,26 +456,26 @@ return true; } -bool PlotArea::removeAxis( Axis *axis ) +bool PlotArea::removeAxis(Axis *axis) { - if ( !d->axes.contains( axis ) ) { + if (!d->axes.contains(axis)) { qWarning() << "PlotArea::removeAxis(): Trying to remove non-added axis."; return false; } - if ( !axis ) { + if (!axis) { qWarning() << "PlotArea::removeAxis(): Pointer to axis is NULL!"; return false; } - if ( axis->title() ) - d->automaticallyHiddenAxisTitles.removeAll( axis->title() ); + if (axis->title()) + d->automaticallyHiddenAxisTitles.removeAll(axis->title()); - d->axes.removeAll( axis ); + d->axes.removeAll(axis); - if ( axis->dimension() == XAxisDimension ) { - foreach ( Axis *_axis, d->axes ) - _axis->deregisterKdAxis( axis->kdAxis() ); + if (axis->dimension() == XAxisDimension) { + foreach (Axis *_axis, d->axes) + _axis->deregisterKdAxis(axis->kdAxis()); } // This also removes the axis' title, which is a shape as well @@ -486,10 +486,10 @@ return true; } -CoordinatePlaneList PlotArea::Private::coordinatePlanesForChartType( ChartType type ) +CoordinatePlaneList PlotArea::Private::coordinatePlanesForChartType(ChartType type) { CoordinatePlaneList result; - switch ( type ) { + switch (type) { case BarChartType: case LineChartType: case AreaChartType: @@ -498,45 +498,45 @@ case SurfaceChartType: case StockChartType: case BubbleChartType: - result.append( kdCartesianPlanePrimary ); - result.append( kdCartesianPlaneSecondary ); + result.append(kdCartesianPlanePrimary); + result.append(kdCartesianPlaneSecondary); break; case CircleChartType: case RingChartType: - result.append( kdPolarPlane ); + result.append(kdPolarPlane); break; case RadarChartType: case FilledRadarChartType: - result.append( kdRadarPlane ); + result.append(kdRadarPlane); break; case LastChartType: - Q_ASSERT( "There's no coordinate plane for LastChartType" ); + Q_ASSERT("There's no coordinate plane for LastChartType"); break; } - Q_ASSERT( !result.isEmpty() ); + Q_ASSERT(!result.isEmpty()); return result; } -void PlotArea::setChartType( ChartType type ) +void PlotArea::setChartType(ChartType type) { - if ( d->chartType == type ) + if (d->chartType == type) return; // Lots of things to do if the old and new types of coordinate // systems don't match. - if ( !isPolar( d->chartType ) && isPolar( type ) ) { - foreach ( Axis *axis, d->axes ) { - if ( !axis->title()->isVisible() ) + if (!isPolar(d->chartType) && isPolar(type)) { + foreach (Axis *axis, d->axes) { + if (!axis->title()->isVisible()) continue; - axis->title()->setVisible( false ); - d->automaticallyHiddenAxisTitles.append( axis->title() ); + axis->title()->setVisible(false); + d->automaticallyHiddenAxisTitles.append(axis->title()); } } - else if ( isPolar( d->chartType ) && !isPolar( type ) ) { - foreach ( KoShape *title, d->automaticallyHiddenAxisTitles ) { - title->setVisible( true ); + else if (isPolar(d->chartType) && !isPolar(type)) { + foreach (KoShape *title, d->automaticallyHiddenAxisTitles) { + title->setVisible(true); } d->automaticallyHiddenAxisTitles.clear(); } @@ -547,47 +547,47 @@ // removing a plane that's not in the chart is not a problem. planesToRemove << d->kdCartesianPlaneSecondary << d->kdCartesianPlanePrimary << d->kdPolarPlane << d->kdRadarPlane; - foreach( KDChart::AbstractCoordinatePlane *plane, planesToRemove ) - d->kdChart->takeCoordinatePlane( plane ); - CoordinatePlaneList newPlanes = d->coordinatePlanesForChartType( type ); - foreach( KDChart::AbstractCoordinatePlane *plane, newPlanes ) - d->kdChart->addCoordinatePlane( plane ); - Q_ASSERT( d->kdChart->coordinatePlanes() == newPlanes ); + foreach(KDChart::AbstractCoordinatePlane *plane, planesToRemove) + d->kdChart->takeCoordinatePlane(plane); + CoordinatePlaneList newPlanes = d->coordinatePlanesForChartType(type); + foreach(KDChart::AbstractCoordinatePlane *plane, newPlanes) + d->kdChart->addCoordinatePlane(plane); + Q_ASSERT(d->kdChart->coordinatePlanes() == newPlanes); d->chartType = type; - foreach ( Axis *axis, d->axes ) { - axis->plotAreaChartTypeChanged( type ); + foreach (Axis *axis, d->axes) { + axis->plotAreaChartTypeChanged(type); } requestRepaint(); } -void PlotArea::setChartSubType( ChartSubtype subType ) +void PlotArea::setChartSubType(ChartSubtype subType) { d->chartSubtype = subType; - foreach ( Axis *axis, d->axes ) { - axis->plotAreaChartSubTypeChanged( subType ); + foreach (Axis *axis, d->axes) { + axis->plotAreaChartSubTypeChanged(subType); } requestRepaint(); } -void PlotArea::setThreeD( bool threeD ) +void PlotArea::setThreeD(bool threeD) { d->threeD = threeD; - foreach( Axis *axis, d->axes ) - axis->setThreeD( threeD ); + foreach(Axis *axis, d->axes) + axis->setThreeD(threeD); requestRepaint(); } -void PlotArea::setVertical( bool vertical ) +void PlotArea::setVertical(bool vertical) { d->vertical = vertical; - foreach( Axis *axis, d->axes ) + foreach(Axis *axis, d->axes) axis->plotAreaIsVerticalChanged(); } @@ -595,29 +595,31 @@ // loading and saving -bool PlotArea::loadOdf( const KoXmlElement &plotAreaElement, - KoShapeLoadingContext &context ) +bool PlotArea::loadOdf(const KoXmlElement &plotAreaElement, + KoShapeLoadingContext &context) { KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); // The exact position defined in ODF overwrites the default layout position - if ( plotAreaElement.hasAttributeNS( KoXmlNS::svg, "x" ) || - plotAreaElement.hasAttributeNS( KoXmlNS::svg, "y" ) || - plotAreaElement.hasAttributeNS( KoXmlNS::svg, "width" ) || - plotAreaElement.hasAttributeNS( KoXmlNS::svg, "height" ) ) - parent()->layout()->setPosition( this, FloatingPosition ); + if (plotAreaElement.hasAttributeNS(KoXmlNS::svg, "x") || + plotAreaElement.hasAttributeNS(KoXmlNS::svg, "y") || + plotAreaElement.hasAttributeNS(KoXmlNS::svg, "width") || + plotAreaElement.hasAttributeNS(KoXmlNS::svg, "height")) + { + parent()->layout()->setPosition(this, FloatingPosition); + } - context.odfLoadingContext().fillStyleStack( plotAreaElement, KoXmlNS::chart, "style-name", "chart" ); - loadOdfAttributes( plotAreaElement, context, OdfAllAttributes ); + context.odfLoadingContext().fillStyleStack(plotAreaElement, KoXmlNS::chart, "style-name", "chart"); + loadOdfAttributes(plotAreaElement, context, OdfAllAttributes); // First step is to clear all old axis instances. - while ( !d->axes.isEmpty() ) { + while (!d->axes.isEmpty()) { Axis *axis = d->axes.takeLast(); - Q_ASSERT( axis ); + Q_ASSERT(axis); // Clear this axis of all data sets, deleting any diagram associated with it. axis->clearDataSets(); - if ( axis->title() ) - d->automaticallyHiddenAxisTitles.removeAll( axis->title() ); + if (axis->title()) + d->automaticallyHiddenAxisTitles.removeAll(axis->title()); delete axis; } @@ -629,50 +631,52 @@ // Note that this has to happen BEFORE we create a axis and call // there loadOdf method cause the axis will evaluate settings // like the PlotArea::isVertical boolean. - if ( plotAreaElement.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + if (plotAreaElement.hasAttributeNS(KoXmlNS::chart, "style-name")) { styleStack.clear(); - context.odfLoadingContext().fillStyleStack( plotAreaElement, KoXmlNS::chart, "style-name", "chart" ); + context.odfLoadingContext().fillStyleStack(plotAreaElement, KoXmlNS::chart, "style-name", "chart"); - styleStack.setTypeProperties( "graphic" ); - styleStack.setTypeProperties( "chart" ); + styleStack.setTypeProperties("graphic"); + styleStack.setTypeProperties("chart"); - if ( styleStack.hasProperty( KoXmlNS::chart, "angle-offset" ) ) { + if (styleStack.hasProperty(KoXmlNS::chart, "angle-offset")) { bool ok; - const int angleOffset = styleStack.property( KoXmlNS::chart, "angle-offset" ).toInt(&ok); + const int angleOffset = styleStack.property(KoXmlNS::chart, "angle-offset").toInt(&ok); if (ok) - setPieAngleOffset( angleOffset ); + setPieAngleOffset(angleOffset); } - if ( styleStack.hasProperty( KoXmlNS::chart, "three-dimensional" ) ) - setThreeD( styleStack.property( KoXmlNS::chart, "three-dimensional" ) == "true" ); + // Check for 3D. + if (styleStack.hasProperty(KoXmlNS::chart, "three-dimensional")) + setThreeD(styleStack.property(KoXmlNS::chart, "three-dimensional") == "true"); + d->threeDScene = load3dScene(plotAreaElement); // Set subtypes stacked or percent. // These are valid for Bar, Line, Area and Radar types. - if ( styleStack.hasProperty( KoXmlNS::chart, "percentage" ) - && styleStack.property( KoXmlNS::chart, "percentage" ) == "true" ) + if (styleStack.hasProperty(KoXmlNS::chart, "percentage") + && styleStack.property(KoXmlNS::chart, "percentage") == "true") { - setChartSubType( PercentChartSubtype ); + setChartSubType(PercentChartSubtype); } - else if ( styleStack.hasProperty( KoXmlNS::chart, "stacked" ) - && styleStack.property( KoXmlNS::chart, "stacked" ) == "true" ) + else if (styleStack.hasProperty(KoXmlNS::chart, "stacked") + && styleStack.property(KoXmlNS::chart, "stacked") == "true") { - setChartSubType( StackedChartSubtype ); + setChartSubType(StackedChartSubtype); } // Data specific to bar charts - if ( styleStack.hasProperty( KoXmlNS::chart, "vertical" ) ) - setVertical( styleStack.property( KoXmlNS::chart, "vertical" ) == "true" ); + if (styleStack.hasProperty(KoXmlNS::chart, "vertical")) + setVertical(styleStack.property(KoXmlNS::chart, "vertical") == "true"); // Special properties for various chart types #if 0 switch () { case BarChartType: - if ( styleStack ) + if (styleStack) ; } #endif styleStack.clear(); - context.odfLoadingContext().fillStyleStack( plotAreaElement, KoXmlNS::chart, "style-name", "chart" ); + context.odfLoadingContext().fillStyleStack(plotAreaElement, KoXmlNS::chart, "style-name", "chart"); } // Now create and load the axis from the ODF. This needs to happen @@ -681,33 +685,33 @@ // depending on them. This is especially required for the // PlotArea::isVertical() boolean flag else things will go wrong. KoXmlElement n; - forEachElement ( n, plotAreaElement ) { - if ( n.namespaceURI() != KoXmlNS::chart ) + forEachElement (n, plotAreaElement) { + if (n.namespaceURI() != KoXmlNS::chart) continue; - if ( n.localName() == "axis" ) { - if ( !n.hasAttributeNS( KoXmlNS::chart, "dimension" ) ) + if (n.localName() == "axis") { + if (!n.hasAttributeNS(KoXmlNS::chart, "dimension")) // We have to know what dimension the axis is supposed to be.. continue; - const QString dimension = n.attributeNS( KoXmlNS::chart, "dimension", QString() ); + const QString dimension = n.attributeNS(KoXmlNS::chart, "dimension", QString()); AxisDimension dim; - if ( dimension == "x" ) dim = XAxisDimension; - else if ( dimension == "y" ) dim = YAxisDimension; - else if ( dimension == "z" ) dim = ZAxisDimension; + if (dimension == "x") dim = XAxisDimension; + else if (dimension == "y") dim = YAxisDimension; + else if (dimension == "z") dim = ZAxisDimension; else continue; - Axis *axis = new Axis( this, dim ); - axis->loadOdf( n, context ); + Axis *axis = new Axis(this, dim); + axis->loadOdf(n, context); } } // Two axes are mandatory, check that we have them. - if ( !xAxis() ) { - Axis *xAxis = new Axis( this, XAxisDimension ); - xAxis->setVisible( false ); - } - if ( !yAxis() ) { - Axis *yAxis = new Axis( this, YAxisDimension ); - yAxis->setVisible( false ); + if (!xAxis()) { + Axis *xAxis = new Axis(this, XAxisDimension); + xAxis->setVisible(false); + } + if (!yAxis()) { + Axis *yAxis = new Axis(this, YAxisDimension); + yAxis->setVisible(false); } // Now, after the axes, load the datasets. @@ -715,45 +719,45 @@ // actual data is not stored here. // // FIXME: Isn't the proxy model a strange place to store this data? - proxyModel()->loadOdf( plotAreaElement, context, d->chartType == StockChartType ? 3 : 1, d->chartType ); + proxyModel()->loadOdf(plotAreaElement, context, d->chartType == StockChartType ? 3 : 1, d->chartType); // Now load the surfaces (wall and possibly floor) // FIXME: Use named tags instead of looping? - forEachElement ( n, plotAreaElement ) { - if ( n.namespaceURI() != KoXmlNS::chart ) + forEachElement (n, plotAreaElement) { + if (n.namespaceURI() != KoXmlNS::chart) continue; - if ( n.localName() == "wall" ) { - d->wall->loadOdf( n, context ); + if (n.localName() == "wall") { + d->wall->loadOdf(n, context); } - else if ( n.localName() == "floor" ) { + else if (n.localName() == "floor") { // The floor is not always present, so allocate it if needed. // FIXME: Load floor, even if we don't really support it yet // and save it back to ODF. - //if ( !d->floor ) - // d->floor = new Surface( this ); - //d->floor->loadOdf( n, context ); + //if (!d->floor) + // d->floor = new Surface(this); + //d->floor->loadOdf(n, context); } - else if (d->chartType == StockChartType && n.localName() == "stock-gain-marker" ) { + else if (d->chartType == StockChartType && n.localName() == "stock-gain-marker") { // FIXME } - else if (d->chartType == StockChartType && n.localName() == "stock-loss-marker" ) { + else if (d->chartType == StockChartType && n.localName() == "stock-loss-marker") { // FIXME } - else if (d->chartType == StockChartType && n.localName() == "stock-range-line" ) { - if ( n.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + else if (d->chartType == StockChartType && n.localName() == "stock-range-line") { + if (n.hasAttributeNS(KoXmlNS::chart, "style-name")) { styleStack.clear(); - context.odfLoadingContext().fillStyleStack( n, KoXmlNS::chart, "style-name", "chart" ); + context.odfLoadingContext().fillStyleStack(n, KoXmlNS::chart, "style-name", "chart"); // stroke-color - const QString strokeColor = styleStack.property( KoXmlNS::svg, "stroke-color" ); + const QString strokeColor = styleStack.property(KoXmlNS::svg, "stroke-color"); // FIXME: There seem to be no way to set this for the StockChart in KDChart. :-/ - //QPen( QColor( strokeColor) ); + //QPen(QColor(strokeColor)); // FIXME: svg:stroke-width } } - else if ( n.localName() != "axis" && n.localName() != "series" ) { + else if (n.localName() != "axis" && n.localName() != "series") { qWarning() << "PlotArea::loadOdf(): Unknown tag name " << n.localName(); } } @@ -763,137 +767,145 @@ return true; } -void PlotArea::saveOdf( KoShapeSavingContext &context ) const +void PlotArea::saveOdf(KoShapeSavingContext &context) const { KoXmlWriter &bodyWriter = context.xmlWriter(); //KoGenStyles &mainStyles = context.mainStyles(); - bodyWriter.startElement( "chart:plot-area" ); + bodyWriter.startElement("chart:plot-area"); // FIXME: Somehow this style gets the name gr2 instead of ch2. // Fix that as well. - KoGenStyle plotAreaStyle( KoGenStyle::ChartAutoStyle, "chart" ); + KoGenStyle plotAreaStyle(KoGenStyle::ChartAutoStyle, "chart"); // Data direction const Qt::Orientation direction = proxyModel()->dataDirection(); - plotAreaStyle.addProperty( "chart:series-source", - ( direction == Qt::Horizontal ) - ? "rows" : "columns" ); + plotAreaStyle.addProperty("chart:series-source", + (direction == Qt::Horizontal) + ? "rows" : "columns"); // Save chart subtype - saveOdfSubType( bodyWriter, plotAreaStyle ); + saveOdfSubType(bodyWriter, plotAreaStyle); - bodyWriter.addAttribute( "chart:style-name", - saveStyle( plotAreaStyle, context ) ); + bodyWriter.addAttribute("chart:style-name", + saveStyle(plotAreaStyle, context)); - const QSizeF s( size() ); - const QPointF p( position() ); - bodyWriter.addAttributePt( "svg:width", s.width() ); - bodyWriter.addAttributePt( "svg:height", s.height() ); - bodyWriter.addAttributePt( "svg:x", p.x() ); - bodyWriter.addAttributePt( "svg:y", p.y() ); + const QSizeF s(size()); + const QPointF p(position()); + bodyWriter.addAttributePt("svg:width", s.width()); + bodyWriter.addAttributePt("svg:height", s.height()); + bodyWriter.addAttributePt("svg:x", p.x()); + bodyWriter.addAttributePt("svg:y", p.y()); CellRegion cellRangeAddress = d->shape->proxyModel()->cellRangeAddress(); - bodyWriter.addAttribute( "table:cell-range-address", cellRangeAddress.toString() ); + bodyWriter.addAttribute("table:cell-range-address", cellRangeAddress.toString()); // About the data: // Save if the first row / column contain headers. QString dataSourceHasLabels; - if ( proxyModel()->firstRowIsLabel() ) { - if ( proxyModel()->firstColumnIsLabel() ) + if (proxyModel()->firstRowIsLabel()) { + if (proxyModel()->firstColumnIsLabel()) dataSourceHasLabels = "both"; else dataSourceHasLabels = "row"; } else { - if ( proxyModel()->firstColumnIsLabel() ) + if (proxyModel()->firstColumnIsLabel()) dataSourceHasLabels = "column"; else dataSourceHasLabels = "none"; } // Note: this is saved in the plotarea attributes and not the style. - bodyWriter.addAttribute( "chart:data-source-has-labels", - dataSourceHasLabels ); + bodyWriter.addAttribute("chart:data-source-has-labels", dataSourceHasLabels); + + if (d->threeDScene) { + d->threeDScene->saveOdfAttributes(bodyWriter); + } + + // Done with the attributes, start writing the children. // Save the axes. - if ( isCartesian( d->chartType ) ) { - foreach( Axis *axis, d->axes ) { - axis->saveOdf( context ); - } + foreach(Axis *axis, d->axes) { + axis->saveOdf(context); + } + + if (d->threeDScene) { + d->threeDScene->saveOdfChildren(bodyWriter); } // Save data series - d->shape->proxyModel()->saveOdf( context ); + d->shape->proxyModel()->saveOdf(context); // Save the floor and wall of the plotarea. - d->wall->saveOdf( context, "chart:wall" ); - //if ( d->floor ) - // d->floor->saveOdf( context, "chart:floor" ); + d->wall->saveOdf(context, "chart:wall"); + //if (d->floor) + // d->floor->saveOdf(context, "chart:floor"); bodyWriter.endElement(); // chart:plot-area } -void PlotArea::saveOdfSubType( KoXmlWriter& xmlWriter, - KoGenStyle& plotAreaStyle ) const +void PlotArea::saveOdfSubType(KoXmlWriter& xmlWriter, + KoGenStyle& plotAreaStyle) const { - Q_UNUSED( xmlWriter ); + Q_UNUSED(xmlWriter); - switch ( d->chartType ) { + switch (d->chartType) { case BarChartType: - switch( d->chartSubtype ) { + switch(d->chartSubtype) { case NoChartSubtype: case NormalChartSubtype: break; case StackedChartSubtype: - plotAreaStyle.addProperty( "chart:stacked", "true" ); + plotAreaStyle.addProperty("chart:stacked", "true"); break; case PercentChartSubtype: - plotAreaStyle.addProperty( "chart:percentage", "true" ); + plotAreaStyle.addProperty("chart:percentage", "true"); break; } - if ( d->threeD ) { - plotAreaStyle.addProperty( "chart:three-dimensional", "true" ); - // FIXME: Save all 3D attributes too. + + if (d->threeD) { + plotAreaStyle.addProperty("chart:three-dimensional", "true"); } + // Data specific to bar charts - if ( d->vertical ) - plotAreaStyle.addProperty( "chart:vertical", "true" ); + if (d->vertical) + plotAreaStyle.addProperty("chart:vertical", "true"); // Don't save this if zero, because that's the default. - //plotAreaStyle.addProperty( "chart:lines-used", 0 ); // FIXME: for now + //plotAreaStyle.addProperty("chart:lines-used", 0); // FIXME: for now break; case LineChartType: - switch( d->chartSubtype ) { + switch(d->chartSubtype) { case NoChartSubtype: case NormalChartSubtype: break; case StackedChartSubtype: - plotAreaStyle.addProperty( "chart:stacked", "true" ); + plotAreaStyle.addProperty("chart:stacked", "true"); break; case PercentChartSubtype: - plotAreaStyle.addProperty( "chart:percentage", "true" ); + plotAreaStyle.addProperty("chart:percentage", "true"); break; } - if ( d->threeD ) { - plotAreaStyle.addProperty( "chart:three-dimensional", "true" ); + if (d->threeD) { + plotAreaStyle.addProperty("chart:three-dimensional", "true"); // FIXME: Save all 3D attributes too. } // FIXME: What does this mean? - plotAreaStyle.addProperty( "chart:symbol-type", "automatic" ); + plotAreaStyle.addProperty("chart:symbol-type", "automatic"); break; case AreaChartType: - switch( d->chartSubtype ) { + switch(d->chartSubtype) { case NoChartSubtype: case NormalChartSubtype: break; case StackedChartSubtype: - plotAreaStyle.addProperty( "chart:stacked", "true" ); + plotAreaStyle.addProperty("chart:stacked", "true"); break; case PercentChartSubtype: - plotAreaStyle.addProperty( "chart:percentage", "true" ); + plotAreaStyle.addProperty("chart:percentage", "true"); break; } - if ( d->threeD ) { - plotAreaStyle.addProperty( "chart:three-dimensional", "true" ); + if (d->threeD) { + plotAreaStyle.addProperty("chart:three-dimensional", "true"); // FIXME: Save all 3D attributes too. } break; @@ -912,15 +924,15 @@ case RadarChartType: case FilledRadarChartType: // Save subtype of the Radar chart. - switch( d->chartSubtype ) { + switch(d->chartSubtype) { case NoChartSubtype: case NormalChartSubtype: break; case StackedChartSubtype: - plotAreaStyle.addProperty( "chart:stacked", "true" ); + plotAreaStyle.addProperty("chart:stacked", "true"); break; case PercentChartSubtype: - plotAreaStyle.addProperty( "chart:percentage", "true" ); + plotAreaStyle.addProperty("chart:percentage", "true"); break; } break; @@ -941,40 +953,40 @@ } } -void PlotArea::setGapBetweenBars( int percent ) +void PlotArea::setGapBetweenBars(int percent) { d->gapBetweenBars = percent; - emit gapBetweenBarsChanged( percent ); + emit gapBetweenBarsChanged(percent); } -void PlotArea::setGapBetweenSets( int percent ) +void PlotArea::setGapBetweenSets(int percent) { d->gapBetweenSets = percent; - emit gapBetweenSetsChanged( percent ); + emit gapBetweenSetsChanged(percent); } -void PlotArea::setPieAngleOffset( qreal angle ) +void PlotArea::setPieAngleOffset(qreal angle) { d->pieAngleOffset = angle; - emit pieAngleOffsetChanged( angle ); + emit pieAngleOffsetChanged(angle); } ChartShape *PlotArea::parent() const { // There has to be a valid parent - Q_ASSERT( d->shape ); + Q_ASSERT(d->shape); return d->shape; } -KDChart::CartesianCoordinatePlane *PlotArea::kdCartesianPlane( Axis *axis ) const +KDChart::CartesianCoordinatePlane *PlotArea::kdCartesianPlane(Axis *axis) const { - if ( axis ) { - Q_ASSERT( d->axes.contains( axis ) ); + if (axis) { + Q_ASSERT(d->axes.contains(axis)); // Only a secondary y axis gets the secondary plane - if ( axis->dimension() == YAxisDimension && axis != yAxis() ) + if (axis->dimension() == YAxisDimension && axis != yAxis()) return d->kdCartesianPlaneSecondary; } @@ -996,21 +1008,21 @@ return d->kdChart; } -bool PlotArea::registerKdDiagram( KDChart::AbstractDiagram *diagram ) +bool PlotArea::registerKdDiagram(KDChart::AbstractDiagram *diagram) { - if ( d->kdDiagrams.contains( diagram ) ) + if (d->kdDiagrams.contains(diagram)) return false; - d->kdDiagrams.append( diagram ); + d->kdDiagrams.append(diagram); return true; } -bool PlotArea::deregisterKdDiagram( KDChart::AbstractDiagram *diagram ) +bool PlotArea::deregisterKdDiagram(KDChart::AbstractDiagram *diagram) { - if ( !d->kdDiagrams.contains( diagram ) ) + if (!d->kdDiagrams.contains(diagram)) return false; - d->kdDiagrams.removeAll( diagram ); + d->kdDiagrams.removeAll(diagram); return true; } @@ -1018,7 +1030,7 @@ { parent()->legend()->update(); requestRepaint(); - foreach( Axis* axis, d->axes ) + foreach(Axis* axis, d->axes) axis->update(); KoShape::update(); @@ -1029,10 +1041,10 @@ d->pixmapRepaintRequested = true; } -void PlotArea::paintPixmap( QPainter &painter, const KoViewConverter &converter ) +void PlotArea::paintPixmap(QPainter &painter, const KoViewConverter &converter) { // Adjust the size of the painting area to the current zoom level - const QSize paintRectSize = converter.documentToView( size() ).toSize(); + const QSize paintRectSize = converter.documentToView(size()).toSize(); const QSize plotAreaSize = size().toSize(); const int borderX = 4; const int borderY = 4; @@ -1040,52 +1052,55 @@ // Only use a pixmap with sane sizes d->paintPixmap = false;//paintRectSize.width() < MAX_PIXMAP_SIZE || paintRectSize.height() < MAX_PIXMAP_SIZE; - if ( d->paintPixmap ) { - d->image = QImage( paintRectSize, QImage::Format_RGB32 ); + if (d->paintPixmap) { + d->image = QImage(paintRectSize, QImage::Format_RGB32); // Copy the painter's render hints, such as antialiasing - QPainter pixmapPainter( &d->image ); - pixmapPainter.setRenderHints( painter.renderHints() ); - pixmapPainter.setRenderHint( QPainter::Antialiasing, false ); + QPainter pixmapPainter(&d->image); + pixmapPainter.setRenderHints(painter.renderHints()); + pixmapPainter.setRenderHint(QPainter::Antialiasing, false); // scale the painter's coordinate system to fit the current zoom level - applyConversion( pixmapPainter, converter ); + applyConversion(pixmapPainter, converter); - d->kdChart->paint( &pixmapPainter, QRect( QPoint( borderX, borderY ), QSize( plotAreaSize.width() - 2 * borderX, plotAreaSize.height() - 2 * borderY ) ) ); + d->kdChart->paint(&pixmapPainter, QRect(QPoint(borderX, borderY), + QSize(plotAreaSize.width() - 2 * borderX, + plotAreaSize.height() - 2 * borderY))); } else { - - d->kdChart->paint( &painter, QRect( QPoint( borderX, borderY ), QSize( plotAreaSize.width() - 2 * borderX, plotAreaSize.height() - 2 * borderY ) ) ); + d->kdChart->paint(&painter, QRect(QPoint(borderX, borderY), + QSize(plotAreaSize.width() - 2 * borderX, + plotAreaSize.height() - 2 * borderY))); } } -void PlotArea::paint( QPainter& painter, const KoViewConverter& converter, KoShapePaintingContext &) +void PlotArea::paint(QPainter& painter, const KoViewConverter& converter, KoShapePaintingContext &) { //painter.save(); // First of all, scale the painter's coordinate system to fit the current zoom level - applyConversion( painter, converter ); + applyConversion(painter, converter); // Calculate the clipping rect - QRectF paintRect = QRectF( QPointF( 0, 0 ), size() ); - painter.setClipRect( paintRect, Qt::IntersectClip ); + QRectF paintRect = QRectF(QPointF(0, 0), size()); + painter.setClipRect(paintRect, Qt::IntersectClip); // Paint the background - if ( background() ) { + if (background()) { QPainterPath p; - p.addRect( paintRect ); - background()->paint( painter, p ); + p.addRect(paintRect); + background()->paint(painter, p); } // Get the current zoom level QPointF zoomLevel; - converter.zoom( &zoomLevel.rx(), &zoomLevel.ry() ); + converter.zoom(&zoomLevel.rx(), &zoomLevel.ry()); // Only repaint the pixmap if it is scheduled, the zoom level // changed or the shape was resized. - /*if ( d->pixmapRepaintRequested + /*if ( d->pixmapRepaintRequested || d->lastZoomLevel != zoomLevel || d->lastSize != size() - || !d->paintPixmap ) { + || !d->paintPixmap) { // TODO (js): What if two zoom levels are constantly being // requested? At the moment, this *is* the case, // due to the fact that the shape is also rendered @@ -1098,30 +1113,30 @@ // in pixels and pixmaps? The size could be 2 or // at most 3. We could manage the replacing // using LRU. - paintPixmap( painter, converter ); + paintPixmap(painter, converter); d->pixmapRepaintRequested = false; d->lastZoomLevel = zoomLevel; d->lastSize = size(); }*/ - painter.setRenderHint( QPainter::Antialiasing, false ); + painter.setRenderHint(QPainter::Antialiasing, false); // KDChart thinks in pixels, Calligra in pt - ScreenConversions::scaleFromPtToPx( painter ); + ScreenConversions::scaleFromPtToPx(painter); // Only paint the actual chart if there is a certain minimal size, // because otherwise kdchart will crash. QRect kdchartRect = ScreenConversions::scaleFromPtToPx(paintRect); // Turn off clipping so that border (or "frame") drawn by KDChart::Chart // is not not cut off. - painter.setClipping( false ); + painter.setClipping(false); if (kdchartRect.width() > 10 && kdchartRect.height() > 10) { d->kdChart->paint(&painter, kdchartRect); } //painter.restore(); // Paint the cached pixmap if we got a GO from paintPixmap() - //if ( d->paintPixmap ) - // painter.drawImage( 0, 0, d->image ); + //if (d->paintPixmap) + // painter.drawImage(0, 0, d->image); } void PlotArea::relayout() const diff -Nru calligra-2.4.0/plugins/chartshape/PlotArea.h calligra-2.4.3/plugins/chartshape/PlotArea.h --- calligra-2.4.0/plugins/chartshape/PlotArea.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/PlotArea.h 2012-06-26 04:18:01.000000000 +0000 @@ -36,6 +36,9 @@ } +class Ko3dScene; + + namespace KChart { /** @@ -62,7 +65,7 @@ Q_OBJECT public: - PlotArea( ChartShape *parent ); + PlotArea(ChartShape *parent); ~PlotArea(); void plotAreaInit(); @@ -71,23 +74,24 @@ ChartType chartType() const; ChartSubtype chartSubType() const; - void setChartType( ChartType type ); - void setChartSubType( ChartSubtype subType ); + void setChartType(ChartType type); + void setChartSubType(ChartSubtype subType); QList axes() const; QList dataSets() const; int dataSetCount() const; - bool addAxis( Axis *axis ); - bool removeAxis( Axis *axis ); + bool addAxis(Axis *axis); + bool removeAxis(Axis *axis); - ThreeDScene *threeDScene() const; // TODO: Rename this into primaryXAxis() Axis *xAxis() const; // TODO: Rename this into primaryYAxis() Axis *yAxis() const; Axis *secondaryXAxis() const; Axis *secondaryYAxis() const; + bool isThreeD() const; + Ko3dScene *threeDScene() const; /** * Determines from what range of cells the data in this chart @@ -116,39 +120,39 @@ */ qreal pieAngleOffset() const; - void setGapBetweenBars( int percent ); - void setGapBetweenSets( int percent ); + void setGapBetweenBars(int percent); + void setGapBetweenSets(int percent); /** * @see pieAngleOffset */ - void setPieAngleOffset( qreal angle ); + void setPieAngleOffset(qreal angle); - bool loadOdf( const KoXmlElement &plotAreaElement, KoShapeLoadingContext &context ); - bool loadOdfSeries( const KoXmlElement &seriesElement, KoShapeLoadingContext &context ); + bool loadOdf(const KoXmlElement &plotAreaElement, KoShapeLoadingContext &context); + bool loadOdfSeries(const KoXmlElement &seriesElement, KoShapeLoadingContext &context); - void saveOdf( KoShapeSavingContext &context ) const; - void saveOdfSubType( KoXmlWriter &bodyWriter, KoGenStyle &plotAreaStyle ) const; + void saveOdf(KoShapeSavingContext &context) const; + void saveOdfSubType(KoXmlWriter &bodyWriter, KoGenStyle &plotAreaStyle) const; - void setThreeD( bool threeD ); + void setThreeD(bool threeD); /** * @see cellRangeAddress */ - void setCellRangeAddress( const CellRegion ®ion ); + void setCellRangeAddress(const CellRegion ®ion); /** * @see isVertical */ - void setVertical( bool vertical ); + void setVertical(bool vertical); ChartShape *parent() const; - void paint( QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &paintcontext); + void paint(QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &paintcontext); - bool registerKdDiagram( KDChart::AbstractDiagram *diagram ); - bool deregisterKdDiagram( KDChart::AbstractDiagram *diagram ); + bool registerKdDiagram(KDChart::AbstractDiagram *diagram); + bool deregisterKdDiagram(KDChart::AbstractDiagram *diagram); void relayout() const; @@ -158,15 +162,15 @@ void plotAreaUpdate() const; signals: - void gapBetweenBarsChanged( int ); - void gapBetweenSetsChanged( int ); - void pieAngleOffsetChanged( qreal ); + void gapBetweenBarsChanged(int); + void gapBetweenSetsChanged(int); + void pieAngleOffsetChanged(qreal); private: - void paintPixmap( QPainter &painter, const KoViewConverter &converter ); + void paintPixmap(QPainter &painter, const KoViewConverter &converter); // For class Axis - KDChart::CartesianCoordinatePlane *kdCartesianPlane( Axis *axis = 0 ) const; + KDChart::CartesianCoordinatePlane *kdCartesianPlane(Axis *axis = 0) const; KDChart::PolarCoordinatePlane *kdPolarPlane() const; KDChart::RadarCoordinatePlane *kdRadarPlane() const; KDChart::Chart *kdChart() const; diff -Nru calligra-2.4.0/plugins/chartshape/ScreenConversions.cpp calligra-2.4.3/plugins/chartshape/ScreenConversions.cpp --- calligra-2.4.0/plugins/chartshape/ScreenConversions.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ScreenConversions.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -34,49 +34,49 @@ using namespace KChart; -qreal ScreenConversions::pxToPtX( qreal px ) +qreal ScreenConversions::pxToPtX(qreal px) { - return KoUnit( KoUnit::Inch ).fromUserValue( px / KoDpi::dpiX() ); + return KoUnit(KoUnit::Inch).fromUserValue(px / KoDpi::dpiX()); } -qreal ScreenConversions::pxToPtY( qreal px ) +qreal ScreenConversions::pxToPtY(qreal px) { - return KoUnit( KoUnit::Inch ).fromUserValue( px / KoDpi::dpiY() ); + return KoUnit(KoUnit::Inch).fromUserValue(px / KoDpi::dpiY()); } -qreal ScreenConversions::ptToPxX( qreal pt ) +qreal ScreenConversions::ptToPxX(qreal pt) { - return KoUnit::toInch( pt ) * KoDpi::dpiX(); + return KoUnit::toInch(pt) * KoDpi::dpiX(); } -qreal ScreenConversions::ptToPxY( qreal pt ) +qreal ScreenConversions::ptToPxY(qreal pt) { - return KoUnit::toInch( pt ) * KoDpi::dpiY(); + return KoUnit::toInch(pt) * KoDpi::dpiY(); } -void ScreenConversions::scaleFromPtToPx( QPainter &painter ) +void ScreenConversions::scaleFromPtToPx(QPainter &painter) { - const qreal inPerPt = KoUnit::toInch( 1.0 ); - painter.scale( 1.0 / (inPerPt * KoDpi::dpiX()), 1.0 / (inPerPt * KoDpi::dpiY()) ); + const qreal inPerPt = KoUnit::toInch(1.0); + painter.scale(1.0 / (inPerPt * KoDpi::dpiX()), 1.0 / (inPerPt * KoDpi::dpiY())); } -QSize ScreenConversions::scaleFromPtToPx( const QSizeF &size ) +QSize ScreenConversions::scaleFromPtToPx(const QSizeF &size) { - return QSizeF( ptToPxX( size.width() ), ptToPxY( size.height() ) ).toSize(); + return QSizeF(ptToPxX(size.width()), ptToPxY(size.height())).toSize(); } -QSizeF ScreenConversions::scaleFromPxToPt( const QSize &size ) +QSizeF ScreenConversions::scaleFromPxToPt(const QSize &size) { - return QSizeF( pxToPtX( size.width() ), pxToPtY( size.height() ) ); + return QSizeF(pxToPtX(size.width()), pxToPtY(size.height())); } -QPoint ScreenConversions::scaleFromPtToPx( const QPointF &point ) +QPoint ScreenConversions::scaleFromPtToPx(const QPointF &point) { - return QPointF( ptToPxX( point.x() ), ptToPxY( point.y() ) ).toPoint(); + return QPointF(ptToPxX(point.x()), ptToPxY(point.y())).toPoint(); } -QRect ScreenConversions::scaleFromPtToPx( const QRectF &rect ) +QRect ScreenConversions::scaleFromPtToPx(const QRectF &rect) { - return QRect( scaleFromPtToPx( rect.topLeft() ), - scaleFromPtToPx( rect.size() ) ); + return QRect(scaleFromPtToPx(rect.topLeft()), + scaleFromPtToPx(rect.size())); } diff -Nru calligra-2.4.0/plugins/chartshape/ScreenConversions.h calligra-2.4.3/plugins/chartshape/ScreenConversions.h --- calligra-2.4.0/plugins/chartshape/ScreenConversions.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ScreenConversions.h 2012-06-26 04:18:01.000000000 +0000 @@ -35,17 +35,17 @@ { public: // pt --> px - static qreal ptToPxX( qreal pt ); - static qreal ptToPxY( qreal pt ); - static void scaleFromPtToPx( QPainter &painter ); - static QPoint scaleFromPtToPx( const QPointF &point ); - static QSize scaleFromPtToPx( const QSizeF &size ); - static QRect scaleFromPtToPx( const QRectF &rect ); + static qreal ptToPxX(qreal pt); + static qreal ptToPxY(qreal pt); + static void scaleFromPtToPx(QPainter &painter); + static QPoint scaleFromPtToPx(const QPointF &point); + static QSize scaleFromPtToPx(const QSizeF &size); + static QRect scaleFromPtToPx(const QRectF &rect); // px --> pt - static qreal pxToPtX( qreal px ); - static qreal pxToPtY( qreal px ); - static QSizeF scaleFromPxToPt( const QSize &size ); + static qreal pxToPtX(qreal px); + static qreal pxToPtY(qreal px); + static QSizeF scaleFromPxToPt(const QSize &size); }; } // namespace KChart diff -Nru calligra-2.4.0/plugins/chartshape/SingleModelHelper.cpp calligra-2.4.3/plugins/chartshape/SingleModelHelper.cpp --- calligra-2.4.0/plugins/chartshape/SingleModelHelper.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/SingleModelHelper.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -31,24 +31,24 @@ using namespace KChart; -SingleModelHelper::SingleModelHelper( Table *table, ChartProxyModel *proxyModel ) - : m_table( table ) - , m_proxyModel( proxyModel ) +SingleModelHelper::SingleModelHelper(Table *table, ChartProxyModel *proxyModel) + : m_table(table) + , m_proxyModel(proxyModel) { - Q_ASSERT( table ); - Q_ASSERT( proxyModel ); + Q_ASSERT(table); + Q_ASSERT(proxyModel); QAbstractItemModel *model = table->model(); - connect( model, SIGNAL( modelReset() ), - this, SLOT( slotModelStructureChanged() ) ); - connect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), - this, SLOT( slotModelStructureChanged() ) ); - connect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), - this, SLOT( slotModelStructureChanged() ) ); - connect( model, SIGNAL( columnsInserted( QModelIndex, int, int ) ), - this, SLOT( slotModelStructureChanged() ) ); - connect( model, SIGNAL( columnsRemoved( QModelIndex, int, int ) ), - this, SLOT( slotModelStructureChanged() ) ); + connect(model, SIGNAL(modelReset()), + this, SLOT(slotModelStructureChanged())); + connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), + this, SLOT(slotModelStructureChanged())); + connect(model, SIGNAL(rowsRemoved(QModelIndex, int, int)), + this, SLOT(slotModelStructureChanged())); + connect(model, SIGNAL(columnsInserted(QModelIndex, int, int)), + this, SLOT(slotModelStructureChanged())); + connect(model, SIGNAL(columnsRemoved(QModelIndex, int, int)), + this, SLOT(slotModelStructureChanged())); // Initialize the proxy with this model slotModelStructureChanged(); @@ -59,11 +59,11 @@ QAbstractItemModel *model = m_table->model(); const int columnCount = model->columnCount(); const int rowCount = model->rowCount(); - CellRegion region( m_table ); - if ( columnCount >= 1 && rowCount >= 1 ) { - QPoint topLeft( 1, 1 ); - QPoint bottomRight( columnCount, rowCount ); - region.add( QRect( topLeft, bottomRight ) ); + CellRegion region(m_table); + if (columnCount >= 1 && rowCount >= 1) { + QPoint topLeft(1, 1); + QPoint bottomRight(columnCount, rowCount); + region.add(QRect(topLeft, bottomRight)); } - m_proxyModel->reset( region ); + m_proxyModel->reset(region); } diff -Nru calligra-2.4.0/plugins/chartshape/SingleModelHelper.h calligra-2.4.3/plugins/chartshape/SingleModelHelper.h --- calligra-2.4.0/plugins/chartshape/SingleModelHelper.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/SingleModelHelper.h 2012-06-26 04:18:01.000000000 +0000 @@ -24,6 +24,7 @@ // Qt #include + namespace KChart { class ChartProxyModel; @@ -34,7 +35,7 @@ Q_OBJECT public: - SingleModelHelper( Table *table, ChartProxyModel *proxyModel ); + SingleModelHelper(Table *table, ChartProxyModel *proxyModel); private slots: void slotModelStructureChanged(); diff -Nru calligra-2.4.0/plugins/chartshape/Surface.cpp calligra-2.4.3/plugins/chartshape/Surface.cpp --- calligra-2.4.0/plugins/chartshape/Surface.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/Surface.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -88,16 +88,16 @@ // ================================================================ -Surface::Surface( PlotArea *parent ) - : d( new Private(parent) ) +Surface::Surface(PlotArea *parent) + : d(new Private(parent)) { - Q_ASSERT( parent ); + Q_ASSERT(parent); // FIXME: Make this class capable of storing floor-specific // attributes as well. Right now, it's really only used // and designed to load and save the chart's wall. d->kdPlane = d->plotArea->kdCartesianPlane(); - Q_ASSERT( d->kdPlane ); + Q_ASSERT(d->kdPlane); } Surface::~Surface() @@ -111,7 +111,7 @@ return d->position; } -void Surface::setPosition( const QPointF &position ) +void Surface::setPosition(const QPointF &position) { d->position = position; } @@ -121,7 +121,7 @@ return d->width; } -void Surface::setWidth( int width ) +void Surface::setWidth(int width) { d->width = width; } @@ -131,7 +131,7 @@ return d->brush; } -void Surface::setBrush( const QBrush &brush ) +void Surface::setBrush(const QBrush &brush) { d->brush = brush; } @@ -141,79 +141,80 @@ return d->framePen; } -void Surface::setFramePen( const QPen &pen ) +void Surface::setFramePen(const QPen &pen) { d->framePen = pen; } -bool Surface::loadOdf( const KoXmlElement &surfaceElement, - KoShapeLoadingContext &context ) +bool Surface::loadOdf(const KoXmlElement &surfaceElement, + KoShapeLoadingContext &context) { // Get the current style stack and save it's state. KoStyleStack &styleStack = context.odfLoadingContext().styleStack(); bool brushLoaded = false; - if ( surfaceElement.hasAttributeNS( KoXmlNS::chart, "style-name" ) ) { + if (surfaceElement.hasAttributeNS(KoXmlNS::chart, "style-name")) { KDChart::BackgroundAttributes backgroundAttributes = d->kdPlane->backgroundAttributes(); KDChart::FrameAttributes frameAttributes = d->kdPlane->frameAttributes(); // Add the chart style to the style stack. styleStack.clear(); - context.odfLoadingContext().fillStyleStack( surfaceElement, KoXmlNS::chart, "style-name", "chart" ); + context.odfLoadingContext().fillStyleStack(surfaceElement, KoXmlNS::chart, "style-name", "chart"); - styleStack.setTypeProperties( "graphic" ); + styleStack.setTypeProperties("graphic"); // If there is a "stroke" property, then get the stroke style // and set the pen accordingly. - if ( styleStack.hasProperty( KoXmlNS::draw, "stroke" ) ) { - frameAttributes.setVisible( true ); + if (styleStack.hasProperty(KoXmlNS::draw, "stroke")) { + frameAttributes.setVisible(true); - QString stroke = styleStack.property( KoXmlNS::draw, "stroke" ); - QPen pen( Qt::NoPen ); - if ( stroke == "solid" || stroke == "dash" ) - pen = KoOdfGraphicStyles::loadOdfStrokeStyle( styleStack, stroke, context.odfLoadingContext().stylesReader() ); + QString stroke = styleStack.property(KoXmlNS::draw, "stroke"); + QPen pen(Qt::NoPen); + if (stroke == "solid" || stroke == "dash") + pen = KoOdfGraphicStyles::loadOdfStrokeStyle(styleStack, stroke, + context.odfLoadingContext().stylesReader()); - frameAttributes.setPen( pen ); + frameAttributes.setPen(pen); } // If there is a "fill" property, then get the fill style, and // set the brush for the surface accordingly. - if ( styleStack.hasProperty( KoXmlNS::draw, "fill" ) ) { - backgroundAttributes.setVisible( true ); + if (styleStack.hasProperty(KoXmlNS::draw, "fill")) { + backgroundAttributes.setVisible(true); QBrush brush; - QString fill = styleStack.property( KoXmlNS::draw, "fill" ); - if ( fill == "solid" || fill == "hatch" ) { + QString fill = styleStack.property(KoXmlNS::draw, "fill"); + if (fill == "solid" || fill == "hatch") { brushLoaded = true; - brush = KoOdfGraphicStyles::loadOdfFillStyle( styleStack, fill, - context.odfLoadingContext().stylesReader() ); + brush = KoOdfGraphicStyles::loadOdfFillStyle(styleStack, fill, + context.odfLoadingContext().stylesReader()); } - else if ( fill == "gradient" ) { + else if (fill == "gradient") { brushLoaded = true; - brush = KoOdfGraphicStyles::loadOdfGradientStyle( styleStack, context.odfLoadingContext().stylesReader(), QSizeF( 5.0, 60.0 ) ); + brush = KoOdfGraphicStyles::loadOdfGradientStyle(styleStack, context.odfLoadingContext().stylesReader(), QSizeF(5.0, 60.0)); } - else if ( fill == "bitmap" ) { + else if (fill == "bitmap") { brushLoaded = true; brush = loadOdfPatternStyle(styleStack, context.odfLoadingContext(), QSizeF(5.0, 60.0)); } - backgroundAttributes.setBrush( brush ); + backgroundAttributes.setBrush(brush); } // Finally actually set the attributes. - d->kdPlane->setBackgroundAttributes( backgroundAttributes ); - d->kdPlane->setFrameAttributes( frameAttributes ); + d->kdPlane->setBackgroundAttributes(backgroundAttributes); + d->kdPlane->setFrameAttributes(frameAttributes); } #ifndef NWORKAROUND_ODF_BUGS - if ( !brushLoaded ) { + if (!brushLoaded) { KDChart::BackgroundAttributes backgroundAttributes = d->kdPlane->backgroundAttributes(); - QColor fillColor = KoOdfWorkaround::fixMissingFillColor( surfaceElement, context ); - if ( fillColor.isValid() ) { - backgroundAttributes.setVisible( true ); - backgroundAttributes.setBrush( fillColor ); - d->kdPlane->setBackgroundAttributes( backgroundAttributes ); + QColor fillColor = KoOdfWorkaround::fixMissingFillColor(surfaceElement, context); + if (fillColor.isValid()) { + backgroundAttributes.setVisible(true); + backgroundAttributes.setBrush(fillColor); + d->kdPlane->setBackgroundAttributes(backgroundAttributes); } } #endif @@ -221,33 +222,32 @@ return true; } -void Surface::saveOdf( KoShapeSavingContext &context, - const char *elementName ) +void Surface::saveOdf(KoShapeSavingContext &context, const char *elementName) { KoXmlWriter &bodyWriter = context.xmlWriter(); KoGenStyles &mainStyles = context.mainStyles(); - KoGenStyle style = KoGenStyle( KoGenStyle::GraphicAutoStyle, - "chart" ); + KoGenStyle style = KoGenStyle(KoGenStyle::GraphicAutoStyle, "chart"); // elementName is chart:floor or chart:wall - bodyWriter.startElement( elementName ); + bodyWriter.startElement(elementName); QBrush backgroundBrush; - if ( d->kdPlane->backgroundAttributes().isVisible() ) + if (d->kdPlane->backgroundAttributes().isVisible()) backgroundBrush = d->kdPlane->backgroundAttributes().brush(); - QPen framePen( Qt::NoPen ); - if ( d->kdPlane->frameAttributes().isVisible() ) + QPen framePen(Qt::NoPen); + if (d->kdPlane->frameAttributes().isVisible()) framePen = d->kdPlane->frameAttributes().pen(); - KoOdfGraphicStyles::saveOdfFillStyle( style, mainStyles, backgroundBrush ); - KoOdfGraphicStyles::saveOdfStrokeStyle( style, mainStyles, framePen ); + KoOdfGraphicStyles::saveOdfFillStyle(style, mainStyles, backgroundBrush); + KoOdfGraphicStyles::saveOdfStrokeStyle(style, mainStyles, framePen); - bodyWriter.addAttribute( "chart:style-name", mainStyles.insert( style, "ch" ) ); + bodyWriter.addAttribute("chart:style-name", mainStyles.insert(style, "ch")); bodyWriter.endElement(); // chart:floor or chart:wall } -QBrush Surface::loadOdfPatternStyle(const KoStyleStack &styleStack, KoOdfLoadingContext & context, const QSizeF &size) +QBrush Surface::loadOdfPatternStyle(const KoStyleStack &styleStack, + KoOdfLoadingContext &context, const QSizeF &size) { QString styleName = styleStack.property(KoXmlNS::draw, "fill-image-name"); diff -Nru calligra-2.4.0/plugins/chartshape/Surface.h calligra-2.4.3/plugins/chartshape/Surface.h --- calligra-2.4.0/plugins/chartshape/Surface.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/Surface.h 2012-06-26 04:18:01.000000000 +0000 @@ -42,7 +42,7 @@ class Surface { public: - Surface( PlotArea *parent ); + Surface(PlotArea *parent); ~Surface(); /** @@ -56,14 +56,13 @@ QBrush brush() const; QPen framePen() const; - void setPosition( const QPointF &position ); - void setWidth( int ); - void setBrush( const QBrush &brush ); - void setFramePen( const QPen &pen ); + void setPosition(const QPointF &position); + void setWidth(int); + void setBrush(const QBrush &brush); + void setFramePen(const QPen &pen); - bool loadOdf( const KoXmlElement &surfaceElement, KoShapeLoadingContext &context ); - void saveOdf( KoShapeSavingContext &context, - const char *elementName ); + bool loadOdf(const KoXmlElement &surfaceElement, KoShapeLoadingContext &context); + void saveOdf(KoShapeSavingContext &context, const char *elementName); private: class Private; diff -Nru calligra-2.4.0/plugins/chartshape/TableSource.cpp calligra-2.4.3/plugins/chartshape/TableSource.cpp --- calligra-2.4.0/plugins/chartshape/TableSource.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/TableSource.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -25,22 +25,22 @@ #include #include -Q_DECLARE_METATYPE( QPointer ) +Q_DECLARE_METATYPE(QPointer) using namespace KChart; -Table::Table( const QString &name, QAbstractItemModel *model ) - : m_name( name ) - , m_model( model ) +Table::Table(const QString &name, QAbstractItemModel *model) + : m_name(name) + , m_model(model) { - Q_ASSERT( !name.isEmpty() ); - Q_ASSERT( m_model ); + Q_ASSERT(!name.isEmpty()); + Q_ASSERT(m_model); } class TableSource::Private { public: - Private( TableSource *parent ); + Private(TableSource *parent); ~Private(); /** @@ -49,7 +49,7 @@ * If both a table name and a valid model pointer are found, the table * is added and the column is removed from the empty column list. */ - void updateEmptySamColumn( int col ); + void updateEmptySamColumn(int col); /// Pointer to owner of this Private instance TableSource *const q; @@ -74,45 +74,45 @@ QSet tables; }; -TableSource::Private::Private( TableSource *parent ) - : q( parent ) - , sheetAccessModel( 0 ) +TableSource::Private::Private(TableSource *parent) + : q(parent) + , sheetAccessModel(0) { } TableSource::Private::~Private() { - qDeleteAll( tablesByName.values() ); + qDeleteAll(tablesByName.values()); } /** * Retrieves and returns the model of a sheet in @a sheetAccessModel in column @a col */ -static QAbstractItemModel *getModel( QAbstractItemModel *sheetAccessModel, int col ) +static QAbstractItemModel *getModel(QAbstractItemModel *sheetAccessModel, int col) { - QModelIndex tableIndex = sheetAccessModel->index( 0, col ); - QPointer table = sheetAccessModel->data( tableIndex ).value< QPointer >(); + QModelIndex tableIndex = sheetAccessModel->index(0, col); + QPointer table = sheetAccessModel->data(tableIndex).value< QPointer >(); return table.data(); } -void TableSource::Private::updateEmptySamColumn( int col ) +void TableSource::Private::updateEmptySamColumn(int col) { // Check for consistency - Q_ASSERT( samEmptyColumns.contains( col ) ); + Q_ASSERT(samEmptyColumns.contains(col)); - QString tableName = sheetAccessModel->headerData( col, Qt::Horizontal ).toString(); - QAbstractItemModel *model = getModel( sheetAccessModel, col ); - if ( tableName.isEmpty() || model == 0 ) + QString tableName = sheetAccessModel->headerData(col, Qt::Horizontal).toString(); + QAbstractItemModel *model = getModel(sheetAccessModel, col); + if (tableName.isEmpty() || model == 0) return; // Ok. Column is valid now. Add table in this column. - samEmptyColumns.removeAll( col ); - q->add( tableName, model ); + samEmptyColumns.removeAll(col); + q->add(tableName, model); } TableSource::TableSource() - : d( new Private( this ) ) + : d(new Private(this)) { } @@ -121,16 +121,16 @@ delete d; } -Table *TableSource::get( const QString &tableName ) const +Table *TableSource::get(const QString &tableName) const { - if( !d->tablesByName.contains( tableName ) ) + if(!d->tablesByName.contains(tableName)) return 0; return d->tablesByName[tableName]; } -Table *TableSource::get( const QAbstractItemModel *model ) const +Table *TableSource::get(const QAbstractItemModel *model) const { - if( !d->tablesByModel.contains( model ) ) + if(!d->tablesByModel.contains(model)) return 0; return d->tablesByModel[model]; } @@ -140,65 +140,65 @@ return d->tablesByName; } -void TableSource::setSheetAccessModel( QAbstractItemModel *model ) +void TableSource::setSheetAccessModel(QAbstractItemModel *model) { // Disconnect slots from signals in old sheetAccessModel - if ( d->sheetAccessModel ) - d->sheetAccessModel->disconnect( this ); + if (d->sheetAccessModel) + d->sheetAccessModel->disconnect(this); d->sheetAccessModel = model; - if ( model ) { - connect( model, SIGNAL( columnsInserted( QModelIndex, int, int ) ), - this, SLOT( samColumnsInserted( QModelIndex, int, int ) ) ); - connect( model, SIGNAL( columnsAboutToBeRemoved( QModelIndex, int, int ) ), - this, SLOT( samColumnsRemoved( QModelIndex, int, int ) ) ); - connect( model, SIGNAL( headerDataChanged( Qt::Orientation, int, int ) ), - this, SLOT( samHeaderDataChanged( Qt::Orientation, int, int ) ) ); + if (model) { + connect(model, SIGNAL(columnsInserted(QModelIndex, int, int)), + this, SLOT(samColumnsInserted(QModelIndex, int, int))); + connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + this, SLOT(samColumnsRemoved(QModelIndex, int, int))); + connect(model, SIGNAL(headerDataChanged(Qt::Orientation, int, int)), + this, SLOT(samHeaderDataChanged(Qt::Orientation, int, int))); // Process existing data - samColumnsInserted( QModelIndex(), 0, model->columnCount() - 1); + samColumnsInserted(QModelIndex(), 0, model->columnCount() - 1); } } -Table *TableSource::add( const QString &name, QAbstractItemModel *model ) +Table *TableSource::add(const QString &name, QAbstractItemModel *model) { - Q_ASSERT( !d->tablesByName.contains( name ) ); - Q_ASSERT( !d->tablesByModel.contains( model ) ); + Q_ASSERT(!d->tablesByName.contains(name)); + Q_ASSERT(!d->tablesByModel.contains(model)); - Table *table = new Table( name, model ); - d->tablesByName.insert( name, table ); - d->tablesByModel.insert( model, table ); - d->tables.insert( table ); + Table *table = new Table(name, model); + d->tablesByName.insert(name, table); + d->tablesByModel.insert(model, table); + d->tables.insert(table); - emit tableAdded( table ); + emit tableAdded(table); return table; } -void TableSource::remove( const QString &name ) +void TableSource::remove(const QString &name) { - Q_ASSERT( d->tablesByName.contains( name ) ); + Q_ASSERT(d->tablesByName.contains(name)); - Table *table = get( name ); - if ( table ) { - d->tablesByName.remove( table->m_name ); - d->tablesByModel.remove( table->m_model ); - d->tables.remove( table ); - emit tableRemoved( table ); + Table *table = get(name); + if (table) { + d->tablesByName.remove(table->m_name); + d->tablesByModel.remove(table->m_model); + d->tables.remove(table); + emit tableRemoved(table); // Don't delete the Table instance, it might still be in use. table->m_model = 0; } } -void TableSource::rename( const QString &from, const QString &to ) +void TableSource::rename(const QString &from, const QString &to) { - Q_ASSERT( !d->tablesByName.contains( to ) ); + Q_ASSERT(!d->tablesByName.contains(to)); - Table *table = get( from ); - if ( table ) { - d->tablesByName.remove( from ); - d->tablesByName.insert( to, table ); + Table *table = get(from); + if (table) { + d->tablesByName.remove(from); + d->tablesByName.insert(to, table); table->m_name = to; } } @@ -207,67 +207,67 @@ { d->tablesByName.clear(); d->tablesByModel.clear(); - setSheetAccessModel( 0 ); + setSheetAccessModel(0); } -void TableSource::samColumnsInserted( QModelIndex, int first, int last ) +void TableSource::samColumnsInserted(QModelIndex, int first, int last) { - Q_ASSERT( d->sheetAccessModel ); + Q_ASSERT(d->sheetAccessModel); - for ( int col = first; col <= last; col++ ) { - QString tableName = d->sheetAccessModel->headerData( col, Qt::Horizontal ).toString(); - QAbstractItemModel *model = getModel( d->sheetAccessModel, col ); - if ( tableName.isEmpty() || model == 0 ) - d->samEmptyColumns.append( col ); + for (int col = first; col <= last; col++) { + QString tableName = d->sheetAccessModel->headerData(col, Qt::Horizontal).toString(); + QAbstractItemModel *model = getModel(d->sheetAccessModel, col); + if (tableName.isEmpty() || model == 0) + d->samEmptyColumns.append(col); else - add( tableName, getModel( d->sheetAccessModel, col ) ); + add(tableName, getModel(d->sheetAccessModel, col)); } } -void TableSource::samColumnsRemoved( QModelIndex, int first, int last ) +void TableSource::samColumnsRemoved(QModelIndex, int first, int last) { - Q_ASSERT( d->sheetAccessModel ); + Q_ASSERT(d->sheetAccessModel); - for ( int col = first; col <= last; col++ ) { - QString tableName = d->sheetAccessModel->headerData( col, Qt::Horizontal ).toString(); - remove( tableName ); + for (int col = first; col <= last; col++) { + QString tableName = d->sheetAccessModel->headerData(col, Qt::Horizontal).toString(); + remove(tableName); } } -void TableSource::samDataChanged( const QModelIndex &first, const QModelIndex &last ) +void TableSource::samDataChanged(const QModelIndex &first, const QModelIndex &last) { // Only the first row contains useful information for us - if ( first.row() != 0 ) + if (first.row() != 0) return; - for ( int col = first.column(); col <= last.column(); col++ ) { + for (int col = first.column(); col <= last.column(); col++) { // If this column wasn't valid before check if it is now and update - if ( d->samEmptyColumns.contains( col ) ) - d->updateEmptySamColumn( col ); + if (d->samEmptyColumns.contains(col)) + d->updateEmptySamColumn(col); else - Q_ASSERT( "Changing the model of an existing table is not supported!" ); + Q_ASSERT("Changing the model of an existing table is not supported!"); } } -void TableSource::samHeaderDataChanged( Qt::Orientation orientation, int first, int last ) +void TableSource::samHeaderDataChanged(Qt::Orientation orientation, int first, int last) { // There's no useful information for us in vertical headers - if ( orientation == Qt::Vertical ) + if (orientation == Qt::Vertical) return; - for ( int col = first; col <= last; col++ ) { + for (int col = first; col <= last; col++) { // If this column wasn't valid before check if it is now and update - if ( d->samEmptyColumns.contains( col ) ) { - d->updateEmptySamColumn( col ); + if (d->samEmptyColumns.contains(col)) { + d->updateEmptySamColumn(col); continue; } - QAbstractItemModel *model = getModel( d->sheetAccessModel, col ); - Q_ASSERT( model ); - Table *table = get( model ); - Q_ASSERT( table ); - QString newName = d->sheetAccessModel->headerData( col, Qt::Horizontal ).toString(); - rename( table->m_name, newName ); + QAbstractItemModel *model = getModel(d->sheetAccessModel, col); + Q_ASSERT(model); + Table *table = get(model); + Q_ASSERT(table); + QString newName = d->sheetAccessModel->headerData(col, Qt::Horizontal).toString(); + rename(table->m_name, newName); } } diff -Nru calligra-2.4.0/plugins/chartshape/TableSource.h calligra-2.4.3/plugins/chartshape/TableSource.h --- calligra-2.4.0/plugins/chartshape/TableSource.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/TableSource.h 2012-06-26 04:18:01.000000000 +0000 @@ -42,7 +42,7 @@ QString name() const { return m_name; } private: - Table( const QString &name, QAbstractItemModel *model ); + Table(const QString &name, QAbstractItemModel *model); QString m_name; QAbstractItemModel *m_model; @@ -64,7 +64,7 @@ * Note: The table name will be updated automatically when changed * by some "table source". */ - Table *get( const QString &tableName ) const; + Table *get(const QString &tableName) const; /** * Returns the table (model/name pair) associated with @a model. @@ -72,7 +72,7 @@ * Note: The table name will be updated automatically when changed * by some "table source". */ - Table *get( const QAbstractItemModel *model ) const; + Table *get(const QAbstractItemModel *model) const; /** * Returns a map of all name/table pairs in this source. @@ -87,14 +87,14 @@ * This method is only relevant if the chart is embedded in KSpread or * somehow needs access to KSpread's sheets. */ - void setSheetAccessModel( QAbstractItemModel *model ); + void setSheetAccessModel(QAbstractItemModel *model); /** * Adds a named model to this source. * * @return Pointer to new table (name/model pair) instance */ - Table *add( const QString &name, QAbstractItemModel *model ); + Table *add(const QString &name, QAbstractItemModel *model); /** * Makes sure that the name of the specified table always stays unique. @@ -105,19 +105,19 @@ * collide with the new name. */ // TODO - // void setRenameOnNameClash( const QString &tableName ); + // void setRenameOnNameClash(const QString &tableName); // or - // void setRenameOnNameClash( Table *table ); + // void setRenameOnNameClash(Table *table); /** * Removes a table from this source. */ - void remove( const QString &name ); + void remove(const QString &name); /** * Renames a table that has previously been added. */ - void rename( const QString &from, const QString &to ); + void rename(const QString &from, const QString &to); /** * Removes all tables and the sheetAccessModel. @@ -131,7 +131,7 @@ /** * Emitted whenever a table is added to this source. */ - void tableAdded( Table *table ); + void tableAdded(Table *table); /** * Emitted whenever a table is removed from this source @@ -139,16 +139,16 @@ * Note that right after this signal is emitted, the Table* instance * is deleted, thus you can't use it anymore afterwards. */ - void tableRemoved( Table *table ); + void tableRemoved(Table *table); private slots: /** * Methods that react on changes in the SheetAccessModel ("sam") */ - void samColumnsInserted( QModelIndex, int, int ); - void samColumnsRemoved( QModelIndex, int, int ); - void samDataChanged( const QModelIndex &first, const QModelIndex &last ); - void samHeaderDataChanged( Qt::Orientation, int, int ); + void samColumnsInserted(QModelIndex, int, int); + void samColumnsRemoved(QModelIndex, int, int); + void samDataChanged(const QModelIndex &first, const QModelIndex &last); + void samHeaderDataChanged(Qt::Orientation, int, int ); private: class Private; diff -Nru calligra-2.4.0/plugins/chartshape/TestDataSet.cpp calligra-2.4.3/plugins/chartshape/TestDataSet.cpp --- calligra-2.4.0/plugins/chartshape/TestDataSet.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/TestDataSet.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,127 +0,0 @@ -/* This file is part of the KDE project - - Copyright 2008 Johannes Simon - - 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; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -// Own -#include "TestDataSet.h" - -// Qt -#include -#include -#include -#include -#include -#include - -// KChart -#include "DataSet.h" -#include "CellRegion.h" - - -namespace QTest { - template<> - char *toString( const CellRegion ®ion ) - { - return qstrdup( region.toString().toAscii().data() ); - } -} - -using namespace KChart; - -TestDataSet::TestDataSet() - : m_source() - , m_proxyModel( &m_source ) - , m_sourceModel() - , m_table( 0 ) -{ -} - -void TestDataSet::initTestCase() -{ - m_table = m_source.add( "Table1", &m_sourceModel ); - - m_sourceModel.setRowCount( 4 ); - m_sourceModel.setColumnCount( 5 ); - - // Vertical header data - m_sourceModel.setData( m_sourceModel.index( 1, 0 ), "Row 1" ); - m_sourceModel.setData( m_sourceModel.index( 2, 0 ), "Row 2" ); - m_sourceModel.setData( m_sourceModel.index( 3, 0 ), "Row 3" ); - - // Horizontal header data - m_sourceModel.setData( m_sourceModel.index( 0, 1 ), "Column 1" ); - m_sourceModel.setData( m_sourceModel.index( 0, 2 ), "Column 2" ); - m_sourceModel.setData( m_sourceModel.index( 0, 3 ), "Column 3" ); - m_sourceModel.setData( m_sourceModel.index( 0, 4 ), "Column 4" ); - - // First row - m_sourceModel.setData( m_sourceModel.index( 1, 1 ), 7.2 ); - m_sourceModel.setData( m_sourceModel.index( 1, 2 ), 1.8 ); - m_sourceModel.setData( m_sourceModel.index( 1, 3 ), 9.4 ); - m_sourceModel.setData( m_sourceModel.index( 1, 4 ), 1.5 ); - - // Second row - m_sourceModel.setData( m_sourceModel.index( 2, 1 ), 8.4 ); - m_sourceModel.setData( m_sourceModel.index( 2, 2 ), 2.9 ); - m_sourceModel.setData( m_sourceModel.index( 2, 3 ), 3.7 ); - m_sourceModel.setData( m_sourceModel.index( 2, 4 ), 5.5 ); - - // Third row - m_sourceModel.setData( m_sourceModel.index( 3, 1 ), 2.9 ); - m_sourceModel.setData( m_sourceModel.index( 3, 2 ), 5.3 ); - m_sourceModel.setData( m_sourceModel.index( 3, 3 ), 6.4 ); - m_sourceModel.setData( m_sourceModel.index( 3, 4 ), 2.1 ); -} - -void TestDataSet::testFooData() -{ - DataSet dataSet( 0, 0 ); - - dataSet.setLabelDataRegion( CellRegion( m_table, QPoint( 1, 2 ) ) ); - dataSet.setCategoryDataRegion( CellRegion( m_table, QRect( 2, 1, 4, 1 ) ) ); - dataSet.setXDataRegion( CellRegion( m_table, QRect( 2, 2, 4, 1 ) ) ); - dataSet.setYDataRegion( CellRegion( m_table, QRect( 2, 3, 4, 1 ) ) ); - dataSet.setCustomDataRegion( CellRegion( m_table, QRect( 2, 4, 4, 1 ) ) ); - - QCOMPARE( dataSet.size(), 4 ); - - QCOMPARE( dataSet.labelData(), QVariant( "Row 1" ) ); - - QCOMPARE( dataSet.categoryData( 0 ), QVariant( "Column 1" ) ); - QCOMPARE( dataSet.categoryData( 1 ), QVariant( "Column 2" ) ); - QCOMPARE( dataSet.categoryData( 2 ), QVariant( "Column 3" ) ); - QCOMPARE( dataSet.categoryData( 3 ), QVariant( "Column 4" ) ); - - QCOMPARE( dataSet.xData( 0 ), QVariant( 7.2 ) ); - QCOMPARE( dataSet.xData( 1 ), QVariant( 1.8 ) ); - QCOMPARE( dataSet.xData( 2 ), QVariant( 9.4 ) ); - QCOMPARE( dataSet.xData( 3 ), QVariant( 1.5 ) ); - - QCOMPARE( dataSet.yData( 0 ), QVariant( 8.4 ) ); - QCOMPARE( dataSet.yData( 1 ), QVariant( 2.9 ) ); - QCOMPARE( dataSet.yData( 2 ), QVariant( 3.7 ) ); - QCOMPARE( dataSet.yData( 3 ), QVariant( 5.5 ) ); - - QCOMPARE( dataSet.customData( 0 ), QVariant( 2.9 ) ); - QCOMPARE( dataSet.customData( 1 ), QVariant( 5.3 ) ); - QCOMPARE( dataSet.customData( 2 ), QVariant( 6.4 ) ); - QCOMPARE( dataSet.customData( 3 ), QVariant( 2.1 ) ); -} - -QTEST_MAIN( TestDataSet ) diff -Nru calligra-2.4.0/plugins/chartshape/TestDataSet.h calligra-2.4.3/plugins/chartshape/TestDataSet.h --- calligra-2.4.0/plugins/chartshape/TestDataSet.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/TestDataSet.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* This file is part of the KDE project - - Copyright 2008 Johannes Simon - - 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; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KCHART_TESTDATASET_H -#define KCHART_TESTDATASET_H - -// Qt -#include - -// KChart -#include "ChartProxyModel.h" -#include "ChartTableModel.h" -#include "TableSource.h" - -using namespace KChart; - -class TestDataSet : public QObject -{ - Q_OBJECT - -public: - TestDataSet(); - -private slots: - void initTestCase(); - - // Tests DataSet::*Data() methods - void testFooData(); - -private: - // m_source must be initialized before m_proxyModel - TableSource m_source; - ChartProxyModel m_proxyModel; - ChartTableModel m_sourceModel; - Table *m_table; -}; - -#endif // KCHART_TESTDATASET_H diff -Nru calligra-2.4.0/plugins/chartshape/tests/ModelObserver.cpp calligra-2.4.3/plugins/chartshape/tests/ModelObserver.cpp --- calligra-2.4.0/plugins/chartshape/tests/ModelObserver.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/ModelObserver.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -22,7 +22,7 @@ #include #include -ModelObserver::ModelObserver( QAbstractItemModel *source ) +ModelObserver::ModelObserver(QAbstractItemModel *source) : QObject() { m_source = source; @@ -31,54 +31,54 @@ m_lastDataChange.valid = false; m_lastHeaderDataChange.valid = false; - connect( source, SIGNAL( rowsInserted( const QModelIndex&, int, int ) ), - this , SLOT( slotRowsInserted( const QModelIndex&, int, int ) ) ); - connect( source, SIGNAL( columnsInserted( const QModelIndex&, int, int ) ), - this, SLOT( slotColumnsInserted( const QModelIndex&, int, int ) ) ); - connect( source, SIGNAL( rowsRemoved( const QModelIndex&, int, int ) ), - this, SLOT( slotRowsRemoved( const QModelIndex&, int, int ) ) ); - connect( source, SIGNAL( columnsRemoved( const QModelIndex&, int, int ) ), - this, SLOT( slotColumnsRemoved( const QModelIndex&, int, int ) ) ); - connect( source, SIGNAL( headerDataChanged( Qt::Orientation, int, int ) ), - this, SLOT( slotHeaderDataChanged( Qt::Orientation, int, int ) ) ); - connect( source, SIGNAL( dataChanged( const QModelIndex&, const QModelIndex& ) ), - this, SLOT( slotDataChanged( const QModelIndex&, const QModelIndex& ) ) ); - connect( source, SIGNAL( modelReset() ), - this, SLOT( slotModelReset() ) ); + connect(source, SIGNAL(rowsInserted(const QModelIndex&, int, int)), + this , SLOT(slotRowsInserted(const QModelIndex&, int, int))); + connect(source, SIGNAL(columnsInserted(const QModelIndex&, int, int)), + this, SLOT(slotColumnsInserted(const QModelIndex&, int, int))); + connect(source, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), + this, SLOT(slotRowsRemoved(const QModelIndex&, int, int))); + connect(source, SIGNAL(columnsRemoved(const QModelIndex&, int, int)), + this, SLOT(slotColumnsRemoved(const QModelIndex&, int, int))); + connect(source, SIGNAL(headerDataChanged(Qt::Orientation, int, int)), + this, SLOT(slotHeaderDataChanged(Qt::Orientation, int, int))); + connect(source, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), + this, SLOT(slotDataChanged(const QModelIndex&, const QModelIndex&))); + connect(source, SIGNAL(modelReset()), + this, SLOT(slotModelReset())); } -void ModelObserver::slotRowsInserted( const QModelIndex & /*parent*/, int start, int end ) +void ModelObserver::slotRowsInserted(const QModelIndex & /*parent*/, int start, int end) { - Q_ASSERT( start <= end ); + Q_ASSERT(start <= end); m_numRows += end - start + 1; qDebug() << "m_numRows: " << m_numRows; } -void ModelObserver::slotColumnsInserted( const QModelIndex & /*parent*/, int start, int end ) +void ModelObserver::slotColumnsInserted(const QModelIndex & /*parent*/, int start, int end) { - Q_ASSERT( start <= end ); + Q_ASSERT(start <= end); m_numCols += end - start + 1; qDebug() << "m_numCols: " << m_numCols; } -void ModelObserver::slotRowsRemoved( const QModelIndex & /*parent*/, int start, int end ) +void ModelObserver::slotRowsRemoved(const QModelIndex & /*parent*/, int start, int end) { - Q_ASSERT( start <= end ); - Q_ASSERT( end < m_numRows ); + Q_ASSERT(start <= end); + Q_ASSERT(end < m_numRows); m_numRows -= end - start + 1; qDebug() << "m_numRows: " << m_numRows; } -void ModelObserver::slotColumnsRemoved( const QModelIndex & /*parent*/, int start, int end ) +void ModelObserver::slotColumnsRemoved(const QModelIndex & /*parent*/, int start, int end) { - Q_ASSERT( start <= end ); - Q_ASSERT( end < m_numCols ); + Q_ASSERT(start <= end); + Q_ASSERT(end < m_numCols); m_numCols -= end - start + 1; @@ -92,7 +92,7 @@ m_numCols = m_source->columnCount(); } -void ModelObserver::slotHeaderDataChanged( Qt::Orientation orientation, int first, int last ) +void ModelObserver::slotHeaderDataChanged(Qt::Orientation orientation, int first, int last) { m_lastHeaderDataChange.orientation = orientation; m_lastHeaderDataChange.first = first; @@ -100,7 +100,7 @@ m_lastHeaderDataChange.valid = true; } -void ModelObserver::slotDataChanged( const QModelIndex & topLeft, const QModelIndex & bottomRight ) +void ModelObserver::slotDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight) { m_lastDataChange.topLeft = topLeft; m_lastDataChange.bottomRight = bottomRight; diff -Nru calligra-2.4.0/plugins/chartshape/tests/ModelObserver.h calligra-2.4.3/plugins/chartshape/tests/ModelObserver.h --- calligra-2.4.0/plugins/chartshape/tests/ModelObserver.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/ModelObserver.h 2012-06-26 04:18:01.000000000 +0000 @@ -44,15 +44,15 @@ Q_OBJECT public: - ModelObserver( QAbstractItemModel *source ); + ModelObserver(QAbstractItemModel *source); private slots: - void slotRowsInserted( const QModelIndex & parent, int start, int end ); - void slotColumnsInserted( const QModelIndex & parent, int start, int end ); - void slotRowsRemoved( const QModelIndex & parent, int start, int end ); - void slotColumnsRemoved( const QModelIndex & parent, int start, int end ); - void slotHeaderDataChanged( Qt::Orientation, int first, int last ); - void slotDataChanged( const QModelIndex & topLeft, const QModelIndex & bottomRight ); + void slotRowsInserted(const QModelIndex & parent, int start, int end); + void slotColumnsInserted(const QModelIndex & parent, int start, int end); + void slotRowsRemoved(const QModelIndex & parent, int start, int end); + void slotColumnsRemoved(const QModelIndex & parent, int start, int end); + void slotHeaderDataChanged(Qt::Orientation, int first, int last); + void slotDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight); void slotModelReset(); public: diff -Nru calligra-2.4.0/plugins/chartshape/tests/odf/bubble-chart/TestLoading.cpp calligra-2.4.3/plugins/chartshape/tests/odf/bubble-chart/TestLoading.cpp --- calligra-2.4.0/plugins/chartshape/tests/odf/bubble-chart/TestLoading.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/odf/bubble-chart/TestLoading.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -39,55 +39,55 @@ void TestLoading::testLabels() { - testElementIsVisible( m_chart->title(), false ); - testElementIsVisible( m_chart->subTitle(), false ); - testElementIsVisible( m_chart->footer(), false ); + testElementIsVisible(m_chart->title(), false); + testElementIsVisible(m_chart->subTitle(), false); + testElementIsVisible(m_chart->footer(), false); } void TestLoading::testInternalTable() { testHasOnlyInternalTable(); - testInternalTableSize( 5, 5 ); + testInternalTableSize(5, 5); } void TestLoading::testDataSets() { Table *table = internalTable(); - QVERIFY( table ); + QVERIFY(table); // y data - testDataSetCellRegions( 0, CellRegion( table, QRect( 2, 2, 1, 4 ) ), - // series label - CellRegion( table, QRect( 3, 1, 1, 1 ) ), - // categories (specified in x-axis) - CellRegion( table, QRect( 1, 2, 1, 4 ) ), - // x data - CellRegion(), - // bubble widths - CellRegion( table, QRect( 3, 2, 1, 4 ) ) ); - - testDataSetCellRegions( 1, CellRegion( table, QRect( 4, 2, 1, 4 ) ), - CellRegion( table, QRect( 5, 1, 1, 1 ) ), - CellRegion( table, QRect( 1, 2, 1, 4 ) ), - CellRegion(), - CellRegion( table, QRect( 5, 2, 1, 4 ) ) ); + testDataSetCellRegions(0, CellRegion(table, QRect(2, 2, 1, 4)), + // series label + CellRegion(table, QRect(3, 1, 1, 1)), + // categories (specified in x-axis) + CellRegion(table, QRect(1, 2, 1, 4)), + // x data + CellRegion(), + // bubble widths + CellRegion(table, QRect(3, 2, 1, 4))); + + testDataSetCellRegions(1, CellRegion(table, QRect(4, 2, 1, 4)), + CellRegion(table, QRect(5, 1, 1, 1)), + CellRegion(table, QRect(1, 2, 1, 4)), + CellRegion(), + CellRegion(table, QRect(5, 2, 1, 4))); } void TestLoading::testPlotArea() { - testElementIsVisible( m_chart->plotArea(), true ); + testElementIsVisible(m_chart->plotArea(), true); } void TestLoading::testLegend() { - testElementIsVisible( m_chart->legend(), true ); - testLegendElements( QStringList() << "Series 1" << "Series 2" ); + testElementIsVisible(m_chart->legend(), true); + testLegendElements(QStringList() << "Series 1" << "Series 2"); } void TestLoading::testAxes() { - testElementIsVisible( m_chart->plotArea()->xAxis()->title(), false ); - testElementIsVisible( m_chart->plotArea()->yAxis()->title(), false ); + testElementIsVisible(m_chart->plotArea()->xAxis()->title(), false); + testElementIsVisible(m_chart->plotArea()->yAxis()->title(), false); } -QTEST_KDEMAIN( TestLoading, GUI ) +QTEST_KDEMAIN(TestLoading, GUI ) diff -Nru calligra-2.4.0/plugins/chartshape/tests/odf/bug239802/TestLoading.cpp calligra-2.4.3/plugins/chartshape/tests/odf/bug239802/TestLoading.cpp --- calligra-2.4.0/plugins/chartshape/tests/odf/bug239802/TestLoading.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/odf/bug239802/TestLoading.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -41,18 +41,18 @@ void TestLoading::testInternalTable() { testHasOnlyInternalTable(); - testInternalTableSize( 5, 4 ); + testInternalTableSize(5, 4); } void TestLoading::testPlotArea() { - testElementIsVisible( m_chart->plotArea(), true ); + testElementIsVisible(m_chart->plotArea(), true); } void TestLoading::testLegend() { - testElementIsVisible( m_chart->legend(), true ); - testLegendElements( QStringList() << "Row 1" << "Row 2" << "Row 3" << "Row 4" ); + testElementIsVisible(m_chart->legend(), true); + testLegendElements(QStringList() << "Row 1" << "Row 2" << "Row 3" << "Row 4"); } -QTEST_KDEMAIN( TestLoading, GUI ) +QTEST_KDEMAIN(TestLoading, GUI) diff -Nru calligra-2.4.0/plugins/chartshape/tests/odf/default-ooo-chart/TestLoading.cpp calligra-2.4.3/plugins/chartshape/tests/odf/default-ooo-chart/TestLoading.cpp --- calligra-2.4.0/plugins/chartshape/tests/odf/default-ooo-chart/TestLoading.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/odf/default-ooo-chart/TestLoading.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -41,47 +41,47 @@ void TestLoading::testLabels() { - testElementIsVisible( m_chart->title(), false ); - testElementIsVisible( m_chart->subTitle(), false ); - testElementIsVisible( m_chart->footer(), false ); + testElementIsVisible(m_chart->title(), false); + testElementIsVisible(m_chart->subTitle(), false); + testElementIsVisible(m_chart->footer(), false); } void TestLoading::testInternalTable() { testHasOnlyInternalTable(); - testInternalTableSize( 5, 4 ); + testInternalTableSize(5, 4); } void TestLoading::testDataSets() { Table *table = internalTable(); - QVERIFY( table ); - // y data - testDataSetCellRegions( 0, CellRegion( table, QRect( 2, 2, 1, 4 ) ), - // series label - CellRegion( table, QRect( 2, 1, 1, 1 ) ), - // categories (specified in x-axis) - CellRegion( table, QRect( 1, 2, 1, 4 ) ) ); - - testDataSetCellRegions( 1, CellRegion( table, QRect( 3, 2, 1, 4 ) ), - CellRegion( table, QRect( 3, 1, 1, 1 ) ), - CellRegion( table, QRect( 1, 2, 1, 4 ) ) ); - - testDataSetCellRegions( 2, CellRegion( table, QRect( 4, 2, 1, 4 ) ), - CellRegion( table, QRect( 4, 1, 1, 1 ) ), - CellRegion( table, QRect( 1, 2, 1, 4 ) ) ); + QVERIFY(table); + // y data + testDataSetCellRegions(0, CellRegion(table, QRect(2, 2, 1, 4)), + // series label + CellRegion(table, QRect(2, 1, 1, 1)), + // categories (specified in x-axis) + CellRegion(table, QRect(1, 2, 1, 4))); + + testDataSetCellRegions(1, CellRegion(table, QRect(3, 2, 1, 4)), + CellRegion(table, QRect(3, 1, 1, 1)), + CellRegion(table, QRect(1, 2, 1, 4)) ); + + testDataSetCellRegions(2, CellRegion(table, QRect(4, 2, 1, 4)), + CellRegion(table, QRect(4, 1, 1, 1)), + CellRegion(table, QRect(1, 2, 1, 4)) ); } void TestLoading::testPlotArea() { - testElementIsVisible( m_chart->plotArea(), true ); + testElementIsVisible(m_chart->plotArea(), true); } void TestLoading::testLegend() { - testElementIsVisible( m_chart->legend(), true ); - testLegendElements( QStringList() << "Spalte 1" << "Spalte 2" << "Spalte 3" ); + testElementIsVisible(m_chart->legend(), true); + testLegendElements(QStringList() << "Spalte 1" << "Spalte 2" << "Spalte 3"); } -QTEST_KDEMAIN( TestLoading, GUI ) +QTEST_KDEMAIN(TestLoading, GUI) diff -Nru calligra-2.4.0/plugins/chartshape/tests/odf/me07_percentage_stacked_bar_chart/TestLoading.cpp calligra-2.4.3/plugins/chartshape/tests/odf/me07_percentage_stacked_bar_chart/TestLoading.cpp --- calligra-2.4.0/plugins/chartshape/tests/odf/me07_percentage_stacked_bar_chart/TestLoading.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/odf/me07_percentage_stacked_bar_chart/TestLoading.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -42,46 +42,46 @@ void TestLoading::initTestCase() { // Fake sheet data from embedding document - m_sheet.setRowCount( 6 ); - m_sheet.setColumnCount( 8 ); + m_sheet.setRowCount(6); + m_sheet.setColumnCount(8); // Categories - m_sheet.setData( m_sheet.index( 3, 4 ), "Pass" ); - m_sheet.setData( m_sheet.index( 3, 5 ), "Fail" ); - m_sheet.setData( m_sheet.index( 3, 6 ), "NA" ); + m_sheet.setData(m_sheet.index(3, 4), "Pass"); + m_sheet.setData(m_sheet.index(3, 5), "Fail"); + m_sheet.setData(m_sheet.index(3, 6), "NA"); // Series label - m_sheet.setData( m_sheet.index( 4, 3 ), "Week" ); - QVERIFY( tableSource() ); - tableSource()->add( "Sheet1", &m_sheet ); + m_sheet.setData(m_sheet.index(4, 3), "Week"); + QVERIFY(tableSource()); + tableSource()->add("Sheet1", &m_sheet); // No actual data needed // Tell the chart it's embedded - m_chart->setUsesInternalModelOnly( false ); + m_chart->setUsesInternalModelOnly(false); TestLoadingBase::initTestCase(); } void TestLoading::testInternalTable() { - QVERIFY( internalTable() ); + QVERIFY(internalTable()); } void TestLoading::testDataSets() { TableSource *source = tableSource(); - QVERIFY( source ); - // y data - testDataSetCellRegions( 0, CellRegion( source, "Sheet1.E5:G5" ), - // series label - CellRegion( source, "Sheet1.D5" ), - // categories (specified in x-axis) - CellRegion( source, "Sheet1.E4:G4" ) ); + QVERIFY(source); + // y data + testDataSetCellRegions(0, CellRegion(source, "Sheet1.E5:G5"), + // series label + CellRegion(source, "Sheet1.D5"), + // categories (specified in x-axis) + CellRegion(source, "Sheet1.E4:G4")); } void TestLoading::testLegend() { - testElementIsVisible( m_chart->legend(), true ); - testLegendElements( QStringList() << "Week" ); + testElementIsVisible(m_chart->legend(), true); + testLegendElements(QStringList() << "Week"); } -QTEST_KDEMAIN( TestLoading, GUI ) +QTEST_KDEMAIN(TestLoading, GUI ) diff -Nru calligra-2.4.0/plugins/chartshape/tests/odf/template/TestLoading.cpp calligra-2.4.3/plugins/chartshape/tests/odf/template/TestLoading.cpp --- calligra-2.4.0/plugins/chartshape/tests/odf/template/TestLoading.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/odf/template/TestLoading.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -54,5 +54,5 @@ // Your code goes here } -QTEST_KDEMAIN( TestLoading, GUI ) +QTEST_KDEMAIN(TestLoading, GUI) diff -Nru calligra-2.4.0/plugins/chartshape/tests/odf/TestLoadingBase.cpp calligra-2.4.3/plugins/chartshape/tests/odf/TestLoadingBase.cpp --- calligra-2.4.0/plugins/chartshape/tests/odf/TestLoadingBase.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/odf/TestLoadingBase.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -54,141 +54,146 @@ : QObject() { // No message boxes please. - ChartShape::setEnableUserInteraction( false ); - m_chart = new ChartShape( 0 ); + ChartShape::setEnableUserInteraction(false); + m_chart = new ChartShape(0); } void TestLoadingBase::initTestCase() { - ChartDocument document( m_chart ); - QString srcdirname( KDESRCDIR ); - QVERIFY( !srcdirname.isEmpty() ); + ChartDocument document(m_chart); + + QString srcdirname(KDESRCDIR); + QVERIFY(!srcdirname.isEmpty()); + QDir srcdir(srcdirname); - QVERIFY( srcdir.exists() ); + QVERIFY(srcdir.exists()); + bool hasDocDirInSrcDir = srcdir.cd("doc"); - QVERIFY( hasDocDirInSrcDir ); - KoStore *store = KoStore::createStore( srcdir.absolutePath(), KoStore::Read ); - QVERIFY( store->enterDirectory( "doc" ) ); + QVERIFY(hasDocDirInSrcDir); + + KoStore *store = KoStore::createStore(srcdir.absolutePath(), KoStore::Read); + QVERIFY(store->enterDirectory("doc")); + QString errorMsg; - KoOdfReadStore odfReadStore( store ); - bool success = odfReadStore.loadAndParse( errorMsg ); - if ( !success ) + KoOdfReadStore odfReadStore(store); + bool success = odfReadStore.loadAndParse(errorMsg); + if (!success) qDebug() << "Error in odfReadStore.loadAndParse(): " << errorMsg; - QVERIFY( success ); - QVERIFY( document.loadOdf( odfReadStore ) ); + QVERIFY(success); + QVERIFY(document.loadOdf(odfReadStore)); } -void TestLoadingBase::testElementIsVisible( KoShape *element, bool shouldBeVisible ) +void TestLoadingBase::testElementIsVisible(KoShape *element, bool shouldBeVisible) { - QVERIFY( element ); - QCOMPARE( element->isVisible(), shouldBeVisible ); + QVERIFY(element); + QCOMPARE(element->isVisible(), shouldBeVisible); } -void TestLoadingBase::testLegendElements( QStringList labels ) +void TestLoadingBase::testLegendElements(QStringList labels) { - QVERIFY( m_chart->legend() ); - QVERIFY( m_chart->legend()->kdLegend() ); - QCOMPARE( m_chart->legend()->kdLegend()->datasetCount(), - (unsigned int)labels.count() ); + QVERIFY(m_chart->legend()); + QVERIFY(m_chart->legend()->kdLegend()); + QCOMPARE(m_chart->legend()->kdLegend()->datasetCount(), + (unsigned int)labels.count()); QList diagrams = m_chart->legend()->kdLegend()->diagrams(); - foreach( KDChart::AbstractDiagram *diagram, diagrams ) { - QVERIFY( diagram ); + foreach(KDChart::AbstractDiagram *diagram, diagrams) { + QVERIFY(diagram); QStringList diagramLabels = diagram->datasetLabels(); - foreach( QString diagramLabel, diagramLabels ) { - QVERIFY( !labels.isEmpty() ); - QCOMPARE( diagramLabel, labels.takeFirst() ); + foreach(QString diagramLabel, diagramLabels) { + QVERIFY(!labels.isEmpty()); + QCOMPARE(diagramLabel, labels.takeFirst()); } } - QVERIFY( labels.isEmpty() ); + QVERIFY(labels.isEmpty()); } -void TestLoadingBase::testDataSetCellRegions( int dataSetNr, - CellRegion yDataRegion, - CellRegion labelDataRegion, - CellRegion categoryDataRegion, - CellRegion xDataRegion, - CellRegion customDataRegion ) +void TestLoadingBase::testDataSetCellRegions(int dataSetNr, + CellRegion yDataRegion, + CellRegion labelDataRegion, + CellRegion categoryDataRegion, + CellRegion xDataRegion, + CellRegion customDataRegion) { - QVERIFY( m_chart->proxyModel() ); + QVERIFY(m_chart->proxyModel()); QList dataSets = m_chart->proxyModel()->dataSets(); - QVERIFY( dataSetNr >= 0 ); - QVERIFY( dataSets.count() > dataSetNr ); + QVERIFY(dataSetNr >= 0); + QVERIFY(dataSets.count() > dataSetNr); DataSet *dataSet = dataSets[dataSetNr]; - QVERIFY( dataSet ); + QVERIFY(dataSet); int dataSetSize = 0; - dataSetSize = qMax( dataSetSize, yDataRegion.cellCount() ); - dataSetSize = qMax( dataSetSize, categoryDataRegion.cellCount() ); - dataSetSize = qMax( dataSetSize, xDataRegion.cellCount() ); - dataSetSize = qMax( dataSetSize, customDataRegion.cellCount() ); - QCOMPARE( dataSet->size(), dataSetSize ); - - QCOMPARE( dataSet->xDataRegion(), xDataRegion ); - QCOMPARE( dataSet->yDataRegion(), yDataRegion ); - QCOMPARE( dataSet->labelDataRegion(), labelDataRegion ); - QCOMPARE( dataSet->categoryDataRegion(), categoryDataRegion ); - QCOMPARE( dataSet->customDataRegion(), customDataRegion ); + dataSetSize = qMax(dataSetSize, yDataRegion.cellCount()); + dataSetSize = qMax(dataSetSize, categoryDataRegion.cellCount()); + dataSetSize = qMax(dataSetSize, xDataRegion.cellCount()); + dataSetSize = qMax(dataSetSize, customDataRegion.cellCount()); + QCOMPARE(dataSet->size(), dataSetSize); + + QCOMPARE(dataSet->xDataRegion(), xDataRegion); + QCOMPARE(dataSet->yDataRegion(), yDataRegion); + QCOMPARE(dataSet->labelDataRegion(), labelDataRegion); + QCOMPARE(dataSet->categoryDataRegion(), categoryDataRegion); + QCOMPARE(dataSet->customDataRegion(), customDataRegion); } void TestLoadingBase::testHasOnlyInternalTable() { - QVERIFY( m_chart->usesInternalModelOnly() ); - QVERIFY( internalTable() ); + QVERIFY(m_chart->usesInternalModelOnly()); + QVERIFY(internalTable()); } -void TestLoadingBase::testInternalTableSize( int rowCount, int colCount ) +void TestLoadingBase::testInternalTableSize(int rowCount, int colCount) { QAbstractItemModel *model = m_chart->internalModel(); - QVERIFY( model ); - QVERIFY( m_chart->tableSource()->get( model ) ); - QCOMPARE( model->rowCount(), rowCount ); - QCOMPARE( model->columnCount(), colCount ); + QVERIFY(model); + QVERIFY(m_chart->tableSource()->get(model)); + QCOMPARE(model->rowCount(), rowCount); + QCOMPARE(model->columnCount(), colCount); } -void TestLoadingBase::testTitleText( const QString &text ) +void TestLoadingBase::testTitleText(const QString &text) { - QVERIFY( m_chart->title() ); - KoTextShapeDataBase *data = dynamic_cast( m_chart->title()->userData() ); - QVERIFY( data ); - QVERIFY( data->document() ); - QCOMPARE( data->document()->toPlainText(), text ); + QVERIFY(m_chart->title()); + KoTextShapeDataBase *data = dynamic_cast(m_chart->title()->userData()); + QVERIFY(data); + QVERIFY(data->document()); + QCOMPARE(data->document()->toPlainText(), text); } -void TestLoadingBase::testSubTitleText( const QString &text ) +void TestLoadingBase::testSubTitleText(const QString &text) { - QVERIFY( m_chart->subTitle() ); - KoTextShapeDataBase *data = dynamic_cast( m_chart->subTitle()->userData() ); - QVERIFY( data ); - QVERIFY( data->document() ); - QCOMPARE( data->document()->toPlainText(), text ); + QVERIFY(m_chart->subTitle()); + KoTextShapeDataBase *data = dynamic_cast(m_chart->subTitle()->userData()); + QVERIFY(data); + QVERIFY(data->document()); + QCOMPARE(data->document()->toPlainText(), text); } -void TestLoadingBase::testFooterText( const QString &text ) +void TestLoadingBase::testFooterText(const QString &text) { - QVERIFY( m_chart->footer() ); - KoTextShapeDataBase *data = dynamic_cast( m_chart->footer()->userData() ); - QVERIFY( data ); - QVERIFY( data->document() ); - QCOMPARE( data->document()->toPlainText(), text ); + QVERIFY(m_chart->footer()); + KoTextShapeDataBase *data = dynamic_cast(m_chart->footer()->userData()); + QVERIFY(data); + QVERIFY(data->document()); + QCOMPARE(data->document()->toPlainText(), text); } -void TestLoadingBase::testAxisTitle( Axis *axis, const QString &text ) +void TestLoadingBase::testAxisTitle(Axis *axis, const QString &text) { - QVERIFY( axis ); - QVERIFY( axis->title() ); - KoTextShapeDataBase *data = dynamic_cast( axis->title()->userData() ); - QVERIFY( data ); - QVERIFY( data->document() ); - QCOMPARE( data->document()->toPlainText(), text ); + QVERIFY(axis); + QVERIFY(axis->title()); + KoTextShapeDataBase *data = dynamic_cast(axis->title()->userData()); + QVERIFY(data); + QVERIFY(data->document()); + QCOMPARE(data->document()->toPlainText(), text); } Table *TestLoadingBase::internalTable() { QAbstractItemModel *internalModel = m_chart->internalModel(); - if ( !internalModel ) + if (!internalModel) return 0; - return m_chart->tableSource()->get( internalModel ); + return m_chart->tableSource()->get(internalModel); } TableSource *TestLoadingBase::tableSource() @@ -198,7 +203,7 @@ namespace QTest { template<> - char *toString( const KChart::CellRegion ®ion ) { - return qstrdup( region.toString().toAscii().data() ); + char *toString(const KChart::CellRegion ®ion) { + return qstrdup(region.toString().toAscii().data()); } } diff -Nru calligra-2.4.0/plugins/chartshape/tests/odf/TestLoadingBase.h calligra-2.4.3/plugins/chartshape/tests/odf/TestLoadingBase.h --- calligra-2.4.0/plugins/chartshape/tests/odf/TestLoadingBase.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/odf/TestLoadingBase.h 2012-06-26 04:18:01.000000000 +0000 @@ -48,7 +48,7 @@ * The philosophy is basically to do as many tests as possible by * using a helper method from this base class. Lines like these: - * testLegendElements( QStringList() << "Row 1" << "Row 2" << "Row 3" ); + * testLegendElements(QStringList() << "Row 1" << "Row 2" << "Row 3"); * * are much more readable than using flat code by using copy&paste and doing * the same gets and checks over again in multiple unit tests. @@ -68,30 +68,30 @@ // Helper methods to be used by test functions // 0) Generics - void testElementIsVisible( KoShape *element, bool shouldBeVisible ); + void testElementIsVisible(KoShape *element, bool shouldBeVisible); // 1) Legend - void testLegendElements( QStringList labels ); + void testLegendElements(QStringList labels); // 2) Data Sets - void testDataSetCellRegions( int dataSetNr, - CellRegion yDataRegion, - CellRegion labelDataRegion = CellRegion(), - CellRegion categoryDataRegion = CellRegion(), - CellRegion xDataRegion = CellRegion(), - CellRegion customDataRegion = CellRegion() ); + void testDataSetCellRegions(int dataSetNr, + CellRegion yDataRegion, + CellRegion labelDataRegion = CellRegion(), + CellRegion categoryDataRegion = CellRegion(), + CellRegion xDataRegion = CellRegion(), + CellRegion customDataRegion = CellRegion()); // 3) Internal Table void testHasOnlyInternalTable(); - void testInternalTableSize( int rowCount, int colCount ); + void testInternalTableSize(int rowCount, int colCount); // 4) Title, Subtitle and Footer - void testTitleText( const QString &text ); - void testSubTitleText( const QString &text ); - void testFooterText( const QString &text ); + void testTitleText(const QString &text); + void testSubTitleText(const QString &text); + void testFooterText(const QString &text); // 5) Axes - void testAxisTitle( Axis *axis, const QString &text ); + void testAxisTitle(Axis *axis, const QString &text); Table* internalTable(); TableSource* tableSource(); @@ -103,7 +103,7 @@ namespace QTest { template<> - char *toString( const KChart::CellRegion ®ion ); + char *toString(const KChart::CellRegion ®ion); } #endif // KCHART_TESTLOADING_BASE diff -Nru calligra-2.4.0/plugins/chartshape/tests/TestCellRegion.cpp calligra-2.4.3/plugins/chartshape/tests/TestCellRegion.cpp --- calligra-2.4.0/plugins/chartshape/tests/TestCellRegion.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/TestCellRegion.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -31,132 +31,132 @@ #include "CellRegion.h" TestCellRegion::TestCellRegion() - : QObject( 0 ) + : QObject(0) { } void TestCellRegion::init() { m_source.clear(); - m_source.add( "Table1", &m_model1 ); - m_source.add( "Table2", &m_model2 ); - Table *t1 = m_source.get( "Table1" ); - Table *t2 = m_source.get( "Table2" ); + m_source.add("Table1", &m_model1); + m_source.add("Table2", &m_model2); + Table *t1 = m_source.get("Table1"); + Table *t2 = m_source.get("Table2"); - m_region1 = CellRegion( t1 ); - m_region1.add( CellRegion( t1, QRect( 2, 3, 10, 11 ) ) ); + m_region1 = CellRegion(t1); + m_region1.add(CellRegion(t1, QRect(2, 3, 10, 11))); m_region2 = CellRegion(); - m_region2.add( CellRegion( t1, QRect( 2, 3, 10, 11 ) ) ); - m_region2.add( CellRegion( t2, QRect( 1, 2, 5, 6 ) ) ); + m_region2.add(CellRegion(t1, QRect(2, 3, 10, 11))); + m_region2.add(CellRegion(t2, QRect(1, 2, 5, 6))); } void TestCellRegion::testToStringSingleTable() { - QCOMPARE( m_region1.toString(), QString( "$Table1.$B$3:$K$13" ) ); + QCOMPARE(m_region1.toString(), QString("$Table1.$B$3:$K$13")); } void TestCellRegion::testSkippedTableEntry() { - const CellRegion region( &m_source, QString( "Table1.$A$3:.$C$3" ) ); + const CellRegion region(&m_source, QString("Table1.$A$3:.$C$3")); QVector< QRect > rects; - rects.append( QRect( QPoint( 1, 3 ), QPoint( 3, 3 ) ) ); - QCOMPARE( region.rects(), rects ); + rects.append(QRect(QPoint(1, 3), QPoint(3, 3))); + QCOMPARE(region.rects(), rects); } void TestCellRegion::testFromStringSingleTable() { - QCOMPARE( m_region1, CellRegion( &m_source, "$Table1.$B$3:$K$13" ) ); + QCOMPARE(m_region1, CellRegion(&m_source, "$Table1.$B$3:$K$13")); } void TestCellRegion::testTableNameChangeSingleTable() { - m_source.rename( "Table1", "DoubleBubbleGumBubblesDouble" ); - QCOMPARE( m_region1.toString(), QString( "$DoubleBubbleGumBubblesDouble.$B$3:$K$13" ) ); + m_source.rename("Table1", "DoubleBubbleGumBubblesDouble"); + QCOMPARE(m_region1.toString(), QString("$DoubleBubbleGumBubblesDouble.$B$3:$K$13")); } void TestCellRegion::testToStringWithSpecialCharactersSingleTable() { - m_source.rename( "Table1", "table-one" ); - QCOMPARE( m_region1.toString(), QString( "$'table-one'.$B$3:$K$13" ) ); + m_source.rename("Table1", "table-one"); + QCOMPARE(m_region1.toString(), QString("$'table-one'.$B$3:$K$13")); } void TestCellRegion::testFromStringWithSpecialCharactersSingleTable() { - m_source.rename( "Table1", "table-one" ); - CellRegion region( &m_source, QString( "$'table-one'.$B$3:$K$13" ) ); - QCOMPARE( region.table(), m_source.get( "table-one" ) ); + m_source.rename("Table1", "table-one"); + CellRegion region(&m_source, QString("$'table-one'.$B$3:$K$13")); + QCOMPARE(region.table(), m_source.get("table-one")); } void TestCellRegion::testListOfRegions() { - CellRegion region( &m_source, QString( "$Table1.$A$1:$F$13 $Table1.$A$15:$F$26" ) ); - QCOMPARE( region.table(), m_source.get( "Table1" ) ); + CellRegion region(&m_source, QString("$Table1.$A$1:$F$13 $Table1.$A$15:$F$26")); + QCOMPARE(region.table(), m_source.get("Table1")); const QVector< QRect > rects = region.rects(); QVector< QRect > compareRects; - compareRects.push_back( QRect( QPoint( 1, 1 ), QPoint( 6, 13 ) ) ); - compareRects.push_back( QRect( QPoint( 1, 15 ), QPoint( 6, 26 ) ) ); - QCOMPARE( rects.count(), compareRects.count() ); - for ( int i = 0; i < compareRects.count() && i < rects.count(); ++i ) + compareRects.push_back(QRect(QPoint(1, 1), QPoint(6, 13))); + compareRects.push_back(QRect(QPoint(1, 15), QPoint(6, 26))); + QCOMPARE(rects.count(), compareRects.count()); + for (int i = 0; i < compareRects.count() && i < rects.count(); ++i) { - QCOMPARE( rects[i], compareRects[i] ); + QCOMPARE(rects[i], compareRects[i]); } } void TestCellRegion::testListOfRegions2() { - CellRegion region( &m_source, QString( "Table1.A19:Table1.A30 Table1.E20:Table1.E30 Table1.G20:Table1.G30 Table1.I20:Table1.I30 Table1.E58:Table1.E71" ) ); - QCOMPARE( region.table(), m_source.get( "Table1" ) ); + CellRegion region(&m_source, QString("Table1.A19:Table1.A30 Table1.E20:Table1.E30 Table1.G20:Table1.G30 Table1.I20:Table1.I30 Table1.E58:Table1.E71")); + QCOMPARE(region.table(), m_source.get("Table1")); const QVector< QRect > rects = region.rects(); QVector< QRect > compareRects; - compareRects.push_back( QRect( QPoint( 1, 19 ), QPoint( 1, 30 ) ) ); - compareRects.push_back( QRect( QPoint( 5, 20 ), QPoint( 5, 30 ) ) ); - compareRects.push_back( QRect( QPoint( 7,20 ), QPoint( 7, 30 ) ) ); - compareRects.push_back( QRect( QPoint( 9,20 ), QPoint( 9, 30 ) ) ); - compareRects.push_back( QRect( QPoint( 5,58 ), QPoint( 5, 71 ) ) ); - for ( int i = 0; i < compareRects.count() && i < rects.count(); ++i ) + compareRects.push_back(QRect(QPoint(1, 19), QPoint(1, 30))); + compareRects.push_back(QRect(QPoint(5, 20), QPoint(5, 30))); + compareRects.push_back(QRect(QPoint(7,20), QPoint(7, 30))); + compareRects.push_back(QRect(QPoint(9,20), QPoint(9, 30))); + compareRects.push_back(QRect(QPoint(5,58), QPoint(5, 71))); + for (int i = 0; i < compareRects.count() && i < rects.count(); ++i) { - QCOMPARE( rects[i], compareRects[i] ); + QCOMPARE(rects[i], compareRects[i]); } } void TestCellRegion::testToStringMultipleTables() { - QEXPECT_FAIL( "", "Functionality is not yet supported, so its expected to fail", Continue ); - QCOMPARE( m_region2.toString(), QString( "$Table1.$B$3:$K$13;$Table2.$A$2:$E$7" ) ); + QEXPECT_FAIL("", "Functionality is not yet supported, so its expected to fail", Continue); + QCOMPARE(m_region2.toString(), QString("$Table1.$B$3:$K$13;$Table2.$A$2:$E$7")); } void TestCellRegion::testFromStringMultipleTables() { - //QEXPECT_FAIL( "", "Functionality is not yet supported, so its expected to fail", Continue ); - QCOMPARE( m_region2, CellRegion( &m_source, "$Table1.$B$3:$K$13;$Table2.$A$2:$E$7" ) ); + //QEXPECT_FAIL("", "Functionality is not yet supported, so its expected to fail", Continue); + QCOMPARE(m_region2, CellRegion(&m_source, "$Table1.$B$3:$K$13;$Table2.$A$2:$E$7")); } void TestCellRegion::testTableNameChangeMultipleTables() { - m_source.rename( "Table1", "AGoodCookCanCookGoodCookies" ); - QEXPECT_FAIL( "", "Functionality is not yet supported, so its expected to fail", Continue ); - QCOMPARE( m_region2.toString(), QString( "$AGoodCookCanCookGoodCookies.$B$3:$K$13;$Table2.$A$2:$E$7" ) ); - m_source.rename( "Table2", "DoubleBubbleGumBubblesDouble" ); - QEXPECT_FAIL( "", "Functionality is not yet supported, so its expected to fail", Continue ); - QCOMPARE( m_region2.toString(), QString( "$AGoodCookCanCookGoodCookies.$B$3:$K$13;$DoubleBubbleGumBubblesDouble.$A$2:$E$7" ) ); + m_source.rename("Table1", "AGoodCookCanCookGoodCookies"); + QEXPECT_FAIL("", "Functionality is not yet supported, so its expected to fail", Continue); + QCOMPARE(m_region2.toString(), QString("$AGoodCookCanCookGoodCookies.$B$3:$K$13;$Table2.$A$2:$E$7")); + m_source.rename("Table2", "DoubleBubbleGumBubblesDouble"); + QEXPECT_FAIL("", "Functionality is not yet supported, so its expected to fail", Continue); + QCOMPARE(m_region2.toString(), QString("$AGoodCookCanCookGoodCookies.$B$3:$K$13;$DoubleBubbleGumBubblesDouble.$A$2:$E$7")); } void TestCellRegion::testToStringWithSpecialCharactersMultipleTables() { - m_source.rename( "Table1", "table-one" ); - QEXPECT_FAIL( "", "Functionality is not yet supported, so its expected to fail", Continue ); - QCOMPARE( m_region2.toString(), QString( "$'table-one'.$B$3:$K$13;$Table2.$A$2:$E$7" ) ); + m_source.rename("Table1", "table-one"); + QEXPECT_FAIL("", "Functionality is not yet supported, so its expected to fail", Continue); + QCOMPARE(m_region2.toString(), QString("$'table-one'.$B$3:$K$13;$Table2.$A$2:$E$7")); } void TestCellRegion::testFromStringWithSpecialCharactersMultipleTables() { - m_source.rename( "Table1", "table-one" ); - CellRegion region( &m_source, QString( "$'table-one'.$B$3:$K$13" ) ); - QCOMPARE( region.table(), m_source.get( "table-one" ) ); + m_source.rename("Table1", "table-one"); + CellRegion region(&m_source, QString("$'table-one'.$B$3:$K$13")); + QCOMPARE(region.table(), m_source.get("table-one")); } -QTEST_MAIN( TestCellRegion ) +QTEST_MAIN(TestCellRegion) #include "TestCellRegion.moc" diff -Nru calligra-2.4.0/plugins/chartshape/tests/TestDataSet.cpp calligra-2.4.3/plugins/chartshape/tests/TestDataSet.cpp --- calligra-2.4.0/plugins/chartshape/tests/TestDataSet.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/TestDataSet.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -36,9 +36,9 @@ namespace QTest { template<> - char *toString( const CellRegion ®ion ) + char *toString(const CellRegion ®ion) { - return qstrdup( region.toString().toAscii().data() ); + return qstrdup(region.toString().toAscii().data()); } } @@ -46,150 +46,150 @@ TestDataSet::TestDataSet() : m_source() - , m_proxyModel( 0, &m_source ) + , m_proxyModel(0, &m_source) , m_sourceModel1() - , m_table1( 0 ) + , m_table1(0) { } void TestDataSet::initTestCase() { - m_table1 = m_source.add( "Table1", &m_sourceModel1 ); - m_table2 = m_source.add( "Table2", &m_sourceModel2 ); + m_table1 = m_source.add("Table1", &m_sourceModel1); + m_table2 = m_source.add("Table2", &m_sourceModel2); - m_sourceModel1.setRowCount( 4 ); - m_sourceModel1.setColumnCount( 5 ); + m_sourceModel1.setRowCount(4); + m_sourceModel1.setColumnCount(5); // Vertical header data - m_sourceModel1.setData( m_sourceModel1.index( 1, 0 ), "Row 1" ); - m_sourceModel1.setData( m_sourceModel1.index( 2, 0 ), "Row 2" ); - m_sourceModel1.setData( m_sourceModel1.index( 3, 0 ), "Row 3" ); + m_sourceModel1.setData(m_sourceModel1.index(1, 0), "Row 1"); + m_sourceModel1.setData(m_sourceModel1.index(2, 0), "Row 2"); + m_sourceModel1.setData(m_sourceModel1.index(3, 0), "Row 3"); // Horizontal header data - m_sourceModel1.setData( m_sourceModel1.index( 0, 1 ), "Column 1" ); - m_sourceModel1.setData( m_sourceModel1.index( 0, 2 ), "Column 2" ); - m_sourceModel1.setData( m_sourceModel1.index( 0, 3 ), "Column 3" ); - m_sourceModel1.setData( m_sourceModel1.index( 0, 4 ), "Column 4" ); + m_sourceModel1.setData(m_sourceModel1.index(0, 1), "Column 1"); + m_sourceModel1.setData(m_sourceModel1.index(0, 2), "Column 2"); + m_sourceModel1.setData(m_sourceModel1.index(0, 3), "Column 3"); + m_sourceModel1.setData(m_sourceModel1.index(0, 4), "Column 4"); // First row - m_sourceModel1.setData( m_sourceModel1.index( 1, 1 ), 7.2 ); - m_sourceModel1.setData( m_sourceModel1.index( 1, 2 ), 1.8 ); - m_sourceModel1.setData( m_sourceModel1.index( 1, 3 ), 9.4 ); - m_sourceModel1.setData( m_sourceModel1.index( 1, 4 ), 1.5 ); + m_sourceModel1.setData(m_sourceModel1.index(1, 1), 7.2); + m_sourceModel1.setData(m_sourceModel1.index(1, 2), 1.8); + m_sourceModel1.setData(m_sourceModel1.index(1, 3), 9.4); + m_sourceModel1.setData(m_sourceModel1.index(1, 4), 1.5); // Second row - m_sourceModel1.setData( m_sourceModel1.index( 2, 1 ), 8.4 ); - m_sourceModel1.setData( m_sourceModel1.index( 2, 2 ), 2.9 ); - m_sourceModel1.setData( m_sourceModel1.index( 2, 3 ), 3.7 ); - m_sourceModel1.setData( m_sourceModel1.index( 2, 4 ), 5.5 ); + m_sourceModel1.setData(m_sourceModel1.index(2, 1), 8.4); + m_sourceModel1.setData(m_sourceModel1.index(2, 2), 2.9); + m_sourceModel1.setData(m_sourceModel1.index(2, 3), 3.7); + m_sourceModel1.setData(m_sourceModel1.index(2, 4), 5.5); // Third row - m_sourceModel1.setData( m_sourceModel1.index( 3, 1 ), 2.9 ); - m_sourceModel1.setData( m_sourceModel1.index( 3, 2 ), 5.3 ); - m_sourceModel1.setData( m_sourceModel1.index( 3, 3 ), 6.4 ); - m_sourceModel1.setData( m_sourceModel1.index( 3, 4 ), 2.1 ); + m_sourceModel1.setData(m_sourceModel1.index(3, 1), 2.9); + m_sourceModel1.setData(m_sourceModel1.index(3, 2), 5.3); + m_sourceModel1.setData(m_sourceModel1.index(3, 3), 6.4); + m_sourceModel1.setData(m_sourceModel1.index(3, 4), 2.1); - m_sourceModel2.setRowCount( 4 ); - m_sourceModel2.setColumnCount( 5 ); + m_sourceModel2.setRowCount(4); + m_sourceModel2.setColumnCount(5); // Vertical header data - m_sourceModel2.setData( m_sourceModel2.index( 1, 0 ), "Row 1" ); - m_sourceModel2.setData( m_sourceModel2.index( 2, 0 ), "Row 2" ); - m_sourceModel2.setData( m_sourceModel2.index( 3, 0 ), "Row 3" ); + m_sourceModel2.setData(m_sourceModel2.index(1, 0), "Row 1"); + m_sourceModel2.setData(m_sourceModel2.index(2, 0), "Row 2"); + m_sourceModel2.setData(m_sourceModel2.index(3, 0), "Row 3"); // Horizontal header data - m_sourceModel2.setData( m_sourceModel2.index( 0, 1 ), "Column 1" ); - m_sourceModel2.setData( m_sourceModel2.index( 0, 2 ), "Column 2" ); - m_sourceModel2.setData( m_sourceModel2.index( 0, 3 ), "Column 3" ); - m_sourceModel2.setData( m_sourceModel2.index( 0, 4 ), "Column 4" ); + m_sourceModel2.setData(m_sourceModel2.index(0, 1), "Column 1"); + m_sourceModel2.setData(m_sourceModel2.index(0, 2), "Column 2"); + m_sourceModel2.setData(m_sourceModel2.index(0, 3), "Column 3"); + m_sourceModel2.setData(m_sourceModel2.index(0, 4), "Column 4"); // First row - m_sourceModel2.setData( m_sourceModel2.index( 1, 1 ), 1 ); - m_sourceModel2.setData( m_sourceModel2.index( 1, 2 ), 2 ); - m_sourceModel2.setData( m_sourceModel2.index( 1, 3 ), 3 ); - m_sourceModel2.setData( m_sourceModel2.index( 1, 4 ), 4 ); + m_sourceModel2.setData(m_sourceModel2.index(1, 1), 1); + m_sourceModel2.setData(m_sourceModel2.index(1, 2), 2); + m_sourceModel2.setData(m_sourceModel2.index(1, 3), 3); + m_sourceModel2.setData(m_sourceModel2.index(1, 4), 4); // Second row - m_sourceModel2.setData( m_sourceModel2.index( 2, 1 ), 5 ); - m_sourceModel2.setData( m_sourceModel2.index( 2, 2 ), 6 ); - m_sourceModel2.setData( m_sourceModel2.index( 2, 3 ), 7 ); - m_sourceModel2.setData( m_sourceModel2.index( 2, 4 ), 8 ); + m_sourceModel2.setData(m_sourceModel2.index(2, 1), 5); + m_sourceModel2.setData(m_sourceModel2.index(2, 2), 6); + m_sourceModel2.setData(m_sourceModel2.index(2, 3), 7); + m_sourceModel2.setData(m_sourceModel2.index(2, 4), 8); // Third row - m_sourceModel2.setData( m_sourceModel2.index( 3, 1 ), 9 ); - m_sourceModel2.setData( m_sourceModel2.index( 3, 2 ), 10 ); - m_sourceModel2.setData( m_sourceModel2.index( 3, 3 ), 11 ); - m_sourceModel2.setData( m_sourceModel2.index( 3, 4 ), 12 ); + m_sourceModel2.setData(m_sourceModel2.index(3, 1), 9); + m_sourceModel2.setData(m_sourceModel2.index(3, 2), 10); + m_sourceModel2.setData(m_sourceModel2.index(3, 3), 11); + m_sourceModel2.setData(m_sourceModel2.index(3, 4), 12); } void TestDataSet::testFooData() { - DataSet dataSet( 0 ); + DataSet dataSet(0); - dataSet.setLabelDataRegion( CellRegion( m_table1, QPoint( 1, 2 ) ) ); - dataSet.setCategoryDataRegion( CellRegion( m_table1, QRect( 2, 1, 4, 1 ) ) ); - dataSet.setXDataRegion( CellRegion( m_table1, QRect( 2, 2, 4, 1 ) ) ); - dataSet.setYDataRegion( CellRegion( m_table1, QRect( 2, 3, 4, 1 ) ) ); - dataSet.setCustomDataRegion( CellRegion( m_table1, QRect( 2, 4, 4, 1 ) ) ); - - QCOMPARE( dataSet.size(), 4 ); - - QCOMPARE( dataSet.labelData(), QVariant( "Row 1" ) ); - - QCOMPARE( dataSet.categoryData( 0 ), QVariant( "Column 1" ) ); - QCOMPARE( dataSet.categoryData( 1 ), QVariant( "Column 2" ) ); - QCOMPARE( dataSet.categoryData( 2 ), QVariant( "Column 3" ) ); - QCOMPARE( dataSet.categoryData( 3 ), QVariant( "Column 4" ) ); - - QCOMPARE( dataSet.xData( 0 ), QVariant( 7.2 ) ); - QCOMPARE( dataSet.xData( 1 ), QVariant( 1.8 ) ); - QCOMPARE( dataSet.xData( 2 ), QVariant( 9.4 ) ); - QCOMPARE( dataSet.xData( 3 ), QVariant( 1.5 ) ); - - QCOMPARE( dataSet.yData( 0 ), QVariant( 8.4 ) ); - QCOMPARE( dataSet.yData( 1 ), QVariant( 2.9 ) ); - QCOMPARE( dataSet.yData( 2 ), QVariant( 3.7 ) ); - QCOMPARE( dataSet.yData( 3 ), QVariant( 5.5 ) ); - - QCOMPARE( dataSet.customData( 0 ), QVariant( 2.9 ) ); - QCOMPARE( dataSet.customData( 1 ), QVariant( 5.3 ) ); - QCOMPARE( dataSet.customData( 2 ), QVariant( 6.4 ) ); - QCOMPARE( dataSet.customData( 3 ), QVariant( 2.1 ) ); + dataSet.setLabelDataRegion(CellRegion(m_table1, QPoint(1, 2))); + dataSet.setCategoryDataRegion(CellRegion(m_table1, QRect(2, 1, 4, 1))); + dataSet.setXDataRegion(CellRegion(m_table1, QRect(2, 2, 4, 1))); + dataSet.setYDataRegion(CellRegion(m_table1, QRect(2, 3, 4, 1))); + dataSet.setCustomDataRegion(CellRegion(m_table1, QRect(2, 4, 4, 1))); + + QCOMPARE(dataSet.size(), 4); + + QCOMPARE(dataSet.labelData(), QVariant("Row 1")); + + QCOMPARE(dataSet.categoryData(0), QVariant("Column 1")); + QCOMPARE(dataSet.categoryData(1), QVariant("Column 2")); + QCOMPARE(dataSet.categoryData(2), QVariant("Column 3")); + QCOMPARE(dataSet.categoryData(3), QVariant("Column 4")); + + QCOMPARE(dataSet.xData(0), QVariant(7.2)); + QCOMPARE(dataSet.xData(1), QVariant(1.8)); + QCOMPARE(dataSet.xData(2), QVariant(9.4)); + QCOMPARE(dataSet.xData(3), QVariant(1.5)); + + QCOMPARE(dataSet.yData(0), QVariant(8.4)); + QCOMPARE(dataSet.yData(1), QVariant(2.9)); + QCOMPARE(dataSet.yData(2), QVariant(3.7)); + QCOMPARE(dataSet.yData(3), QVariant(5.5)); + + QCOMPARE(dataSet.customData(0), QVariant(2.9)); + QCOMPARE(dataSet.customData(1), QVariant(5.3)); + QCOMPARE(dataSet.customData(2), QVariant(6.4)); + QCOMPARE(dataSet.customData(3), QVariant(2.1)); } void TestDataSet::testFooDataMultipleTables() { - DataSet dataSet( 0 ); + DataSet dataSet(0); - dataSet.setLabelDataRegion( CellRegion( m_table1, QPoint( 1, 2 ) ) ); - dataSet.setCategoryDataRegion( CellRegion( m_table1, QRect( 2, 1, 4, 1 ) ) ); - dataSet.setXDataRegion( CellRegion( m_table2, QRect( 2, 2, 4, 1 ) ) ); - dataSet.setYDataRegion( CellRegion( m_table1, QRect( 2, 3, 4, 1 ) ) ); - dataSet.setCustomDataRegion( CellRegion( m_table2, QRect( 2, 4, 4, 1 ) ) ); - - QCOMPARE( dataSet.size(), 4 ); - - QCOMPARE( dataSet.labelData(), QVariant( "Row 1" ) ); - - QCOMPARE( dataSet.categoryData( 0 ), QVariant( "Column 1" ) ); - QCOMPARE( dataSet.categoryData( 1 ), QVariant( "Column 2" ) ); - QCOMPARE( dataSet.categoryData( 2 ), QVariant( "Column 3" ) ); - QCOMPARE( dataSet.categoryData( 3 ), QVariant( "Column 4" ) ); - - QCOMPARE( dataSet.xData( 0 ), QVariant( 1 ) ); - QCOMPARE( dataSet.xData( 1 ), QVariant( 2 ) ); - QCOMPARE( dataSet.xData( 2 ), QVariant( 3 ) ); - QCOMPARE( dataSet.xData( 3 ), QVariant( 4 ) ); - - QCOMPARE( dataSet.yData( 0 ), QVariant( 8.4 ) ); - QCOMPARE( dataSet.yData( 1 ), QVariant( 2.9 ) ); - QCOMPARE( dataSet.yData( 2 ), QVariant( 3.7 ) ); - QCOMPARE( dataSet.yData( 3 ), QVariant( 5.5 ) ); - - QCOMPARE( dataSet.customData( 0 ), QVariant( 9 ) ); - QCOMPARE( dataSet.customData( 1 ), QVariant( 10 ) ); - QCOMPARE( dataSet.customData( 2 ), QVariant( 11 ) ); - QCOMPARE( dataSet.customData( 3 ), QVariant( 12 ) ); + dataSet.setLabelDataRegion(CellRegion(m_table1, QPoint(1, 2))); + dataSet.setCategoryDataRegion(CellRegion(m_table1, QRect(2, 1, 4, 1))); + dataSet.setXDataRegion(CellRegion(m_table2, QRect(2, 2, 4, 1))); + dataSet.setYDataRegion(CellRegion(m_table1, QRect(2, 3, 4, 1))); + dataSet.setCustomDataRegion(CellRegion(m_table2, QRect(2, 4, 4, 1))); + + QCOMPARE(dataSet.size(), 4); + + QCOMPARE(dataSet.labelData(), QVariant("Row 1")); + + QCOMPARE(dataSet.categoryData(0), QVariant("Column 1")); + QCOMPARE(dataSet.categoryData(1), QVariant("Column 2")); + QCOMPARE(dataSet.categoryData(2), QVariant("Column 3")); + QCOMPARE(dataSet.categoryData(3), QVariant("Column 4")); + + QCOMPARE(dataSet.xData(0), QVariant(1)); + QCOMPARE(dataSet.xData(1), QVariant(2)); + QCOMPARE(dataSet.xData(2), QVariant(3)); + QCOMPARE(dataSet.xData(3), QVariant(4)); + + QCOMPARE(dataSet.yData(0), QVariant(8.4)); + QCOMPARE(dataSet.yData(1), QVariant(2.9)); + QCOMPARE(dataSet.yData(2), QVariant(3.7)); + QCOMPARE(dataSet.yData(3), QVariant(5.5)); + + QCOMPARE(dataSet.customData(0), QVariant(9)); + QCOMPARE(dataSet.customData(1), QVariant(10)); + QCOMPARE(dataSet.customData(2), QVariant(11)); + QCOMPARE(dataSet.customData(3), QVariant(12)); } -QTEST_MAIN( TestDataSet ) +QTEST_MAIN(TestDataSet) diff -Nru calligra-2.4.0/plugins/chartshape/tests/TestKDChartModel.cpp calligra-2.4.3/plugins/chartshape/tests/TestKDChartModel.cpp --- calligra-2.4.0/plugins/chartshape/tests/TestKDChartModel.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/TestKDChartModel.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -31,65 +31,65 @@ TestKDChartModel::TestKDChartModel() - : m_model( 0 ) - , m_testModel( 0 ) + : m_model(0) + , m_testModel(0) , m_source() - , m_table( 0 ) + , m_table(0) { } void TestKDChartModel::initTestCase() { - m_table = m_source.add( "Table1", &m_itemModel ); + m_table = m_source.add("Table1", &m_itemModel); - m_itemModel.setRowCount( 3 ); - m_itemModel.setColumnCount( 11 ); + m_itemModel.setRowCount(3); + m_itemModel.setColumnCount(11); // Vertical header data - m_itemModel.setData( m_itemModel.index( 1, 0 ), "Row 1" ); - m_itemModel.setData( m_itemModel.index( 2, 0 ), "Row 2" ); + m_itemModel.setData(m_itemModel.index(1, 0), "Row 1"); + m_itemModel.setData(m_itemModel.index(2, 0), "Row 2"); // Horizontal header data - m_itemModel.setData( m_itemModel.index( 0, 1 ), "Column 1" ); - m_itemModel.setData( m_itemModel.index( 0, 2 ), "Column 2" ); - m_itemModel.setData( m_itemModel.index( 0, 3 ), "Column 3" ); - m_itemModel.setData( m_itemModel.index( 0, 4 ), "Column 4" ); - m_itemModel.setData( m_itemModel.index( 0, 5 ), "Column 5" ); - m_itemModel.setData( m_itemModel.index( 0, 6 ), "Column 6" ); - m_itemModel.setData( m_itemModel.index( 0, 7 ), "Column 7" ); - m_itemModel.setData( m_itemModel.index( 0, 8 ), "Column 8" ); - m_itemModel.setData( m_itemModel.index( 0, 9 ), "Column 9" ); - m_itemModel.setData( m_itemModel.index( 0, 10 ), "Column 10" ); + m_itemModel.setData(m_itemModel.index(0, 1), "Column 1"); + m_itemModel.setData(m_itemModel.index(0, 2), "Column 2"); + m_itemModel.setData(m_itemModel.index(0, 3), "Column 3"); + m_itemModel.setData(m_itemModel.index(0, 4), "Column 4"); + m_itemModel.setData(m_itemModel.index(0, 5), "Column 5"); + m_itemModel.setData(m_itemModel.index(0, 6), "Column 6"); + m_itemModel.setData(m_itemModel.index(0, 7), "Column 7"); + m_itemModel.setData(m_itemModel.index(0, 8), "Column 8"); + m_itemModel.setData(m_itemModel.index(0, 9), "Column 9"); + m_itemModel.setData(m_itemModel.index(0, 10), "Column 10"); // First row - m_itemModel.setData( m_itemModel.index( 1, 1 ), 7.2 ); - m_itemModel.setData( m_itemModel.index( 1, 2 ), 1.8 ); - m_itemModel.setData( m_itemModel.index( 1, 3 ), 9.4 ); - m_itemModel.setData( m_itemModel.index( 1, 4 ), 1.5 ); - m_itemModel.setData( m_itemModel.index( 1, 5 ), 8.4 ); - m_itemModel.setData( m_itemModel.index( 1, 6 ), 2.9 ); - m_itemModel.setData( m_itemModel.index( 1, 7 ), 3.7 ); - m_itemModel.setData( m_itemModel.index( 1, 8 ), 5.5 ); - m_itemModel.setData( m_itemModel.index( 1, 9 ), 2.9 ); - m_itemModel.setData( m_itemModel.index( 1, 10 ), 5.3 ); + m_itemModel.setData(m_itemModel.index(1, 1), 7.2); + m_itemModel.setData(m_itemModel.index(1, 2), 1.8); + m_itemModel.setData(m_itemModel.index(1, 3), 9.4); + m_itemModel.setData(m_itemModel.index(1, 4), 1.5); + m_itemModel.setData(m_itemModel.index(1, 5), 8.4); + m_itemModel.setData(m_itemModel.index(1, 6), 2.9); + m_itemModel.setData(m_itemModel.index(1, 7), 3.7); + m_itemModel.setData(m_itemModel.index(1, 8), 5.5); + m_itemModel.setData(m_itemModel.index(1, 9), 2.9); + m_itemModel.setData(m_itemModel.index(1, 10), 5.3); // Second row - m_itemModel.setData( m_itemModel.index( 2, 1 ), 8.2 ); - m_itemModel.setData( m_itemModel.index( 2, 2 ), 2.8 ); - m_itemModel.setData( m_itemModel.index( 2, 3 ), 10.4 ); - m_itemModel.setData( m_itemModel.index( 2, 4 ), 2.5 ); - m_itemModel.setData( m_itemModel.index( 2, 5 ), 9.4 ); - m_itemModel.setData( m_itemModel.index( 2, 6 ), 3.9 ); - m_itemModel.setData( m_itemModel.index( 2, 7 ), 4.7 ); - m_itemModel.setData( m_itemModel.index( 2, 8 ), 6.5 ); - m_itemModel.setData( m_itemModel.index( 2, 9 ), 3.9 ); - m_itemModel.setData( m_itemModel.index( 2, 10 ), 6.3 ); + m_itemModel.setData(m_itemModel.index(2, 1), 8.2); + m_itemModel.setData(m_itemModel.index(2, 2), 2.8); + m_itemModel.setData(m_itemModel.index(2, 3), 10.4); + m_itemModel.setData(m_itemModel.index(2, 4), 2.5); + m_itemModel.setData(m_itemModel.index(2, 5), 9.4); + m_itemModel.setData(m_itemModel.index(2, 6), 3.9); + m_itemModel.setData(m_itemModel.index(2, 7), 4.7); + m_itemModel.setData(m_itemModel.index(2, 8), 6.5); + m_itemModel.setData(m_itemModel.index(2, 9), 3.9); + m_itemModel.setData(m_itemModel.index(2, 10), 6.3); } void TestKDChartModel::init() { - m_model = new KDChartModel( 0 ); - m_testModel = new ModelObserver( m_model ); + m_model = new KDChartModel(0); + m_testModel = new ModelObserver(m_model); } void TestKDChartModel::cleanup() @@ -100,205 +100,205 @@ void TestKDChartModel::testDataSetInsertion() { - DataSet dataSet1( 0 ); - DataSet dataSet2( 1 ); - dataSet1.setYDataRegion( CellRegion( m_table, QRect( 1, 1, 10, 1 ) ) ); - dataSet2.setYDataRegion( CellRegion( m_table, QRect( 2, 1, 10, 1 ) ) ); - m_model->addDataSet( &dataSet1 ); - m_model->addDataSet( &dataSet2 ); - QCOMPARE( m_testModel->m_numRows, m_model->rowCount() ); - QCOMPARE( m_testModel->m_numCols, m_model->columnCount() ); + DataSet dataSet1(0); + DataSet dataSet2(1); + dataSet1.setYDataRegion(CellRegion(m_table, QRect(1, 1, 10, 1))); + dataSet2.setYDataRegion(CellRegion(m_table, QRect(2, 1, 10, 1))); + m_model->addDataSet(&dataSet1); + m_model->addDataSet(&dataSet2); + QCOMPARE(m_testModel->m_numRows, m_model->rowCount()); + QCOMPARE(m_testModel->m_numCols, m_model->columnCount()); } void TestKDChartModel::testDataSetInsertionAndRemoval() { - DataSet dataSet1( 0 ); - DataSet dataSet2( 1 ); - dataSet1.setYDataRegion( CellRegion( m_table, QRect( 1, 1, 10, 1 ) ) ); - dataSet2.setYDataRegion( CellRegion( m_table, QRect( 2, 1, 10, 1 ) ) ); - m_model->addDataSet( &dataSet1 ); - m_model->addDataSet( &dataSet2 ); - QCOMPARE( m_testModel->m_numRows, 10 ); - QCOMPARE( m_testModel->m_numCols, 2 ); - QCOMPARE( m_model->rowCount(), 10 ); - QCOMPARE( m_model->columnCount(), 2 ); - m_model->removeDataSet( &dataSet1 ); - m_model->removeDataSet( &dataSet2 ); - QCOMPARE( m_testModel->m_numRows, 0 ); - QCOMPARE( m_testModel->m_numCols, 0 ); - QCOMPARE( m_model->columnCount(), 0 ); - QCOMPARE( m_model->rowCount(), 0 ); - m_model->addDataSet( &dataSet1 ); - m_model->addDataSet( &dataSet2 ); - QCOMPARE( m_testModel->m_numRows, 10 ); - QCOMPARE( m_testModel->m_numCols, 2 ); - QCOMPARE( m_model->rowCount(), 10 ); - QCOMPARE( m_model->columnCount(), 2 ); + DataSet dataSet1(0); + DataSet dataSet2(1); + dataSet1.setYDataRegion(CellRegion(m_table, QRect(1, 1, 10, 1))); + dataSet2.setYDataRegion(CellRegion(m_table, QRect(2, 1, 10, 1))); + m_model->addDataSet(&dataSet1); + m_model->addDataSet(&dataSet2); + QCOMPARE(m_testModel->m_numRows, 10); + QCOMPARE(m_testModel->m_numCols, 2); + QCOMPARE(m_model->rowCount(), 10); + QCOMPARE(m_model->columnCount(), 2); + m_model->removeDataSet(&dataSet1); + m_model->removeDataSet(&dataSet2); + QCOMPARE(m_testModel->m_numRows, 0); + QCOMPARE(m_testModel->m_numCols, 0); + QCOMPARE(m_model->columnCount(), 0); + QCOMPARE(m_model->rowCount(), 0); + m_model->addDataSet(&dataSet1); + m_model->addDataSet(&dataSet2); + QCOMPARE(m_testModel->m_numRows, 10); + QCOMPARE(m_testModel->m_numCols, 2); + QCOMPARE(m_model->rowCount(), 10); + QCOMPARE(m_model->columnCount(), 2); } void TestKDChartModel::testData() { - DataSet dataSet1( 0 ); - DataSet dataSet2( 1 ); + DataSet dataSet1(0); + DataSet dataSet2(1); - dataSet1.setYDataRegion( CellRegion( m_table, QRect( 2, 2, 10, 1 ) ) ); - dataSet1.setLabelDataRegion( CellRegion( m_table, QPoint( 1, 2 ) ) ); - dataSet1.setCategoryDataRegion( CellRegion( m_table, QRect( 2, 1, 10, 1 ) ) ); - - dataSet2.setYDataRegion( CellRegion( m_table, QRect( 2, 3, 10, 1 ) ) ); - dataSet2.setLabelDataRegion( CellRegion( m_table, QPoint( 1, 3 ) ) ); - dataSet2.setCategoryDataRegion( CellRegion( m_table, QRect( 2, 1, 10, 1 ) ) ); + dataSet1.setYDataRegion(CellRegion(m_table, QRect(2, 2, 10, 1))); + dataSet1.setLabelDataRegion(CellRegion(m_table, QPoint(1, 2))); + dataSet1.setCategoryDataRegion(CellRegion(m_table, QRect(2, 1, 10, 1))); + + dataSet2.setYDataRegion(CellRegion(m_table, QRect(2, 3, 10, 1))); + dataSet2.setLabelDataRegion(CellRegion(m_table, QPoint(1, 3))); + dataSet2.setCategoryDataRegion(CellRegion(m_table, QRect(2, 1, 10, 1))); - m_model->addDataSet( &dataSet1 ); - m_model->addDataSet( &dataSet2 ); + m_model->addDataSet(&dataSet1); + m_model->addDataSet(&dataSet2); - QCOMPARE( m_model->rowCount(), 10 ); - QCOMPARE( m_model->columnCount(), 2 ); + QCOMPARE(m_model->rowCount(), 10); + QCOMPARE(m_model->columnCount(), 2); // category data - QCOMPARE( m_model->headerData( 0, Qt::Vertical ), QVariant( "Column 1" ) ); - QCOMPARE( m_model->headerData( 1, Qt::Vertical ), QVariant( "Column 2" ) ); - QCOMPARE( m_model->headerData( 2, Qt::Vertical ), QVariant( "Column 3" ) ); - QCOMPARE( m_model->headerData( 3, Qt::Vertical ), QVariant( "Column 4" ) ); - QCOMPARE( m_model->headerData( 4, Qt::Vertical ), QVariant( "Column 5" ) ); - QCOMPARE( m_model->headerData( 5, Qt::Vertical ), QVariant( "Column 6" ) ); - QCOMPARE( m_model->headerData( 6, Qt::Vertical ), QVariant( "Column 7" ) ); - QCOMPARE( m_model->headerData( 7, Qt::Vertical ), QVariant( "Column 8" ) ); - QCOMPARE( m_model->headerData( 8, Qt::Vertical ), QVariant( "Column 9" ) ); - QCOMPARE( m_model->headerData( 9, Qt::Vertical ), QVariant( "Column 10" ) ); + QCOMPARE(m_model->headerData(0, Qt::Vertical), QVariant("Column 1")); + QCOMPARE(m_model->headerData(1, Qt::Vertical), QVariant("Column 2")); + QCOMPARE(m_model->headerData(2, Qt::Vertical), QVariant("Column 3")); + QCOMPARE(m_model->headerData(3, Qt::Vertical), QVariant("Column 4")); + QCOMPARE(m_model->headerData(4, Qt::Vertical), QVariant("Column 5")); + QCOMPARE(m_model->headerData(5, Qt::Vertical), QVariant("Column 6")); + QCOMPARE(m_model->headerData(6, Qt::Vertical), QVariant("Column 7")); + QCOMPARE(m_model->headerData(7, Qt::Vertical), QVariant("Column 8")); + QCOMPARE(m_model->headerData(8, Qt::Vertical), QVariant("Column 9")); + QCOMPARE(m_model->headerData(9, Qt::Vertical), QVariant("Column 10")); // dataSet1 // label data - QCOMPARE( m_model->headerData( 0, Qt::Horizontal ), QVariant( "Row 1" ) ); + QCOMPARE(m_model->headerData(0, Qt::Horizontal), QVariant("Row 1")); // y data - QCOMPARE( m_model->data( m_model->index( 0, 0 ) ), QVariant( 7.2 ) ); - QCOMPARE( m_model->data( m_model->index( 1, 0 ) ), QVariant( 1.8 ) ); - QCOMPARE( m_model->data( m_model->index( 2, 0 ) ), QVariant( 9.4 ) ); - QCOMPARE( m_model->data( m_model->index( 3, 0 ) ), QVariant( 1.5 ) ); - QCOMPARE( m_model->data( m_model->index( 4, 0 ) ), QVariant( 8.4 ) ); - QCOMPARE( m_model->data( m_model->index( 5, 0 ) ), QVariant( 2.9 ) ); - QCOMPARE( m_model->data( m_model->index( 6, 0 ) ), QVariant( 3.7 ) ); - QCOMPARE( m_model->data( m_model->index( 7, 0 ) ), QVariant( 5.5 ) ); - QCOMPARE( m_model->data( m_model->index( 8, 0 ) ), QVariant( 2.9 ) ); - QCOMPARE( m_model->data( m_model->index( 9, 0 ) ), QVariant( 5.3 ) ); + QCOMPARE(m_model->data(m_model->index(0, 0)), QVariant(7.2)); + QCOMPARE(m_model->data(m_model->index(1, 0)), QVariant(1.8)); + QCOMPARE(m_model->data(m_model->index(2, 0)), QVariant(9.4)); + QCOMPARE(m_model->data(m_model->index(3, 0)), QVariant(1.5)); + QCOMPARE(m_model->data(m_model->index(4, 0)), QVariant(8.4)); + QCOMPARE(m_model->data(m_model->index(5, 0)), QVariant(2.9)); + QCOMPARE(m_model->data(m_model->index(6, 0)), QVariant(3.7)); + QCOMPARE(m_model->data(m_model->index(7, 0)), QVariant(5.5)); + QCOMPARE(m_model->data(m_model->index(8, 0)), QVariant(2.9)); + QCOMPARE(m_model->data(m_model->index(9, 0)), QVariant(5.3)); // dataSet2 // label data - QCOMPARE( m_model->headerData( 1, Qt::Horizontal ), QVariant( "Row 2" ) ); - QCOMPARE( m_model->data( m_model->index( 0, 1 ) ), QVariant( 8.2 ) ); - QCOMPARE( m_model->data( m_model->index( 1, 1 ) ), QVariant( 2.8 ) ); - QCOMPARE( m_model->data( m_model->index( 2, 1 ) ), QVariant( 10.4 ) ); - QCOMPARE( m_model->data( m_model->index( 3, 1 ) ), QVariant( 2.5 ) ); - QCOMPARE( m_model->data( m_model->index( 4, 1 ) ), QVariant( 9.4 ) ); - QCOMPARE( m_model->data( m_model->index( 5, 1 ) ), QVariant( 3.9 ) ); - QCOMPARE( m_model->data( m_model->index( 6, 1 ) ), QVariant( 4.7 ) ); - QCOMPARE( m_model->data( m_model->index( 7, 1 ) ), QVariant( 6.5 ) ); - QCOMPARE( m_model->data( m_model->index( 8, 1 ) ), QVariant( 3.9 ) ); - QCOMPARE( m_model->data( m_model->index( 9, 1 ) ), QVariant( 6.3 ) ); + QCOMPARE(m_model->headerData(1, Qt::Horizontal), QVariant("Row 2")); + QCOMPARE(m_model->data(m_model->index(0, 1)), QVariant(8.2)); + QCOMPARE(m_model->data(m_model->index(1, 1)), QVariant(2.8)); + QCOMPARE(m_model->data(m_model->index(2, 1)), QVariant(10.4)); + QCOMPARE(m_model->data(m_model->index(3, 1)), QVariant(2.5)); + QCOMPARE(m_model->data(m_model->index(4, 1)), QVariant(9.4)); + QCOMPARE(m_model->data(m_model->index(5, 1)), QVariant(3.9)); + QCOMPARE(m_model->data(m_model->index(6, 1)), QVariant(4.7)); + QCOMPARE(m_model->data(m_model->index(7, 1)), QVariant(6.5)); + QCOMPARE(m_model->data(m_model->index(8, 1)), QVariant(3.9)); + QCOMPARE(m_model->data(m_model->index(9, 1)), QVariant(6.3)); } void TestKDChartModel::testDataChanges() { - DataSet dataSet1( 0 ); - DataSet dataSet2( 1 ); + DataSet dataSet1(0); + DataSet dataSet2(1); - dataSet1.setYDataRegion( CellRegion( m_table, QRect( 2, 2, 10, 1 ) ) ); - dataSet2.setYDataRegion( CellRegion( m_table, QRect( 2, 3, 10, 1 ) ) ); + dataSet1.setYDataRegion(CellRegion(m_table, QRect(2, 2, 10, 1))); + dataSet2.setYDataRegion(CellRegion(m_table, QRect(2, 3, 10, 1))); - m_model->addDataSet( &dataSet1 ); - m_model->addDataSet( &dataSet2 ); + m_model->addDataSet(&dataSet1); + m_model->addDataSet(&dataSet2); // Test changing dataset-wide data - dataSet1.setLabelDataRegion( CellRegion( m_table, QPoint( 2, 2 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.first, 0 ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.last, 0 ); + dataSet1.setLabelDataRegion(CellRegion(m_table, QPoint(2, 2))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical); + QCOMPARE(m_testModel->m_lastHeaderDataChange.first, 0); + QCOMPARE(m_testModel->m_lastHeaderDataChange.last, 0); // Forget the last change to test another one m_testModel->m_lastHeaderDataChange.valid = false; - dataSet2.setLabelDataRegion( CellRegion( m_table, QPoint( 2, 3 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.first, 1 ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.last, 1 ); + dataSet2.setLabelDataRegion(CellRegion(m_table, QPoint(2, 3))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical); + QCOMPARE(m_testModel->m_lastHeaderDataChange.first, 1); + QCOMPARE(m_testModel->m_lastHeaderDataChange.last, 1); // Test changing data points // Forget the last change to test another one m_testModel->m_lastDataChange.valid = false; - dataSet1.setYDataRegion( CellRegion( m_table, QRect( 3, 2, 9, 1 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastDataChange.topLeft, m_model->index( 0, 0 ) ); - QCOMPARE( m_testModel->m_lastDataChange.bottomRight, m_model->index( 9, 0 ) ); + dataSet1.setYDataRegion(CellRegion(m_table, QRect(3, 2, 9, 1))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastDataChange.topLeft, m_model->index(0, 0)); + QCOMPARE(m_testModel->m_lastDataChange.bottomRight, m_model->index(9, 0)); // Forget the last change to test another one m_testModel->m_lastDataChange.valid = false; - dataSet2.setYDataRegion( CellRegion( m_table, QRect( 3, 3, 9, 1 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastDataChange.topLeft, m_model->index( 0, 1 ) ); + dataSet2.setYDataRegion(CellRegion(m_table, QRect(3, 3, 9, 1))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastDataChange.topLeft, m_model->index(0, 1)); // The number of rows (data points) is now reduced by one because // both y data regions have been reduced by one cell. - QCOMPARE( m_testModel->m_lastDataChange.bottomRight, m_model->index( 8, 1 ) ); + QCOMPARE(m_testModel->m_lastDataChange.bottomRight, m_model->index(8, 1)); } void TestKDChartModel::testDataChangesWithTwoDimensions() { - DataSet dataSet1( 0 ); - DataSet dataSet2( 1 ); + DataSet dataSet1(0); + DataSet dataSet2(1); - dataSet1.setXDataRegion( CellRegion( m_table, QRect( 2, 1, 10, 1 ) ) ); - dataSet1.setYDataRegion( CellRegion( m_table, QRect( 2, 2, 10, 1 ) ) ); - dataSet1.setLabelDataRegion( CellRegion( m_table, QPoint( 1, 2 ) ) ); - - dataSet2.setXDataRegion( CellRegion( m_table, QRect( 2, 1, 10, 1 ) ) ); - dataSet2.setYDataRegion( CellRegion( m_table, QRect( 2, 3, 10, 1 ) ) ); - dataSet2.setLabelDataRegion( CellRegion( m_table, QPoint( 1, 3 ) ) ); - - m_model->setDataDimensions( 2 ); - m_model->addDataSet( &dataSet1 ); - m_model->addDataSet( &dataSet2 ); + dataSet1.setXDataRegion(CellRegion(m_table, QRect(2, 1, 10, 1))); + dataSet1.setYDataRegion(CellRegion(m_table, QRect(2, 2, 10, 1))); + dataSet1.setLabelDataRegion(CellRegion(m_table, QPoint(1, 2))); + + dataSet2.setXDataRegion(CellRegion(m_table, QRect(2, 1, 10, 1))); + dataSet2.setYDataRegion(CellRegion(m_table, QRect(2, 3, 10, 1))); + dataSet2.setLabelDataRegion(CellRegion(m_table, QPoint(1, 3))); + + m_model->setDataDimensions(2); + m_model->addDataSet(&dataSet1); + m_model->addDataSet(&dataSet2); // Test changing dataset-wide data - dataSet1.setLabelDataRegion( CellRegion( m_table, QPoint( 2, 2 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.first, 0 ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.last, 1 ); + dataSet1.setLabelDataRegion(CellRegion(m_table, QPoint(2, 2))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical); + QCOMPARE(m_testModel->m_lastHeaderDataChange.first, 0); + QCOMPARE(m_testModel->m_lastHeaderDataChange.last, 1); // Forget the last change to test another one m_testModel->m_lastHeaderDataChange.valid = false; - dataSet2.setLabelDataRegion( CellRegion( m_table, QPoint( 2, 3 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.first, 2 ); - QCOMPARE( m_testModel->m_lastHeaderDataChange.last, 3 ); + dataSet2.setLabelDataRegion(CellRegion(m_table, QPoint(2, 3))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastHeaderDataChange.orientation, Qt::Vertical); + QCOMPARE(m_testModel->m_lastHeaderDataChange.first, 2); + QCOMPARE(m_testModel->m_lastHeaderDataChange.last, 3); // Test changing data points // Forget the last change to test another one m_testModel->m_lastDataChange.valid = false; - dataSet1.setYDataRegion( CellRegion( m_table, QRect( 3, 2, 9, 1 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastDataChange.topLeft, m_model->index( 0, 0 ) ); - QCOMPARE( m_testModel->m_lastDataChange.bottomRight, m_model->index( 9, 1 ) ); + dataSet1.setYDataRegion(CellRegion(m_table, QRect(3, 2, 9, 1))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastDataChange.topLeft, m_model->index(0, 0)); + QCOMPARE(m_testModel->m_lastDataChange.bottomRight, m_model->index(9, 1)); // Forget the last change to test another one m_testModel->m_lastDataChange.valid = false; - dataSet2.setYDataRegion( CellRegion( m_table, QRect( 3, 3, 9, 1 ) ) ); - QVERIFY( m_testModel->m_lastHeaderDataChange.valid ); - QCOMPARE( m_testModel->m_lastDataChange.topLeft, m_model->index( 0, 2 ) ); - QCOMPARE( m_testModel->m_lastDataChange.bottomRight, m_model->index( 9, 3 ) ); + dataSet2.setYDataRegion(CellRegion(m_table, QRect(3, 3, 9, 1))); + QVERIFY(m_testModel->m_lastHeaderDataChange.valid); + QCOMPARE(m_testModel->m_lastDataChange.topLeft, m_model->index(0, 2)); + QCOMPARE(m_testModel->m_lastDataChange.bottomRight, m_model->index(9, 3)); } -QTEST_MAIN( TestKDChartModel ) +QTEST_MAIN(TestKDChartModel) diff -Nru calligra-2.4.0/plugins/chartshape/tests/TestProxyModel.cpp calligra-2.4.3/plugins/chartshape/tests/TestProxyModel.cpp --- calligra-2.4.0/plugins/chartshape/tests/TestProxyModel.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/TestProxyModel.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -36,9 +36,9 @@ namespace QTest { template<> - char *toString( const CellRegion ®ion ) + char *toString(const CellRegion ®ion) { - return qstrdup( region.toString().toAscii().data() ); + return qstrdup(region.toString().toAscii().data()); } } @@ -46,53 +46,52 @@ TestProxyModel::TestProxyModel() : m_source() - , m_proxyModel( 0, &m_source ) + , m_proxyModel(0, &m_source) , m_sourceModel() - , m_table( 0 ) + , m_table(0) { } void TestProxyModel::init() { m_source.clear(); - m_table = m_source.add( "Table1", &m_sourceModel ); + m_table = m_source.add("Table1", &m_sourceModel); - m_sourceModel.setRowCount( 4 ); - m_sourceModel.setColumnCount( 5 ); + m_sourceModel.setRowCount(4); + m_sourceModel.setColumnCount(5); // Vertical header data - m_sourceModel.setData( m_sourceModel.index( 1, 0 ), "Row 1" ); - m_sourceModel.setData( m_sourceModel.index( 2, 0 ), "Row 2" ); - m_sourceModel.setData( m_sourceModel.index( 3, 0 ), "Row 3" ); + m_sourceModel.setData(m_sourceModel.index(1, 0), "Row 1"); + m_sourceModel.setData(m_sourceModel.index(2, 0), "Row 2"); + m_sourceModel.setData(m_sourceModel.index(3, 0), "Row 3"); // Horizontal header data - m_sourceModel.setData( m_sourceModel.index( 0, 1 ), "Column 1" ); - m_sourceModel.setData( m_sourceModel.index( 0, 2 ), "Column 2" ); - m_sourceModel.setData( m_sourceModel.index( 0, 3 ), "Column 3" ); - m_sourceModel.setData( m_sourceModel.index( 0, 4 ), "Column 4" ); + m_sourceModel.setData(m_sourceModel.index(0, 1), "Column 1"); + m_sourceModel.setData(m_sourceModel.index(0, 2), "Column 2"); + m_sourceModel.setData(m_sourceModel.index(0, 3), "Column 3"); + m_sourceModel.setData(m_sourceModel.index(0, 4), "Column 4"); // First row - m_sourceModel.setData( m_sourceModel.index( 1, 1 ), 7.2 ); - m_sourceModel.setData( m_sourceModel.index( 1, 2 ), 1.8 ); - m_sourceModel.setData( m_sourceModel.index( 1, 3 ), 9.4 ); - m_sourceModel.setData( m_sourceModel.index( 1, 4 ), 1.5 ); + m_sourceModel.setData(m_sourceModel.index(1, 1), 7.2); + m_sourceModel.setData(m_sourceModel.index(1, 2), 1.8); + m_sourceModel.setData(m_sourceModel.index(1, 3), 9.4); + m_sourceModel.setData(m_sourceModel.index(1, 4), 1.5); // Second row - m_sourceModel.setData( m_sourceModel.index( 2, 1 ), 8.4 ); - m_sourceModel.setData( m_sourceModel.index( 2, 2 ), 2.9 ); - m_sourceModel.setData( m_sourceModel.index( 2, 3 ), 3.7 ); - m_sourceModel.setData( m_sourceModel.index( 2, 4 ), 5.5 ); + m_sourceModel.setData(m_sourceModel.index(2, 1), 8.4); + m_sourceModel.setData(m_sourceModel.index(2, 2), 2.9); + m_sourceModel.setData(m_sourceModel.index(2, 3), 3.7); + m_sourceModel.setData(m_sourceModel.index(2, 4), 5.5); // Third row - m_sourceModel.setData( m_sourceModel.index( 3, 1 ), 2.9 ); - m_sourceModel.setData( m_sourceModel.index( 3, 2 ), 5.3 ); - m_sourceModel.setData( m_sourceModel.index( 3, 3 ), 6.4 ); - m_sourceModel.setData( m_sourceModel.index( 3, 4 ), 2.1 ); + m_sourceModel.setData(m_sourceModel.index(3, 1), 2.9); + m_sourceModel.setData(m_sourceModel.index(3, 2), 5.3); + m_sourceModel.setData(m_sourceModel.index(3, 3), 6.4); + m_sourceModel.setData(m_sourceModel.index(3, 4), 2.1); - QRect selection( QPoint( 1, 1 ), - QSize( m_sourceModel.columnCount(), m_sourceModel.rowCount() ) ); + QRect selection(QPoint(1, 1), QSize(m_sourceModel.columnCount(), m_sourceModel.rowCount())); - m_proxyModel.reset( CellRegion( m_table, selection ) ); + m_proxyModel.reset(CellRegion(m_table, selection)); } void TestProxyModel::testWithoutLabels() @@ -100,84 +99,84 @@ QList dataSets; // Horizontal data direction - m_proxyModel.setDataDirection( Qt::Horizontal ); - m_proxyModel.setFirstColumnIsLabel( false ); - m_proxyModel.setFirstRowIsLabel( false ); + m_proxyModel.setDataDirection(Qt::Horizontal); + m_proxyModel.setFirstColumnIsLabel(false); + m_proxyModel.setFirstRowIsLabel(false); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 4 ); - QCOMPARE( dataSets[0]->size(), 5 ); - QCOMPARE( dataSets[1]->size(), 5 ); - QCOMPARE( dataSets[2]->size(), 5 ); - QCOMPARE( dataSets[3]->size(), 5 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 1, 2, 5, 1 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 1, 3, 5, 1 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[3]->yDataRegion(), CellRegion( m_table, QRect( 1, 4, 5, 1 ) ) ); - QCOMPARE( dataSets[3]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets.size(), 4); + QCOMPARE(dataSets[0]->size(), 5); + QCOMPARE(dataSets[1]->size(), 5); + QCOMPARE(dataSets[2]->size(), 5); + QCOMPARE(dataSets[3]->size(), 5); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(1, 1, 5, 1))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(1, 2, 5, 1))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(1, 3, 5, 1))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[3]->yDataRegion(), CellRegion(m_table, QRect(1, 4, 5, 1))); + QCOMPARE(dataSets[3]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->categoryDataRegion(), CellRegion()); // Vertical data direction - m_proxyModel.setDataDirection( Qt::Vertical ); + m_proxyModel.setDataDirection(Qt::Vertical); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 5 ); - QCOMPARE( dataSets[0]->size(), 4 ); - QCOMPARE( dataSets[1]->size(), 4 ); - QCOMPARE( dataSets[2]->size(), 4 ); - QCOMPARE( dataSets[3]->size(), 4 ); - QCOMPARE( dataSets[4]->size(), 4 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 1, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 2, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 3, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[3]->yDataRegion(), CellRegion( m_table, QRect( 4, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[3]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[4]->yDataRegion(), CellRegion( m_table, QRect( 5, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[4]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets.size(), 5); + QCOMPARE(dataSets[0]->size(), 4); + QCOMPARE(dataSets[1]->size(), 4); + QCOMPARE(dataSets[2]->size(), 4); + QCOMPARE(dataSets[3]->size(), 4); + QCOMPARE(dataSets[4]->size(), 4); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(1, 1, 1, 4))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(2, 1, 1, 4))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(3, 1, 1, 4))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[3]->yDataRegion(), CellRegion(m_table, QRect(4, 1, 1, 4))); + QCOMPARE(dataSets[3]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[4]->yDataRegion(), CellRegion(m_table, QRect(5, 1, 1, 4))); + QCOMPARE(dataSets[4]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->categoryDataRegion(), CellRegion()); } void TestProxyModel::testFirstRowAsLabel() @@ -185,77 +184,77 @@ QList dataSets; // Horizontal data direction - m_proxyModel.setDataDirection( Qt::Horizontal ); + m_proxyModel.setDataDirection(Qt::Horizontal); - m_proxyModel.setFirstColumnIsLabel( false ); + m_proxyModel.setFirstColumnIsLabel(false); // With first row as category data - m_proxyModel.setFirstRowIsLabel( true ); + m_proxyModel.setFirstRowIsLabel(true); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 3 ); - QCOMPARE( dataSets[0]->size(), 5 ); - QCOMPARE( dataSets[1]->size(), 5 ); - QCOMPARE( dataSets[2]->size(), 5 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 1, 2, 5, 1 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 1, 3, 5, 1 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 1, 4, 5, 1 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); + QCOMPARE(dataSets.size(), 3); + QCOMPARE(dataSets[0]->size(), 5); + QCOMPARE(dataSets[1]->size(), 5); + QCOMPARE(dataSets[2]->size(), 5); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(1, 2, 5, 1))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion(m_table, QRect(1, 1, 5, 1))); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(1, 3, 5, 1))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion(m_table, QRect(1, 1, 5, 1))); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(1, 4, 5, 1))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion(m_table, QRect(1, 1, 5, 1))); // Vertical data direction - m_proxyModel.setDataDirection( Qt::Vertical ); + m_proxyModel.setDataDirection(Qt::Vertical); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 5 ); - QCOMPARE( dataSets[0]->size(), 3 ); - QCOMPARE( dataSets[1]->size(), 3 ); - QCOMPARE( dataSets[2]->size(), 3 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 1, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion( m_table, QRect( 1, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 2, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion( m_table, QRect( 2, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 3, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion( m_table, QRect( 3, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[3]->yDataRegion(), CellRegion( m_table, QRect( 4, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[3]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->labelDataRegion(), CellRegion( m_table, QRect( 4, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[3]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[4]->yDataRegion(), CellRegion( m_table, QRect( 5, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[4]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->labelDataRegion(), CellRegion( m_table, QRect( 5, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[4]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets.size(), 5); + QCOMPARE(dataSets[0]->size(), 3); + QCOMPARE(dataSets[1]->size(), 3); + QCOMPARE(dataSets[2]->size(), 3); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(1, 2, 1, 3))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion(m_table, QRect(1, 1, 1, 1))); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(2, 2, 1, 3))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion(m_table, QRect(2, 1, 1, 1))); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(3, 2, 1, 3))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion(m_table, QRect(3, 1, 1, 1))); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[3]->yDataRegion(), CellRegion(m_table, QRect(4, 2, 1, 3))); + QCOMPARE(dataSets[3]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->labelDataRegion(), CellRegion(m_table, QRect(4, 1, 1, 1))); + QCOMPARE(dataSets[3]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[4]->yDataRegion(), CellRegion(m_table, QRect(5, 2, 1, 3))); + QCOMPARE(dataSets[4]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->labelDataRegion(), CellRegion(m_table, QRect(5, 1, 1, 1))); + QCOMPARE(dataSets[4]->categoryDataRegion(), CellRegion()); } void TestProxyModel::testFirstColumnAsLabel() @@ -263,79 +262,79 @@ QList dataSets; // Horizontal data direction - m_proxyModel.setDataDirection( Qt::Horizontal ); + m_proxyModel.setDataDirection(Qt::Horizontal); - m_proxyModel.setFirstRowIsLabel( false ); + m_proxyModel.setFirstRowIsLabel(false); // With first column as label data - m_proxyModel.setFirstColumnIsLabel( true ); + m_proxyModel.setFirstColumnIsLabel(true); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 4 ); - QCOMPARE( dataSets[0]->size(), 4 ); - QCOMPARE( dataSets[1]->size(), 4 ); - QCOMPARE( dataSets[2]->size(), 4 ); - QCOMPARE( dataSets[3]->size(), 4 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 2, 1, 4, 1 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion( m_table, QRect( 1, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 2, 2, 4, 1 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion( m_table, QRect( 1, 2, 1, 1 ) ) ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 2, 3, 4, 1 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion( m_table, QRect( 1, 3, 1, 1 ) ) ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[3]->yDataRegion(), CellRegion( m_table, QRect( 2, 4, 4, 1 ) ) ); - QCOMPARE( dataSets[3]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->labelDataRegion(), CellRegion( m_table, QRect( 1, 4, 1, 1 ) ) ); - QCOMPARE( dataSets[3]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets.size(), 4); + QCOMPARE(dataSets[0]->size(), 4); + QCOMPARE(dataSets[1]->size(), 4); + QCOMPARE(dataSets[2]->size(), 4); + QCOMPARE(dataSets[3]->size(), 4); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(2, 1, 4, 1))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion(m_table, QRect(1, 1, 1, 1))); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(2, 2, 4, 1))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion(m_table, QRect(1, 2, 1, 1))); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(2, 3, 4, 1))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion(m_table, QRect(1, 3, 1, 1))); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[3]->yDataRegion(), CellRegion(m_table, QRect(2, 4, 4, 1))); + QCOMPARE(dataSets[3]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->labelDataRegion(), CellRegion(m_table, QRect(1, 4, 1, 1))); + QCOMPARE(dataSets[3]->categoryDataRegion(), CellRegion()); // Vertical data direction - m_proxyModel.setDataDirection( Qt::Vertical ); + m_proxyModel.setDataDirection(Qt::Vertical); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 4 ); - QCOMPARE( dataSets[0]->size(), 4 ); - QCOMPARE( dataSets[1]->size(), 4 ); - QCOMPARE( dataSets[2]->size(), 4 ); - QCOMPARE( dataSets[3]->size(), 4 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 2, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 1, 1, 4 ) ) ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 3, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 1, 1, 4 ) ) ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 4, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 1, 1, 4 ) ) ); - - QCOMPARE( dataSets[3]->yDataRegion(), CellRegion( m_table, QRect( 5, 1, 1, 4 ) ) ); - QCOMPARE( dataSets[3]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 1, 1, 4 ) ) ); + QCOMPARE(dataSets.size(), 4); + QCOMPARE(dataSets[0]->size(), 4); + QCOMPARE(dataSets[1]->size(), 4); + QCOMPARE(dataSets[2]->size(), 4); + QCOMPARE(dataSets[3]->size(), 4); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(2, 1, 1, 4))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion(m_table, QRect(1, 1, 1, 4))); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(3, 1, 1, 4))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion(m_table, QRect(1, 1, 1, 4))); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(4, 1, 1, 4))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion(m_table, QRect(1, 1, 1, 4))); + + QCOMPARE(dataSets[3]->yDataRegion(), CellRegion(m_table, QRect(5, 1, 1, 4))); + QCOMPARE(dataSets[3]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->categoryDataRegion(), CellRegion(m_table, QRect(1, 1, 1, 4))); } void TestProxyModel::testFirstRowAndColumnAsLabels() @@ -343,197 +342,197 @@ QList dataSets; // Horizontal data direction - m_proxyModel.setDataDirection( Qt::Horizontal ); + m_proxyModel.setDataDirection(Qt::Horizontal); // With first row as category data - m_proxyModel.setFirstRowIsLabel( true ); + m_proxyModel.setFirstRowIsLabel(true); // ...and first column as label data - m_proxyModel.setFirstColumnIsLabel( true ); + m_proxyModel.setFirstColumnIsLabel(true); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 3 ); - QCOMPARE( dataSets[0]->size(), 4 ); - QCOMPARE( dataSets[1]->size(), 4 ); - QCOMPARE( dataSets[2]->size(), 4 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 2, 2, 4, 1 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion( m_table, QRect( 1, 2, 1, 1 ) ) ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion( m_table, QRect( 2, 1, 4, 1 ) ) ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 2, 3, 4, 1 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion( m_table, QRect( 1, 3, 1, 1 ) ) ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion( m_table, QRect( 2, 1, 4, 1 ) ) ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 2, 4, 4, 1 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion( m_table, QRect( 1, 4, 1, 1 ) ) ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion( m_table, QRect( 2, 1, 4, 1 ) ) ); + QCOMPARE(dataSets.size(), 3); + QCOMPARE(dataSets[0]->size(), 4); + QCOMPARE(dataSets[1]->size(), 4); + QCOMPARE(dataSets[2]->size(), 4); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(2, 2, 4, 1))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion(m_table, QRect(1, 2, 1, 1))); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion(m_table, QRect(2, 1, 4, 1))); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(2, 3, 4, 1))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion(m_table, QRect(1, 3, 1, 1))); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion(m_table, QRect(2, 1, 4, 1))); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(2, 4, 4, 1))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion(m_table, QRect(1, 4, 1, 1))); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion(m_table, QRect(2, 1, 4, 1))); // Vertical data direction - m_proxyModel.setDataDirection( Qt::Vertical ); + m_proxyModel.setDataDirection(Qt::Vertical); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 4 ); - QCOMPARE( dataSets[0]->size(), 3 ); - QCOMPARE( dataSets[1]->size(), 3 ); - QCOMPARE( dataSets[2]->size(), 3 ); - QCOMPARE( dataSets[3]->size(), 3 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 2, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion( m_table, QRect( 2, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 2, 1, 3 ) ) ); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 3, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion( m_table, QRect( 3, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 2, 1, 3 ) ) ); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 4, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion( m_table, QRect( 4, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 2, 1, 3 ) ) ); - - QCOMPARE( dataSets[3]->yDataRegion(), CellRegion( m_table, QRect( 5, 2, 1, 3 ) ) ); - QCOMPARE( dataSets[3]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->labelDataRegion(), CellRegion( m_table, QRect( 5, 1, 1, 1 ) ) ); - QCOMPARE( dataSets[3]->categoryDataRegion(), CellRegion( m_table, QRect( 1, 2, 1, 3 ) ) ); + QCOMPARE(dataSets.size(), 4); + QCOMPARE(dataSets[0]->size(), 3); + QCOMPARE(dataSets[1]->size(), 3); + QCOMPARE(dataSets[2]->size(), 3); + QCOMPARE(dataSets[3]->size(), 3); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(2, 2, 1, 3))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion(m_table, QRect(2, 1, 1, 1))); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion(m_table, QRect(1, 2, 1, 3))); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(3, 2, 1, 3))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion(m_table, QRect(3, 1, 1, 1))); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion(m_table, QRect(1, 2, 1, 3))); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(4, 2, 1, 3))); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion(m_table, QRect(4, 1, 1, 1))); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion(m_table, QRect(1, 2, 1, 3))); + + QCOMPARE(dataSets[3]->yDataRegion(), CellRegion(m_table, QRect(5, 2, 1, 3))); + QCOMPARE(dataSets[3]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->labelDataRegion(), CellRegion(m_table, QRect(5, 1, 1, 1))); + QCOMPARE(dataSets[3]->categoryDataRegion(), CellRegion(m_table, QRect(1, 2, 1, 3))); } void TestProxyModel::testRegionOrder() { - CellRegion selection( m_table ); + CellRegion selection(m_table); // Second row - selection.add( QRect( 1, 2, 4, 1 ) ); + selection.add(QRect(1, 2, 4, 1)); // First row - selection.add( QRect( 1, 1, 4, 1 ) ); + selection.add(QRect(1, 1, 4, 1)); - m_proxyModel.setDataDirection( Qt::Horizontal ); - m_proxyModel.setFirstColumnIsLabel( false ); - m_proxyModel.setFirstRowIsLabel( false ); - m_proxyModel.reset( selection ); + m_proxyModel.setDataDirection(Qt::Horizontal); + m_proxyModel.setFirstColumnIsLabel(false); + m_proxyModel.setFirstRowIsLabel(false); + m_proxyModel.reset(selection); QList dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 2 ); - QCOMPARE( dataSets[0]->size(), 4 ); - QCOMPARE( dataSets[1]->size(), 4 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 1, 1, 4, 1 ) ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 1, 2, 4, 1 ) ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets.size(), 2); + QCOMPARE(dataSets[0]->size(), 4); + QCOMPARE(dataSets[1]->size(), 4); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(1, 1, 4, 1))); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(1, 2, 4, 1))); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); } // Random test case with results from Open Office void TestProxyModel::testComplexRegions() { - CellRegion selection( &m_source, "Table1.C2:D3;Table1.D9:F10;Table1.E4:F4;Table1.E6:E7" ); + CellRegion selection(&m_source, "Table1.C2:D3;Table1.D9:F10;Table1.E4:F4;Table1.E6:E7"); - m_proxyModel.setDataDirection( Qt::Horizontal ); - m_proxyModel.setFirstColumnIsLabel( false ); - m_proxyModel.setFirstRowIsLabel( false ); - m_proxyModel.reset( selection ); + m_proxyModel.setDataDirection(Qt::Horizontal); + m_proxyModel.setFirstColumnIsLabel(false); + m_proxyModel.setFirstRowIsLabel(false); + m_proxyModel.reset(selection); QList dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 7 ); - QCOMPARE( dataSets[0]->size(), 2 ); - QCOMPARE( dataSets[1]->size(), 2 ); - QCOMPARE( dataSets[2]->size(), 2 ); - QCOMPARE( dataSets[3]->size(), 1 ); - QCOMPARE( dataSets[4]->size(), 1 ); - QCOMPARE( dataSets[5]->size(), 3 ); - QCOMPARE( dataSets[6]->size(), 3 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( &m_source, "Table1.C2:D2" ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( &m_source, "Table1.C3:D3" ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( &m_source, "Table1.E4:F4" ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[3]->yDataRegion(), CellRegion( &m_source, "Table1.E6" ) ); - QCOMPARE( dataSets[3]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[3]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[4]->yDataRegion(), CellRegion( &m_source, "Table1.E7" ) ); - QCOMPARE( dataSets[4]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[4]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[5]->yDataRegion(), CellRegion( &m_source, "Table1.D9:F9" ) ); - QCOMPARE( dataSets[5]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[5]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[5]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[5]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[6]->yDataRegion(), CellRegion( &m_source, "Table1.D10:F10" ) ); - QCOMPARE( dataSets[6]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[6]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[6]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[6]->categoryDataRegion(), CellRegion()); - - m_proxyModel.setDataDirection( Qt::Vertical ); - - dataSets = m_proxyModel.dataSets(); - - QCOMPARE( dataSets.size(), 4 ); - QCOMPARE( dataSets[0]->size(), 2 ); - QCOMPARE( dataSets[1]->size(), 4 ); - QCOMPARE( dataSets[2]->size(), 5 ); - - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( &m_source, "Table1.C2:C3" ) ); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( &m_source, "Table1.D2:D3;$Table1.D9:D10" ) ); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion()); - - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( &m_source, "Table1.E4;Table1.E6:E7;Table1.E9:E10" ) ); - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion()); + QCOMPARE(dataSets.size(), 7); + QCOMPARE(dataSets[0]->size(), 2); + QCOMPARE(dataSets[1]->size(), 2); + QCOMPARE(dataSets[2]->size(), 2); + QCOMPARE(dataSets[3]->size(), 1); + QCOMPARE(dataSets[4]->size(), 1); + QCOMPARE(dataSets[5]->size(), 3); + QCOMPARE(dataSets[6]->size(), 3); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(&m_source, "Table1.C2:D2")); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(&m_source, "Table1.C3:D3")); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(&m_source, "Table1.E4:F4")); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[3]->yDataRegion(), CellRegion(&m_source, "Table1.E6")); + QCOMPARE(dataSets[3]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[3]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[4]->yDataRegion(), CellRegion(&m_source, "Table1.E7")); + QCOMPARE(dataSets[4]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[4]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[5]->yDataRegion(), CellRegion(&m_source, "Table1.D9:F9")); + QCOMPARE(dataSets[5]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[5]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[5]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[5]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[6]->yDataRegion(), CellRegion(&m_source, "Table1.D10:F10")); + QCOMPARE(dataSets[6]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[6]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[6]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[6]->categoryDataRegion(), CellRegion()); + + m_proxyModel.setDataDirection(Qt::Vertical); + + dataSets = m_proxyModel.dataSets(); + + QCOMPARE(dataSets.size(), 4); + QCOMPARE(dataSets[0]->size(), 2); + QCOMPARE(dataSets[1]->size(), 4); + QCOMPARE(dataSets[2]->size(), 5); + + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(&m_source, "Table1.C2:C3")); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(&m_source, "Table1.D2:D3;$Table1.D9:D10")); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(&m_source, "Table1.E4;Table1.E6:E7;Table1.E9:E10")); + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion()); } void TestProxyModel::testTwoDimensions() @@ -541,35 +540,35 @@ QList dataSets; // Horizontal data direction - m_proxyModel.setDataDirection( Qt::Horizontal ); - m_proxyModel.setFirstColumnIsLabel( false ); - m_proxyModel.setFirstRowIsLabel( false ); - m_proxyModel.setDataDimensions( 2 ); + m_proxyModel.setDataDirection(Qt::Horizontal); + m_proxyModel.setFirstColumnIsLabel(false); + m_proxyModel.setFirstRowIsLabel(false); + m_proxyModel.setDataDimensions(2); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 3 ); - QCOMPARE( dataSets[0]->size(), 5 ); - QCOMPARE( dataSets[1]->size(), 5 ); - QCOMPARE( dataSets[2]->size(), 5 ); - - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( m_table, QRect( 1, 2, 5, 1 ) ) ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( m_table, QRect( 1, 3, 5, 1 ) ) ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); - - QCOMPARE( dataSets[2]->xDataRegion(), CellRegion( m_table, QRect( 1, 1, 5, 1 ) ) ); - QCOMPARE( dataSets[2]->yDataRegion(), CellRegion( m_table, QRect( 1, 4, 5, 1 ) ) ); - QCOMPARE( dataSets[2]->customDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[2]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets.size(), 3); + QCOMPARE(dataSets[0]->size(), 5); + QCOMPARE(dataSets[1]->size(), 5); + QCOMPARE(dataSets[2]->size(), 5); + + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion(m_table, QRect(1, 1, 5, 1))); + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(m_table, QRect(1, 2, 5, 1))); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion(m_table, QRect(1, 1, 5, 1))); + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(m_table, QRect(1, 3, 5, 1))); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); + + QCOMPARE(dataSets[2]->xDataRegion(), CellRegion(m_table, QRect(1, 1, 5, 1))); + QCOMPARE(dataSets[2]->yDataRegion(), CellRegion(m_table, QRect(1, 4, 5, 1))); + QCOMPARE(dataSets[2]->customDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[2]->categoryDataRegion(), CellRegion()); } void TestProxyModel::testThreeDimensions() @@ -577,28 +576,28 @@ QList dataSets; // Horizontal data direction - m_proxyModel.setDataDirection( Qt::Horizontal ); - m_proxyModel.setFirstColumnIsLabel( false ); - m_proxyModel.setFirstRowIsLabel( false ); - m_proxyModel.setDataDimensions( 3 ); + m_proxyModel.setDataDirection(Qt::Horizontal); + m_proxyModel.setFirstColumnIsLabel(false); + m_proxyModel.setFirstRowIsLabel(false); + m_proxyModel.setDataDimensions(3); dataSets = m_proxyModel.dataSets(); - QCOMPARE( dataSets.size(), 2 ); - QCOMPARE( dataSets[0]->size(), 5 ); - QCOMPARE( dataSets[1]->size(), 5 ); + QCOMPARE(dataSets.size(), 2); + QCOMPARE(dataSets[0]->size(), 5); + QCOMPARE(dataSets[1]->size(), 5); - QCOMPARE( dataSets[0]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->yDataRegion(), CellRegion( &m_source, "Table1.$A$1:$E$1" ) ); - QCOMPARE( dataSets[0]->customDataRegion(), CellRegion( &m_source, "Table1.$A$2:$E$2" ) ); - QCOMPARE( dataSets[0]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[0]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets[0]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->yDataRegion(), CellRegion(&m_source, "Table1.$A$1:$E$1")); + QCOMPARE(dataSets[0]->customDataRegion(), CellRegion(&m_source, "Table1.$A$2:$E$2")); + QCOMPARE(dataSets[0]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[0]->categoryDataRegion(), CellRegion()); - QCOMPARE( dataSets[1]->xDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->yDataRegion(), CellRegion( &m_source, "Table1.$A$3:$E$3" ) ); - QCOMPARE( dataSets[1]->customDataRegion(), CellRegion( &m_source, "Table1.$A$4:$E$4" ) ); - QCOMPARE( dataSets[1]->labelDataRegion(), CellRegion() ); - QCOMPARE( dataSets[1]->categoryDataRegion(), CellRegion() ); + QCOMPARE(dataSets[1]->xDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->yDataRegion(), CellRegion(&m_source, "Table1.$A$3:$E$3")); + QCOMPARE(dataSets[1]->customDataRegion(), CellRegion(&m_source, "Table1.$A$4:$E$4")); + QCOMPARE(dataSets[1]->labelDataRegion(), CellRegion()); + QCOMPARE(dataSets[1]->categoryDataRegion(), CellRegion()); } -QTEST_MAIN( TestProxyModel ) +QTEST_MAIN(TestProxyModel) diff -Nru calligra-2.4.0/plugins/chartshape/tests/TestTableSource.cpp calligra-2.4.3/plugins/chartshape/tests/TestTableSource.cpp --- calligra-2.4.0/plugins/chartshape/tests/TestTableSource.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/tests/TestTableSource.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -34,91 +34,91 @@ void TestTableSource::init() { m_source.clear(); - m_source.add( "Table1", &m_table1 ); - m_source.add( "Table2", &m_table2 ); + m_source.add("Table1", &m_table1); + m_source.add("Table2", &m_table2); QStandardItem *table3 = new QStandardItem; QStandardItem *table4 = new QStandardItem; - table3->setData( qVariantFromValue( QPointer( &m_table3 ) ), - Qt::DisplayRole ); - table4->setData( qVariantFromValue( QPointer( &m_table4 ) ), - Qt::DisplayRole ); + table3->setData(qVariantFromValue(QPointer(&m_table3)), + Qt::DisplayRole); + table4->setData(qVariantFromValue(QPointer(&m_table4)), + Qt::DisplayRole); - m_sheetAccessModel.setItem( 0, 0, table3 ); - m_sheetAccessModel.setHeaderData( 0, Qt::Horizontal, "Table3" ); + m_sheetAccessModel.setItem(0, 0, table3); + m_sheetAccessModel.setHeaderData(0, Qt::Horizontal, "Table3"); // Setting the sheetAccessModel now is done on purpose to test // if already existant data is automatically used by table source - m_source.setSheetAccessModel( &m_sheetAccessModel ); + m_source.setSheetAccessModel(&m_sheetAccessModel); - m_sheetAccessModel.setItem( 0, 1, table4 ); - m_sheetAccessModel.setHeaderData( 1, Qt::Horizontal, "Table4" ); + m_sheetAccessModel.setItem(0, 1, table4); + m_sheetAccessModel.setHeaderData(1, Qt::Horizontal, "Table4"); } void TestTableSource::testAdding() { - QVERIFY( m_source.get( "Table1" ) ); - QCOMPARE( m_source.get( "Table1" )->model(), &m_table1 ); - QVERIFY( m_source.get( "Table2" ) ); - QCOMPARE( m_source.get( "Table2" )->model(), &m_table2 ); + QVERIFY(m_source.get("Table1")); + QCOMPARE(m_source.get("Table1")->model(), &m_table1); + QVERIFY(m_source.get("Table2")); + QCOMPARE(m_source.get("Table2")->model(), &m_table2); } void TestTableSource::testRenaming() { - m_source.rename( "Table2", "BlueBerryCake" ); - QVERIFY( m_source.get( "Table1" ) ); - QCOMPARE( m_source.get( "Table1" )->model(), &m_table1 ); - QVERIFY( m_source.get( "BlueBerryCake" ) ); - QCOMPARE( m_source.get( "BlueBerryCake" )->model(), &m_table2 ); + m_source.rename("Table2", "BlueBerryCake"); + QVERIFY(m_source.get("Table1")); + QCOMPARE(m_source.get("Table1")->model(), &m_table1); + QVERIFY(m_source.get("BlueBerryCake")); + QCOMPARE(m_source.get("BlueBerryCake")->model(), &m_table2); } void TestTableSource::testRemoval() { - m_source.remove( "Table1" ); - QCOMPARE( m_source.get( "Table1" ), (Table*)0 ); - QVERIFY( m_source.get( "Table2" ) ); - QCOMPARE( m_source.get( "Table2" )->model(), &m_table2 ); - - m_source.remove( "Table2" ); - QCOMPARE( m_source.get( "Table1" ), (Table*)0 ); - QCOMPARE( m_source.get( "Table2" ), (Table*)0 ); + m_source.remove("Table1"); + QCOMPARE(m_source.get("Table1"), (Table*)0); + QVERIFY(m_source.get("Table2")); + QCOMPARE(m_source.get("Table2")->model(), &m_table2); + + m_source.remove("Table2"); + QCOMPARE(m_source.get("Table1"), (Table*)0); + QCOMPARE(m_source.get("Table2"), (Table*)0); } void TestTableSource::testAdding_SAM() { - QVERIFY( m_source.get( "Table3" ) ); - QCOMPARE( m_source.get( "Table3" )->model(), &m_table3 ); - QVERIFY( m_source.get( "Table4" ) ); - QCOMPARE( m_source.get( "Table4" )->model(), &m_table4 ); + QVERIFY(m_source.get("Table3")); + QCOMPARE(m_source.get("Table3")->model(), &m_table3); + QVERIFY(m_source.get("Table4")); + QCOMPARE(m_source.get("Table4")->model(), &m_table4); } void TestTableSource::testRenaming_SAM() { - m_sheetAccessModel.setHeaderData( 0, Qt::Horizontal, "RedCarpet" ); - QVERIFY( m_source.get( "RedCarpet" ) ); - QCOMPARE( m_source.get( "RedCarpet" )->model(), &m_table3 ); - QVERIFY( m_source.get( "Table4" ) ); - QCOMPARE( m_source.get( "Table4" )->model(), &m_table4 ); - - m_sheetAccessModel.setHeaderData( 1, Qt::Horizontal, "Bartholomew" ); - QVERIFY( m_source.get( "RedCarpet" ) ); - QCOMPARE( m_source.get( "RedCarpet" )->model(), &m_table3 ); - QVERIFY( m_source.get( "Bartholomew" ) ); - QCOMPARE( m_source.get( "Bartholomew" )->model(), &m_table4 ); + m_sheetAccessModel.setHeaderData(0, Qt::Horizontal, "RedCarpet"); + QVERIFY(m_source.get("RedCarpet")); + QCOMPARE(m_source.get("RedCarpet")->model(), &m_table3); + QVERIFY(m_source.get("Table4")); + QCOMPARE(m_source.get("Table4")->model(), &m_table4); + + m_sheetAccessModel.setHeaderData(1, Qt::Horizontal, "Bartholomew"); + QVERIFY(m_source.get("RedCarpet")); + QCOMPARE(m_source.get("RedCarpet")->model(), &m_table3); + QVERIFY(m_source.get("Bartholomew")); + QCOMPARE(m_source.get("Bartholomew")->model(), &m_table4); } void TestTableSource::testRemoval_SAM() { - m_sheetAccessModel.removeColumns( 0, 1 ); - QCOMPARE( m_source.get( "Table3" ), (Table*)0 ); - QVERIFY( m_source.get( "Table4" ) ); - QCOMPARE( m_source.get( "Table4" )->model(), &m_table4 ); + m_sheetAccessModel.removeColumns(0, 1); + QCOMPARE(m_source.get("Table3"), (Table*)0); + QVERIFY(m_source.get("Table4")); + QCOMPARE(m_source.get("Table4")->model(), &m_table4); - m_sheetAccessModel.removeColumns( 0, 1 ); - QCOMPARE( m_source.get( "Table3" ), (Table*)0 ); - QCOMPARE( m_source.get( "Table4" ), (Table*)0 ); + m_sheetAccessModel.removeColumns(0, 1); + QCOMPARE(m_source.get("Table3"), (Table*)0); + QCOMPARE(m_source.get("Table4"), (Table*)0); } -QTEST_MAIN( TestTableSource ) +QTEST_MAIN(TestTableSource) -Q_DECLARE_METATYPE( QPointer ) +Q_DECLARE_METATYPE(QPointer) diff -Nru calligra-2.4.0/plugins/chartshape/TextLabelDummy.cpp calligra-2.4.3/plugins/chartshape/TextLabelDummy.cpp --- calligra-2.4.0/plugins/chartshape/TextLabelDummy.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/TextLabelDummy.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -21,15 +21,15 @@ #include "TextLabelDummy.h" -void TextLabelDummy::paint( QPainter&, const KoViewConverter&, KoShapePaintingContext &) +void TextLabelDummy::paint(QPainter&, const KoViewConverter&, KoShapePaintingContext&) { } -bool TextLabelDummy::loadOdf( const KoXmlElement&, KoShapeLoadingContext& ) +bool TextLabelDummy::loadOdf(const KoXmlElement&, KoShapeLoadingContext&) { return false; } -void TextLabelDummy::saveOdf( KoShapeSavingContext& ) const +void TextLabelDummy::saveOdf(KoShapeSavingContext&) const { } diff -Nru calligra-2.4.0/plugins/chartshape/TextLabelDummy.h calligra-2.4.3/plugins/chartshape/TextLabelDummy.h --- calligra-2.4.0/plugins/chartshape/TextLabelDummy.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/TextLabelDummy.h 2012-06-26 04:18:01.000000000 +0000 @@ -29,9 +29,9 @@ class TextLabelDummy : public KoShape { public: - void paint( QPainter&, const KoViewConverter&, KoShapePaintingContext &paintcontext); - bool loadOdf( const KoXmlElement&, KoShapeLoadingContext& ); - void saveOdf( KoShapeSavingContext& ) const; + void paint(QPainter&, const KoViewConverter&, KoShapePaintingContext &paintcontext); + bool loadOdf(const KoXmlElement&, KoShapeLoadingContext&); + void saveOdf(KoShapeSavingContext&) const; }; #endif diff -Nru calligra-2.4.0/plugins/chartshape/ThreeDScene.cpp calligra-2.4.3/plugins/chartshape/ThreeDScene.cpp --- calligra-2.4.0/plugins/chartshape/ThreeDScene.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ThreeDScene.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* This file is part of the KDE project - - Copyright 2007 Johannes Simon - Copyright 2009 Inge Wallin - - 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; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - - -// Own -#include "ThreeDScene.h" - - -using namespace KChart; - -class ThreeDScene::Private -{ -public: - Private(); - ~Private(); - - int foo; -}; - -ThreeDScene::Private::Private() -{ -} - -ThreeDScene::Private::~Private() -{ -} - - -using namespace KChart; - -ThreeDScene::ThreeDScene() - : d( new Private ) -{ -} - -ThreeDScene::~ThreeDScene() -{ - delete d; -} - diff -Nru calligra-2.4.0/plugins/chartshape/ThreeDScene.h calligra-2.4.3/plugins/chartshape/ThreeDScene.h --- calligra-2.4.0/plugins/chartshape/ThreeDScene.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ThreeDScene.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -/* This file is part of the KDE project - - Copyright 2007 Johannes Simon - Copyright 2009 Inge Wallin - - 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; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - - -#ifndef KCHART_THREEDSCENE_H -#define KCHART_THREEDSCENE_H - - -namespace KChart { - -/** - * @brief The ThreeDScene class is used to store properties of a 3D scene. - * - * Currently this is only used for storage so that if we load a file - * with a real ODF 3D chart, we can save it back without losing - * data. More will be implemented once we have a real 3D charting - * backend. - */ - -class ThreeDScene -{ -public: - ThreeDScene(); - ~ThreeDScene(); - -private: - class Private; - Private *const d; -}; - -} // Namespace KChart - -#endif // KCHART_THREEDSCENE_H - diff -Nru calligra-2.4.0/plugins/chartshape/ThreeDTransformation.cpp calligra-2.4.3/plugins/chartshape/ThreeDTransformation.cpp --- calligra-2.4.0/plugins/chartshape/ThreeDTransformation.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ThreeDTransformation.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/* This file is part of the KDE project - - Copyright 2007 Johannes Simon - - 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; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - - -// Own -#include "ThreeDTransformation.h" - - -using namespace KChart; - -ThreeDTransformation::ThreeDTransformation() -{ -} - -ThreeDTransformation::~ThreeDTransformation() -{ -} diff -Nru calligra-2.4.0/plugins/chartshape/ThreeDTransformation.h calligra-2.4.3/plugins/chartshape/ThreeDTransformation.h --- calligra-2.4.0/plugins/chartshape/ThreeDTransformation.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/chartshape/ThreeDTransformation.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* This file is part of the KDE project - - Copyright 2007 Johannes Simon - - 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; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - - -#ifndef KCHART_THREEDTRANSFORMATION_H -#define KCHART_THREEDTRANSFORMATION_H - - -namespace KChart { - -class ThreeDTransformation -{ -public: - ThreeDTransformation(); - ~ThreeDTransformation(); -}; - -} // Namespace KChart - -#endif // KCHART_THREEDTRANSFORMATION_H - diff -Nru calligra-2.4.0/plugins/colorengines/lcms2/colorspaces/gray_u8/calligragrayaplugin.desktop calligra-2.4.3/plugins/colorengines/lcms2/colorspaces/gray_u8/calligragrayaplugin.desktop --- calligra-2.4.0/plugins/colorengines/lcms2/colorspaces/gray_u8/calligragrayaplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/colorengines/lcms2/colorspaces/gray_u8/calligragrayaplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Grayscale Color Model with Alpha Name[bg]=Цветови модел със степени на сивото и алфа-канал Name[ca]=Model de color d'escala de grisos amb alfa +Name[ca@valencia]=Model de color d'escala de grisos amb alfa Name[da]=Gråskala-farvemodel med alfa Name[de]=Graustufen-Farbmodell mit Alphakanal Name[el]=Χρωματικό μοντέλο διαβαθμίσεων του γκρι με άλφα @@ -26,7 +27,7 @@ Name[nl]=Grijswaarden kleurmodel met alphakanaal Name[pl]=Skala szarości z kanałem alfa Name[pt]=Modelo de Cor de Tons de Cinzento -Name[pt_BR]=Modelo de Cor de Tons de Cinza com Alfa +Name[pt_BR]=Modelo de cor de tons de cinza com Alfa Name[ru]=Цветовая модель «градации серого» с поддержкой прозрачности Name[sk]=Mode šedá škála s alfou Name[sl]=Sivinski barvni model z alfo @@ -40,6 +41,7 @@ Comment=Color model for 8-bit grayscale images Comment[bg]=Цветови модел за 8 битови сиви изображения Comment[ca]=Model de color d'escala de grisos de 8 bits +Comment[ca@valencia]=Model de color d'escala de grisos de 8 bits Comment[cs]=Model barev pro obrázky v odstínech šedi s 8 bity na kanál Comment[cy]=Model lliw ar gyfer delweddau graddlwyd 8-did Comment[da]=Farvemodel for 8-bit gråskala-billeder diff -Nru calligra-2.4.0/plugins/colorengines/lcms2/colorspaces/gray_u8/templates/.directory calligra-2.4.3/plugins/colorengines/lcms2/colorspaces/gray_u8/templates/.directory --- calligra-2.4.0/plugins/colorengines/lcms2/colorspaces/gray_u8/templates/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/colorengines/lcms2/colorspaces/gray_u8/templates/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Степени на сивото Name[br]=SkeulLouet Name[ca]=Escala de grisos +Name[ca@valencia]=Escala de grisos Name[cs]=Odstíny šedé Name[cy]=Graddlwyd Name[da]=Gråskala diff -Nru calligra-2.4.0/plugins/colorengines/lcms2/kolcmsengine.desktop calligra-2.4.3/plugins/colorengines/lcms2/kolcmsengine.desktop --- calligra-2.4.0/plugins/colorengines/lcms2/kolcmsengine.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/colorengines/lcms2/kolcmsengine.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=LCMS Color Management Engine for Pigment Name[ca]=Motor de gestió de color LCMS per al Pigment +Name[ca@valencia]=Motor de gestió de color LCMS per al Pigment Name[da]=LCMS farvehåndteringsmotor til Pigment Name[de]=LCMS-Farbverwaltung für Pigment Name[el]=LCMS μηχανή διαχείρισης χρωμάτων για βαφή @@ -16,7 +17,7 @@ Name[nl]=LCMS Kleurbeheer-engine voor Pigment Name[pl]=Silnik zarządzania kolorami LCMS dla Pigment Name[pt]=Motor de Gestão de Cores do LCMS para o Pigment -Name[pt_BR]=Motor de Gerenciamento de Cores do LCMS para o Pigment +Name[pt_BR]=Motor de gerenciamento de cores do LCMS para o Pigment Name[ru]=Управление цветами LCMS для пигмента Name[sk]=Nástroj LCMS správy farieb pre Pigment Name[sv]=LCMS-färghanteringsverktyg för pigment diff -Nru calligra-2.4.0/plugins/commentshape/commentshape.desktop calligra-2.4.3/plugins/commentshape/commentshape.desktop --- calligra-2.4.0/plugins/commentshape/commentshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/commentshape/commentshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Comment Shape Name[bg]=Форма за коментар Name[ca]=Forma de comentaris +Name[ca@valencia]=Forma de comentaris Name[cs]=Tvar komentáře Name[da]=Kommentar-form Name[de]=Kommentar-Objekt @@ -20,7 +21,7 @@ Name[nl]=Vorm voor commentaar Name[pl]=Kształt komentarza Name[pt]=Forma de Comentário -Name[pt_BR]=Forma de Comentário +Name[pt_BR]=Forma de comentário Name[ru]=Комментарий Name[sk]=Tvar komentára Name[sv]=Kommentarform diff -Nru calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeMoveStrategy.cpp calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeMoveStrategy.cpp --- calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeMoveStrategy.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeMoveStrategy.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -124,6 +124,12 @@ return new KoShapeMoveCommand(m_selectedShapes, m_previousPositions, m_newPositions); } +void ShapeMoveStrategy::finishInteraction(Qt::KeyboardModifiers modifiers) +{ + Q_UNUSED(modifiers); + tool()->canvas()->updateCanvas(tool()->canvas()->snapGuide()->boundingRect()); +} + void ShapeMoveStrategy::paint( QPainter &painter, const KoViewConverter &converter) { SelectionDecorator decorator (KoFlake::NoHandle, false, false); diff -Nru calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeMoveStrategy.h calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeMoveStrategy.h --- calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeMoveStrategy.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeMoveStrategy.h 2012-06-26 04:18:01.000000000 +0000 @@ -48,7 +48,7 @@ void handleMouseMove(const QPointF &mouseLocation, Qt::KeyboardModifiers modifiers); KUndo2Command* createCommand(); - void finishInteraction( Qt::KeyboardModifiers modifiers ) { Q_UNUSED( modifiers ); } + void finishInteraction(Qt::KeyboardModifiers modifiers); virtual void paint( QPainter &painter, const KoViewConverter &converter); virtual void handleCustomEvent( KoPointerEvent * event ); private: diff -Nru calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeResizeStrategy.cpp calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeResizeStrategy.cpp --- calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeResizeStrategy.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeResizeStrategy.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -97,7 +97,9 @@ void ShapeResizeStrategy::handleMouseMove(const QPointF &point, Qt::KeyboardModifiers modifiers) { + tool()->canvas()->updateCanvas(tool()->canvas()->snapGuide()->boundingRect()); QPointF newPos = tool()->canvas()->snapGuide()->snap( point, modifiers ); + tool()->canvas()->updateCanvas(tool()->canvas()->snapGuide()->boundingRect()); bool keepAspect = modifiers & Qt::ShiftModifier; foreach(KoShape *shape, m_selectedShapes) @@ -236,6 +238,7 @@ KUndo2Command* ShapeResizeStrategy::createCommand() { + tool()->canvas()->snapGuide()->reset(); QList newSizes; QList transformations; const int shapeCount = m_selectedShapes.count(); @@ -250,6 +253,12 @@ return cmd; } +void ShapeResizeStrategy::finishInteraction(Qt::KeyboardModifiers modifiers) +{ + Q_UNUSED(modifiers); + tool()->canvas()->updateCanvas(tool()->canvas()->snapGuide()->boundingRect()); +} + void ShapeResizeStrategy::paint( QPainter &painter, const KoViewConverter &converter) { SelectionDecorator decorator (KoFlake::NoHandle, false, false); diff -Nru calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeResizeStrategy.h calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeResizeStrategy.h --- calligra-2.4.0/plugins/defaultTools/defaulttool/ShapeResizeStrategy.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/defaultTools/defaulttool/ShapeResizeStrategy.h 2012-06-26 04:18:01.000000000 +0000 @@ -46,7 +46,7 @@ void handleMouseMove(const QPointF &mouseLocation, Qt::KeyboardModifiers modifiers); KUndo2Command* createCommand(); - void finishInteraction( Qt::KeyboardModifiers modifiers ) { Q_UNUSED(modifiers); } + void finishInteraction(Qt::KeyboardModifiers modifiers); virtual void paint( QPainter &painter, const KoViewConverter &converter); virtual void handleCustomEvent( KoPointerEvent * event ); private: diff -Nru calligra-2.4.0/plugins/defaultTools/defaulttools.desktop calligra-2.4.3/plugins/defaultTools/defaulttools.desktop --- calligra-2.4.0/plugins/defaultTools/defaulttools.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/defaultTools/defaulttools.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Default Flake Tools Name[ca]=Eines de floc per defecte +Name[ca@valencia]=Eines de floc per defecte Name[da]=Standard Flake-værktøjer Name[de]=Flake-Standardwerkzeuge Name[el]=Προκαθορισμένα εργαλεία Flake @@ -24,7 +25,7 @@ Name[nl]=Standaard Flake-gereedschappen Name[pl]=Domyślne narzędzia płatków Name[pt]=Ferramentas Predefinidas do Flake -Name[pt_BR]=Ferramentas Padrão do Flake +Name[pt_BR]=Ferramentas padrão do Flake Name[ru]=Стандартный инструментарий Flake Name[sk]=Štandardné vločkové nástroje Name[sv]=Flake standardverktyg diff -Nru calligra-2.4.0/plugins/dockers/calligradockers.desktop calligra-2.4.3/plugins/dockers/calligradockers.desktop --- calligra-2.4.0/plugins/dockers/calligradockers.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/dockers/calligradockers.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Calligra Dockers plugin Name[ca]=Connector de Dockers del Calligra +Name[ca@valencia]=Connector de Dockers del Calligra Name[cs]=Modul doků Calligra Name[da]=Dokker-plugin til Calligra Name[de]=Calligra Docker-Modul @@ -9,7 +10,9 @@ Name[et]=Calligra dokkide plugin Name[fi]=Calligra-telakointiliitännäinen Name[fr]=Module externe de panneaux pour Calligra +Name[gl]=Engadido Calligra Dockers Name[it]=Estensione per i ganci di Calligra +Name[ja]=Calligra ドッキングパネル・プラグイン Name[kk]=Calligra-ның докерлер плагині Name[nb]=Dockers programtillegg for Calligra Name[nds]=Andockmoduul för Calligra @@ -18,6 +21,7 @@ Name[pt]='Plugin' de Áreas Acopláveis do Calligra Name[pt_BR]=Plugin de módulos acopláveis do Calligra Name[ru]=Модуль панелей Calligra +Name[sk]=Plugin dockerov Calligra Name[sv]=Calligra-dockningsinsticksprogram Name[uk]=Додаток панелей для Calligra Name[x-test]=xxCalligra Dockers pluginxx diff -Nru calligra-2.4.0/plugins/formulashape/formulashape.desktop calligra-2.4.3/plugins/formulashape/formulashape.desktop --- calligra-2.4.0/plugins/formulashape/formulashape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/formulashape/formulashape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Formula Shape Name[ca]=Forma de la fórmula +Name[ca@valencia]=Forma de la fórmula Name[cs]=Tvar vzorce Name[da]=Formel-form Name[de]=Formel-Objekt @@ -25,7 +26,7 @@ Name[nl]=Formula-vorm Name[pl]=Kształt formuły Name[pt]=Forma de Fórmula -Name[pt_BR]=Forma de Fórmula +Name[pt_BR]=Forma de fórmula Name[ru]=Формула Name[sk]=Tvar vzorca Name[sv]=Formelform diff -Nru calligra-2.4.0/plugins/formulashape/kformulapart.desktop calligra-2.4.3/plugins/formulashape/kformulapart.desktop --- calligra-2.4.0/plugins/formulashape/kformulapart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/formulashape/kformulapart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Calligra Formula Component Name[ca]=Component de fórmules del Calligra +Name[ca@valencia]=Component de fórmules del Calligra Name[cs]=Komponenta Calligra pro vzorce Name[da]=Calligra-komponent til formler Name[de]=Calligra-Formel-Komponente @@ -9,8 +10,10 @@ Name[et]=Calligra valemikomponent Name[fi]=Calligra Formula -osa Name[fr]=Composant gestion de formulaires pour Calligra +Name[gl]=Compoñente de xestión de proxectos de Calligra Name[hu]=Calligra Formula komponens Name[it]=Componente di Calligra Formula +Name[ja]=Calligra 数式コンポーネント Name[kk]=Calligra-ның формула жазу бағдарламасы Name[nb]=Calligra formel-komponent Name[nl]=Formulecomponent van Calligra @@ -18,6 +21,7 @@ Name[pt]=Componente de Fórmulas do Calligra Name[pt_BR]=Componente de fórmula do Calligra Name[ru]=Компонент формул Calligra +Name[sk]=Komponent vzorca Calligra Name[sv]=Calligra Formula-komponent Name[uk]=Компонент формул Calligra Name[x-test]=xxCalligra Formula Componentxx @@ -35,6 +39,7 @@ GenericName[bg]=Редактор на формули GenericName[br]=Un aozer formulennoù GenericName[ca]=Editor de fórmules +GenericName[ca@valencia]=Editor de fórmules GenericName[cs]=Editor vzorců GenericName[cy]=Golygydd Fformiwla GenericName[da]=Formeleditor @@ -69,7 +74,7 @@ GenericName[nl]=Formulebewerker GenericName[pl]=Edytor wyrażeń matematycznych GenericName[pt]=Editor de Fórmulas -GenericName[pt_BR]=Editor de Fórmulas +GenericName[pt_BR]=Editor de fórmulas GenericName[ro]=Redactor de formule GenericName[ru]=Формулы GenericName[se]=Hápmodoaimmaheaddji diff -Nru calligra-2.4.0/plugins/kexi/spreadsheet/keximigrate_spreadsheet.desktop calligra-2.4.3/plugins/kexi/spreadsheet/keximigrate_spreadsheet.desktop --- calligra-2.4.0/plugins/kexi/spreadsheet/keximigrate_spreadsheet.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/kexi/spreadsheet/keximigrate_spreadsheet.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Spreadsheet Name[ca]=Full de càlcul +Name[ca@valencia]=Full de càlcul Name[cs]=Sešit Name[da]=Regneark Name[de]=Tabellenkalkulation @@ -11,6 +12,7 @@ Name[fr]=Tableur Name[hu]=Munkalap Name[it]=Foglio di calcolo +Name[ja]=表計算 Name[kk]=Электрондық кесте Name[nb]=Regneark Name[nl]=Rekenblad @@ -18,6 +20,7 @@ Name[pt]=Folha de cálculo Name[pt_BR]=Planilha Name[ru]=Таблица +Name[sk]=Tabuľkový procesor Name[sv]=Kalkylark Name[ug]=ئېلېكترونلۇق جەدۋەل Name[uk]=Електронні таблиці @@ -26,6 +29,7 @@ Name[zh_TW]=試算表 Comment=Spreadsheet Import Plugin for Kexi Comment[ca]=Connector d'importació de fulls de dades per al Kexi +Comment[ca@valencia]=Connector d'importació de fulls de dades per al Kexi Comment[da]=Importplugin til regneark til Kexi Comment[de]=Tabellenkalkulations-Importmodul für Kexi Comment[el]=Πρόσθετο εισαγωγής Spreadsheet για το Kexi @@ -33,14 +37,18 @@ Comment[et]=Kexi arvutustabeli impordiplugin Comment[fi]=Laskentataulukon tuontiliitännäinen Kexiin Comment[fr]=Module d'importation de Tables pour Kexi +Comment[gl]=Engadido de importación de follas de cálculo para Kexi +Comment[hu]=Munkafüzet importbővítmény a Kritához Comment[it]=Estensione di importazione foglio elettronico di Kexi +Comment[ja]=Kexi のためのスプレッドシートインポートプラグイン Comment[kk]=Эл.кестеден Kexi-ге импорттау плагині Comment[nb]=Regneark import-programtillegg for Kexi Comment[nl]=Import-plug-in van rekenblad voor Kexi Comment[pl]=Wtyczka importu arkusza kalkulacyjnego dla Kexi Comment[pt]='Plugin' de Importação de Folhas de Cálculo para o Kexi -Comment[pt_BR]=Plugin de Importação de Planilha para o Kexi +Comment[pt_BR]=Plugin de importação de planilha para o Kexi Comment[ru]=Модуль импорта таблиц для Kexi +Comment[sk]=Importný plugin zošita pre Kexi Comment[sv]=Importinsticksprogram av kalkylark för Kexi Comment[uk]=Додаток імпортування даних з електронної таблиці для Kexi Comment[x-test]=xxSpreadsheet Import Plugin for Kexixx diff -Nru calligra-2.4.0/plugins/mapshape/mapshape.desktop calligra-2.4.3/plugins/mapshape/mapshape.desktop --- calligra-2.4.0/plugins/mapshape/mapshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/mapshape/mapshape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Map Shape Name[ca]=Forma de mapes +Name[ca@valencia]=Forma de mapes Name[cs]=Tvar mapy Name[da]=Kort-form Name[de]=Karten-Objekt @@ -16,6 +17,7 @@ Name[pt]=Forma de Mapa Name[pt_BR]=Forma de mapa Name[ru]=Фигура карты +Name[sk]=Tvar mapy Name[sv]=Kartform Name[ug]=خەرىتە شەكلى Name[uk]=Форма карти diff -Nru calligra-2.4.0/plugins/musicshape/musicshape.desktop calligra-2.4.3/plugins/musicshape/musicshape.desktop --- calligra-2.4.0/plugins/musicshape/musicshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/musicshape/musicshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Music Shape Name[ca]=Forma de música +Name[ca@valencia]=Forma de música Name[cs]=Music Shape Name[da]=Musik-form Name[de]=Musik-Objekt @@ -25,7 +26,7 @@ Name[nl]=Muziekvorm Name[pl]=Kształt muzyki Name[pt]=Forma Musical -Name[pt_BR]=Forma Musical +Name[pt_BR]=Forma musical Name[ru]=Партитура Name[sk]=Tvar hudba Name[sv]=Musikform diff -Nru calligra-2.4.0/plugins/paragraphtool/paragraphtool.desktop calligra-2.4.3/plugins/paragraphtool/paragraphtool.desktop --- calligra-2.4.0/plugins/paragraphtool/paragraphtool.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/paragraphtool/paragraphtool.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Paragraph Tool Name[bg]=Инструмент за абзаци Name[ca]=Eina de paràgraf +Name[ca@valencia]=Eina de paràgraf Name[cs]=Nástroj na odstavce Name[da]=Afsnitsværktøj Name[de]=Absatzwerkzeug @@ -23,7 +24,7 @@ Name[nl]=Hulpmiddel voor alinea's Name[pl]=Narzędzie akapitu Name[pt]=Ferramenta de Parágrafos -Name[pt_BR]=Ferramenta de Parágrafos +Name[pt_BR]=Ferramenta de parágrafos Name[ru]=Инструмент для абзацев Name[sk]=Nástroj odstavec Name[sl]=Orodje za odstavke diff -Nru calligra-2.4.0/plugins/pathshapes/pathshapes.desktop calligra-2.4.3/plugins/pathshapes/pathshapes.desktop --- calligra-2.4.0/plugins/pathshapes/pathshapes.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/pathshapes/pathshapes.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Icon= Name=Path Shapes Name[ca]=Formes de camí +Name[ca@valencia]=Formes de camí Name[da]=Sti-former Name[de]=Pfad-Objekte Name[el]=Σχήματα διαδρομής @@ -24,7 +25,7 @@ Name[nl]=Padvormen Name[pl]=Kształty ścieżek Name[pt]=Formas de Caminhos -Name[pt_BR]=Formas de Caminhos +Name[pt_BR]=Formas de caminhos Name[ru]=Путь фигур Name[sk]=Tvary cesty Name[sv]=Konturformer diff -Nru calligra-2.4.0/plugins/pathshapes/rectangle/RectangleShape.cpp calligra-2.4.3/plugins/pathshapes/rectangle/RectangleShape.cpp --- calligra-2.4.0/plugins/pathshapes/rectangle/RectangleShape.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/pathshapes/rectangle/RectangleShape.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -60,9 +60,9 @@ } else { QString cornerRadius = element.attributeNS(KoXmlNS::draw, "corner-radius", ""); if (! cornerRadius.isEmpty()) { - float radius = KoUnit::parseValue(cornerRadius); - m_cornerRadiusX = radius / (0.5 * size().width()) * 100; - m_cornerRadiusY = radius / (0.5 * size().height()) * 100; + qreal radius = KoUnit::parseValue(cornerRadius); + m_cornerRadiusX = qMin(radius / (0.5 * size().width()) * 100, qreal(100)); + m_cornerRadiusY = qMin(radius / (0.5 * size().height()) * 100, qreal(100)); } } diff -Nru calligra-2.4.0/plugins/pictureshape/GreyscaleFilterEffect.cpp calligra-2.4.3/plugins/pictureshape/GreyscaleFilterEffect.cpp --- calligra-2.4.0/plugins/pictureshape/GreyscaleFilterEffect.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/pictureshape/GreyscaleFilterEffect.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -1,5 +1,6 @@ /* This file is part of the KDE project * Copyright (C) 2010 Carlos Licea + * Copyright (C) 2012 Inge Wallin * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,9 +18,11 @@ * Boston, MA 02110-1301, USA. */ + #include "GreyscaleFilterEffect.h" #include + GreyscaleFilterEffect::GreyscaleFilterEffect() : KoFilterEffect(GreyscaleFilterEffectId, "Grayscale effect") { @@ -40,19 +43,26 @@ QImage GreyscaleFilterEffect::processImage(const QImage& image, const KoFilterEffectRenderContext& context) const { - QImage result = image; - QRgb* pixel = reinterpret_cast( result.bits() ); - const int right = context.filterRegion().right(); + QImage result = image.convertToFormat(QImage::Format_ARGB32); + const int bottom = context.filterRegion().bottom(); + const int left = context.filterRegion().left(); + const int right = context.filterRegion().right(); const int width = result.width(); - for( int row = context.filterRegion().top(); row < bottom; ++row ) { - for( int col = context.filterRegion().left(); col < right; ++col ){ - const QRgb currentPixel = pixel[row * width + col]; - const int red = qRed(currentPixel); - const int green = qGreen(currentPixel); - const int blue = qBlue(currentPixel); + + const QRgb *src = (const QRgb*)image.bits(); + QRgb *dst = (QRgb*)result.bits(); + + for (int row = context.filterRegion().top(); row < bottom; ++row) { + for (int col = left; col < right; ++col) { + int index = row * width + col; + const QRgb &s = src[index]; + const int red = qRed(s); + const int green = qGreen(s); + const int blue = qBlue(s); + const int alpha = qAlpha(s); const int grayValue = (red * 11 + green * 16 + blue * 5) / 32; - pixel[row * width + col] = qRgb(grayValue, grayValue, grayValue); + dst[index] = qRgba(grayValue, grayValue, grayValue, alpha); } } return result; diff -Nru calligra-2.4.0/plugins/pictureshape/MonoFilterEffect.cpp calligra-2.4.3/plugins/pictureshape/MonoFilterEffect.cpp --- calligra-2.4.0/plugins/pictureshape/MonoFilterEffect.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/pictureshape/MonoFilterEffect.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -40,7 +40,7 @@ QImage MonoFilterEffect::processImage(const QImage& image, const KoFilterEffectRenderContext& context) const { - QImage result = image; + QImage result = image.convertToFormat(QImage::Format_ARGB32); QRgb* pixel = reinterpret_cast( result.bits() ); const int right = context.filterRegion().right(); const int bottom = context.filterRegion().bottom(); @@ -51,8 +51,9 @@ const int red = qRed(currentPixel); const int green = qGreen(currentPixel); const int blue = qBlue(currentPixel); + const int alpha = qAlpha(currentPixel); const int monoValue = ( (red * 11 + green * 16 + blue * 5) / 32 ) / 127 * 255; - pixel[row * width + col] = qRgb(monoValue, monoValue, monoValue); + pixel[row * width + col] = qRgba(monoValue, monoValue, monoValue, alpha); } } return result; diff -Nru calligra-2.4.0/plugins/pictureshape/pictureshape.desktop calligra-2.4.3/plugins/pictureshape/pictureshape.desktop --- calligra-2.4.0/plugins/pictureshape/pictureshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/pictureshape/pictureshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Picture Shape Name[ca]=Forma d'imatge +Name[ca@valencia]=Forma d'imatge Name[da]=Billede-form Name[de]=Bild-Objekt Name[el]=Σχήμα εικόνας @@ -24,7 +25,7 @@ Name[nl]=Afbeeldingvorm Name[pl]=Kształt obrazu Name[pt]=Forma de Imagem -Name[pt_BR]=Forma de Imagem +Name[pt_BR]=Forma de imagem Name[ru]=Форма изображения Name[sk]=Tvar obrázku Name[sv]=Bildform diff -Nru calligra-2.4.0/plugins/pluginshape/pluginshape.desktop calligra-2.4.3/plugins/pluginshape/pluginshape.desktop --- calligra-2.4.0/plugins/pluginshape/pluginshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/pluginshape/pluginshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Plugin Shape Name[ca]=Forma de connector +Name[ca@valencia]=Forma de connector Name[cs]=Tvar modulu Name[da]=Plugin-form Name[de]=Modul-Objekt @@ -19,7 +20,7 @@ Name[nl]=Plug-in voor vorm Name[pl]=Kształt wtyczki Name[pt]=Forma de 'Plugin' -Name[pt_BR]=Forma do Plugin +Name[pt_BR]=Forma do plugin Name[ru]=Модуль фигуры Name[sk]=Tvar pluginu Name[sv]=Insticksform diff -Nru calligra-2.4.0/plugins/reporting/barcode/koreport_barcodeplugin.desktop calligra-2.4.3/plugins/reporting/barcode/koreport_barcodeplugin.desktop --- calligra-2.4.0/plugins/reporting/barcode/koreport_barcodeplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/reporting/barcode/koreport_barcodeplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Barcode Report Plugin Name[ca]=Connector d'informes de codi de barres +Name[ca@valencia]=Connector d'informes de codi de barres Name[da]=Plugin til stregkoderapport Name[el]=Πρόσθετο αναφοράς γραμμωτού κώδικα Name[es]=Complemento de informe de código de barras @@ -13,12 +14,14 @@ Name[pt]='Plugin' de Relatório de Códigos de Barras Name[pt_BR]=Plugin de código de barras para relatório Name[ru]=Модуль считывания штрих-кодов +Name[sk]=Plugin správy čiarového kódu Name[sv]=Insticksprogram för streckkodsrapport Name[uk]=Додаток штрихкодів звіту Name[x-test]=xxBarcode Report Pluginxx Name[zh_TW]=條碼報告外掛程式 Comment=KoReport Barcode Plugin Comment[ca]=Connector de codi de barres KoReport +Comment[ca@valencia]=Connector de codi de barres KoReport Comment[da]=Stregkode-plugin til KoReport Comment[de]=KoReport-Strichcodemodul Comment[el]=Πρόσθετο KoReport Barcode @@ -32,6 +35,7 @@ Comment[pt]='Plugin' de Códigos de Barras do KoReport Comment[pt_BR]=Plugin de códigos de barra do KoReport Comment[ru]=Модуль считывания штрих-кодов KoReport +Comment[sk]=Plugin čiarového kódu KoReport Comment[sv]=Insticksprogram för Koffice streckkodsrapport Comment[uk]=Додаток штрихкодів KoReport Comment[x-test]=xxKoReport Barcode Pluginxx diff -Nru calligra-2.4.0/plugins/reporting/chart/koreport_chartplugin.desktop calligra-2.4.3/plugins/reporting/chart/koreport_chartplugin.desktop --- calligra-2.4.0/plugins/reporting/chart/koreport_chartplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/reporting/chart/koreport_chartplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,10 +1,12 @@ [Desktop Entry] Name=Chart Report Plugin Name[ca]=Connector d'informes de diagrames +Name[ca@valencia]=Connector d'informes de diagrames Name[el]=Πρόσθετο αναφοράς Chart Name[es]=Complemento de informe de gráficos Name[et]=Aruande diagrammiplugin Name[fr]=Module externe de panneaux pour Chart +Name[gl]=Engadido Chart Report Name[it]=Estensione rapporti grafici Name[kk]=Диаграмманы баяндау плагині Name[nb]=Programtillegg for diagramrapport @@ -13,12 +15,14 @@ Name[pt]='Plugin' Web de Relatórios de Gráficos Name[pt_BR]=Plugin de mapas para relatório Name[ru]=Модуль диаграмм для отчётов +Name[sk]=Plugin správy Chart Name[sv]=Insticksprogram för diagramrapport Name[uk]=Додаток діаграм звіту Name[x-test]=xxChart Report Pluginxx Name[zh_TW]=圖表報告外掛程式 Comment=KoReport Chart Plugin Comment[ca]=Connector de diagrames KoReport +Comment[ca@valencia]=Connector de diagrames KoReport Comment[da]=Diagram-plugin til KoReport Comment[de]=KoReport-Diagrammmodul Comment[el]=Πρόσθετο KoReport Chart @@ -32,6 +36,7 @@ Comment[pt]='Plugin' de Gráficos do KoReport Comment[pt_BR]=Plugin de gráficos do KoReport Comment[ru]=Модуль диаграмм для отчётов KoReport +Comment[sk]=Plugin grafu KoReport Comment[sv]=Insticksprogram för Koffice diagramrapport Comment[uk]=Додаток діаграм KoReport Comment[x-test]=xxKoReport Chart Pluginxx diff -Nru calligra-2.4.0/plugins/reporting/maps/koreport_mapsplugin.desktop calligra-2.4.3/plugins/reporting/maps/koreport_mapsplugin.desktop --- calligra-2.4.0/plugins/reporting/maps/koreport_mapsplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/reporting/maps/koreport_mapsplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Maps Report Plugin Name[ca]=Connector d'informes de mapes +Name[ca@valencia]=Connector d'informes de mapes Name[de]=Kartenberichtmodul Name[el]=Πρόσθετο Maps Report Name[es]=Complemento de informe de mapas @@ -14,17 +15,20 @@ Name[pt]='Plugin' de Relatório de Mapas Name[pt_BR]=Plugin de mapas para relatório Name[ru]=Модуль карт для отчётов +Name[sk]=Plugin správy Maps Name[sv]=Insticksprogram för kartrapport Name[uk]=Додаток карт звіту Name[x-test]=xxMaps Report Pluginxx Name[zh_TW]=地圖報告外掛程式 Comment=Calligra Reports Maps Plugin Comment[ca]=Connector d'informes de mapes del Calligra +Comment[ca@valencia]=Connector d'informes de maps del Calligra Comment[da]=Kort-plugin til Calligra Reports Comment[el]=Πρόσθετο για Reports Maps του Calligra Comment[es]=Complemento de mapas de informes de Calligra Comment[et]=Calligra aruannete kaardiplugin Comment[fr]=Module externe de panneaux pour Calligra +Comment[gl]=Engadido Calligra Reports Maps Comment[it]=Estensione rapporti mappe di Calligra Comment[kk]=Calligra-ның картаны баяндау плагині Comment[nb]=Kart-programtillegg for Calligra-rapporter @@ -33,6 +37,7 @@ Comment[pt]='Plugin' de Mapas dos Relatórios do Calligra Comment[pt_BR]=Plugin de mapas dos relatórios do Calligra Comment[ru]=Модуль карт Calligra для отчётов +Comment[sk]=Mapový plugin Calligra Reports Comment[sv]=Calligra-insticksprogram för kartrapport Comment[uk]=Додаток карт у звітах Calligra Comment[x-test]=xxCalligra Reports Maps Pluginxx diff -Nru calligra-2.4.0/plugins/reporting/shape/koreport_shapeplugin.desktop calligra-2.4.3/plugins/reporting/shape/koreport_shapeplugin.desktop --- calligra-2.4.0/plugins/reporting/shape/koreport_shapeplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/reporting/shape/koreport_shapeplugin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Shape Report Plugin Name[ca]=Connector d'informes de forma +Name[ca@valencia]=Connector d'informes de forma Name[de]=Objektberichtmodul Name[el]=Πρόσθετο Shape Report Name[es]=Complemento de informe de formas @@ -13,12 +14,14 @@ Name[pt]='Plugin' de Relatório de Formas Name[pt_BR]=Plugin de forma para relatório Name[ru]=Модуль фигур для отчётов +Name[sk]=Plugin správy Tvar Name[sv]=Insticksprogram för formrapport Name[uk]=Додаток форм звіту Name[x-test]=xxShape Report Pluginxx Name[zh_TW]=元件報告外掛程式 Comment=KoReport Shape Plugin Comment[ca]=Connector de forma KoReport +Comment[ca@valencia]=Connector de forma KoReport Comment[da]=Form-plugin til KoReport Comment[de]=KoReport-Objektmodul Comment[el]=Πρόσθετο KoReport Shape @@ -34,6 +37,7 @@ Comment[pt]='Plugin' de Formas Gráficas do KoReport Comment[pt_BR]=Plugin de formas do KoReport Comment[ru]=Модуль фигур для отчётов KoReport +Comment[sk]=Plugin tvaru KoReport Comment[sv]=Insticksprogram för Koffice formrapport Comment[uk]=Додаток форм KoReport Comment[x-test]=xxKoReport Shape Pluginxx diff -Nru calligra-2.4.0/plugins/reporting/web/koreport_webplugin.desktop calligra-2.4.3/plugins/reporting/web/koreport_webplugin.desktop --- calligra-2.4.0/plugins/reporting/web/koreport_webplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/reporting/web/koreport_webplugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Web Report Plugin Name[ca]=Connector d'informes web +Name[ca@valencia]=Connector d'informes web Name[de]=Webbericht-Modul Name[el]=Πρόσθετο αναφοράς ιστού Name[es]=Complemento de informe web @@ -15,17 +16,20 @@ Name[pt]='Plugin' de Relatório Web Name[pt_BR]=Plugin de Web para relatório Name[ru]=Модуль веб-отчётов +Name[sk]=Plugin správy Web Name[sv]=Insticksprogram för webbrapport Name[uk]=Додаток перегляду інтернету у звіті Name[x-test]=xxWeb Report Pluginxx Name[zh_TW]=網頁報告外掛程式 Comment=Calligra Reports web Plugin Comment[ca]=Connector d'informes web del Calligra +Comment[ca@valencia]=Connector d'informes web del Calligra Comment[el]=Πρόσθετο ιστού του Calligra Reports Comment[es]=Complemento de informes web Calligra Comment[et]=Calligra aruannete veebiplugin Comment[fi]=Calligra Reports -WWW-liitännäinen Comment[fr]=Module de rapports Calligra pour le web +Comment[gl]=Engadido web para Calligra Reports Comment[it]=Estensione rapporti web di Calligra Comment[kk]=Calligra-ның веб баяндау плагині Comment[nb]=Vev-programtillegg for Calligra-rapporter @@ -34,6 +38,7 @@ Comment[pt]='Plugin' Web de Relatórios do Calligra Comment[pt_BR]=Plugin da Web para relatórios do Calligra Comment[ru]=Модуль веб-отчётов Calligra +Comment[sk]=Webový plugin Calligra Reports Comment[sv]=Calligra-insticksprogram för webbrapport Comment[uk]=Інтернет-додаток звітів Calligra Comment[x-test]=xxCalligra Reports web Pluginxx diff -Nru calligra-2.4.0/plugins/spacenavigator/spacenavigator.desktop calligra-2.4.3/plugins/spacenavigator/spacenavigator.desktop --- calligra-2.4.0/plugins/spacenavigator/spacenavigator.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/spacenavigator/spacenavigator.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Spacenavigator Device Name[ca]=Aparell NavegadorEspacial +Name[ca@valencia]=Aparell NavegadorEspacial Name[da]=Enhed til rumnavigering Name[de]=Spacenavigator-Gerät Name[el]=Συσκευή Spacenavigator diff -Nru calligra-2.4.0/plugins/textediting/autocorrection/autocorrect.desktop calligra-2.4.3/plugins/textediting/autocorrection/autocorrect.desktop --- calligra-2.4.0/plugins/textediting/autocorrection/autocorrect.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/autocorrection/autocorrect.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Autocorrection plugin Name[bg]=Приставка за автокорекция Name[ca]=Connector d'autocorrecció +Name[ca@valencia]=Connector d'autocorrecció Name[cs]=Modul pro automatické opravy Name[da]=Plugin til autokorrektur Name[de]=Autokorrektur-Modul diff -Nru calligra-2.4.0/plugins/textediting/changecase/changecase.desktop calligra-2.4.3/plugins/textediting/changecase/changecase.desktop --- calligra-2.4.0/plugins/textediting/changecase/changecase.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/changecase/changecase.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Change case plugin Name[bg]=Приставка за смяна на регистъра Name[ca]=Connector de canvi de caixa +Name[ca@valencia]=Connector de canvi de caixa Name[cs]=Modul pro změnu velikosti písmen Name[da]=Plugin til at skifte mellem store/små bogstaver Name[de]=„Groß-/Kleinschreibung ändern“-Modul @@ -12,7 +13,7 @@ Name[fa]=تغییر وصله حالت Name[fi]=Merkkikoon muutosliitännäinen Name[fr]=Module externe de changement de taille -Name[gl]=Extensión para o cambio a maiúsculas +Name[gl]=Engado para o cambio de maiúsculas Name[hi]=अंग्रेज़ी अक्षरों के केस बदलने का प्लगइन Name[hne]=अंगरेजी अक्छर के केस बदले के प्लगइन Name[it]=Estensione di modifica delle maiuscole diff -Nru calligra-2.4.0/plugins/textediting/spellcheck/BgSpellCheck.cpp calligra-2.4.3/plugins/textediting/spellcheck/BgSpellCheck.cpp --- calligra-2.4.0/plugins/textediting/spellcheck/BgSpellCheck.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/spellcheck/BgSpellCheck.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -64,7 +64,11 @@ if (m_currentLanguage != m_defaultLanguage || m_currentCountry != m_defaultCountry) { m_currentCountry = m_defaultCountry; m_currentLanguage = m_defaultLanguage; - changeLanguage(m_currentLanguage+'_'+m_currentCountry); + if (m_currentCountry.isEmpty()) { + changeLanguage(m_currentLanguage); + } else { + changeLanguage(m_currentLanguage+'_'+m_currentCountry); + } } if (m_currentPosition < m_endPosition) { kDebug(31000) << "Starting:" << m_currentPosition << m_endPosition; @@ -152,7 +156,12 @@ m_currentCountry = country; #if 0 Disabling this as sonnet crashes on this. See https://bugs.kde.org/228271 - changeLanguage(m_currentLanguage+'_'+m_currentCountry); + if (m_currentCountry.isEmpty()) { + changeLanguage(m_currentLanguage); + } else { + changeLanguage(m_currentLanguage+'_'+m_currentCountry); + } + #endif } diff -Nru calligra-2.4.0/plugins/textediting/spellcheck/SpellCheck.cpp calligra-2.4.3/plugins/textediting/spellcheck/SpellCheck.cpp --- calligra-2.4.0/plugins/textediting/spellcheck/SpellCheck.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/spellcheck/SpellCheck.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -117,14 +117,14 @@ m_spellCheckMenu->setVisible(true); } -void SpellCheck::setDocument(const QTextDocument *document) +void SpellCheck::setDocument(QTextDocument *document) { if (m_document == document) return; if (m_document) disconnect (document, SIGNAL(contentsChange(int,int,int)), this, SLOT(documentChanged(int,int,int))); - // XXX: evil! - m_document = const_cast(document); + + m_document = document; connect (document, SIGNAL(contentsChange(int,int,int)), this, SLOT(documentChanged(int,int,int))); } @@ -142,7 +142,7 @@ { m_speller.setDefaultLanguage(language); m_bgSpellCheck->setDefaultLanguage(language); - if (m_enableSpellCheck) { + if (m_enableSpellCheck && m_document) { checkSection(m_document, 0, m_document->characterCount() - 1); } } @@ -183,6 +183,12 @@ m_speller.setAttribute(Speller::SkipRunTogether, on); } +bool SpellCheck::addWordToPersonal(const QString &word) +{ + return m_bgSpellCheck->addWordToPersonal(word); +} + + QString SpellCheck::defaultLanguage() const { return m_speller.defaultLanguage(); @@ -358,7 +364,7 @@ block.layout()->clearAdditionalFormats(); else block.layout()->setAdditionalFormats(newRanges); - m_document->markContentsDirty(bl.start, bl.start + bl.length); + m_document->markContentsDirty(bl.start, bl.length); } } m_allowSignals = true; @@ -366,7 +372,7 @@ QTimer::singleShot(0, this, SLOT(runQueue())); } -void SpellCheck::setCurrentCursorPosition(const QTextDocument *document, int cursorPosition) +void SpellCheck::setCurrentCursorPosition(QTextDocument *document, int cursorPosition) { setDocument(document); if (m_enableSpellCheck) { diff -Nru calligra-2.4.0/plugins/textediting/spellcheck/spellcheck.desktop calligra-2.4.3/plugins/textediting/spellcheck/spellcheck.desktop --- calligra-2.4.0/plugins/textediting/spellcheck/spellcheck.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/spellcheck/spellcheck.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=SpellCheck plugin Name[bg]=Проверка на правописа Name[ca]=Connector d'ortografia +Name[ca@valencia]=Connector d'ortografia Name[cs]=Modul pro kontrolu pravopisu Name[da]=Plugin til stavekontrol Name[de]=Rechtschreibprüfung-Modul @@ -13,7 +14,7 @@ Name[fr]=Module externe de Vérificateur orthographique Name[fy]=Staveringshifker plugin Name[ga]=Breiseán Litreora -Name[gl]=Extensión do Corrector Ortográfico +Name[gl]=Extensión do corrector ortográfico Name[he]=תוסף בודק איות Name[hi]=वर्तनीजांच प्लगइन Name[hne]=हिज्जाजांच प्लगइन @@ -28,7 +29,7 @@ Name[nl]=Spellingcontroleplug-in Name[pl]=Wtyczka sprawdzania pisowni Name[pt]='Plugin' de Verificação Ortográfica -Name[pt_BR]=Plugin de Verificação Ortográfica +Name[pt_BR]=Plugin de verificação ortográfica Name[ru]=Проверка правописания Name[sk]=Plugin SpellCheck Name[sl]=Vstavek za preverjanje črkovanja diff -Nru calligra-2.4.0/plugins/textediting/spellcheck/SpellCheck.h calligra-2.4.3/plugins/textediting/spellcheck/SpellCheck.h --- calligra-2.4.0/plugins/textediting/spellcheck/SpellCheck.h 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/spellcheck/SpellCheck.h 2012-06-26 04:18:01.000000000 +0000 @@ -54,7 +54,7 @@ void checkSection(QTextDocument *document, int startPosition, int endPosition); ///reimplemented from superclass - void setCurrentCursorPosition(const QTextDocument *document, int cursorPosition); + void setCurrentCursorPosition(QTextDocument *document, int cursorPosition); QStringList availableBackends() const; QStringList availableLanguages() const; @@ -67,8 +67,10 @@ bool skipAllUppercaseWords(); bool skipRunTogetherWords(); + bool addWordToPersonal(const QString &word); + //reimplemented from Calligra2.0, we disconnect and re- connect the 'documentChanged' signal only when the document has replaced - void setDocument(const QTextDocument *document); + void setDocument(QTextDocument *document); void replaceWordBySuggestion(const QString &word, int startPosition,int lengthOfWord); diff -Nru calligra-2.4.0/plugins/textediting/spellcheck/SpellCheckMenu.cpp calligra-2.4.3/plugins/textediting/spellcheck/SpellCheckMenu.cpp --- calligra-2.4.0/plugins/textediting/spellcheck/SpellCheckMenu.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/spellcheck/SpellCheckMenu.cpp 2012-06-26 04:18:01.000000000 +0000 @@ -45,8 +45,14 @@ m_addToDictionaryAction = new KAction(i18n("Add to Dictionary"), this); connect(m_addToDictionaryAction, SIGNAL(triggered()), this, SLOT(addWordToDictionary())); - m_ignoreWordAction = new KAction(i18n("Ignore Word"), this); - connect(m_ignoreWordAction, SIGNAL(triggered()), this, SLOT(ignoreWord())); + + // disabling this as if it calls the speller it's only changed in a local copy + // see addWordToDictionary for how it should be done, except background checker + // doesn't have suche a method for ignoreWord + // Only option left is to personally ignore words + + // m_ignoreWordAction = new KAction(i18n("Ignore Word"), this); + // connect(m_ignoreWordAction, SIGNAL(triggered()), this, SLOT(ignoreWord())); connect(m_suggestionsSignalMapper, SIGNAL(mapped(const QString&)), this, SLOT(replaceWord(const QString&))); @@ -104,7 +110,8 @@ if (m_currentMisspelled.isEmpty() || m_currentMisspelledPosition < 0) return; - m_speller.addToPersonal(m_currentMisspelled); + // see comment in ctor above why this will never work + m_spellCheck->addWordToPersonal(m_currentMisspelled); emit clearHighlightingForWord(m_currentMisspelledPosition); diff -Nru calligra-2.4.0/plugins/textediting/thesaurus/thesaurustool.desktop calligra-2.4.3/plugins/textediting/thesaurus/thesaurustool.desktop --- calligra-2.4.0/plugins/textediting/thesaurus/thesaurustool.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textediting/thesaurus/thesaurustool.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Синонимен речник Name[br]=Ostilh tezorus Name[ca]=Eina Thesaurus +Name[ca@valencia]=Eina Thesaurus Name[cs]=Tezaurus Name[cy]=Erfyn Thesawrws Name[da]=Thesaurusværktøj @@ -40,7 +41,7 @@ Name[nl]=Thesaurus hulpprogramma Name[pl]=Narzędzie Thesaurus Name[pt]=Ferramenta de Sinónimos -Name[pt_BR]=Ferramenta de Sinônimos +Name[pt_BR]=Ferramenta de sinônimos Name[ru]=Тезаурус Name[se]=Sátnegirjereaidu Name[sk]=Thesaurus @@ -63,6 +64,7 @@ Comment[af]=Vertoon Verwanter Woorde Comment[bg]=Търсене на синоними Comment[ca]=Mostra paraules relacionades +Comment[ca@valencia]=Mostra paraules relacionades Comment[cs]=Zobrazit podobná slova Comment[cy]=Dangos Geiriau Perthnasol Comment[da]=Viser relaterede ord @@ -97,7 +99,7 @@ Comment[nl]=Toon gerelateerde woorden Comment[pl]=Pokaż wyrazy pokrewne Comment[pt]=Mostrar as Palavras Relacionadas -Comment[pt_BR]=Mostrar as Palavras Relacionadas +Comment[pt_BR]=Mostrar as palavras relacionadas Comment[ru]=Показать синонимы Comment[se]=Čájet oktiigullevaš sániid Comment[sk]=Zobrazenie súvisiacich slov diff -Nru calligra-2.4.0/plugins/textshape/textshape.desktop calligra-2.4.3/plugins/textshape/textshape.desktop --- calligra-2.4.0/plugins/textshape/textshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textshape/textshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -2,6 +2,7 @@ Name=Text Shape Name[bg]=Текстова форма Name[ca]=Forma de text +Name[ca@valencia]=Forma de text Name[cs]=Tvar textu Name[da]=Tekst-form Name[de]=Text-Objekt @@ -27,7 +28,7 @@ Name[nl]=Tekstvorm Name[pl]=Kształt tekstu Name[pt]=Forma de Texto -Name[pt_BR]=Forma de Texto +Name[pt_BR]=Forma de texto Name[ru]=Форма текста Name[sk]=Tvar textu Name[sv]=Textform diff -Nru calligra-2.4.0/plugins/textshape/TextTool.cpp calligra-2.4.3/plugins/textshape/TextTool.cpp --- calligra-2.4.0/plugins/textshape/TextTool.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/textshape/TextTool.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -772,7 +772,7 @@ if (event->button() == Qt::RightButton) { KoTextEditingPlugin *plugin = m_textEditingPlugins->spellcheck(); if (plugin) - plugin->setCurrentCursorPosition(m_textEditor.data()->document(), m_textEditor.data()->position()); + plugin->setCurrentCursorPosition(m_textShapeData->document(), m_textEditor.data()->position()); event->ignore(); } diff -Nru calligra-2.4.0/plugins/treeshape/treeshape.desktop calligra-2.4.3/plugins/treeshape/treeshape.desktop --- calligra-2.4.0/plugins/treeshape/treeshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/treeshape/treeshape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Mind Tree Name[ca]=Arbre de ment +Name[ca@valencia]=Arbre de ment Name[cs]=Myšlenkový strom Name[da]=Tanketræ Name[el]=Mind Tree @@ -15,7 +16,8 @@ Name[nl]=Gedachtenboom Name[pl]=Drzewo pamięci Name[pt]=Árvore Mental -Name[pt_BR]=Árvore Mental +Name[pt_BR]=Árvore mental +Name[sk]=Myšlienkový strom Name[sv]=Tanketräd Name[uk]=Дерево запам’ятовування Name[wa]=Coxhlaedje do tuzaedje diff -Nru calligra-2.4.0/plugins/variables/textvariables.desktop calligra-2.4.3/plugins/variables/textvariables.desktop --- calligra-2.4.0/plugins/variables/textvariables.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/variables/textvariables.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Text Variables Name[bg]=Текстови променливи Name[ca]=Variables de text +Name[ca@valencia]=Variables de text Name[cs]=Proměnné textu Name[da]=Tekst-variable Name[de]=Textvariablen @@ -29,7 +30,7 @@ Name[nl]=Tekstvariabelen Name[pl]=Zmienne tekstu Name[pt]=Variáveis de Texto -Name[pt_BR]=Variáveis de Texto +Name[pt_BR]=Variáveis de texto Name[ru]=Строковые переменные Name[sk]=Premenné textu Name[sv]=Textvariabler diff -Nru calligra-2.4.0/plugins/vectorshape/vectorshape.desktop calligra-2.4.3/plugins/vectorshape/vectorshape.desktop --- calligra-2.4.0/plugins/vectorshape/vectorshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/vectorshape/vectorshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Static Vector Shape Name[ca]=Forma de vector estàtic +Name[ca@valencia]=Forma de vector estàtic Name[da]=Statisk vektor-form Name[de]=Statisches Vektor-Objekt Name[el]=Στατικό διανυσματικό σχήμα @@ -17,8 +18,9 @@ Name[nl]=Statische vectorvorm Name[pl]=Kształt statycznego wektora Name[pt]=Forma de Vector Estático -Name[pt_BR]=Forma de Vetor Estático +Name[pt_BR]=Forma de vetor estático Name[ru]=Статическая векторная фигура +Name[sk]=Statický vektorový tvar Name[sv]=Statisk vektorform Name[uk]=Статична векторна форма Name[wa]=Fôme di royes sitatikes diff -Nru calligra-2.4.0/plugins/videoshape/videoshape.desktop calligra-2.4.3/plugins/videoshape/videoshape.desktop --- calligra-2.4.0/plugins/videoshape/videoshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/plugins/videoshape/videoshape.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Video Shape Name[ca]=Forma de vídeo +Name[ca@valencia]=Forma de vídeo Name[cs]=Tvar Video Name[da]=Video-form Name[de]=Video-Objekt diff -Nru calligra-2.4.0/README calligra-2.4.3/README --- calligra-2.4.0/README 2012-04-06 15:37:55.000000000 +0000 +++ calligra-2.4.3/README 2012-06-26 04:21:31.000000000 +0000 @@ -16,7 +16,7 @@ Office productivity: - Words - Word processor -- Tables - Spreadsheet calculator +- Sheets - Spreadsheet calculator - Stage - Presentation program Graphics: @@ -59,48 +59,6 @@ http://community.kde.org/Calligra/Building/Building_Calligra -The Calligra Suite source tree ------------------------ - -Here follows a short overview of the source code. - -cmake/ files to help cmake do it's job configuring -doc/ user documentation. - -karbon/ source code of the different applications -kexi/ -kplato/ -kpresenter/ -krita/ -kspread/ -words/ -kivio/ - -kounavail a shape that is used when an application that handles a - certain embedded datatype is not available - -libs/ the common libraries -plugins/ some plugins, both flake shapes and other types. - -filters/ import and export filters for foreign file formats - -tools/ tools used internally (e.g. for testing) and released - with Calligra Suite, such as the koconverter file format - conversion tool. - -interfaces/ simplified external interfaces to some advanced data types - such as charts. - -servicetypes/ desktop files for some service types provided by Calligra Suite - -templates/ templates for new documents. - NOTE: Out of date since they use the old Calligra Suite file formats - -kdgantt/ and advanced gantt chart library provided by an external vendor. - -pics/ icons - - Contact info ------------ diff -Nru calligra-2.4.0/servicetypes/calligra_application.desktop calligra-2.4.3/servicetypes/calligra_application.desktop --- calligra-2.4.0/servicetypes/calligra_application.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/servicetypes/calligra_application.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -3,6 +3,7 @@ X-KDE-ServiceType=Calligra/Application Comment=Calligra Application Comment[ca]=Aplicació Calligra +Comment[ca@valencia]=Aplicació Calligra Comment[cs]=Aplikace Calligra Comment[da]=Calligra-program Comment[de]=Calligra-Anwendung @@ -22,6 +23,7 @@ Comment[pt]=Aplicação Calligra Comment[pt_BR]=Aplicativo do Calligra Comment[ru]=Приложение Calligra +Comment[sk]=Calligra aplikácia Comment[sv]=Calligra-program Comment[uk]=Програма Calligra Comment[x-test]=xxCalligra Applicationxx diff -Nru calligra-2.4.0/servicetypes/calligra_deferred_plugin.desktop calligra-2.4.3/servicetypes/calligra_deferred_plugin.desktop --- calligra-2.4.0/servicetypes/calligra_deferred_plugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/servicetypes/calligra_deferred_plugin.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Calligra Deferred Loading Plugin Name[ca]=Connector de càrrega diferida del Calligra +Name[ca@valencia]=Connector de càrrega diferida del Calligra Name[da]=Plugin til forsinket indlæsning til Calligra Name[el]=Πρόσθετο Calligra για αναβολή φόρτωσης Name[es]=Complemento de carga diferida de Calligra @@ -13,6 +14,7 @@ Name[pt]='Plugin' de Carregamento Posterior do Calligra Name[pt_BR]=Plugin de carregamento posterior do Calligra Name[ru]=Модуль отложенной загрузки Calligra +Name[sk]=Odložené načítanie pluginu Calligra Name[sv]=Calligra insticksprogram för fördröjd inläsning Name[uk]=Додаток завантаження з затримкою Calligra Name[x-test]=xxCalligra Deferred Loading Pluginxx diff -Nru calligra-2.4.0/servicetypes/calligrapart.desktop calligra-2.4.3/servicetypes/calligrapart.desktop --- calligra-2.4.0/servicetypes/calligrapart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/servicetypes/calligrapart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Comment=Calligra Component Comment[bg]=Компонент на Calligra Comment[ca]=Component del Calligra +Comment[ca@valencia]=Component del Calligra Comment[cs]=Komponenta Calligra Comment[da]=Calligra-komponent Comment[de]=Calligra-Komponente @@ -13,8 +14,10 @@ Comment[et]=Calligra komponent Comment[fi]=Calligra-osa Comment[fr]=Composant gestion de projets de Calligra +Comment[gl]=Compoñente de xestión de proxectos de Calligra Comment[hu]=Calligra komponens Comment[it]=Componente di Calligra +Comment[ja]=Calligra コンポーネント Comment[kk]=Calligra-ның компоненті Comment[nb]=Calligra-komponent Comment[nds]=Calligra-Komponent @@ -23,6 +26,7 @@ Comment[pt]=Componente do Calligra Comment[pt_BR]=Componente do Calligra Comment[ru]=Компонент Calligra +Comment[sk]=Calligra komponent Comment[sv]=Calligra-komponent Comment[uk]=Компонент Calligra Comment[x-test]=xxCalligra Componentxx diff -Nru calligra-2.4.0/servicetypes/kofilter.desktop calligra-2.4.3/servicetypes/kofilter.desktop --- calligra-2.4.0/servicetypes/kofilter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/servicetypes/kofilter.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Calligra Filter Comment[bg]=Филтър за Calligra Comment[ca]=Filtre del Calligra +Comment[ca@valencia]=Filtre del Calligra Comment[cs]=Filtr Calligra Comment[da]=Calligra-filter Comment[de]=Calligra-Filter @@ -14,6 +15,7 @@ Comment[fr]=Filtres pour Calligra Comment[hu]=Calligra szűrő Comment[it]=Filtro di Calligra +Comment[ja]=Calligra フィルタ Comment[kk]=Calligra сүзгісі Comment[nb]=Calligra-filter Comment[nds]=Calligra-Filter @@ -22,6 +24,7 @@ Comment[pt]=Filtro do Calligra Comment[pt_BR]=Filtro do Calligra Comment[ru]=Фильтр Calligra +Comment[sk]=Calligra Filter Comment[sv]=Calligra-filter Comment[uk]=Фільтр Calligra Comment[x-test]=xxCalligra Filterxx diff -Nru calligra-2.4.0/servicetypes/kofilterwrapper.desktop calligra-2.4.3/servicetypes/kofilterwrapper.desktop --- calligra-2.4.0/servicetypes/kofilterwrapper.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/servicetypes/kofilterwrapper.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,21 +4,25 @@ Comment=Calligra Filter Wrapper Comment[bg]=Обвивка за филтър на Calligra Comment[ca]=Filtre d'embolcall del Calligra +Comment[ca@valencia]=Filtre d'embolcall del Calligra Comment[da]=Filteromslag til Calligra Comment[de]=Calligra-Filter-Wrapper Comment[el]=Περίβλημα φίλτρου του Calligra Comment[es]=Interfaz de filtro de Calligra Comment[et]=Calligra filtrikest Comment[fr]=Conteneur de filtre Calligra +Comment[gl]=Interface para un filtro de Calligra Comment[it]=Adattatore per filtri di Calligra +Comment[ja]=Calligra フィルタラッパー Comment[kk]=Calligra-ның сүзгісінін жақтауы Comment[nb]=Calligra filterinnpakning Comment[nds]=Filter-Koppelsteed för Calligra Comment[nl]=Calligra Filterwrapper Comment[pl]=Opłynięcie filtra Calligra Comment[pt]=Interface do Filtro do Calligra -Comment[pt_BR]=Interface para um Filtro do Calligra +Comment[pt_BR]=Interface para um filtro do Calligra Comment[ru]=Обработчик фильтра KOffice +Comment[sk]=Obálka filtra Calligra Comment[sv]=Calligra-filteromgivning Comment[uk]=Обгортка фільтрів Calligra Comment[x-test]=xxCalligra Filter Wrapperxx diff -Nru calligra-2.4.0/servicetypes/koplugin.desktop calligra-2.4.3/servicetypes/koplugin.desktop --- calligra-2.4.0/servicetypes/koplugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/servicetypes/koplugin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Comment=Calligra Plugin Comment[bg]=Приставка за Calligra Comment[ca]=Connector del Calligra +Comment[ca@valencia]=Connector del Calligra Comment[cs]=Modul Calligra Comment[da]=Calligra-plugin Comment[de]=Calligramodul @@ -14,6 +15,7 @@ Comment[fr]=Module de Calligra Comment[hu]=Calligra bővítmény Comment[it]=Estensione di Calligra +Comment[ja]=Calligra プラグイン Comment[kk]=Calligra-ның плагині Comment[nb]=Programtillegg for Calligra Comment[nds]=Calligra-Moduul @@ -22,6 +24,7 @@ Comment[pt]='Plugin' do Calligra Comment[pt_BR]=Plugin do Calligra Comment[ru]=Модуль Calligra +Comment[sk]=Calligra Plugin Comment[sv]=Calligra-insticksprogram Comment[uk]=Додаток Calligra Comment[x-test]=xxCalligra Pluginxx diff -Nru calligra-2.4.0/sheets/Cell.cpp calligra-2.4.3/sheets/Cell.cpp --- calligra-2.4.0/sheets/Cell.cpp 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/sheets/Cell.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -1160,6 +1160,12 @@ // if the origin cell was a default cell, // we count the default cells repeated = nextCell.column() - j + 1; + + // check if any of the empty/default cells we skipped contained anchored shapes + int shapeColumn = tableContext.nextAnchoredShape(sheet(), row, column); + if (shapeColumn) { + repeated = qMin(repeated, shapeColumn - column); + } } // otherwise we just stop here to process the adjacent // cell in the next iteration of the outer loop @@ -1168,7 +1174,7 @@ } if (nextCell.isPartOfMerged() || nextCell.doesMergeCells() || - !nextCell.comment().isEmpty() || tableContext.cellHasAnchoredShapes(sheet(), row, column) || + !nextCell.comment().isEmpty() || tableContext.cellHasAnchoredShapes(sheet(), row, nextCell.column()) || !(nextCell.style() == cellStyle && nextCell.conditions() == conditions())) { break; } @@ -1247,15 +1253,19 @@ const QPointF bottomRight = shape->boundingRect().bottomRight(); qreal endX = 0.0; qreal endY = 0.0; - const int col = sheet()->leftColumn(bottomRight.x(), endX); - const int row = sheet()->topRow(bottomRight.y(), endY); - shape->setAdditionalAttribute("table:end-cell-address", Cell(sheet(), col, row).name()); - shape->setAdditionalAttribute("table:end-x", QString::number(bottomRight.x() - endX)); - shape->setAdditionalAttribute("table:end-y", QString::number(bottomRight.y() - endY)); - shapes[i]->saveOdf(tableContext.shapeContext); + const int scol = sheet()->leftColumn(bottomRight.x(), endX); + const int srow = sheet()->topRow(bottomRight.y(), endY); + qreal offsetX = sheet()->columnPosition(column); + qreal offsetY = sheet()->rowPosition(row); + tableContext.shapeContext.addShapeOffset(shape, QTransform::fromTranslate(-offsetX, -offsetY)); + shape->setAdditionalAttribute("table:end-cell-address", Cell(sheet(), scol, srow).name()); + shape->setAdditionalAttribute("table:end-x", QString::number(bottomRight.x() - endX) + "pt"); + shape->setAdditionalAttribute("table:end-y", QString::number(bottomRight.y() - endY) + "pt"); + shape->saveOdf(tableContext.shapeContext); shape->removeAdditionalAttribute("table:end-cell-address"); shape->removeAdditionalAttribute("table:end-x"); shape->removeAdditionalAttribute("table:end-y"); + tableContext.shapeContext.removeShapeOffset(shape); } } diff -Nru calligra-2.4.0/sheets/data/templates/Business/BalanceSheet.desktop calligra-2.4.3/sheets/data/templates/Business/BalanceSheet.desktop --- calligra-2.4.0/sheets/data/templates/Business/BalanceSheet.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/Business/BalanceSheet.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=Balance Sheet Name[bg]=Баланс Name[ca]=Full de balanç +Name[ca@valencia]=Full de balanç Name[cs]=Rozvaha Name[cy]=Mantolen Name[da]=Balanceringsark @@ -34,7 +35,7 @@ Name[nl]=Balans-werkblad Name[pl]=Arkusz salda Name[pt]=Folha de Balanço -Name[pt_BR]=Folha de Balanço +Name[pt_BR]=Folha de balanço Name[ru]=Баланс Name[se]=Balánsaárka Name[sk]=Rozvaha diff -Nru calligra-2.4.0/sheets/data/templates/Business/.directory calligra-2.4.3/sheets/data/templates/Business/.directory --- calligra-2.4.0/sheets/data/templates/Business/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/Business/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Бизнес Name[br]=Labour Name[ca]=Negoci +Name[ca@valencia]=Negoci Name[cs]=Business Name[cy]=Busnes Name[da]=Business diff -Nru calligra-2.4.0/sheets/data/templates/Business/ExpenseReport.desktop calligra-2.4.3/sheets/data/templates/Business/ExpenseReport.desktop --- calligra-2.4.0/sheets/data/templates/Business/ExpenseReport.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/Business/ExpenseReport.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[af]=Ten koste Raporteer Name[bg]=Отчет за разходи Name[ca]=Informe de despeses +Name[ca@valencia]=Informe de despeses Name[cs]=Výkaz výdajů Name[cy]=Adroddiad Treuliau Name[da]=Udgiftsrapport @@ -37,7 +38,7 @@ Name[nl]=Uitgavenrapport Name[pl]=Raport wydatków Name[pt]=Relatório de Despesas -Name[pt_BR]=Relatório de Despesas +Name[pt_BR]=Relatório de despesas Name[ru]=Авансовый отчёт Name[se]=Golloraporta Name[sk]=Výdaje diff -Nru calligra-2.4.0/sheets/data/templates/Business/Invoice.desktop calligra-2.4.3/sheets/data/templates/Business/Invoice.desktop --- calligra-2.4.0/sheets/data/templates/Business/Invoice.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/Business/Invoice.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Name=Invoice Name[bg]=Фактура Name[ca]=Factura +Name[ca@valencia]=Factura Name[cs]=Faktura Name[cy]=Derbyneb Name[da]=Faktura diff -Nru calligra-2.4.0/sheets/data/templates/Business/PackingSlip.desktop calligra-2.4.3/sheets/data/templates/Business/PackingSlip.desktop --- calligra-2.4.0/sheets/data/templates/Business/PackingSlip.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/Business/PackingSlip.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=Packing Slip Name[bg]=Каса Name[ca]=Qüestions d'empaquetat +Name[ca@valencia]=Qüestions d'empaquetat Name[cs]=Příbalový leták Name[cy]=Taflen Pacio Name[da]=Packing Slip @@ -33,7 +34,7 @@ Name[nl]=Pakbon Name[pl]=Druk wysyłki Name[pt]=Guia de Transporte -Name[pt_BR]=Guia de Transporte +Name[pt_BR]=Guia de transporte Name[ru]=Упаковочная этикетка Name[se]=Páhkkaseattal Name[sk]=Balenie diff -Nru calligra-2.4.0/sheets/data/templates/Business/PriceQuotation.desktop calligra-2.4.3/sheets/data/templates/Business/PriceQuotation.desktop --- calligra-2.4.0/sheets/data/templates/Business/PriceQuotation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/Business/PriceQuotation.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Name=Price Quotation Name[bg]=Ценова листа Name[ca]=Cita de preus +Name[ca@valencia]=Cita de preus Name[cs]=Cenová nabídka Name[cy]=Datganiad Pris Name[da]=Pristilbud diff -Nru calligra-2.4.0/sheets/data/templates/General/.directory calligra-2.4.3/sheets/data/templates/General/.directory --- calligra-2.4.0/sheets/data/templates/General/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/General/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Основен Name[br]=Pennañ Name[ca]=General +Name[ca@valencia]=General Name[cs]=Obecné Name[cy]=Cyffredinol Name[da]=Generelt diff -Nru calligra-2.4.0/sheets/data/templates/General/StudentIDCard.desktop calligra-2.4.3/sheets/data/templates/General/StudentIDCard.desktop --- calligra-2.4.0/sheets/data/templates/General/StudentIDCard.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/General/StudentIDCard.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[af]=Student Id Kaart Name[bg]=Студентска лична карта Name[ca]=Targeta d'identificació d'estudiant +Name[ca@valencia]=Targeta d'identificació d'estudiant Name[cs]=ID karta studenta Name[cy]=Cerdyn ID Myfyriwr Name[da]=Student ID-kort @@ -36,7 +37,7 @@ Name[nl]=Studentenkaart Name[pl]=Studencka karta identyfikacyjna Name[pt]=Cartão de Estudante -Name[pt_BR]=Carteira de Estudante +Name[pt_BR]=Carteira de estudante Name[ru]=Идентификационная карта студента Name[se]=Studeantagoarta Name[sk]=ID karta študenta diff -Nru calligra-2.4.0/sheets/data/templates/General/Worksheet.desktop calligra-2.4.3/sheets/data/templates/General/Worksheet.desktop --- calligra-2.4.0/sheets/data/templates/General/Worksheet.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/General/Worksheet.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Празен лист Name[br]=Folenn labour goullo Name[ca]=Full de treball buit +Name[ca@valencia]=Full de treball buit Name[cs]=Prázdný sešit Name[cy]=Gweithlen Wâg Name[da]=Blankt arbejdsark diff -Nru calligra-2.4.0/sheets/data/templates/HomeFamily/BMI.desktop calligra-2.4.3/sheets/data/templates/HomeFamily/BMI.desktop --- calligra-2.4.0/sheets/data/templates/HomeFamily/BMI.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/HomeFamily/BMI.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Калкулатор за маса Name[br]=Jederez BMI Name[ca]=Calculadora BMI +Name[ca@valencia]=Calculadora BMI Name[cs]=Kalkulátor BMI Name[cy]=Cyfrifiannell BMI Name[da]=BMI-Regnemaskine @@ -55,6 +56,7 @@ Comment=Simple Body Mass Index Calculator Comment[bg]=Калкулатор за изчисление на индекса на теглото на тяло Comment[ca]=Calculadora senzilla per a índexs de massa corporal +Comment[ca@valencia]=Calculadora senzilla per a índexs de massa corporal Comment[cs]=Jednoduchý kalkulátor BMI Comment[cy]=Cyfrifiannell Indecs Mas Corff Syml Comment[da]=Simpel Body Mass Index regnemaskine @@ -83,7 +85,7 @@ Comment[nl]=Eenvoudige berekening van lichaamsgewichtindex (BMI) Comment[pl]=Prosty kalkulator wskaźnika masy ciała Comment[pt]=Calculadora Simples do Índice de Massa Corporal -Comment[pt_BR]=Calculadora Simples do Índice de Massa Corporal +Comment[pt_BR]=Calculadora simples do Índice de Massa Corporal Comment[ru]=Простой калькулятор вычисления индекса массы тела Comment[sk]=Jednoduchá kalkulačka indexu telesnej hmotnosti (BMI). Comment[sl]=Preprosto računalo za indeks telesne teže diff -Nru calligra-2.4.0/sheets/data/templates/HomeFamily/CreditCardTracker.desktop calligra-2.4.3/sheets/data/templates/HomeFamily/CreditCardTracker.desktop --- calligra-2.4.0/sheets/data/templates/HomeFamily/CreditCardTracker.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/HomeFamily/CreditCardTracker.desktop 2012-06-26 04:18:01.000000000 +0000 @@ -4,6 +4,7 @@ Name=Credit Card Tracker Name[bg]=Кредитна карта Name[ca]=Rastrejador de targetes de crèdit +Name[ca@valencia]=Rastrejador de targetes de crèdit Name[cs]=Sledování kreditky Name[cy]=Dilynnydd Cerdyn Credyd Name[da]=Kreditkortsfølger @@ -36,7 +37,7 @@ Name[nl]=Creditkaart-programma Name[pl]=Zestawienie transakcji kartą kredytową Name[pt]=Gestão do Cartão de Crédito -Name[pt_BR]=Controle do Cartão de Crédito +Name[pt_BR]=Controle do cartão de crédito Name[ru]=Кредитная карточка Name[se]=Vealggásgoartageavaheapmi Name[sk]=Sledovanie kreditných kariet diff -Nru calligra-2.4.0/sheets/data/templates/HomeFamily/.directory calligra-2.4.3/sheets/data/templates/HomeFamily/.directory --- calligra-2.4.0/sheets/data/templates/HomeFamily/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/HomeFamily/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Дом и семейство Name[br]=Kêr ha Tud Name[ca]=Domicili i família +Name[ca@valencia]=Domicili i família Name[cs]=Domov a rodina Name[cy]=Cartref a Theulu Name[da]=Hjem og familie diff -Nru calligra-2.4.0/sheets/data/templates/HomeFamily/MenuPlan.desktop calligra-2.4.3/sheets/data/templates/HomeFamily/MenuPlan.desktop --- calligra-2.4.0/sheets/data/templates/HomeFamily/MenuPlan.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/HomeFamily/MenuPlan.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=Menu Plan Name[bg]=Меню-лист Name[ca]=Pla de menú +Name[ca@valencia]=Pla de menú Name[cs]=Jídelníček Name[cy]=Cynllun Bwydlen Name[da]=Menuplan diff -Nru calligra-2.4.0/sheets/data/templates/HomeFamily/VacationChecklist.desktop calligra-2.4.3/sheets/data/templates/HomeFamily/VacationChecklist.desktop --- calligra-2.4.0/sheets/data/templates/HomeFamily/VacationChecklist.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/data/templates/HomeFamily/VacationChecklist.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=Vacation Checklist Name[bg]=Ваканция Name[ca]=Llista de comprovació de vacances +Name[ca@valencia]=Llista de comprovació de vacances Name[cs]=Seznam na dovolenou Name[cy]=Rhestr Wirio Gwyliau Name[da]=Ferie-tjekliste @@ -35,7 +36,7 @@ Name[nl]=Vakantie-controlelijst Name[pl]=Wakacyjny spis kontrolny Name[pt]=Lista para Férias -Name[pt_BR]=Lista para Férias +Name[pt_BR]=Lista para férias Name[ru]=Подготовка к отпуску Name[se]=Luopmodárkkistanlistu Name[sk]=Zoznam pre dovolenku diff -Nru calligra-2.4.0/sheets/functions/kspreadbitopsmodule.desktop calligra-2.4.3/sheets/functions/kspreadbitopsmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadbitopsmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadbitopsmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Bit Operation Functions Name[ca]=Funcions d'operació de bit +Name[ca@valencia]=Funcions d'operació de bit Name[da]=Funktioner til bitoperationer Name[de]=Bit-Operation-Funktionen Name[el]=Συναρτήσεις δυαδικών λειτουργιών @@ -10,6 +11,7 @@ Name[fi]=Bittioperaatiofunktiot Name[fr]=Fonctions d'opérations de bit Name[gl]=Funcións de Lóxica Binaria +Name[hu]=Bitműveleti függvények Name[it]=Funzioni di operazione sui bit Name[ja]=ビット演算関数 Name[kk]=Биттік амалдар функциялары @@ -19,7 +21,7 @@ Name[nl]=Bit-operatie functies Name[pl]=Funkcje operacji na bitach Name[pt]=Funções de Operação com 'Bits' -Name[pt_BR]=Funções de Operação com 'Bits' +Name[pt_BR]=Funções de operação com 'Bits' Name[ru]=Функции битовых операций Name[sk]=Funkcie bitových operácií Name[sv]=Bithanteringsfunktioner @@ -31,6 +33,7 @@ Name[zh_TW]=位元操作函數 Comment=BITAND, BITOR, BITXOR, BITLSHIFT, BITRSHIFT Comment[ca]=BITAND, BITOR, BITXOR, BITLSHIFT, BITRSHIFT +Comment[ca@valencia]=BITAND, BITOR, BITXOR, BITLSHIFT, BITRSHIFT Comment[cs]=BITAND, BITOR, BITXOR, BITLSHIFT, BITRSHIFT Comment[da]=BITAND, BITOR, BITXOR, BITLSHIFT, BITRSHIFT Comment[de]=BITAND, BITOR, BITXOR, BITLSHIFT, BITRSHIFT diff -Nru calligra-2.4.0/sheets/functions/kspreadconversionmodule.desktop calligra-2.4.3/sheets/functions/kspreadconversionmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadconversionmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadconversionmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Conversion Functions Name[bg]=Функции за преобразуване Name[ca]=Funcions de conversió +Name[ca@valencia]=Funcions de conversió Name[da]=Konverteringsfunktioner Name[de]=Konvertierungsfunktionen Name[el]=Συναρτήσεις μετατροπής @@ -23,7 +24,7 @@ Name[nl]=Conversiefunctions Name[pl]=Funkcje przekształcenia Name[pt]=Funções de Conversão -Name[pt_BR]=Funções de Conversão +Name[pt_BR]=Funções de conversão Name[ru]=Функции преобразования Name[sk]=Konverzné funkcie Name[sl]=Funkcije za pretvorbo @@ -36,6 +37,7 @@ Name[zh_TW]=轉換函數 Comment=ARABIC, ASCIITOCHAR, BOOL2INT, BOOL2STRING, CARX, CARY, CHARTOASCII, DECSEX, INT2BOOL, NUM2STRING, POLA, POLR, ROMAN, SEXDEC, STRING Comment[ca]=ARABIC, ASCIITOCHAR, BOOL2INT, BOOL2STRING, CARX, CARY, CHARTOASCII, DECSEX, INT2BOOL, NUM2STRING, POLA, POLR, ROMAN, SEXDEC, STRING +Comment[ca@valencia]=ARABIC, ASCIITOCHAR, BOOL2INT, BOOL2STRING, CARX, CARY, CHARTOASCII, DECSEX, INT2BOOL, NUM2STRING, POLA, POLR, ROMAN, SEXDEC, STRING Comment[cs]=ARABIC, ASCIITOCHAR, BOOL2INT, BOOL2STRING, CARX, CARY, CHARTOASCII, DECSEX, INT2BOOL, NUM2STRING, POLA, POLR, ROMAN, SEXDEC, STRING Comment[da]=ARABIC, ASCIITOCHAR, BOOL2INT, BOOL2STRING, CARX, CARY, CHARTOASCII, DECSEX, INT2BOOL, NUM2STRING, POLA, POLR, ROMAN, SEXDEC, STRING Comment[de]=ARABIC, ASCIITOCHAR, BOOL2INT, BOOL2STRING, CARX, CARY, CHARTOASCII, DECSEX, INT2BOOL, NUM2STRING, POLA, POLR, ROMAN, SEXDEC, STRING diff -Nru calligra-2.4.0/sheets/functions/kspreaddatabasemodule.desktop calligra-2.4.3/sheets/functions/kspreaddatabasemodule.desktop --- calligra-2.4.0/sheets/functions/kspreaddatabasemodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreaddatabasemodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Database Functions Name[bg]=Функции за бази от данни Name[ca]=Funcions de base de dades +Name[ca@valencia]=Funcions de base de dades Name[cs]=Funkce databází Name[da]=Databaserfunktioner Name[de]=Datenbankfunktionen @@ -26,7 +27,7 @@ Name[oc]=Foncions de basa de donadas Name[pl]=Funkcje baz danych Name[pt]=Funções de Bases de Dados -Name[pt_BR]=Funções de Bancos de Dados +Name[pt_BR]=Funções de bancos de dados Name[ru]=Функции баз данных Name[sk]=Databázové funkcie Name[sv]=Databasfunktioner @@ -39,6 +40,7 @@ Name[zh_TW]=資料庫函數 Comment=DAVERAGE, DCOUNT, DCOUNTA, DGET, DMAX, DMIN, DPRODUCT, DSTDEV, DSTDEVP, DSUM, DVAR, DVARP, GETPIVOTDATA Comment[ca]=DAVERAGE, DCOUNT, DCOUNTA, DGET, DMAX, DMIN, DPRODUCT, DSTDEV, DSTDEVP, DSUM, DVAR, DVARP, GETPIVOTDATA +Comment[ca@valencia]=DAVERAGE, DCOUNT, DCOUNTA, DGET, DMAX, DMIN, DPRODUCT, DSTDEV, DSTDEVP, DSUM, DVAR, DVARP, GETPIVOTDATA Comment[cs]=DAVERAGE, DCOUNT, DCOUNTA, DGET, DMAX, DMIN, DPRODUCT, DSTDEV, DSTDEVP, DSUM, DVAR, DVARP, GETPIVOTDATA Comment[da]=DAVERAGE, DCOUNT, DCOUNTA, DGET, DMAX, DMIN, DPRODUCT, DSTDEV, DSTDEVP, DSUM, DVAR, DVARP, GETPIVOTDATA Comment[de]=DAVERAGE, DCOUNT, DCOUNTA, DGET, DMAX, DMIN, DPRODUCT, DSTDEV, DSTDEVP, DSUM, DVAR, DVARP, GETPIVOTDATA diff -Nru calligra-2.4.0/sheets/functions/kspreaddatetimemodule.desktop calligra-2.4.3/sheets/functions/kspreaddatetimemodule.desktop --- calligra-2.4.0/sheets/functions/kspreaddatetimemodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreaddatetimemodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=DateTime Functions Name[bg]=Функции за дата и час Name[ca]=Funcions DataHora +Name[ca@valencia]=Funcions DataHora Name[da]=DatoTid-funktioner Name[de]=Datum-Zeit-Funktionen Name[el]=Συναρτήσεις ημερομηνίας ώρας @@ -11,6 +12,7 @@ Name[fi]=Päiväys- ja aikafunktiot Name[fr]=FonctionsHeureDate Name[gl]=Funcions DateTime +Name[hu]=Dátum és idő függvények Name[it]=Funzioni di data e ora Name[ja]=日付・時間関数 Name[kk]=Күн-уақыт функциялары @@ -20,7 +22,7 @@ Name[nl]=Datumtijd-functies Name[pl]=Funkcje daty i czasu Name[pt]=Funções de Data/Hora -Name[pt_BR]=Funções de Data/Hora +Name[pt_BR]=Funções de data/hora Name[ru]=Функции даты и времени Name[sk]=Dátumové a časové funkcie Name[sl]=Funkcije za datum in čas @@ -33,6 +35,7 @@ Name[zh_TW]=日期時間函數 Comment=CURRENTDATE, CURRENTDATETIME, CURRENTTIME, DATE, DATE2UNIX, DATEDIF, DATEVALUE, DAY, DAYNAME, DAYOFYEAR, DAYS, DAYS360, DAYSINMONTH, DAYSINYEAR, EASTERSUNDAY, EDATE, EOMONTH, HOUR, HOURS, ISLEAPYEAR, ISOWEEKNUM, MINUTE, MINUTES, MONTH, MONTHNAME, MONTHS, NETWORKDAY, NOW, SECOND, SECONDS, TIME, TIMEVALUE, TODAY, UNIX2DATE, WEEKDAY, WEEKNUM, WEEKS, WEEKSINYEAR, WORKDAY, YEAR, YEARFRAC, YEARS Comment[ca]=CURRENTDATE, CURRENTDATETIME, CURRENTTIME, DATE, DATE2UNIX, DATEDIF, DATEVALUE, DAY, DAYNAME, DAYOFYEAR, DAYS, DAYS360, DAYSINMONTH, DAYSINYEAR, EASTERSUNDAY, EDATE, EOMONTH, HOUR, HOURS, ISLEAPYEAR, ISOWEEKNUM, MINUTE, MINUTES, MONTH, MONTHNAME, MONTHS, NETWORKDAY, NOW, SECOND, SECONDS, TIME, TIMEVALUE, TODAY, UNIX2DATE, WEEKDAY, WEEKNUM, WEEKS, WEEKSINYEAR, WORKDAY, YEAR, YEARFRAC, YEARS +Comment[ca@valencia]=CURRENTDATE, CURRENTDATETIME, CURRENTTIME, DATE, DATE2UNIX, DATEDIF, DATEVALUE, DAY, DAYNAME, DAYOFYEAR, DAYS, DAYS360, DAYSINMONTH, DAYSINYEAR, EASTERSUNDAY, EDATE, EOMONTH, HOUR, HOURS, ISLEAPYEAR, ISOWEEKNUM, MINUTE, MINUTES, MONTH, MONTHNAME, MONTHS, NETWORKDAY, NOW, SECOND, SECONDS, TIME, TIMEVALUE, TODAY, UNIX2DATE, WEEKDAY, WEEKNUM, WEEKS, WEEKSINYEAR, WORKDAY, YEAR, YEARFRAC, YEARS Comment[cs]=CURRENTDATE, CURRENTDATETIME, CURRENTTIME, DATE, DATE2UNIX, DATEDIF, DATEVALUE, DAY, DAYNAME, DAYOFYEAR, DAYS, DAYS360, DAYSINMONTH, DAYSINYEAR, EASTERSUNDAY, EDATE, EOMONTH, HOUR, HOURS, ISLEAPYEAR, ISOWEEKNUM, MINUTE, MINUTES, MONTH, MONTHNAME, MONTHS, NETWORKDAY, NOW, SECOND, SECONDS, TIME, TIMEVALUE, TODAY, UNIX2DATE, WEEKDAY, WEEKNUM, WEEKS, WEEKSINYEAR, WORKDAY, YEAR, YEARFRAC, YEARS Comment[da]=CURRENTDATE, CURRENTDATETIME, CURRENTTIME, DATE, DATE2UNIX, DATEDIF, DATEVALUE, DAY, DAYNAME, DAYOFYEAR, DAYS, DAYS360, DAYSINMONTH, DAYSINYEAR, EASTERSUNDAY, EDATE, EOMONTH, HOUR, HOURS, ISLEAPYEAR, ISOWEEKNUM, MINUTE, MINUTES, MONTH, MONTHNAME, MONTHS, NETWORKDAY, NOW, SECOND, SECONDS, TIME, TIMEVALUE, TODAY, UNIX2DATE, WEEKDAY, WEEKNUM, WEEKS, WEEKSINYEAR, WORKDAY, YEAR, YEARFRAC, YEARS Comment[de]=CURRENTDATE, CURRENTDATETIME, CURRENTTIME, DATE, DATE2UNIX, DATEDIF, DATEVALUE, DAY, DAYNAME, DAYOFYEAR, DAYS, DAYS360, DAYSINMONTH, DAYSINYEAR, EASTERSUNDAY, EDATE, EOMONTH, HOUR, HOURS, ISLEAPYEAR, ISOWEEKNUM, MINUTE, MINUTES, MONTH, MONTHNAME, MONTHS, NETWORKDAY, NOW, SECOND, SECONDS, TIME, TIMEVALUE, TODAY, UNIX2DATE, WEEKDAY, WEEKNUM, WEEKS, WEEKSINYEAR, WORKDAY, YEAR, YEARFRAC, YEARS diff -Nru calligra-2.4.0/sheets/functions/kspreadengineeringmodule.desktop calligra-2.4.3/sheets/functions/kspreadengineeringmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadengineeringmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadengineeringmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Engineering Functions Name[bg]=Инженерни функции Name[ca]=Funcions d'enginyeria +Name[ca@valencia]=Funcions d'enginyeria Name[cs]=Inženýrské funkce Name[da]=Udviklingsfunktioner Name[de]=Ingenieurwesen-Funktionen @@ -13,6 +14,7 @@ Name[fr]=Fonctions technologiques Name[gl]=Funcións de Enxeñería Name[he]=פונקציות הנדסה +Name[hu]=Műszaki függvények Name[it]=Funzioni ingegneristiche Name[ja]=エンジニアリング関数 Name[kk]=Инженерлік функциялары @@ -22,7 +24,7 @@ Name[nl]=Engineering-functies Name[pl]=Funkcje inżynierskie Name[pt]=Funções de Engenharia -Name[pt_BR]=Funções de Engenharia +Name[pt_BR]=Funções de engenharia Name[ru]=Инженерные функции Name[sk]=Inžinierske funkcie Name[sl]=Inženirske funkcije @@ -35,6 +37,7 @@ Name[zh_TW]=工程函數 Comment=BASE, BESSELI, BESSELJ, BESSELK, BESSELY, BIN2DEC, BIN2HEX, BIN2OCT, COMPLEX, CONVERT, DEC2BIN, DEC2HEX, DEC2OCT, DELTA, ERF, ERFC, GESTEP, HEX2BIN, HEX2DEC, HEX2OCT, IMABS, IMAGINARY, IMARGUMENT, IMCONJUGATE, IMCOS, IMCOSH, IMDIV, IMEXP, IMLN, IMLOG10, IMLOG2, IMPOWER, IMPRODUCT, IMREAL, IMSIN, IMSINH, IMSQRT, IMSUB, IMSUM, IMTAN, IMTANH, OCT2BIN, OCT2DEC, OCT2HEX Comment[ca]=BASE, BESSELI, BESSELJ, BESSELK, BESSELY, BIN2DEC, BIN2HEX, BIN2OCT, COMPLEX, CONVERT, DEC2BIN, DEC2HEX, DEC2OCT, DELTA, ERF, ERFC, GESTEP, HEX2BIN, HEX2DEC, HEX2OCT, IMABS, IMAGINARY, IMARGUMENT, IMCONJUGATE, IMCOS, IMCOSH, IMDIV, IMEXP, IMLN, IMLOG10, IMLOG2, IMPOWER, IMPRODUCT, IMREAL, IMSIN, IMSINH, IMSQRT, IMSUB, IMSUM, IMTAN, IMTANH, OCT2BIN, OCT2DEC, OCT2HEX +Comment[ca@valencia]=BASE, BESSELI, BESSELJ, BESSELK, BESSELY, BIN2DEC, BIN2HEX, BIN2OCT, COMPLEX, CONVERT, DEC2BIN, DEC2HEX, DEC2OCT, DELTA, ERF, ERFC, GESTEP, HEX2BIN, HEX2DEC, HEX2OCT, IMABS, IMAGINARY, IMARGUMENT, IMCONJUGATE, IMCOS, IMCOSH, IMDIV, IMEXP, IMLN, IMLOG10, IMLOG2, IMPOWER, IMPRODUCT, IMREAL, IMSIN, IMSINH, IMSQRT, IMSUB, IMSUM, IMTAN, IMTANH, OCT2BIN, OCT2DEC, OCT2HEX Comment[cs]=BASE, BESSELI, BESSELJ, BESSELK, BESSELY, BIN2DEC, BIN2HEX, BIN2OCT, COMPLEX, CONVERT, DEC2BIN, DEC2HEX, DEC2OCT, DELTA, ERF, ERFC, GESTEP, HEX2BIN, HEX2DEC, HEX2OCT, IMABS, IMAGINARY, IMARGUMENT, IMCONJUGATE, IMCOS, IMCOSH, IMDIV, IMEXP, IMLN, IMLOG10, IMLOG2, IMPOWER, IMPRODUCT, IMREAL, IMSIN, IMSINH, IMSQRT, IMSUB, IMSUM, IMTAN, IMTANH, OCT2BIN, OCT2DEC, OCT2HEX Comment[da]=BASE, BESSELI, BESSELJ, BESSELK, BESSELY, BIN2DEC, BIN2HEX, BIN2OCT, COMPLEX, CONVERT, DEC2BIN, DEC2HEX, DEC2OCT, DELTA, ERF, ERFC, GESTEP, HEX2BIN, HEX2DEC, HEX2OCT, IMABS, IMAGINARY, IMARGUMENT, IMCONJUGATE, IMCOS, IMCOSH, IMDIV, IMEXP, IMLN, IMLOG10, IMLOG2, IMPOWER, IMPRODUCT, IMREAL, IMSIN, IMSINH, IMSQRT, IMSUB, IMSUM, IMTAN, IMTANH, OCT2BIN, OCT2DEC, OCT2HEX Comment[de]=BASE, BESSELI, BESSELJ, BESSELK, BESSELY, BIN2DEC, BIN2HEX, BIN2OCT, COMPLEX, CONVERT, DEC2BIN, DEC2HEX, DEC2OCT, DELTA, ERF, ERFC, GESTEP, HEX2BIN, HEX2DEC, HEX2OCT, IMABS, IMAGINARY, IMARGUMENT, IMCONJUGATE, IMCOS, IMCOSH, IMDIV, IMEXP, IMLN, IMLOG10, IMLOG2, IMPOWER, IMPRODUCT, IMREAL, IMSIN, IMSINH, IMSQRT, IMSUB, IMSUM, IMTAN, IMTANH, OCT2BIN, OCT2DEC, OCT2HEX diff -Nru calligra-2.4.0/sheets/functions/kspreadfinancialmodule.desktop calligra-2.4.3/sheets/functions/kspreadfinancialmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadfinancialmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadfinancialmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Financial Functions Name[bg]=Финансови функции Name[ca]=Funcions financeres +Name[ca@valencia]=Funcions financeres Name[cs]=Finanční funkce Name[da]=Finansfunktioner Name[de]=Finanzfunktionen @@ -13,6 +14,7 @@ Name[fr]=Fonctions financières Name[gl]=Funcións Financieiras Name[he]=פונקציות כספיות +Name[hu]=Pénzügyi függvények Name[it]=Funzioni finanziarie Name[ja]=財務関数 Name[kk]=Қаржылық функциялары @@ -22,7 +24,7 @@ Name[nl]=Financiële functies Name[pl]=Funkcje finansowe Name[pt]=Funções Financeiras -Name[pt_BR]=Funções Financeiras +Name[pt_BR]=Funções financeiras Name[ru]=Финансовые функции Name[sk]=Finančné funkcie Name[sl]=Finančne funkcije @@ -35,6 +37,7 @@ Name[zh_TW]=財務函數 Comment=ACCRINT, ACCRINTM, AMORDEGRC, AMORLINC, COMPOUND, CONTINUOUS, COUPNUM, CUMIPMT, CUMPRINC, DB, DDB, DISC, DOLLARDE, DOLLARFR, DURATION, DURATION_ADD, EFFECT, EFFECTIVE, EURO, EUROCONVERT, FV, FV_ANNUITY, INTRATE, IPMT, ISPMT, LEVEL_COUPON, MDURATION, MIRR, NOMINAL, NPER, NPV, ODDLPRICE, ODDLYIELD, PMT, PPMT, PRICEMAT, PV, PV_ANNUITY, RECEIVED, RRI, SLN, SYD, TBILLEQ, TBILLPRICE, TBILLYIELD, VDB, XIRR, XNPV, YIELDDISC, YIELDMAT, ZERO_COUPON Comment[ca]=ACCRINT, ACCRINTM, AMORDEGRC, AMORLINC, COMPOUND, CONTINUOUS, COUPNUM, CUMIPMT, CUMPRINC, DB, DDB, DISC, DOLLARDE, DOLLARFR, DURATION, DURATION_ADD, EFFECT, EFFECTIVE, EURO, EUROCONVERT, FV, FV_ANNUITY, INTRATE, IPMT, ISPMT, LEVEL_COUPON, MDURATION, MIRR, NOMINAL, NPER, NPV, ODDLPRICE, ODDLYIELD, PMT, PPMT, PRICEMAT, PV, PV_ANNUITY, RECEIVED, RRI, SLN, SYD, TBILLEQ, TBILLPRICE, TBILLYIELD, VDB, XIRR, XNPV, YIELDDISC, YIELDMAT, ZERO_COUPON +Comment[ca@valencia]=ACCRINT, ACCRINTM, AMORDEGRC, AMORLINC, COMPOUND, CONTINUOUS, COUPNUM, CUMIPMT, CUMPRINC, DB, DDB, DISC, DOLLARDE, DOLLARFR, DURATION, DURATION_ADD, EFFECT, EFFECTIVE, EURO, EUROCONVERT, FV, FV_ANNUITY, INTRATE, IPMT, ISPMT, LEVEL_COUPON, MDURATION, MIRR, NOMINAL, NPER, NPV, ODDLPRICE, ODDLYIELD, PMT, PPMT, PRICEMAT, PV, PV_ANNUITY, RECEIVED, RRI, SLN, SYD, TBILLEQ, TBILLPRICE, TBILLYIELD, VDB, XIRR, XNPV, YIELDDISC, YIELDMAT, ZERO_COUPON Comment[cs]=ACCRINT, ACCRINTM, AMORDEGRC, AMORLINC, COMPOUND, CONTINUOUS, COUPNUM, CUMIPMT, CUMPRINC, DB, DDB, DISC, DOLLARDE, DOLLARFR, DURATION, DURATION_ADD, EFFECT, EFFECTIVE, EURO, EUROCONVERT, FV, FV_ANNUITY, INTRATE, IPMT, ISPMT, LEVEL_COUPON, MDURATION, MIRR, NOMINAL, NPER, NPV, ODDLPRICE, ODDLYIELD, PMT, PPMT, PRICEMAT, PV, PV_ANNUITY, RECEIVED, RRI, SLN, SYD, TBILLEQ, TBILLPRICE, TBILLYIELD, VDB, XIRR, XNPV, YIELDDISC, YIELDMAT, ZERO_COUPON Comment[da]=ACCRINT, ACCRINTM, AMORDEGRC, AMORLINC, COMPOUND, CONTINUOUS, COUPNUM, CUMIPMT, CUMPRINC, DB, DDB, DISC, DOLLARDE, DOLLARFR, DURATION, DURATION_ADD, EFFECT, EFFECTIVE, EURO, EUROCONVERT, FV, FV_ANNUITY, INTRATE, IPMT, ISPMT, LEVEL_COUPON, MDURATION, MIRR, NOMINAL, NPER, NPV, ODDLPRICE, ODDLYIELD, PMT, PPMT, PRICEMAT, PV, PV_ANNUITY, RECEIVED, RRI, SLN, SYD, TBILLEQ, TBILLPRICE, TBILLYIELD, VDB, XIRR, XNPV, YIELDDISC, YIELDMAT, ZERO_COUPON Comment[de]=ACCRINT, ACCRINTM, AMORDEGRC, AMORLINC, COMPOUND, CONTINUOUS, COUPNUM, CUMIPMT, CUMPRINC, DB, DDB, DISC, DOLLARDE, DOLLARFR, DURATION, DURATION_ADD, EFFECT, EFFECTIVE, EURO, EUROCONVERT, FV, FV_ANNUITY, INTRATE, IPMT, ISPMT, LEVEL_COUPON, MDURATION, MIRR, NOMINAL, NPER, NPV, ODDLPRICE, ODDLYIELD, PMT, PPMT, PRICEMAT, PV, PV_ANNUITY, RECEIVED, RRI, SLN, SYD, TBILLEQ, TBILLPRICE, TBILLYIELD, VDB, XIRR, XNPV, YIELDDISC, YIELDMAT, ZERO_COUPON diff -Nru calligra-2.4.0/sheets/functions/kspreadinformationmodule.desktop calligra-2.4.3/sheets/functions/kspreadinformationmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadinformationmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadinformationmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Information Functions Name[bg]=Информационни функции Name[ca]=Funcions d'informació +Name[ca@valencia]=Funcions d'informació Name[cs]=Informační funkce Name[da]=Informationsfunktioner Name[de]=Informationsfunktionen @@ -13,6 +14,7 @@ Name[fr]=Fonctions d'information Name[gl]=Funcións de Información Name[he]=פונקציות מידע +Name[hu]=Információs függvények Name[it]=Funzioni informatiche Name[ja]=情報関数 Name[kk]=Ақпараттық функциялары @@ -22,7 +24,7 @@ Name[nl]=Informatiefuncties Name[pl]=Funkcje informacyjne Name[pt]=Funções Informativas -Name[pt_BR]=Funções Informativas +Name[pt_BR]=Funções informativas Name[ru]=Информационные функции Name[sk]=Informačné funkcie Name[sv]=Informationsfunktioner @@ -34,6 +36,7 @@ Name[zh_TW]=資訊函數 Comment=ERRORTYPE, FILENAME, INFO, ISBLANK, ISDATE, ISERR, ISERROR, ISEVEN, ISLOGICAL, ISNA, ISNONTEXT, ISNOTTEXT, ISNUM, ISNUMBER, ISODD, ISREF, ISTEXT, ISTIME, N, NA, TYPE Comment[ca]=ERRORTYPE, FILENAME, INFO, ISBLANK, ISDATE, ISERR, ISERROR, ISEVEN, ISLOGICAL, ISNA, ISNONTEXT, ISNOTTEXT, ISNUM, ISNUMBER, ISODD, ISREF, ISTEXT, ISTIME, N, NA, TYPE +Comment[ca@valencia]=ERRORTYPE, FILENAME, INFO, ISBLANK, ISDATE, ISERR, ISERROR, ISEVEN, ISLOGICAL, ISNA, ISNONTEXT, ISNOTTEXT, ISNUM, ISNUMBER, ISODD, ISREF, ISTEXT, ISTIME, N, NA, TYPE Comment[cs]=ERRORTYPE, FILENAME, INFO, ISBLANK, ISDATE, ISERR, ISERROR, ISEVEN, ISLOGICAL, ISNA, ISNONTEXT, ISNOTTEXT, ISNUM, ISNUMBER, ISODD, ISREF, ISTEXT, ISTIME, N, NA, TYPE Comment[da]=ERRORTYPE, FILENAME, INFO, ISBLANK, ISDATE, ISERR, ISERROR, ISEVEN, ISLOGICAL, ISNA, ISNONTEXT, ISNOTTEXT, ISNUM, ISNUMBER, ISODD, ISREF, ISTEXT, ISTIME, N, NA, TYPE Comment[de]=ERRORTYPE, FILENAME, INFO, ISBLANK, ISDATE, ISERR, ISERROR, ISEVEN, ISLOGICAL, ISNA, ISNONTEXT, ISNOTTEXT, ISNUM, ISNUMBER, ISODD, ISREF, ISTEXT, ISTIME, N, NA, TYPE diff -Nru calligra-2.4.0/sheets/functions/kspreadlogicmodule.desktop calligra-2.4.3/sheets/functions/kspreadlogicmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadlogicmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadlogicmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Logic Functions Name[bg]=Логически функции Name[ca]=Funcions lògiques +Name[ca@valencia]=Funcions lògiques Name[cs]=Logické funkce Name[da]=Logiske funktioner Name[de]=Logikfunktionen @@ -25,7 +26,7 @@ Name[nl]=Logische functies Name[pl]=Funkcje logiczne Name[pt]=Funções Lógicas -Name[pt_BR]=Funções Lógicas +Name[pt_BR]=Funções lógicas Name[ru]=Логические функции Name[sk]=Logické funkcie Name[sl]=Logične funkcije @@ -38,6 +39,7 @@ Name[zh_TW]=邏輯函數 Comment=AND, FALSE, IF, NAND, NOR, NOT, OR, TRUE, XOR Comment[ca]=AND, FALSE, IF, NAND, NOR, NOT, OR, TRUE, XOR +Comment[ca@valencia]=AND, FALSE, IF, NAND, NOR, NOT, OR, TRUE, XOR Comment[cs]=AND, FALSE, IF, NAND, NOR, NOT, OR, TRUE, XOR Comment[da]=AND, FALSE, IF, NAND, NOR, NOT, OR, TRUE, XOR Comment[de]=AND, FALSE, IF, NAND, NOR, NOT, OR, TRUE, XOR diff -Nru calligra-2.4.0/sheets/functions/kspreadmathmodule.desktop calligra-2.4.3/sheets/functions/kspreadmathmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadmathmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadmathmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Math Functions Name[bg]=Математически функции Name[ca]=Funcions matemàtiques +Name[ca@valencia]=Funcions matemàtiques Name[cs]=Matematické funkce Name[da]=Matematiske funktioner Name[de]=Mathematische Funktionen @@ -23,7 +24,7 @@ Name[nl]=Wiskundige functies Name[pl]=Funkcje matematyczne Name[pt]=Funções Matemáticas -Name[pt_BR]=Funções Matemáticas +Name[pt_BR]=Funções matemáticas Name[ru]=Математические функции Name[sk]=Matematické funkcie Name[sl]=Matematične funkcije @@ -36,6 +37,7 @@ Name[zh_TW]=數學函數 Comment=ABS, CEIL, CEILING, COUNT, COUNTA, COUNTBLANK, COUNTIF, CUR, DIV, EPS, EVEN, EXP, FACT, FACTDOUBLE, FIB, FLOOR, GAMMA, GCD, G_PRODUCT, INT, INV, KPRODUCT, LCM, LN, LOG, LOG10, LOG2, LOGN, MAX, MAXA, MDETERM, MIN, MINA, MINVERSE, MMULT, MOD, MROUND, MULTINOMIAL, MULTIPLY, MUNIT, ODD, POW, POWER, PRODUCT, QUOTIENT, RAND, RANDBERNOULLI, RANDBETWEEN, RANDBINOM, RANDEXP, RANDNEGBINOM, RANDNORM, RANDPOISSON, ROOTN, ROUND, ROUNDDOWN, ROUNDUP, SERIESSUM, SIGN, SQRT, SQRTPI, SUBTOTAL, SUM, SUMA, SUMIF, SUMSQ, TRANSPOSE, TRUNC Comment[ca]=ABS, CEIL, CEILING, COUNT, COUNTA, COUNTBLANK, COUNTIF, CUR, DIV, EPS, EVEN, EXP, FACT, FACTDOUBLE, FIB, FLOOR, GAMMA, GCD, G_PRODUCT, INT, INV, KPRODUCT, LCM, LN, LOG, LOG10, LOG2, LOGN, MAX, MAXA, MDETERM, MIN, MINA, MINVERSE, MMULT, MOD, MROUND, MULTINOMIAL, MULTIPLY, MUNIT, ODD, POW, POWER, PRODUCT, QUOTIENT, RAND, RANDBERNOULLI, RANDBETWEEN, RANDBINOM, RANDEXP, RANDNEGBINOM, RANDNORM, RANDPOISSON, ROOTN, ROUND, ROUNDDOWN, ROUNDUP, SERIESSUM, SIGN, SQRT, SQRTPI, SUBTOTAL, SUM, SUMA, SUMIF, SUMSQ, TRANSPOSE, TRUNC +Comment[ca@valencia]=ABS, CEIL, CEILING, COUNT, COUNTA, COUNTBLANK, COUNTIF, CUR, DIV, EPS, EVEN, EXP, FACT, FACTDOUBLE, FIB, FLOOR, GAMMA, GCD, G_PRODUCT, INT, INV, KPRODUCT, LCM, LN, LOG, LOG10, LOG2, LOGN, MAX, MAXA, MDETERM, MIN, MINA, MINVERSE, MMULT, MOD, MROUND, MULTINOMIAL, MULTIPLY, MUNIT, ODD, POW, POWER, PRODUCT, QUOTIENT, RAND, RANDBERNOULLI, RANDBETWEEN, RANDBINOM, RANDEXP, RANDNEGBINOM, RANDNORM, RANDPOISSON, ROOTN, ROUND, ROUNDDOWN, ROUNDUP, SERIESSUM, SIGN, SQRT, SQRTPI, SUBTOTAL, SUM, SUMA, SUMIF, SUMSQ, TRANSPOSE, TRUNC Comment[cs]=ABS, CEIL, CEILING, COUNT, COUNTA, COUNTBLANK, COUNTIF, CUR, DIV, EPS, EVEN, EXP, FACT, FACTDOUBLE, FIB, FLOOR, GAMMA, GCD, G_PRODUCT, INT, INV, KPRODUCT, LCM, LN, LOG, LOG10, LOG2, LOGN, MAX, MAXA, MDETERM, MIN, MINA, MINVERSE, MMULT, MOD, MROUND, MULTINOMIAL, MULTIPLY, MUNIT, ODD, POW, POWER, PRODUCT, QUOTIENT, RAND, RANDBERNOULLI, RANDBETWEEN, RANDBINOM, RANDEXP, RANDNEGBINOM, RANDNORM, RANDPOISSON, ROOTN, ROUND, ROUNDDOWN, ROUNDUP, SERIESSUM, SIGN, SQRT, SQRTPI, SUBTOTAL, SUM, SUMA, SUMIF, SUMSQ, TRANSPOSE, TRUNC Comment[da]=ABS, CEIL, CEILING, COUNT, COUNTA, COUNTBLANK, COUNTIF, CUR, DIV, EPS, EVEN, EXP, FACT, FACTDOUBLE, FIB, FLOOR, GAMMA, GCD, G_PRODUCT, INT, INV, KPRODUCT, LCM, LN, LOG, LOG10, LOG2, LOGN, MAX, MAXA, MDETERM, MIN, MINA, MINVERSE, MMULT, MOD, MROUND, MULTINOMIAL, MULTIPLY, MUNIT, ODD, POW, POWER, PRODUCT, QUOTIENT, RAND, RANDBERNOULLI, RANDBETWEEN, RANDBINOM, RANDEXP, RANDNEGBINOM, RANDNORM, RANDPOISSON, ROOTN, ROUND, ROUNDDOWN, ROUNDUP, SERIESSUM, SIGN, SQRT, SQRTPI, SUBTOTAL, SUM, SUMA, SUMIF, SUMSQ, TRANSPOSE, TRUNC Comment[de]=ABS, CEIL, CEILING, COUNT, COUNTA, COUNTBLANK, COUNTIF, CUR, DIV, EPS, EVEN, EXP, FACT, FACTDOUBLE, FIB, FLOOR, GAMMA, GCD, G_PRODUCT, INT, INV, KPRODUCT, LCM, LN, LOG, LOG10, LOG2, LOGN, MAX, MAXA, MDETERM, MIN, MINA, MINVERSE, MMULT, MOD, MROUND, MULTINOMIAL, MULTIPLY, MUNIT, ODD, POW, POWER, PRODUCT, QUOTIENT, RAND, RANDBERNOULLI, RANDBETWEEN, RANDBINOM, RANDEXP, RANDNEGBINOM, RANDNORM, RANDPOISSON, ROOTN, ROUND, ROUNDDOWN, ROUNDUP, SERIESSUM, SIGN, SQRT, SQRTPI, SUBTOTAL, SUM, SUMA, SUMIF, SUMSQ, TRANSPOSE, TRUNC diff -Nru calligra-2.4.0/sheets/functions/kspreadreferencemodule.desktop calligra-2.4.3/sheets/functions/kspreadreferencemodule.desktop --- calligra-2.4.0/sheets/functions/kspreadreferencemodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadreferencemodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Reference Functions Name[bg]=Справочни функции Name[ca]=Funcions de referència +Name[ca@valencia]=Funcions de referència Name[cs]=Referenční funkce Name[da]=Referencefunktioner Name[de]=Verweisfunktionen @@ -12,6 +13,7 @@ Name[fi]=Viittausfunktiot Name[fr]=Fonctions de référence Name[gl]=Funcións de Referencia +Name[hu]=Hivatkozás függvények Name[it]=Funzioni di riferimento Name[ja]=検索・参照関数 Name[kk]=Сілтеме функциялары @@ -21,7 +23,7 @@ Name[nl]=Referentie-functies Name[pl]=Funkcje odniesienia Name[pt]=Funções de Referência -Name[pt_BR]=Funções de Referência +Name[pt_BR]=Funções de referência Name[ru]=Таблица функций Name[sk]=Referenčné funkcie Name[sv]=Referensfunktioner @@ -33,6 +35,7 @@ Name[zh_TW]=參考函數 Comment=ADDRESS, AREAS, CHOOSE, COLUMN, COLUMNS, HLOOKUP, INDEX, INDIRECT, LOOKUP, MULTIPLE.OPERATIONS ROW, ROWS, VLOOKUP Comment[ca]=ADDRESS, AREAS, CHOOSE, COLUMN, COLUMNS, HLOOKUP, INDEX, INDIRECT, LOOKUP, MULTIPLE.OPERATIONS ROW, ROWS, VLOOKUP +Comment[ca@valencia]=ADDRESS, AREAS, CHOOSE, COLUMN, COLUMNS, HLOOKUP, INDEX, INDIRECT, LOOKUP, MULTIPLE.OPERATIONS ROW, ROWS, VLOOKUP Comment[cs]=ADDRESS, AREAS, CHOOSE, COLUMN, COLUMNS, HLOOKUP, INDEX, INDIRECT, LOOKUP, MULTIPLE.OPERATIONS ROW, ROWS, VLOOKUP Comment[da]=ADDRESS, AREAS, CHOOSE, COLUMN, COLUMNS, HLOOKUP, INDEX, INDIRECT, LOOKUP, MULTIPLE.OPERATIONS ROW, ROWS, VLOOKUP Comment[de]=ADDRESS, AREAS, CHOOSE, COLUMN, COLUMNS, HLOOKUP, INDEX, INDIRECT, LOOKUP, MULTIPLE.OPERATIONS ROW, ROWS, VLOOKUP diff -Nru calligra-2.4.0/sheets/functions/kspreadstatisticalmodule.desktop calligra-2.4.3/sheets/functions/kspreadstatisticalmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadstatisticalmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadstatisticalmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Statistical Functions Name[bg]=Статистически функции Name[ca]=Funcions estadístiques +Name[ca@valencia]=Funcions estadístiques Name[cs]=Statistické funkce Name[da]=Statistiske funktioner Name[de]=Statistikfunktionen @@ -25,7 +26,7 @@ Name[oc]=Foncions estadisticas Name[pl]=Funkcje statystyczne Name[pt]=Funções Estatísticas -Name[pt_BR]=Funções Estatísticas +Name[pt_BR]=Funções estatísticas Name[ru]=Статистические функции Name[sk]=Štatistické funkcie Name[sl]=Statistične funkcije @@ -39,6 +40,7 @@ Name[zh_TW]=統計函數 Comment=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[ca]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST +Comment[ca@valencia]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[cs]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[da]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[de]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST @@ -56,6 +58,7 @@ Comment[pt]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[pt_BR]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[ru]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST +Comment[sk]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[sv]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[uk]=AVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTEST Comment[x-test]=xxAVEDEV, AVERAGE, AVERAGEA, BETADIST, BETAINV, BINO, CHIDIST, COMBIN, COMBINA, CONFIDENCE, CORREL, COVAR, DEVSQ, EXPONDIST, FDIST, FINV, FISHER, FISHERINV, FREQUENCY, GAMMADIST, GAMMAINV, GAMMALN, GAUSS, GEOMEAN, HARMEAN, HYPGEOMDIST, INTERCEPT, INVBINO, KURT, KURTP, LARGE, LEGACYFDIST, LOGINV, LOGNORMDIST, MEDIAN, MODE, NEGBINOMDIST, NORMDIST, NORMINV, NORMSDIST, NORMSINV, PEARSON, PERMUT, PERMUTATIONA, PHI, POISSON, RANK, RSQ, SKEW, SKEWP, SLOPE, SMALL, STANDARDIZE, STDEV, STDEVA, STDEVP, STDEVPA, STEYX, SUM2XMY, SUMPRODUCT, SUMX2MY2, SUMX2PY2, SUMXMY2, TDIST, TREND, TRIMMEAN, TTEST, VAR, VARA, VARIANCE, VARP, VARPA, WEIBULL, ZTESTxx diff -Nru calligra-2.4.0/sheets/functions/kspreadtextmodule.desktop calligra-2.4.3/sheets/functions/kspreadtextmodule.desktop --- calligra-2.4.0/sheets/functions/kspreadtextmodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadtextmodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Text Functions Name[bg]=Текстови функции Name[ca]=Funcions de text +Name[ca@valencia]=Funcions de text Name[cs]=Funkce textu Name[da]=Tekstfunktioner Name[de]=Textfunktionen @@ -25,7 +26,7 @@ Name[nl]=Tekstfuncties Name[pl]=Funkcje tekstowe Name[pt]=Funções de Texto -Name[pt_BR]=Funções de Texto +Name[pt_BR]=Funções de texto Name[ru]=Текстовые функции Name[sk]=Textové funkcie Name[sl]=Besedilne funkcije @@ -38,6 +39,7 @@ Name[zh_TW]=文字函數 Comment=ASC, BAHTTEXT, CHAR, CLEAN, CODE, COMPARE, CONCATENATE, DOLLAR, EXACT, FIND, FIXED, JIS, LEFT, LEN, LOWER, MID, PROPER, REGEXP, REGEXPRE, REPLACE, REPT, RIGHT, ROT, SEARCH, SLEEK, SUBSTITUTE, T, TEXT, TOGGLE, TRIM, UNICHAR, UNICODE, UPPER, VALUE Comment[ca]=ASC, BAHTTEXT, CHAR, CLEAN, CODE, COMPARE, CONCATENATE, DOLLAR, EXACT, FIND, FIXED, JIS, LEFT, LEN, LOWER, MID, PROPER, REGEXP, REGEXPRE, REPLACE, REPT, RIGHT, ROT, SEARCH, SLEEK, SUBSTITUTE, T, TEXT, TOGGLE, TRIM, UNICHAR, UNICODE, UPPER, VALUE +Comment[ca@valencia]=ASC, BAHTTEXT, CHAR, CLEAN, CODE, COMPARE, CONCATENATE, DOLLAR, EXACT, FIND, FIXED, JIS, LEFT, LEN, LOWER, MID, PROPER, REGEXP, REGEXPRE, REPLACE, REPT, RIGHT, ROT, SEARCH, SLEEK, SUBSTITUTE, T, TEXT, TOGGLE, TRIM, UNICHAR, UNICODE, UPPER, VALUE Comment[cs]=ASC, BAHTTEXT, CHAR, CLEAN, CODE, COMPARE, CONCATENATE, DOLLAR, EXACT, FIND, FIXED, JIS, LEFT, LEN, LOWER, MID, PROPER, REGEXP, REGEXPRE, REPLACE, REPT, RIGHT, ROT, SEARCH, SLEEK, SUBSTITUTE, T, TEXT, TOGGLE, TRIM, UNICHAR, UNICODE, UPPER, VALUE Comment[da]=ASC, BAHTTEXT, CHAR, CLEAN, CODE, COMPARE, CONCATENATE, DOLLAR, EXACT, FIND, FIXED, JIS, LEFT, LEN, LOWER, MID, PROPER, REGEXP, REGEXPRE, REPLACE, REPT, RIGHT, ROT, SEARCH, SLEEK, SUBSTITUTE, T, TEXT, TOGGLE, TRIM, UNICHAR, UNICODE, UPPER, VALUE Comment[de]=ASC, BAHTTEXT, CHAR, CLEAN, CODE, COMPARE, CONCATENATE, DOLLAR, EXACT, FIND, FIXED, JIS, LEFT, LEN, LOWER, MID, PROPER, REGEXP, REGEXPRE, REPLACE, REPT, RIGHT, ROT, SEARCH, SLEEK, SUBSTITUTE, T, TEXT, TOGGLE, TRIM, UNICHAR, UNICODE, UPPER, VALUE diff -Nru calligra-2.4.0/sheets/functions/kspreadtrigonometrymodule.desktop calligra-2.4.3/sheets/functions/kspreadtrigonometrymodule.desktop --- calligra-2.4.0/sheets/functions/kspreadtrigonometrymodule.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/functions/kspreadtrigonometrymodule.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Trigonometry Functions Name[bg]=Тригонометрични функции Name[ca]=Funcions trigonomètriques +Name[ca@valencia]=Funcions trigonomètriques Name[cs]=Trigonometrické funkce Name[da]=Trigonometrifunktioner Name[de]=Trigonometrie-Funktionen @@ -23,7 +24,7 @@ Name[nl]=Trigonometrie-functies Name[pl]=Funkcje trygonometryczne Name[pt]=Funções Trigonométricas -Name[pt_BR]=Funções Trigonométricas +Name[pt_BR]=Funções trigonométricas Name[ru]=Тригонометрические функции Name[sk]=Trigonometrické funkcie Name[sl]=Trigonometrične funkcije @@ -36,6 +37,7 @@ Name[zh_TW]=三角函數 Comment=ACOS, ACOSH, ACOT, ASIN, ASINH, ATAN, ATAN2, ATANH, COS, COSH, DEGREES, PI, RADIANS, SIN, SINH, TAN, TANH Comment[ca]=ACOS, ACOSH, ACOT, ASIN, ASINH, ATAN, ATAN2, ATANH, COS, COSH, DEGREES, PI, RADIANS, SIN, SINH, TAN, TANH +Comment[ca@valencia]=ACOS, ACOSH, ACOT, ASIN, ASINH, ATAN, ATAN2, ATANH, COS, COSH, DEGREES, PI, RADIANS, SIN, SINH, TAN, TANH Comment[cs]=ACOS, ACOSH, ACOT, ASIN, ASINH, ATAN, ATAN2, ATANH, COS, COSH, DEGREES, PI, RADIANS, SIN, SINH, TAN, TANH Comment[da]=ACOS, ACOSH, ACOT, ASIN, ASINH, ATAN, ATAN2, ATANH, COS, COSH, DEGREES, PI, RADIANS, SIN, SINH, TAN, TANH Comment[de]=ACOS, ACOSH, ACOT, ASIN, ASINH, ATAN, ATAN2, ATANH, COS, COSH, DEGREES, PI, RADIANS, SIN, SINH, TAN, TANH diff -Nru calligra-2.4.0/sheets/plugins/calendar/kspread_plugin_tool_calendar.desktop calligra-2.4.3/sheets/plugins/calendar/kspread_plugin_tool_calendar.desktop --- calligra-2.4.0/sheets/plugins/calendar/kspread_plugin_tool_calendar.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/plugins/calendar/kspread_plugin_tool_calendar.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Name=Calendar Tool Name[bg]=Инструмент календар Name[ca]=Eina de calendari +Name[ca@valencia]=Eina de calendari Name[cs]=Nástroj kalendáře Name[da]=Kalenderværktøj Name[de]=Kalender-Werkzeug @@ -24,7 +25,7 @@ Name[nl]=Kalenderhulpmiddel Name[pl]=Narzędzie kalendarza Name[pt]=Ferramenta de Calendário -Name[pt_BR]=Ferramenta de Calendário +Name[pt_BR]=Ferramenta de calendário Name[ru]=Календарь Name[sk]=Nástroj kalendára Name[sl]=Koledarsko orodje @@ -39,6 +40,7 @@ Comment=Inserts a calendar into a cell range. Comment[bg]=Вмъкване на календар в набор от клетки Comment[ca]=Insereix un calendari a un interval de cel·la. +Comment[ca@valencia]=Insereix un calendari a un interval de cel·la. Comment[cs]=Vloží kalendář do rozsahu buněk. Comment[da]=Indsætter en kalender i et celleområde. Comment[de]=Fügt einen Kalender in einen Zellbereich ein. @@ -49,6 +51,7 @@ Comment[fi]=Lisää kalenteri solualueelle. Comment[fr]=Insère un calendrier dans un intervalle de cellules Comment[gl]=Insire un calendario nun rango de celas. +Comment[hu]=Egy naptárat szúr be a cellatartományba. Comment[it]=Inserisce un calendario in un intervallo di celle. Comment[ja]=セルの範囲にカレンダーを挿入します Comment[kk]=Ұяшықтар аумағына күнтізбені ендіреді. diff -Nru calligra-2.4.0/sheets/plugins/scripting/krossmodulekspread.desktop calligra-2.4.3/sheets/plugins/scripting/krossmodulekspread.desktop --- calligra-2.4.0/sheets/plugins/scripting/krossmodulekspread.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/plugins/scripting/krossmodulekspread.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Scripting plugin Name[bg]=Приставка за скриптове Name[ca]=Connector d'scripting +Name[ca@valencia]=Connector d'scripting Name[cs]=Skriptovací modul Name[da]=Scriptplugin Name[de]=Skripting-Modul @@ -15,7 +16,7 @@ Name[fr]=Module de scriptage Name[fy]=Skriptplugin Name[ga]=Breiseán scriptithe -Name[gl]=Plugin de programación +Name[gl]=Engadido de scripting Name[he]=תוסף לתסריטים Name[hi]=स्क्रिप्टिंग प्लगइन Name[hne]=स्क्रिप्टिंग प्लगइन @@ -47,6 +48,7 @@ Comment=Allow execution of scripts Comment[bg]=Изпълнение на скриптове Comment[ca]=Permet l'execució d'scripts +Comment[ca@valencia]=Permet l'execució d'scripts Comment[cs]=Umožní spouštění skriptů Comment[da]=Tillad kørsel af script Comment[de]=Ermöglicht das Ausführen von Skripten @@ -60,7 +62,7 @@ Comment[fr]=Permet d'exécuter des scripts Comment[fy]=It útfieren fan skripts tastean Comment[ga]=Ceadaigh scripteanna a rith -Comment[gl]=Permite executar guións +Comment[gl]=Permite executar engadidos Comment[he]=אפשרות להרצת תסריטים Comment[hi]=स्क्रिप्ट को चलाने की अनुमति दें Comment[hne]=स्क्रिप्ट ल चलाय के अनुमति देव diff -Nru calligra-2.4.0/sheets/plugins/scripting/scripts/CMakeLists.txt calligra-2.4.3/sheets/plugins/scripting/scripts/CMakeLists.txt --- calligra-2.4.0/sheets/plugins/scripting/scripts/CMakeLists.txt 2012-04-06 15:37:58.000000000 +0000 +++ calligra-2.4.3/sheets/plugins/scripting/scripts/CMakeLists.txt 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,6 @@ install(FILES scripts.rc - DESTINATION ${DATA_INSTALL_DIR}/tables/scripts) + DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts) install(FILES csvimport.py csvexport.py csvoptions.ui @@ -11,16 +11,16 @@ logger.py xmlviewer.py myorca.py - DESTINATION ${DATA_INSTALL_DIR}/tables/scripts/extensions) + DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/extensions) install(FILES functions.py rpyfunctions.py yfinance.py yweather.py pytime.py pyregexp.py - DESTINATION ${DATA_INSTALL_DIR}/tables/scripts/functions) + DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/functions) install(FILES consoledocker.py snippetsdocker.rb - DESTINATION ${DATA_INSTALL_DIR}/tables/scripts/docker) + DESTINATION ${DATA_INSTALL_DIR}/sheets/scripts/docker) diff -Nru calligra-2.4.0/sheets/RTree.h calligra-2.4.3/sheets/RTree.h --- calligra-2.4.0/sheets/RTree.h 2012-04-06 15:37:57.000000000 +0000 +++ calligra-2.4.3/sheets/RTree.h 2012-06-26 04:21:31.000000000 +0000 @@ -412,7 +412,7 @@ void RTree::load(const QList >& data) { // clear current tree - KoRTree::clear(); + clear(); // make rect->data mapping typedef QPair DataRegion; diff -Nru calligra-2.4.0/sheets/shape/spreadsheetshape-deferred.desktop calligra-2.4.3/sheets/shape/spreadsheetshape-deferred.desktop --- calligra-2.4.0/sheets/shape/spreadsheetshape-deferred.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/shape/spreadsheetshape-deferred.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Spreadsheet Shape Name[ca]=Forma de full de càlcul +Name[ca@valencia]=Forma de full de càlcul Name[cs]=Tvar sešitu Name[da]=Regneark-form Name[de]=Tabellenobjekt diff -Nru calligra-2.4.0/sheets/shape/spreadsheetshape.desktop calligra-2.4.3/sheets/shape/spreadsheetshape.desktop --- calligra-2.4.0/sheets/shape/spreadsheetshape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/shape/spreadsheetshape.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Spreadsheet Shape Name[ca]=Forma de full de càlcul +Name[ca@valencia]=Forma de full de càlcul Name[cs]=Tvar sešitu Name[da]=Regneark-form Name[de]=Tabellenobjekt diff -Nru calligra-2.4.0/sheets/Sheet.cpp calligra-2.4.3/sheets/Sheet.cpp --- calligra-2.4.0/sheets/Sheet.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/Sheet.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -2880,7 +2880,7 @@ // the current cell is not a default one // or // we have a further cell in this row - while (!cell.isDefault() || tableContext.cellHasAnchoredShapes(this, cell.row(), cell.column()) || !nextCell.isNull()) { + do { // kDebug(36003) <<"Sheet::saveOdfCells:" // << " i: " << i // << " column: " << cell.column() << endl; @@ -2902,7 +2902,7 @@ } nextCell = d->cellStorage->nextInRow(i, row); - } + } while (!cell.isDefault() || tableContext.cellHasAnchoredShapes(this, cell.row(), cell.column()) || !nextCell.isNull()); // Fill the row with empty cells, if there's a row default cell style. if (tableContext.rowDefaultStyles.contains(row)) { diff -Nru calligra-2.4.0/sheets/sheets.desktop calligra-2.4.3/sheets/sheets.desktop --- calligra-2.4.0/sheets/sheets.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/sheets.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,7 +3,10 @@ Name[ca]=Sheets del Calligra Name[cs]=Calligra Sheets Name[da]=Calligra Sheets +Name[de]=Calligra Sheets Name[el]=Calligra Sheets +Name[es]=Calligra Sheets +Name[et]=Calligra Sheets Name[fi]=Calligra Sheets Name[hu]=Calligra Sheets Name[it]=Calligra Sheets @@ -12,6 +15,7 @@ Name[pl]=Calligra Sheets Name[pt]=Calligra Sheets Name[pt_BR]=Calligra Sheets +Name[sk]=Calligra Sheets Name[sv]=Calligra Sheets Name[uk]=Calligra Sheets Name[x-test]=xxCalligra Sheetsxx @@ -20,6 +24,7 @@ GenericName=Spreadsheet GenericName[bg]=Електронни таблици GenericName[ca]=Full de càlcul +GenericName[ca@valencia]=Full de càlcul GenericName[cs]=Sešit GenericName[da]=Regneark GenericName[de]=Tabellenkalkulation @@ -27,7 +32,7 @@ GenericName[en_GB]=Spreadsheet GenericName[es]=Hoja de cálculo GenericName[et]=Tabelitöötlus -GenericName[fi]=Taulukkolaskentaohjelma +GenericName[fi]=Taulukkolaskenta GenericName[fr]=Tableur GenericName[fy]=Spreadsheet GenericName[ga]=Scarbhileog @@ -62,6 +67,7 @@ Comment=Write spreadsheet documents Comment[bg]=Писане на електронни таблици Comment[ca]=Escriu documents de full de càlcul +Comment[ca@valencia]=Escriu documents de full de càlcul Comment[da]=Skriv regnearksdokumenter Comment[de]=Tabellendokumente verfassen Comment[el]=Γραφή εγγράφων φύλλου εργασίας diff -Nru calligra-2.4.0/sheets/sheets.notifyrc calligra-2.4.3/sheets/sheets.notifyrc --- calligra-2.4.0/sheets/sheets.notifyrc 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/sheets.notifyrc 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=KSpread Name[br]=KSpread Name[ca]=KSpread +Name[ca@valencia]=KSpread Name[cs]=KSpread Name[cy]=KSpread Name[da]=KSpread @@ -61,6 +62,7 @@ Comment=KSpread Spreadsheet Comment[bg]=Електронни таблици KSpread Comment[ca]=Full de càlcul KSpread +Comment[ca@valencia]=Full de càlcul KSpread Comment[cs]=Tabulky KSpread Comment[da]=KSpread regneark Comment[de]=KSpread-Tabellenkalkulation @@ -103,6 +105,7 @@ Name=Document loaded Name[bg]=Документът е зареден Name[ca]=Document carregat +Name[ca@valencia]=Document carregat Name[cs]=Dokument načten Name[da]=Dokument indlæst Name[de]=Dokument geladen @@ -142,6 +145,7 @@ Comment=A document was loaded Comment[bg]=Документът е зареден Comment[ca]=S'ha carregat un document +Comment[ca@valencia]=S'ha carregat un document Comment[cs]=Dokument byl načten Comment[da]=Et dokument blev indlæst Comment[de]=Ein Dokument wurde geladen @@ -185,6 +189,7 @@ Name=Document saved Name[bg]=Документът е записан Name[ca]=Document desat +Name[ca@valencia]=Document alçat Name[cs]=Dokument uložen Name[da]=Dokument gemt Name[de]=Dokument gespeichert @@ -224,6 +229,7 @@ Comment=A document was saved Comment[bg]=Документът е записан Comment[ca]=S'ha desat un document +Comment[ca@valencia]=S'ha alçat un document Comment[cs]=Dokument byl uložen Comment[da]=Et dokument blev gemt Comment[de]=Ein Dokument wurde gespeichert. diff -Nru calligra-2.4.0/sheets/sheetspart.desktop calligra-2.4.3/sheets/sheetspart.desktop --- calligra-2.4.0/sheets/sheetspart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/sheetspart.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Name=Calligra Spreadsheet Component Name[bg]=Компонент за електронни таблици в Calligra Name[ca]=Component de full de càlcul del Calligra +Name[ca@valencia]=Component de full de càlcul del Calligra Name[cs]=Komponenta Calligra pro tabulky Name[da]=Caligra-komponent til regneark Name[de]=Calligra-Komponente für Tabellenkalkulation @@ -9,8 +10,10 @@ Name[es]=Componente de hoja de cálculo de Calligra Name[et]=Calligra tabelitöötluse komponent Name[fr]=Composant gestion de projets de Calligra +Name[gl]=Compoñente de xestión de proxectos de Calligra Name[hu]=Calligra táblázatkezelő komponens Name[it]=Componente per il foglio elettronico di Calligra +Name[ja]=Calligra スプレッドシートコンポーネント Name[kk]=Calligra-ның электрондық кесте бағдарламасы Name[nb]=Calligra regnearkkomponent Name[nds]=Calligra-Komponent för Projektpleeg @@ -19,6 +22,7 @@ Name[pt]=Componente de Folhas de Cálculo do Calligra Name[pt_BR]=Componente de planilha do Calligra Name[ru]=Компонент Calligra Spreadsheet +Name[sk]=Komponent zošita Calligra Name[sv]=Calligra-kalkylarkskomponent Name[uk]=Компонент електронних таблиць Calligra Name[x-test]=xxCalligra Spreadsheet Componentxx @@ -34,6 +38,7 @@ GenericName=Spreadsheet GenericName[bg]=Електронни таблици GenericName[ca]=Full de càlcul +GenericName[ca@valencia]=Full de càlcul GenericName[cs]=Sešit GenericName[da]=Regneark GenericName[de]=Tabellenkalkulation @@ -41,7 +46,7 @@ GenericName[en_GB]=Spreadsheet GenericName[es]=Hoja de cálculo GenericName[et]=Tabelitöötlus -GenericName[fi]=Taulukkolaskentaohjelma +GenericName[fi]=Taulukkolaskenta GenericName[fr]=Tableur GenericName[fy]=Spreadsheet GenericName[ga]=Scarbhileog diff -Nru calligra-2.4.0/sheets/sheets_plugin.desktop calligra-2.4.3/sheets/sheets_plugin.desktop --- calligra-2.4.0/sheets/sheets_plugin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/sheets/sheets_plugin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,14 +5,20 @@ Comment[ca]=Connector per al Sheets del Calligra Comment[cs]=Modul pro Calligra Sheets Comment[da]=Plugin til Calligra Sheets +Comment[de]=Modul für Calligra Sheets Comment[el]=Πρόσθετο για Calligra Sheets +Comment[es]=Complemento para Calligra Sheets +Comment[et]=Calligra Sheetsi plugin +Comment[gl]=Engadido para Calligra Sheets Comment[hu]=Bővítmény a Calligra Sheetshez Comment[it]=Estensione per Calligra Sheets +Comment[ja]=Calligra Sheets のプラグイン Comment[kk]=Calligra Sheets плагині Comment[nl]=Plug-in voor Calligra Sheets Comment[pl]=Wtyczka dla Calligra Sheets Comment[pt]='Plugin' para o Calligra Sheets Comment[pt_BR]=Plugin para o Calligra Sheets +Comment[sk]=Plugin pre Calligra Sheets Comment[sv]=Insticksprogram för Calligra Sheets Comment[uk]=Додаток до Calligra Sheets Comment[x-test]=xxPlugin for Calligra Sheetsxx diff -Nru calligra-2.4.0/stage/data/kpr_pageeffect.desktop calligra-2.4.3/stage/data/kpr_pageeffect.desktop --- calligra-2.4.0/stage/data/kpr_pageeffect.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/data/kpr_pageeffect.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -3,12 +3,14 @@ X-KDE-ServiceType=CalligraStage/PageEffect Comment=Page effect plugin for Calligra Stage Comment[bg]=Приставка за ефекти в страниците на Calligra Stage -Comment[ca]=Connector d'efectes de pàgina per al Calligra +Comment[ca]=Connector d'efectes de pàgina per al Calligra Stage +Comment[ca@valencia]=Connector d'efectes de pàgina per al Calligra Comment[da]=Sideeffekt-plugin til Calligra Stage Comment[de]=Seiteneffektmodul für Calligra Stage Comment[el]=Πρόσθετο εφέ σελίδας για το Calligra Stage Comment[es]=Complemento de efectos de página de Calligra Stage Comment[et]=Calligra Stage'i leheküljeefektide plugin +Comment[gl]=Engadido de efectos de páxina para Calligra Stage Comment[it]=Estensione per gli effetti di pagina per Calligra Stage Comment[kk]=Calligra Stage-дің бет эффект плагині Comment[nb]=Calligra Stage programtillegg for sideeffekter @@ -18,6 +20,7 @@ Comment[pt]='Plugin' de efeitos das páginas do Calligra Stage Comment[pt_BR]=Plugin de efeitos das páginas do Calligra Stage Comment[ru]=Модуль эффектов страницы для Calligra Stage +Comment[sk]=Efektový plugin strany pre Calligra Stage Comment[sv]=Insticksprogram med sideffekter för Calligra Stage Comment[uk]=Додаток ефектів сторінки для Calligra Stage Comment[x-test]=xxPage effect plugin for Calligra Stagexx diff -Nru calligra-2.4.0/stage/data/kpr_shapeanimation.desktop calligra-2.4.3/stage/data/kpr_shapeanimation.desktop --- calligra-2.4.0/stage/data/kpr_shapeanimation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/data/kpr_shapeanimation.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -3,12 +3,14 @@ X-KDE-ServiceType=CalligraStage/ShapeAnimation Comment=Shape animation plugin for Calligra Stage Comment[bg]=Приставка за анимации на Calligra Stage -Comment[ca]=Connector d'animació de formes per al Calligra +Comment[ca]=Connector d'animació de formes per al Calligra Stage +Comment[ca@valencia]=Connector d'animació de formes per al Calligra Comment[da]=Form-animationsplugin til Calligra Stage Comment[de]=Objektanimationsmodul für Calligra Stage Comment[el]=Πρόσθετο κίνησης σχήματος για το Calligra Stage Comment[es]=Complemento de animación de formas de Calligra Stage Comment[et]=Calligra Stage'i kujundi animeerimise plugin +Comment[gl]=Engadido de formas de animación de Calligra Stage Comment[it]=Estensione per l'animazione delle forme di Calligra Stage Comment[kk]=Calligra Stage қалыпын анимациялау плагині Comment[nb]=Calligra Stage programtillegg for form-animasjoner @@ -18,6 +20,7 @@ Comment[pt]='Plugin' de animação de formas para o Calligra Stage Comment[pt_BR]=Plugin de animação de formas para o Calligra Stage Comment[ru]=Модуль анимации фигур для Calligra Stage +Comment[sk]=Plugin animácie tvaru pre Calligra Stage Comment[sv]=Insticksprogram med animeringsåtgärderför Calligra Stage Comment[uk]=Додаток анімації форм для Calligra Stage Comment[x-test]=xxShape animation plugin for Calligra Stagexx diff -Nru calligra-2.4.0/stage/part/stage.desktop calligra-2.4.3/stage/part/stage.desktop --- calligra-2.4.0/stage/part/stage.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/part/stage.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,7 +2,8 @@ Type=Application Name=Calligra Stage Name[bg]=Calligra Stage -Name[ca]=Etapa del Calligra +Name[ca]=Stage del Calligra +Name[ca@valencia]=Etapa del Calligra Name[cs]=Calligra Stage Name[da]=Calligra Stage Name[de]=Calligra Stage @@ -21,6 +22,7 @@ Name[pt]=Calligra Stage Name[pt_BR]=Calligra Stage Name[ru]=Calligra Stage +Name[sk]=Calligra Stage Name[sv]=Calligra Stage Name[uk]=Calligra Stage Name[x-test]=xxCalligra Stagexx @@ -30,6 +32,7 @@ GenericName=Presentation GenericName[bg]=Екранни презентации GenericName[ca]=Presentació +GenericName[ca@valencia]=Presentació GenericName[cs]=Prezentace GenericName[da]=Præsentation GenericName[de]=Präsentation @@ -74,6 +77,7 @@ Comment=Write presentation documents Comment[bg]=Създаване на документи за презентации Comment[ca]=Escriu documents de presentació +Comment[ca@valencia]=Escriu documents de presentació Comment[da]=Skriv præsentationsdokumenter Comment[de]=Präsentationsdokumente verfassen Comment[el]=Γράψτε έγγραφα παρουσιάσεων diff -Nru calligra-2.4.0/stage/part/stagepart.desktop calligra-2.4.3/stage/part/stagepart.desktop --- calligra-2.4.0/stage/part/stagepart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/part/stagepart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -1,7 +1,8 @@ [Desktop Entry] Name=Calligra Stage Component Name[bg]=Компонент Calligra Stage -Name[ca]=Component d'etapes del Calligra +Name[ca]=Component Stage del Calligra +Name[ca@valencia]=Component d'etapes del Calligra Name[cs]=Komponenta Calligra Stage Name[da]=Calligra-komponenten Stage Name[de]=Calligra-Komponente für Tabellenkalkulation @@ -9,8 +10,10 @@ Name[es]=Componente de Calligra Stage Name[et]=Calligra Stage'i komponent Name[fr]=Composant gestion de projets de Calligra +Name[gl]=Compoñente de xestión de proxectos de Calligra Name[hu]=Calligra Stage komponens Name[it]=Componente di Calligra Stage +Name[ja]=Calligra Stage コンポーネント Name[kk]=Calligra Stage компоненті Name[nb]=Calligra Stage-komponent Name[nds]=Komponent för Calligra-Stage @@ -19,6 +22,7 @@ Name[pt]=Componente do Calligra Stage Name[pt_BR]=Componente do Calligra Stage Name[ru]=Компонент Calligra Stage +Name[sk]=Komponent Calligra Stage Name[sv]=Calligra Stage-komponent Name[uk]=Компонент Calligra Stage Name[x-test]=xxCalligra Stage Componentxx diff -Nru calligra-2.4.0/stage/part/tools/animationtool/calligrastagetoolanimation.desktop calligra-2.4.3/stage/part/tools/animationtool/calligrastagetoolanimation.desktop --- calligra-2.4.0/stage/part/tools/animationtool/calligrastagetoolanimation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/part/tools/animationtool/calligrastagetoolanimation.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Name=Animation Tool Name[bg]=Инструмент за анимации Name[ca]=Eina d'animació +Name[ca@valencia]=Eina d'animació Name[cs]=Nástroj pro animaci Name[da]=Animationsværktøj Name[de]=Animationswerkzeug @@ -26,7 +27,7 @@ Name[nl]=Animatie-hulpmiddel Name[pl]=Narzędzie animacji Name[pt]=Ferramenta de Animação -Name[pt_BR]=Ferramenta de Animação +Name[pt_BR]=Ferramenta de animação Name[ru]=Инструмент анимации Name[sk]=Animačný nástroj Name[sl]=Orodje za animacijo diff -Nru calligra-2.4.0/stage/plugins/eventactions/calligrastageeventactions.desktop calligra-2.4.3/stage/plugins/eventactions/calligrastageeventactions.desktop --- calligra-2.4.0/stage/plugins/eventactions/calligrastageeventactions.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/eventactions/calligrastageeventactions.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon= Name=Presentation Event Actions Name[ca]=Accions de presentació d'esdeveniments +Name[ca@valencia]=Accions de presentació d'esdeveniments Name[da]=Begivenhedshandlinger til præsentation Name[de]=Präsentationsaktionsereignisse Name[el]=Ενέργειες γεγονότων παρουσίασης @@ -20,7 +21,7 @@ Name[nl]=Acties na presentatie-events Name[pl]=Przypadki działania prezentacji Name[pt]=Acções do Evento da Apresentação -Name[pt_BR]=Ações do Evento da Apresentação +Name[pt_BR]=Ações do evento da apresentação Name[ru]=Действия для событий презентации Name[sk]=Akcie udalostí prezentácie Name[sv]=Händelseåtgärder för presentationer diff -Nru calligra-2.4.0/stage/plugins/pageeffects/barwipe/kpr_pageeffect_barwipe.desktop calligra-2.4.3/stage/plugins/pageeffects/barwipe/kpr_pageeffect_barwipe.desktop --- calligra-2.4.0/stage/plugins/pageeffects/barwipe/kpr_pageeffect_barwipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/barwipe/kpr_pageeffect_barwipe.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Bar Wipe Name[ca]=Esborrat de barra +Name[ca@valencia]=Esborrat de barra Name[da]=Bjælkevisker Name[de]=Wischblende (Stange) Name[el]=Σβήσιμο ράβδων @@ -20,7 +21,7 @@ Name[nl]=Balkvegen Name[pl]=Wycieranie poprzeczką Name[pt]=Varrimento de Barras -Name[pt_BR]=Varredura de Barras +Name[pt_BR]=Varredura de barras Name[ru]=Исчезновение полосами Name[sk]=Zotrieť stĺpec Name[sv]=Suddning med staplar @@ -32,6 +33,7 @@ Name[zh_TW]=條狀掃描 Comment=Bar Wipe Page Effect Comment[ca]=Efecte d'esborrat de barra de la pàgina +Comment[ca@valencia]=Efecte d'esborrat de barra de la pàgina Comment[da]=Bjælkevisker-sideeffekt Comment[de]=Wischblenden-Seiteneffekt (Stange) Comment[el]=Εφέ σελίδας σβήσιμο ράβδων @@ -51,7 +53,7 @@ Comment[nl]=Balkvegen pagina-effect Comment[pl]=Efekt wycierania strony poprzeczką Comment[pt]=Efeito de Varrimento da Página em Barras -Comment[pt_BR]=Efeito de Varredura da Página em Barras +Comment[pt_BR]=Efeito de varredura da página em barras Comment[ru]=Эффект исчезновения полосами Comment[sk]=Efekt strany zotretie stĺpca Comment[sv]=Sideffekt: Suddning med staplar diff -Nru calligra-2.4.0/stage/plugins/pageeffects/clockwipe/kpr_pageeffect_clockwipe.desktop calligra-2.4.3/stage/plugins/pageeffects/clockwipe/kpr_pageeffect_clockwipe.desktop --- calligra-2.4.0/stage/plugins/pageeffects/clockwipe/kpr_pageeffect_clockwipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/clockwipe/kpr_pageeffect_clockwipe.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Clock wipe Name[ca]=Esborrat de rellotge +Name[ca@valencia]=Esborrat de rellotge Name[da]=Urvisker Name[de]=Wischblende (Uhr) Name[el]=Ωρολογιακό σβήσιμο @@ -32,6 +33,7 @@ Name[zh_TW]=時鐘掃描 Comment=Clock wipe Page Effects Comment[ca]=Efectes d'esborrat de rellotge de la pàgina +Comment[ca@valencia]=Efectes d'esborrat de rellotge de la pàgina Comment[da]=Urvisker-sideeffekter Comment[de]=Wischblenden-Seiteneffekt (Uhr) Comment[el]=Εφέ σελίδας ωρολογιακό σβήσιμο @@ -51,7 +53,7 @@ Comment[nl]=Klokvegen pagina-effecten Comment[pl]=Efekt wycierania strony zegarem Comment[pt]=Efeitos de Varrimento da Página em Relógio -Comment[pt_BR]=Efeitos de Varredura da Página em Relógio +Comment[pt_BR]=Efeitos de varredura da página em relógio Comment[ru]=Эффект исчезновения в форме циферблата Comment[sk]=Efekty strany zotretie hodín Comment[sv]=Sideffekter: Klockformad suddning diff -Nru calligra-2.4.0/stage/plugins/pageeffects/edgewipe/kpr_pageeffect_edgewipe.desktop calligra-2.4.3/stage/plugins/pageeffects/edgewipe/kpr_pageeffect_edgewipe.desktop --- calligra-2.4.0/stage/plugins/pageeffects/edgewipe/kpr_pageeffect_edgewipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/edgewipe/kpr_pageeffect_edgewipe.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Edge wipe Name[ca]=Esborrat de vora +Name[ca@valencia]=Esborrat de vora Name[da]=Kantvisker Name[de]=Wischblende (Rand) Name[el]=Σβήσιμο άκρων @@ -32,6 +33,7 @@ Name[zh_TW]=邊緣掃描 Comment=Edge Wipe Page Effects Comment[ca]=Efectes d'esborrat de vora de la pàgina +Comment[ca@valencia]=Efectes d'esborrat de vora de la pàgina Comment[da]=Kantvisker-sideeffekter Comment[de]=Wischblenden-Seiteneffekte Comment[el]=Εφέ σελίδας σβήσιμο άκρων @@ -51,7 +53,7 @@ Comment[nl]=Randvegen pagina-effecten Comment[pl]=Efekt wycierania strony krawędzią Comment[pt]=Efeito de Varrimento da Página pelo Extremo -Comment[pt_BR]=Efeito de Varredura da Página pela Extremidade +Comment[pt_BR]=Efeito de varredura da página pela extremidade Comment[ru]=Эффект исчезновения краёв Comment[sk]=Efekty strany zotretie okraja Comment[sv]=Sideffekter: Kantsuddning diff -Nru calligra-2.4.0/stage/plugins/pageeffects/example/kpr_pageeffect_example.desktop calligra-2.4.3/stage/plugins/pageeffects/example/kpr_pageeffect_example.desktop --- calligra-2.4.0/stage/plugins/pageeffects/example/kpr_pageeffect_example.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/example/kpr_pageeffect_example.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Exploding Page Name[bg]=Избухваща страница Name[ca]=Explosió de pàgina +Name[ca@valencia]=Explosió de pàgina Name[da]=Eksploderende side Name[de]=Explodierende Seite Name[el]=Έκρηξη σελίδας @@ -22,7 +23,7 @@ Name[nl]=Exploderende pagina Name[pl]=Eksplodująca strona Name[pt]=Página em Explosão -Name[pt_BR]=Explosão de Página +Name[pt_BR]=Explosão de página Name[ru]=Эффект взрыва Name[sk]=Explodujúca strana Name[sv]=Exploderande sida @@ -35,6 +36,7 @@ Comment=Exploding Page Page Effect Comment[bg]=Ефект на избухваща страница Comment[ca]=Efecte d'explosió de la pàgina +Comment[ca@valencia]=Efecte d'explosió de la pàgina Comment[da]=Eksploderende side-sideeffekt Comment[de]=Seiteneffekt mit explodierender Seite Comment[el]=Εφέ σελίδας έκρηξη @@ -55,7 +57,7 @@ Comment[nl]=Exploderende pagina pagina-effect Comment[pl]=Efekt eksplodującej strony Comment[pt]=Efeito de Explosão da Página -Comment[pt_BR]=Efeito de Explosão da Página +Comment[pt_BR]=Efeito de explosão da página Comment[ru]=Эффект взрыва Comment[sk]=Efekt strany Explodujúca strana Comment[sv]=Sideffekt: Exploderande sida diff -Nru calligra-2.4.0/stage/plugins/pageeffects/fade/kpr_pageeffect_fade.desktop calligra-2.4.3/stage/plugins/pageeffects/fade/kpr_pageeffect_fade.desktop --- calligra-2.4.0/stage/plugins/pageeffects/fade/kpr_pageeffect_fade.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/fade/kpr_pageeffect_fade.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Fade Name[bg]=Избледняване Name[ca]=Esvaïment +Name[ca@valencia]=Esvaïment Name[cs]=Blednutí Name[da]=Udtoning Name[de]=Verblassen @@ -34,6 +35,7 @@ Comment=Fade Effect Comment[bg]=Ефект на избледняване Comment[ca]=Efecte d'esvaïment +Comment[ca@valencia]=Efecte d'esvaïment Comment[cs]=Efekt mizení Comment[da]=Udtoningseffekt Comment[de]=Verblassungseffekt diff -Nru calligra-2.4.0/stage/plugins/pageeffects/iriswipe/kpr_pageeffect_iriswipe.desktop calligra-2.4.3/stage/plugins/pageeffects/iriswipe/kpr_pageeffect_iriswipe.desktop --- calligra-2.4.0/stage/plugins/pageeffects/iriswipe/kpr_pageeffect_iriswipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/iriswipe/kpr_pageeffect_iriswipe.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Iris Wipe Name[ca]=Esborrat d'iris +Name[ca@valencia]=Esborrat d'iris Name[da]=Irisvisker Name[de]=Wischblende (Iris) Name[el]=Σβήσιμο ίριδας @@ -31,6 +32,7 @@ Name[zh_TW]=彩虹掃描 Comment=Iris Wipe Page Effects Comment[ca]=Efectes d'esborrat d'iris de la pàgina +Comment[ca@valencia]=Efectes d'esborrat d'iris de la pàgina Comment[da]=Irisvisker-sideeffekter Comment[de]=Wischblenden-Seiteneffekte (Iris) Comment[el]=Εφέ σελίδας σβήσιμο ίριδας @@ -49,7 +51,7 @@ Comment[nl]=Irisvegen pagina-effect Comment[pl]=Efekt wycierania strony soczewką Comment[pt]=Efeito de Varrimento da Página em Íris -Comment[pt_BR]=Efeito de Varredura da Página em Íris +Comment[pt_BR]=Efeito de varredura da página em Íris Comment[ru]=Эффект исчезновения «ирис» Comment[sk]=Efekt strany zotretie clony Comment[sv]=Sideffekter: Irissuddning diff -Nru calligra-2.4.0/stage/plugins/pageeffects/matrixwipe/kpr_pageeffect_matrixwipe.desktop calligra-2.4.3/stage/plugins/pageeffects/matrixwipe/kpr_pageeffect_matrixwipe.desktop --- calligra-2.4.0/stage/plugins/pageeffects/matrixwipe/kpr_pageeffect_matrixwipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/matrixwipe/kpr_pageeffect_matrixwipe.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Matrix wipe Name[ca]=Esborrat de matriu +Name[ca@valencia]=Esborrat de matriu Name[da]=Matrixvisker Name[de]=Wischblende (Matrix) Name[el]=Σβήσιμο πίνακα @@ -20,7 +21,7 @@ Name[nl]=Matrixvegen Name[pl]=Wycieranie macierzowe Name[pt]=Varrimento em Matriz -Name[pt_BR]=Varredura em Matriz +Name[pt_BR]=Varredura em matriz Name[ru]=Исчезновение «матрица» Name[sk]=Zotrieť maticu Name[sv]=Matrissuddning @@ -32,6 +33,7 @@ Name[zh_TW]=矩陣掃描 Comment=Matrix wipe Page Effects Comment[ca]=Efectes d'esborrat de matriu de la pàgina +Comment[ca@valencia]=Efectes d'esborrat de matriu de la pàgina Comment[da]=Matrixvisker-sideeffekt Comment[de]=Wischblenden-Seiteneffekte (Matrix) Comment[el]=Εφέ σελίδας σβήσιμο πίνακα @@ -51,7 +53,7 @@ Comment[nl]=Matrixvegen pagina-effecten Comment[pl]=Efekt macierzowego wycierania strony Comment[pt]=Efeitos de Varrimento da Página em Matriz -Comment[pt_BR]=Efeitos de Varredura da Página em Matriz +Comment[pt_BR]=Efeitos de varredura da página em matriz Comment[ru]=Эффект исчезновения «матрица» Comment[sk]=Efekty strany zotretie matice Comment[sv]=Sideffekter: Matrissuddning diff -Nru calligra-2.4.0/stage/plugins/pageeffects/slidewipe/kpr_pageeffect_slidewipe.desktop calligra-2.4.3/stage/plugins/pageeffects/slidewipe/kpr_pageeffect_slidewipe.desktop --- calligra-2.4.0/stage/plugins/pageeffects/slidewipe/kpr_pageeffect_slidewipe.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/slidewipe/kpr_pageeffect_slidewipe.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Slide Wipe Name[ca]=Esborrat de diapositiva +Name[ca@valencia]=Esborrat de diapositiva Name[da]=Diasvisker Name[de]=Wischblende (Gleiten) Name[el]=Σβήσιμο κύλιση @@ -19,7 +20,7 @@ Name[nl]=Diavegen Name[pl]=Wycieranie ślizgające Name[pt]=Varrimento Deslizante -Name[pt_BR]=Varredura do Slide +Name[pt_BR]=Varredura do slide Name[ru]=Исчезновение скольжением Name[sk]=Zotrieť snímku Name[sv]=Glidsuddning @@ -31,6 +32,7 @@ Name[zh_TW]=滑動掃描 Comment=Slide Wipe Page Effect Comment[ca]=Efectes d'esborrat de diapositiva de la pàgina +Comment[ca@valencia]=Efectes d'esborrat de diapositiva de la pàgina Comment[da]=Diasvisker-sideeffekt Comment[de]=Wischblenden-Seiteneffekt (Gleiten) Comment[el]=Εφέ σελίδας σβήσιμο κύλιση @@ -49,7 +51,7 @@ Comment[nl]=Diavegen pagina-effect Comment[pl]=Efekt ślizgającego wycierania strony Comment[pt]=Efeito de Varrimento da Página do 'Slide' -Comment[pt_BR]=Efeito de Varredura da Página do Slide +Comment[pt_BR]=Efeito de varredura da página do slide Comment[ru]=Эффект исчезновения скольжением Comment[sk]=Efekt strany zotretie snímky Comment[sv]=Sideffekt: Glidsuddning diff -Nru calligra-2.4.0/stage/plugins/pageeffects/spacerotation/kpr_pageeffect_spacerotation.desktop calligra-2.4.3/stage/plugins/pageeffects/spacerotation/kpr_pageeffect_spacerotation.desktop --- calligra-2.4.0/stage/plugins/pageeffects/spacerotation/kpr_pageeffect_spacerotation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/spacerotation/kpr_pageeffect_spacerotation.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Name=Space Rotation Name[bg]=Пространствено въртене Name[ca]=Rotació de l'espai +Name[ca@valencia]=Rotació de l'espai Name[da]=Rotation i rum Name[de]=Flächendrehung Name[el]=Περιστροφή διάκενων @@ -28,6 +29,7 @@ Name[zh_TW]=空間旋轉 Comment=Space Rotation Page Effect Comment[ca]=Efecte de pàgina de rotació de l'espai +Comment[ca@valencia]=Efecte de pàgina de rotació de l'espai Comment[da]=Sideeffekt til rotation i rum Comment[de]=Flächendrehung-Seiteneffekt Comment[el]=Εφέ σελίδας περιστροφή διάκενων diff -Nru calligra-2.4.0/stage/plugins/pageeffects/swapeffect/kpr_pageeffect_swapeffect.desktop calligra-2.4.3/stage/plugins/pageeffects/swapeffect/kpr_pageeffect_swapeffect.desktop --- calligra-2.4.0/stage/plugins/pageeffects/swapeffect/kpr_pageeffect_swapeffect.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/pageeffects/swapeffect/kpr_pageeffect_swapeffect.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Swap Effect Name[ca]=Efecte d'escombrat +Name[ca@valencia]=Efecte d'escombrat Name[da]=Ombytningseffekt Name[de]=Wechseleffekt Name[el]=Εφέ ανταλλαγής @@ -26,6 +27,7 @@ Name[zh_TW]=變換效果 Comment=Swap Page Effect Comment[ca]=Efecte d'escombrat de pàgina +Comment[ca@valencia]=Efecte d'escombrat de pàgina Comment[da]=Sideombytningseffekt Comment[de]=Seitenwechseleffekt Comment[el]=Εφέ ανταλλαγής σελίδας diff -Nru calligra-2.4.0/stage/plugins/shapeanimations/example/kpr_shapeanimation_example.desktop calligra-2.4.3/stage/plugins/shapeanimations/example/kpr_shapeanimation_example.desktop --- calligra-2.4.0/stage/plugins/shapeanimations/example/kpr_shapeanimation_example.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/shapeanimations/example/kpr_shapeanimation_example.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Jiggle and Wiggle Name[ca]=Sacseja +Name[ca@valencia]=Sacseja Name[da]=Rysten og blævren Name[de]=Rütteln und Wackeln Name[el]=Κίνηση και στροβιλισμός @@ -20,7 +21,7 @@ Name[nl]=Bibberen en bewegen Name[pl]=Trzęsienie i skręcanie Name[pt]=Agitação e Ondulação -Name[pt_BR]=Agitação e Ondulação +Name[pt_BR]=Agitação e ondulação Name[ru]=Покачивания Name[sk]=Jiggle a Wiggle Name[sv]=Vicka och skaka @@ -32,6 +33,7 @@ Name[zh_TW]=搖搖擺擺 Comment=Jiggle and Wiggle that Shape! Comment[ca]=Sacseja aquesta imatge! +Comment[ca@valencia]=Sacseja esta imatge! Comment[da]=Ryst og blævr den form! Comment[de]=Am Objekt rütteln und wackeln. Comment[el]=Κίνηση και στροβιλισμός του σχήματος! @@ -51,7 +53,7 @@ Comment[nl]=Bibber en beweeg die vorm! Comment[pl]=Potrząśnij i skręcaj ten kształt! Comment[pt]=Agite e ondule essa forma! -Comment[pt_BR]=Agite e Ondule essa Forma! +Comment[pt_BR]=Agite e ondule essa forma! Comment[ru]=Покачивание фигуры. Comment[sk]=Pohúpať a krútiť ten tvar! Comment[sv]=Vicka och skaka formen! diff -Nru calligra-2.4.0/stage/plugins/variable/kprvariables.desktop calligra-2.4.3/stage/plugins/variable/kprvariables.desktop --- calligra-2.4.0/stage/plugins/variable/kprvariables.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/plugins/variable/kprvariables.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon= Name=Presentation Variables Name[ca]=Variables de presentació +Name[ca@valencia]=Variables de presentació Name[cs]=Proměnné prezentace Name[da]=Præsentationsvariabler Name[de]=Präsentationsvariablen diff -Nru calligra-2.4.0/stage/templates/common_desktop/emptyLandscape.desktop calligra-2.4.3/stage/templates/common_desktop/emptyLandscape.desktop --- calligra-2.4.0/stage/templates/common_desktop/emptyLandscape.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/common_desktop/emptyLandscape.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Празен документ Name[br]=Goullonderiñ Name[ca]=Buit +Name[ca@valencia]=Buit Name[cs]=Prázdné Name[cy]=Gwag Name[da]=Tom @@ -59,6 +60,7 @@ Comment=Empty presentation Comment[bg]=Празна презентация Comment[ca]=Presentació buida +Comment[ca@valencia]=Presentació buida Comment[cs]=Prázdná prezentace Comment[cy]=Cyflwyniad gwag Comment[da]=Tom præsentation diff -Nru calligra-2.4.0/stage/templates/common_desktop/emptyLandscapeWide.desktop calligra-2.4.3/stage/templates/common_desktop/emptyLandscapeWide.desktop --- calligra-2.4.0/stage/templates/common_desktop/emptyLandscapeWide.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/common_desktop/emptyLandscapeWide.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -3,6 +3,7 @@ Name=Empty 16:10 Name[bg]=Празен документ 10:16 Name[ca]=Buit 16:10 +Name[ca@valencia]=Buit 16:10 Name[cs]=Prázdné 16:10 Name[da]=Tom 16:10 Name[de]=Leer 16:10 @@ -40,6 +41,7 @@ Comment=Empty presentation 10:16 Comment[bg]=Празна презентация 10:16 Comment[ca]=Presentació buida 10:16 +Comment[ca@valencia]=Presentació buida 10:16 Comment[cs]=Prázdná prezentace 10:16 Comment[da]=Tom præsentation 10:16 Comment[de]=Leere Präsentation 16:10 diff -Nru calligra-2.4.0/stage/templates/odf/blue_orange_vector.desktop calligra-2.4.3/stage/templates/odf/blue_orange_vector.desktop --- calligra-2.4.0/stage/templates/odf/blue_orange_vector.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/blue_orange_vector.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Icon=blue_orange_vector Name=Blue Orange Vector Name[ca]=Vector blau taronja +Name[ca@valencia]=Vector blau taronja Name[da]=Blue Orange Vector Name[el]=Blue Orange Vector Name[en_GB]=Blue Orange Vector @@ -25,6 +26,7 @@ Name[zh_TW]=Blue Orange Vector Comment=Blue Orange Vector Comment[ca]=Vector blau taronja +Comment[ca@valencia]=Vector blau taronja Comment[da]=Blåorgange vektor Comment[el]=Μπλε πορτοκαλί διάνυσμα Comment[en_GB]=Blue Orange Vector diff -Nru calligra-2.4.0/stage/templates/odf/burning_desire.desktop calligra-2.4.3/stage/templates/odf/burning_desire.desktop --- calligra-2.4.0/stage/templates/odf/burning_desire.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/burning_desire.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Icon=burning_desire Name=Burning Desire Name[ca]=Desig roent +Name[ca@valencia]=Desig roent Name[da]=Burning Desire Name[de]=Brennendes Verlangen Name[el]=Burning Desire @@ -25,6 +26,7 @@ Name[zh_TW]=燃燒的慾望 Comment=Burning Desire Comment[ca]=Desig roent +Comment[ca@valencia]=Desig roent Comment[da]=Brændende længsel Comment[de]=Brennendes Verlangen Comment[el]=Διακαής επιθυμία diff -Nru calligra-2.4.0/stage/templates/odf/business.desktop calligra-2.4.3/stage/templates/odf/business.desktop --- calligra-2.4.0/stage/templates/odf/business.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/business.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Бизнес Name[br]=Labour Name[ca]=Negoci +Name[ca@valencia]=Negoci Name[cs]=Business Name[cy]=Busnes Name[da]=Business @@ -57,6 +58,7 @@ Comment=Business Comment[bg]=Бизнес Comment[ca]=Negoci +Comment[ca@valencia]=Negoci Comment[cs]=Business Comment[da]=Erhverv Comment[de]=Geschäftlich @@ -68,6 +70,7 @@ Comment[ga]=Gnó Comment[hu]=Üzlet Comment[it]=Affari +Comment[ja]=ビジネス Comment[kk]=Іскерлік Comment[nb]=Firmadrift Comment[nds]=Weertschap diff -Nru calligra-2.4.0/stage/templates/odf/curious_penguin.desktop calligra-2.4.3/stage/templates/odf/curious_penguin.desktop --- calligra-2.4.0/stage/templates/odf/curious_penguin.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/curious_penguin.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Icon=curious_penguin Name=Curious Penguin Name[ca]=Pingüí curiós +Name[ca@valencia]=Pingüí curiós Name[cs]=Zvědavý tučňák Name[da]=Curious Penguin Name[de]=Seltsamer Pinguin @@ -27,6 +28,7 @@ Name[zh_TW]=好奇的企鵝 Comment=Curious Penguin Comment[ca]=Pingüí curiós +Comment[ca@valencia]=Pingüí curiós Comment[cs]=Zvědavý tučňák Comment[da]=Nysgerrig pingvin Comment[de]=Seltsamer Pinguin diff -Nru calligra-2.4.0/stage/templates/odf/.directory calligra-2.4.3/stage/templates/odf/.directory --- calligra-2.4.0/stage/templates/odf/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Templates Name[ca]=Plantilles +Name[ca@valencia]=Plantilles Name[cs]=Šablony Name[da]=Skabeloner Name[de]=Vorlagen @@ -12,6 +13,7 @@ Name[ga]=Teimpléid Name[hu]=Sablonok Name[it]=Modelli +Name[ja]=テンプレート Name[kk]=Үлгілер Name[nb]=Maler Name[nds]=Vörlagen diff -Nru calligra-2.4.0/stage/templates/odf/flood_light.desktop calligra-2.4.3/stage/templates/odf/flood_light.desktop --- calligra-2.4.0/stage/templates/odf/flood_light.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/flood_light.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=flood_light Name=Flood Light Name[ca]=Inundació lleugera +Name[ca@valencia]=Inundació lleugera Name[da]=Flood Light Name[de]=Flutlicht Name[el]=Φωτισμός προβολέα @@ -25,6 +26,7 @@ Name[zh_TW]=Flood Light Comment=Flood Light Comment[ca]=Inundació lleugera +Comment[ca@valencia]=Inundació lleugera Comment[da]=Flood Light Comment[de]=Flutlicht Comment[el]=Φωτισμός προβολέα diff -Nru calligra-2.4.0/stage/templates/odf/kde_events.desktop calligra-2.4.3/stage/templates/odf/kde_events.desktop --- calligra-2.4.0/stage/templates/odf/kde_events.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/kde_events.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Icon=kde_events Name=KDE Events Name[ca]=Esdeveniments del KDE +Name[ca@valencia]=Esdeveniments del KDE Name[cs]=Události KDE Name[da]=KDE Events Name[de]=KDE-Termine @@ -10,6 +11,7 @@ Name[es]=Eventos de KDE Name[et]=KDE sündmused Name[fr]=Événements KDE +Name[hu]=KDE események Name[it]=Eventi di KDE Name[kk]=KDE оқиғалары Name[nb]=KDE-hendelser @@ -28,6 +30,7 @@ Name[zh_TW]=KDE 事件 Comment=KDE Events Comment[ca]=Esdeveniments del KDE +Comment[ca@valencia]=Esdeveniments del KDE Comment[cs]=Události KDE Comment[da]=KDE-arrangementer Comment[de]=KDE-Termine @@ -36,6 +39,7 @@ Comment[es]=Eventos de KDE Comment[et]=KDE sündmused Comment[fr]=Événements KDE +Comment[hu]=KDE események Comment[it]=Eventi di KDE Comment[kk]=KDE оқиғалары Comment[nb]=KDE-hendelser diff -Nru calligra-2.4.0/stage/templates/odf/rounded_square.desktop calligra-2.4.3/stage/templates/odf/rounded_square.desktop --- calligra-2.4.0/stage/templates/odf/rounded_square.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/rounded_square.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Icon=rounded_square Name=Rounded Square Name[ca]=Quadrat arrodonit +Name[ca@valencia]=Quadrat arrodonit Name[cs]=Zaoblený čtverec Name[da]=Rounded Square Name[de]=Abgerundetes Quadrat @@ -27,6 +28,7 @@ Name[zh_TW]=圓角方形 Comment=Rounded Square Comment[ca]=Quadrat arrodonit +Comment[ca@valencia]=Quadrat arrodonit Comment[cs]=Zaoblený čtverec Comment[da]=Afrundet firkant Comment[de]=Abgerundetes Quadrat diff -Nru calligra-2.4.0/stage/templates/odf/simple_waves.desktop calligra-2.4.3/stage/templates/odf/simple_waves.desktop --- calligra-2.4.0/stage/templates/odf/simple_waves.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/simple_waves.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Icon=simple_waves Name=Simple Waves Name[ca]=Ones simples +Name[ca@valencia]=Ones simples Name[da]=Simple Waves Name[de]=Einfache Wellen Name[el]=Simple Waves @@ -29,6 +30,7 @@ Name[zh_TW]=簡單波浪 Comment=Simple Waves Comment[ca]=Ones simples +Comment[ca@valencia]=Ones simples Comment[da]=Simple bølger Comment[de]=Einfache Wellen Comment[el]=Απλά κύματα diff -Nru calligra-2.4.0/stage/templates/odf/skyline_monotone.desktop calligra-2.4.3/stage/templates/odf/skyline_monotone.desktop --- calligra-2.4.0/stage/templates/odf/skyline_monotone.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/skyline_monotone.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=skyline_monotone Name=Skyline Monotone Name[ca]=Horitzó monòton +Name[ca@valencia]=Horitzó monòton Name[da]=Skyline Monotone Name[de]=Monotoner Horizont Name[el]=Skyline Monotone @@ -26,6 +27,7 @@ Name[zh_TW]=Skyline Monotone Comment=Skyline Monotone Comment[ca]=Horitzó monòton +Comment[ca@valencia]=Horitzó monòton Comment[da]=Skyline Monotone Comment[de]=Monotoner Horizont Comment[el]=Skyline Monotone diff -Nru calligra-2.4.0/stage/templates/odf/skyline_monotone_wide.desktop calligra-2.4.3/stage/templates/odf/skyline_monotone_wide.desktop --- calligra-2.4.0/stage/templates/odf/skyline_monotone_wide.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/skyline_monotone_wide.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=skyline_monotone_wide Name=Skyline Monotone Wide Name[ca]=Horitzó monòton ample +Name[ca@valencia]=Horitzó monòton ample Name[da]=Skyline Monotone (bred) Name[de]=Langer monotoner Horizont Name[el]=Skyline Monotone Wide @@ -26,6 +27,7 @@ Name[zh_TW]=Skyline Monotone Wide Comment=Skyline Monotone Wide Comment[ca]=Horitzó monòton ample +Comment[ca@valencia]=Horitzó monòton ample Comment[da]=Skyline Monotone (bred) Comment[de]=Langer monotoner Horizont Comment[el]=Skyline Monotone Wide diff -Nru calligra-2.4.0/stage/templates/odf/skyline_morning.desktop calligra-2.4.3/stage/templates/odf/skyline_morning.desktop --- calligra-2.4.0/stage/templates/odf/skyline_morning.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/skyline_morning.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=skyline_morning Name=Skyline Morning Name[ca]=Horitzó matinal +Name[ca@valencia]=Horitzó matinal Name[da]=Skyline Morning Name[de]=Horizont am Morgen Name[el]=Skyline Morning @@ -26,6 +27,7 @@ Name[zh_TW]=Skyline Morning Comment=Skyline Morning Comment[ca]=Horitzó matinal +Comment[ca@valencia]=Horitzó matinal Comment[da]=Skyline Morning Comment[de]=Horizont am Morgen Comment[el]=Skyline Morning diff -Nru calligra-2.4.0/stage/templates/odf/skyline_morning_wide.desktop calligra-2.4.3/stage/templates/odf/skyline_morning_wide.desktop --- calligra-2.4.0/stage/templates/odf/skyline_morning_wide.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/skyline_morning_wide.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=skyline_morning_wide Name=Skyline Morning Wide Name[ca]=Horitzó matinal ample +Name[ca@valencia]=Horitzó matinal ample Name[da]=Skyline Morning (bred) Name[de]=Langer Horizont am Morgen Name[el]=Skyline Morning Wide @@ -26,6 +27,7 @@ Name[zh_TW]=Skyline Morning Wide Comment=Skyline Morning Wide Comment[ca]=Horitzó matinal ample +Comment[ca@valencia]=Horitzó matinal ample Comment[da]=Skyline Morning (bred) Comment[de]=Langer Horizont am Morgen Comment[el]=Skyline Morning Wide diff -Nru calligra-2.4.0/stage/templates/odf/skyline_night.desktop calligra-2.4.3/stage/templates/odf/skyline_night.desktop --- calligra-2.4.0/stage/templates/odf/skyline_night.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/skyline_night.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=skyline_night Name=Skyline Night Name[ca]=Horitzó nocturn +Name[ca@valencia]=Horitzó nocturn Name[da]=Skyline Night Name[de]=Horizont bei Nacht Name[el]=Γραμμή ορίζοντα νύχτα @@ -26,6 +27,7 @@ Name[zh_TW]=Skyline Night Comment=Skyline Night Comment[ca]=Horitzó nocturn +Comment[ca@valencia]=Horitzó nocturn Comment[da]=Skyline Night Comment[de]=Horizont bei Nacht Comment[el]=Γραμμή ορίζοντα νύχτα diff -Nru calligra-2.4.0/stage/templates/odf/skyline_night_wide.desktop calligra-2.4.3/stage/templates/odf/skyline_night_wide.desktop --- calligra-2.4.0/stage/templates/odf/skyline_night_wide.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/skyline_night_wide.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=skyline_night_wide Name=Skyline Night Wide Name[ca]=Horitzó nocturn ample +Name[ca@valencia]=Horitzó nocturn ample Name[da]=Skyline Night (bred) Name[de]=Langer Horizont bei Nacht Name[el]=Skyline Night Wide @@ -26,6 +27,7 @@ Name[zh_TW]=Skyline Night Wide Comment=Skyline Night Wide Comment[ca]=Horitzó nocturn ample +Comment[ca@valencia]=Horitzó nocturn ample Comment[da]=Skyline Night (bred) Comment[de]=Langer Horizont bei Nacht Comment[el]=Skyline Night Wide diff -Nru calligra-2.4.0/stage/templates/odf/strange_far_hills.desktop calligra-2.4.3/stage/templates/odf/strange_far_hills.desktop --- calligra-2.4.0/stage/templates/odf/strange_far_hills.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/odf/strange_far_hills.desktop 2012-06-26 04:18:02.000000000 +0000 @@ -2,6 +2,7 @@ Icon=strange_far_hills Name=Strange Far Hills Name[ca]=Estranyes muntanyes llunyanes +Name[ca@valencia]=Estranyes muntanyes llunyanes Name[da]=Strange Far Hills Name[de]=Geheimnisvolle Berge in der Ferne Name[el]=Παράξενοι μακρινοί λόφοι @@ -26,6 +27,7 @@ Name[zh_TW]=Strange Far Hills Comment=Strange Far Hills Comment[ca]=Estranyes muntanyes llunyanes +Comment[ca@valencia]=Estranyes muntanyes llunyanes Comment[da]=Mærkelige bjerge i det fjerne Comment[de]=Geheimnisvolle Berge in der Ferne Comment[el]=Παράξενοι μακρινοί λόφοι diff -Nru calligra-2.4.0/stage/templates/Screen/.directory calligra-2.4.3/stage/templates/Screen/.directory --- calligra-2.4.0/stage/templates/Screen/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/stage/templates/Screen/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name[bg]=Екран Name[br]=Skramm Name[ca]=Pantalla +Name[ca@valencia]=Pantalla Name[cs]=Obrazovka Name[cy]=Sgrîn Name[da]=Skærm diff -Nru calligra-2.4.0/templates/Illustration.desktop calligra-2.4.3/templates/Illustration.desktop --- calligra-2.4.0/templates/Illustration.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/templates/Illustration.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Illustration Document... Name[bg]=Илюстрация... Name[ca]=Document d'il·lustració... +Name[ca@valencia]=Document d'il·lustració... Name[cs]=Ilustrace Name[cy]=Dogfen Ddarluniad... Name[da]=Illustrationsdokument... @@ -56,14 +57,19 @@ Comment[de]=Neues Karbon-Dokument Comment[el]=Νέο έγγραφο Karbon: Comment[es]=Nuevo documento de Karbon: +Comment[et]=Uus Karboni dokument: Comment[fi]=Uusi Karbon-asiakirja: +Comment[gl]=Novo documento de Karbon: Comment[hu]=Új Karbon dokumentum: +Comment[is]=Nýtt Karbon skjal: Comment[it]=Nuovo documento di Karbon: +Comment[ja]=新しい Karbon 文書: Comment[kk]=Жаңа Karbon құжаты: Comment[nl]=Nieuw Karbon-document: Comment[pl]=Nowy dokument Karbon: Comment[pt]=Novo documento do Karbon: Comment[pt_BR]=Novo documento do Karbon: +Comment[sk]=Nový dokument Karbon: Comment[sv]=Nytt Karbon-dokument: Comment[uk]=Новий документ Karbon: Comment[x-test]=xxNew Karbon document:xx diff -Nru calligra-2.4.0/templates/Presentation.desktop calligra-2.4.3/templates/Presentation.desktop --- calligra-2.4.0/templates/Presentation.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/templates/Presentation.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Презентация... Name[br]=Teul emginnig ... Name[ca]=Document de presentacions... +Name[ca@valencia]=Document de presentacions... Name[cs]=Prezentace Name[cy]=Dogfen Gyflwyniad... Name[da]=Præsentationsdokument... @@ -56,6 +57,7 @@ Comment[bg]=Нова презентация на KPresenter: Comment[br]=Teul emginnig KPresenter nevez : Comment[ca]=Nou document de presentació KPresenter: +Comment[ca@valencia]=Nou document de presentació KPresenter: Comment[cs]=Nový dokument aplikace KPresenter: Comment[cy]=Dogfen cyflwyniad newydd KPresenter: Comment[da]=Nyt KPresenter-præsentationsdokument: diff -Nru calligra-2.4.0/templates/SpreadSheet.desktop calligra-2.4.3/templates/SpreadSheet.desktop --- calligra-2.4.0/templates/SpreadSheet.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/templates/SpreadSheet.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Електронна таблица... Name[br]=Teul al loger ... Name[ca]=Document de full de càlcul... +Name[ca@valencia]=Document de full de càlcul... Name[cs]=Tabulka Name[cy]=Dogfen Daenlen... Name[da]=Regnearksdokument... @@ -56,6 +57,7 @@ Comment[bg]=Нова таблица на KSpread: Comment[br]=Teul KSpread nevez : Comment[ca]=Nou document KSpread: +Comment[ca@valencia]=Nou document KSpread: Comment[cs]=Nový dokument aplikace KSpread: Comment[cy]=Dogfen newydd KSpread: Comment[da]=Nyt KSpread-regneark: diff -Nru calligra-2.4.0/templates/TextDocument.desktop calligra-2.4.3/templates/TextDocument.desktop --- calligra-2.4.0/templates/TextDocument.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/templates/TextDocument.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=Текстов документ... Name[br]=Teul skrid ... Name[ca]=Document de text... +Name[ca@valencia]=Document de text... Name[cs]=Textový dokument Name[cy]=Dogfen Destun... Name[da]=Tekstdokument... @@ -56,6 +57,7 @@ Comment=New Words document: Comment[bg]=Нов документ на Words: Comment[ca]=Nou document del Words: +Comment[ca@valencia]=Nou document del Words: Comment[cs]=Nový dokument aplikace Words: Comment[da]=Nyt Words-dokument: Comment[de]=Neues Words-Dokument: @@ -64,8 +66,11 @@ Comment[et]=Uus Wordsi dokument: Comment[fi]=Uusi Words-asiakirja: Comment[fr]=Nouveau document Words : +Comment[gl]=Novo documento de Words: Comment[hu]=Új Words dokumentum: +Comment[is]=Nýtt Words skjal: Comment[it]=Nuovo documento di Words: +Comment[ja]=新しい Words 文書: Comment[kk]=Жаңа Words құжаты: Comment[nb]=Nytt Words-dokument: Comment[nds]=Nieg Words-Dokment: @@ -74,6 +79,7 @@ Comment[pt]=Novo documento do Words: Comment[pt_BR]=Novo documento do Words: Comment[ru]=Новый документ Words: +Comment[sk]=Nový dokument Words: Comment[sv]=Nytt Words-dokument: Comment[uk]=Новий документ Words: Comment[x-test]=xxNew Words document:xx diff -Nru calligra-2.4.0/tools/kthesaurus/KThesaurus.desktop calligra-2.4.3/tools/kthesaurus/KThesaurus.desktop --- calligra-2.4.0/tools/kthesaurus/KThesaurus.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/kthesaurus/KThesaurus.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name[bg]=KThesaurus Name[br]=KThesaurus Name[ca]=KThesaurus +Name[ca@valencia]=KThesaurus Name[cs]=KThesaurus Name[cy]=KThesawrws Name[da]=KThesaurus @@ -62,6 +63,7 @@ GenericName[af]=Verwanter Woorde GenericName[bg]=Свързани думи GenericName[ca]=Paraules relacionades +GenericName[ca@valencia]=Paraules relacionades GenericName[cs]=Podobná slova GenericName[cy]=Geiriau Perthnasol GenericName[da]=Relaterede ord diff -Nru calligra-2.4.0/tools/mobile/calligramobile.desktop calligra-2.4.3/tools/mobile/calligramobile.desktop --- calligra-2.4.0/tools/mobile/calligramobile.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/mobile/calligramobile.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Type=Application Name=Calligra Mobile Name[ca]=Calligra Mòbil +Name[ca@valencia]=Calligra Mòbil Name[cs]=Calligra Mobile Name[da]=Calligra Mobile Name[de]=Calligra Mobile @@ -12,6 +13,7 @@ Name[fi]=Calligra Mobile Name[fr]=Calligra Mobile Name[hu]=Calligra Mobile +Name[is]=Calligra fyrir smátölvur Name[it]=Calligra Mobile Name[kk]=Calligra Mobile Name[nb]=Calligra mobil diff -Nru calligra-2.4.0/tools/okularodpgenerator/libokularGenerator_odp.desktop calligra-2.4.3/tools/okularodpgenerator/libokularGenerator_odp.desktop --- calligra-2.4.0/tools/okularodpgenerator/libokularGenerator_odp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/okularodpgenerator/libokularGenerator_odp.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Type=Service Name=OpenDocument Presentation Document Name[ca]=Document de presentacions OpenDocument +Name[ca@valencia]=Document de presentacions OpenDocument Name[da]=OpenDocument præsentationsdokument Name[de]=OpenDocument-Präsentations-Dokument Name[el]=Έγγραφο OpenDocument Presentation @@ -12,6 +13,7 @@ Name[fr]=Présentation OpenDocument Name[ga]=Cáipéis Láithreoireachta OpenDocument Name[hu]=OpenDocument bemutató +Name[is]=OpenDocument kynningarskjal Name[it]=Documento di presentazione OpenDocument Name[ja]=OpenDocument プレゼンテーション文書 Name[kk]=OpenDocument презентация құжаты @@ -32,6 +34,7 @@ Comment=Odp for okular Comment[bg]=Odp за okular Comment[ca]=Odp per a okular +Comment[ca@valencia]=Odp per a okular Comment[cs]=Odp pro Okular Comment[da]=ODP til Okular Comment[de]=ODP für Okular @@ -42,6 +45,8 @@ Comment[fi]=ODP Okulariin Comment[fr]=ODP pour Okular Comment[ga]=Odp le haghaidh okular +Comment[gl]=ODP para Okular +Comment[is]=ODP fyrir okular Comment[it]=ODP per Okular Comment[kk]=Okular-ға арналған ODP Comment[nb]=Odp for Okular diff -Nru calligra-2.4.0/tools/okularodpgenerator/okularApplication_odp.desktop calligra-2.4.3/tools/okularodpgenerator/okularApplication_odp.desktop --- calligra-2.4.0/tools/okularodpgenerator/okularApplication_odp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/okularodpgenerator/okularApplication_odp.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -4,6 +4,7 @@ Name=okular Name[bg]=okular Name[ca]=okular +Name[ca@valencia]=okular Name[cs]=Okular Name[da]=okular Name[de]=Okular @@ -15,6 +16,7 @@ Name[fr]=Okular Name[ga]=okular Name[hu]=Okular +Name[is]=okular Name[it]=Okular Name[kk]=Okular Name[nb]=okular @@ -34,6 +36,7 @@ GenericName=Document Viewer GenericName[bg]=Преглед на доументи GenericName[ca]=Visualitzador de documents +GenericName[ca@valencia]=Visualitzador de documents GenericName[cs]=Prohlížeč dokumentů GenericName[da]=Dokumentfremviser GenericName[de]=Dokumentenbetrachter @@ -45,6 +48,7 @@ GenericName[fr]=Afficheur de documents GenericName[ga]=Amharcán Cáipéisí GenericName[hu]=Dokumentummegjelenítő +GenericName[is]=Skjalaskoðari GenericName[it]=Visore di documenti GenericName[ja]=文書ビューア GenericName[kk]=Құжатты қарау құралы diff -Nru calligra-2.4.0/tools/okularodpgenerator/okularOdp.desktop calligra-2.4.3/tools/okularodpgenerator/okularOdp.desktop --- calligra-2.4.0/tools/okularodpgenerator/okularOdp.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/okularodpgenerator/okularOdp.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=okular Name[bg]=okular Name[ca]=okular +Name[ca@valencia]=okular Name[cs]=Okular Name[da]=okular Name[de]=Okular @@ -14,6 +15,7 @@ Name[fr]=Okular Name[ga]=okular Name[hu]=Okular +Name[is]=okular Name[it]=Okular Name[kk]=Okular Name[nb]=okular diff -Nru calligra-2.4.0/tools/quickprint/flow_konqi.desktop calligra-2.4.3/tools/quickprint/flow_konqi.desktop --- calligra-2.4.0/tools/quickprint/flow_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/flow_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/quickprint/karbon_konqi.desktop calligra-2.4.3/tools/quickprint/karbon_konqi.desktop --- calligra-2.4.0/tools/quickprint/karbon_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/karbon_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/quickprint/kchart_konqi.desktop calligra-2.4.3/tools/quickprint/kchart_konqi.desktop --- calligra-2.4.0/tools/quickprint/kchart_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/kchart_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/quickprint/kformula_konqi.desktop calligra-2.4.3/tools/quickprint/kformula_konqi.desktop --- calligra-2.4.0/tools/quickprint/kformula_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/kformula_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/quickprint/kpresenter_konqi.desktop calligra-2.4.3/tools/quickprint/kpresenter_konqi.desktop --- calligra-2.4.0/tools/quickprint/kpresenter_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/kpresenter_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/quickprint/krita_konqi.desktop calligra-2.4.3/tools/quickprint/krita_konqi.desktop --- calligra-2.4.0/tools/quickprint/krita_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/krita_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/quickprint/kspread_konqi.desktop calligra-2.4.3/tools/quickprint/kspread_konqi.desktop --- calligra-2.4.0/tools/quickprint/kspread_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/kspread_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/quickprint/words_konqi.desktop calligra-2.4.3/tools/quickprint/words_konqi.desktop --- calligra-2.4.0/tools/quickprint/words_konqi.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/quickprint/words_konqi.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -9,6 +9,7 @@ Name[bg]=Печат... Name[br]=Moulañ ... Name[ca]=Imprimeix... +Name[ca@valencia]=Imprimeix... Name[cs]=Tisk... Name[cy]=Argraffu... Name[da]=Udskriv... diff -Nru calligra-2.4.0/tools/scripts/validateODF.py calligra-2.4.3/tools/scripts/validateODF.py --- calligra-2.4.0/tools/scripts/validateODF.py 2012-04-06 15:37:59.000000000 +0000 +++ calligra-2.4.3/tools/scripts/validateODF.py 2012-06-26 04:18:02.000000000 +0000 @@ -63,6 +63,14 @@ schemas[odfversion][1]) if (err): return err + err = self.validateFile(zip, 'meta.xml', + schemas[odfversion][0]) + if (err): + return err + err = self.validateFile(zip, 'settings.xml', + schemas[odfversion][0]) + if (err): + return err return None def validateFlatXML(self, filepath): diff -Nru calligra-2.4.0/tools/thumbnail/calligrathumbnail.desktop calligra-2.4.3/tools/thumbnail/calligrathumbnail.desktop --- calligra-2.4.0/tools/thumbnail/calligrathumbnail.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/thumbnail/calligrathumbnail.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Calligra Files Name[bg]=Файлове на Calligra Name[ca]=Fitxers Calligra +Name[ca@valencia]=Fitxers Calligra Name[cs]=Soubory Calligra Name[da]=Calligra-filer Name[de]=Calligra-Dateien @@ -12,6 +13,7 @@ Name[fi]=Calligra-tiedostot Name[fr]=fichier Calligra Name[hu]=Calligra fájlok +Name[is]=Calligra skrár Name[it]=File di Calligra Name[kk]=Calligra файлдары Name[nb]=Calligra-filer diff -Nru calligra-2.4.0/tools/thumbnail/otherofficethumbnail.desktop calligra-2.4.3/tools/thumbnail/otherofficethumbnail.desktop --- calligra-2.4.0/tools/thumbnail/otherofficethumbnail.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/tools/thumbnail/otherofficethumbnail.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Други офисни файлове Name[br]=Restroù burev all Name[ca]=Altres fitxers d'oficina +Name[ca@valencia]=Altres fitxers d'oficina Name[cs]=Ostatní kancelářské soubory Name[cy]=Ffeiliau Eraill KOffice Name[da]=Andre office-filer @@ -20,16 +21,16 @@ Name[fr]=Autres documents bureautiques Name[fy]=Oare Office triemmen Name[ga]=Comhaid Oifige Eile -Name[gl]=Outros Ficheiros de KOffice +Name[gl]=Outros ficheiros de Office Name[he]=קבצי Office אחרים Name[hi]=अन्य ऑफ़िस फ़ाइलें Name[hne]=अऊ दूसर आफिस फाइल मन ल Name[hr]=Ostale Office datoteke Name[hu]=Egyéb Office-fájlok -Name[is]=Aðrar skrifstofuskrár +Name[is]=Önnur skrifstofuskjöl Name[it]=File di altri programmi Office Name[ja]=その他の Office ファイル -Name[kk]=Басқа офис файдары +Name[kk]=Басқа офис файлдары Name[lt]=Kiti Office failai Name[lv]=Citi Office faili Name[ms]=Fail Office Lain diff -Nru calligra-2.4.0/words/part/dockers/KWRdfDocker.cpp calligra-2.4.3/words/part/dockers/KWRdfDocker.cpp --- calligra-2.4.0/words/part/dockers/KWRdfDocker.cpp 2012-04-06 15:37:59.000000000 +0000 +++ calligra-2.4.3/words/part/dockers/KWRdfDocker.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -93,8 +93,8 @@ } m_document = newDoc; - widgetDocker.semanticView->setDocumentRdf(m_document->documentRdf()); - connect(m_document->documentRdf(), SIGNAL(semanticObjectAdded(KoRdfSemanticItem*)), + widgetDocker.semanticView->setDocumentRdf(static_cast(m_document->documentRdf())); + connect(static_cast(m_document->documentRdf()), SIGNAL(semanticObjectAdded(KoRdfSemanticItem*)), this, SLOT(semanticObjectAdded(KoRdfSemanticItem*))); connect(m_document->documentRdf(), SIGNAL(semanticObjectUpdated(KoRdfSemanticItem*)), this, SLOT(semanticObjectUpdated(KoRdfSemanticItem*))); @@ -168,7 +168,7 @@ // TODO try to get rid of 'editor' here by remembering the position in the resourceChanged() KoTextEditor *editor = KoTextEditor::getTextEditorFromCanvas(m_canvas); - KoDocumentRdf *rdf = m_document->documentRdf(); + KoDocumentRdf *rdf = dynamic_cast(m_document->documentRdf()); if (editor && rdf) { //kDebug(30015) << "m_lastCursorPosition:" << m_lastCursorPosition; diff -Nru calligra-2.4.0/words/part/dockers/KWStatistics.cpp calligra-2.4.3/words/part/dockers/KWStatistics.cpp --- calligra-2.4.0/words/part/dockers/KWStatistics.cpp 2012-04-06 15:37:59.000000000 +0000 +++ calligra-2.4.3/words/part/dockers/KWStatistics.cpp 2012-06-26 04:18:02.000000000 +0000 @@ -104,8 +104,15 @@ widgetDocker.count_nospaces->setVisible(visible); } +KWStatistics::~KWStatistics() +{ + m_timer->stop(); +} void KWStatistics::updateData() { + if (!isVisible()) { + return; + } m_charsWithSpace = 0; m_charsWithoutSpace = 0; m_words = 0; diff -Nru calligra-2.4.0/words/part/dockers/KWStatistics.h calligra-2.4.3/words/part/dockers/KWStatistics.h --- calligra-2.4.0/words/part/dockers/KWStatistics.h 2012-04-06 15:37:59.000000000 +0000 +++ calligra-2.4.3/words/part/dockers/KWStatistics.h 2012-06-26 04:18:02.000000000 +0000 @@ -42,6 +42,8 @@ KWStatistics(KoCanvasResourceManager *provider, KWDocument *m_document, KoSelection *selection = 0, QWidget *parent = 0); + virtual ~KWStatistics(); + void updateDataUi(); public slots: diff -Nru calligra-2.4.0/words/part/KWGui.cpp calligra-2.4.3/words/part/KWGui.cpp --- calligra-2.4.0/words/part/KWGui.cpp 2012-04-06 15:37:59.000000000 +0000 +++ calligra-2.4.3/words/part/KWGui.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -63,6 +63,7 @@ m_canvas = new KWCanvas(viewMode, static_cast(m_view->koDocument()), m_view, this); KoCanvasControllerWidget *canvasController = new KoCanvasControllerWidget(m_view->actionCollection(), this); m_canvasController = canvasController; + canvasController->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); m_canvasController->setMargin(10); m_canvasController->setCanvas(m_canvas); m_canvasController->setCanvasMode(KoCanvasController::AlignTop); diff -Nru calligra-2.4.0/words/part/KWOdfLoader.cpp calligra-2.4.3/words/part/KWOdfLoader.cpp --- calligra-2.4.0/words/part/KWOdfLoader.cpp 2012-04-06 15:37:59.000000000 +0000 +++ calligra-2.4.3/words/part/KWOdfLoader.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -46,8 +46,9 @@ #include #include #include +#ifdef SHOULD_BUILD_RDF #include - +#endif // KDE + Qt includes #include #include diff -Nru calligra-2.4.0/words/part/KWPage.cpp calligra-2.4.3/words/part/KWPage.cpp --- calligra-2.4.0/words/part/KWPage.cpp 2012-04-06 15:37:59.000000000 +0000 +++ calligra-2.4.3/words/part/KWPage.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -375,7 +375,7 @@ if (adjustment != 0) { pageNumber += adjustment; - if (!page.priv->pageNumbers.contains(pageNumber)) + if (page.priv && !page.priv->pageNumbers.contains(pageNumber)) pageNumber = -1; // doesn't exist. } diff -Nru calligra-2.4.0/words/part/KWView.cpp calligra-2.4.3/words/part/KWView.cpp --- calligra-2.4.0/words/part/KWView.cpp 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/part/KWView.cpp 2012-06-26 04:21:31.000000000 +0000 @@ -160,7 +160,7 @@ connect(m_zoomController, SIGNAL(zoomChanged(KoZoomMode::Mode, qreal)), this, SLOT(zoomChanged(KoZoomMode::Mode, qreal))); #ifdef SHOULD_BUILD_RDF - if (KoDocumentRdf *rdf = m_document->documentRdf()) { + if (KoDocumentRdf *rdf = dynamic_cast(m_document->documentRdf())) { connect(rdf, SIGNAL(semanticObjectViewSiteUpdated(KoRdfSemanticItem*, const QString&)), this, SLOT(semanticObjectViewSiteUpdated(KoRdfSemanticItem*, const QString&))); } @@ -300,7 +300,7 @@ action->setWhatsThis(i18n("Stylesheets are used to format contact, event, and location information which is stored in Rdf")); connect(action, SIGNAL(triggered()), this, SLOT(editSemanticStylesheets())); - if (KoDocumentRdf* rdf = m_document->documentRdf()) { + if (KoDocumentRdf* rdf = dynamic_cast(m_document->documentRdf())) { KAction* createRef = rdf->createInsertSemanticObjectReferenceAction(canvasBase()); actionCollection()->addAction("insert_semanticobject_ref", createRef); KActionMenu *subMenu = new KActionMenu(i18n("Create"), this); @@ -677,7 +677,7 @@ void KWView::editSemanticStylesheets() { #ifdef SHOULD_BUILD_RDF - if (KoDocumentRdf *rdf = m_document->documentRdf()) { + if (KoDocumentRdf *rdf = dynamic_cast(m_document->documentRdf())) { KoSemanticStylesheetsEditor *dia = new KoSemanticStylesheetsEditor(this, rdf); dia->show(); // TODO this leaks memory diff -Nru calligra-2.4.0/words/part/words.desktop calligra-2.4.3/words/part/words.desktop --- calligra-2.4.0/words/part/words.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/part/words.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Calligra Words Name[bg]=Calligra Words Name[ca]=Words del Calligra +Name[ca@valencia]=Words del Calligra Name[cs]=Calligra Words Name[da]=Calligra Words Name[de]=Calligra Words @@ -11,8 +12,11 @@ Name[et]=Calligra Words Name[fi]=Calligra Words Name[fr]=Calligra Words +Name[gl]=Procesador Words Name[hu]=Calligra Words +Name[is]=Calligra Words Name[it]=Calligra Words +Name[ja]=Calligra Words Name[kk]=Calligra Words Name[nb]=Calligra Words Name[nl]=Calligra Words @@ -30,6 +34,7 @@ GenericName=Word Processor GenericName[bg]=Текстообработваща програма GenericName[ca]=Processador de textos +GenericName[ca@valencia]=Processador de textos GenericName[cs]=Textový procesor GenericName[da]=Tekstbehandling GenericName[de]=Textverarbeitung @@ -46,6 +51,7 @@ GenericName[hi]=वर्ड प्रोसेसर GenericName[hne]=वर्ड प्रोसेसर GenericName[hu]=Szövegszerkesztő +GenericName[is]=Ritvinnsluforrit GenericName[it]=Elaboratore di testi GenericName[ja]=ワープロ GenericName[kk]=Мәтін өңдеуші @@ -73,6 +79,7 @@ Comment=Write documents Comment[bg]=Писане на документи Comment[ca]=Escriviu documents +Comment[ca@valencia]=Escriviu documents Comment[cs]=Zapsat dokumenty Comment[da]=Skriv dokumenter Comment[de]=Dokumente verfassen @@ -83,7 +90,9 @@ Comment[fi]=Kirjoita asiakirjoja Comment[fr]=Documents texte Comment[hu]=Dokumentumok írása +Comment[is]=Write skjöl Comment[it]=Scrivi documenti +Comment[ja]=文書を作成 Comment[kk]=Құжаттарды жазу Comment[nb]=Skriv tekstdokumenter Comment[nds]=Dokmenten opstellen diff -Nru calligra-2.4.0/words/part/wordspart.desktop calligra-2.4.3/words/part/wordspart.desktop --- calligra-2.4.0/words/part/wordspart.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/part/wordspart.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -3,6 +3,7 @@ Name=Calligra Word Processing Component Name[bg]=Компонент за текстообработка в Calligra Name[ca]=Component de processament de textos del Calligra +Name[ca@valencia]=Component de processament de textos del Calligra Name[cs]=Komponenta Calligra pro zpracování textu Name[da]=Calligra-komponent til tekstbehandling Name[de]=Calligra-Komponente für Textverarbeitung @@ -12,8 +13,11 @@ Name[et]=Calligra tekstitöötluse komponent Name[fi]=Calligra-tekstinkäsittelyosa Name[fr]=Composant traitement de texte de Calligra +Name[gl]=Compoñente de procesamento de texto de Calligra Name[hu]=Calligra szövegszerkesztő komponens +Name[is]=Ritvinnsluhluti Calligra Name[it]=Componente di Calligra Word +Name[ja]=Calligra ワープロコンポーネント Name[kk]=Calligra-ның мәтін өңдеу бағдарламасы Name[nb]=Callgra komponent for tekstbehandling Name[nds]=Textverarbeiden-Komponent för Calligra @@ -37,6 +41,7 @@ GenericName=Word processor GenericName[bg]=Текстообработваща програма GenericName[ca]=Processador de textos +GenericName[ca@valencia]=Processador de textos GenericName[cs]=Textový procesor GenericName[da]=Tekstbehandling GenericName[de]=Textverarbeitung @@ -46,8 +51,11 @@ GenericName[et]=Tekstitöötlus GenericName[fi]=Tekstinkäsittely GenericName[fr]=Traitement de texte +GenericName[gl]=Procesador Word GenericName[hu]=Szövegszerkesztő +GenericName[is]=Ritvinnsluforrit GenericName[it]=Elaboratore di testi +GenericName[ja]=ワープロ GenericName[kk]=Мәтін өңдеуші GenericName[nb]=Tekstbehandler GenericName[nds]=Textverarbeiden diff -Nru calligra-2.4.0/words/plugins/scripting/krossmodulewords.desktop calligra-2.4.3/words/plugins/scripting/krossmodulewords.desktop --- calligra-2.4.0/words/plugins/scripting/krossmodulewords.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/plugins/scripting/krossmodulewords.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Scripting plugin Name[bg]=Приставка за скриптове Name[ca]=Connector d'scripting +Name[ca@valencia]=Connector d'scripting Name[cs]=Skriptovací modul Name[da]=Scriptplugin Name[de]=Skripting-Modul @@ -15,7 +16,7 @@ Name[fr]=Module de scriptage Name[fy]=Skriptplugin Name[ga]=Breiseán scriptithe -Name[gl]=Plugin de programación +Name[gl]=Engadido de scripting Name[he]=תוסף לתסריטים Name[hi]=स्क्रिप्टिंग प्लगइन Name[hne]=स्क्रिप्टिंग प्लगइन @@ -47,6 +48,7 @@ Comment=Allow execution of scripts Comment[bg]=Изпълнение на скриптове Comment[ca]=Permet l'execució d'scripts +Comment[ca@valencia]=Permet l'execució d'scripts Comment[cs]=Umožní spouštění skriptů Comment[da]=Tillad kørsel af script Comment[de]=Ermöglicht das Ausführen von Skripten @@ -60,7 +62,7 @@ Comment[fr]=Permet d'exécuter des scripts Comment[fy]=It útfieren fan skripts tastean Comment[ga]=Ceadaigh scripteanna a rith -Comment[gl]=Permite executar guións +Comment[gl]=Permite executar engadidos Comment[he]=אפשרות להרצת תסריטים Comment[hi]=स्क्रिप्ट को चलाने की अनुमति दें Comment[hne]=स्क्रिप्ट ल चलाय के अनुमति देव diff -Nru calligra-2.4.0/words/templates/Wordprocessing/A4.desktop calligra-2.4.3/words/templates/Wordprocessing/A4.desktop --- calligra-2.4.0/words/templates/Wordprocessing/A4.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/A4.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Празен документ Name[br]=Teul goullo Name[ca]=Document buit +Name[ca@valencia]=Document buit Name[cs]=Prázdný dokument Name[da]=Blankt dokument Name[de]=Leeres Dokument @@ -52,6 +53,7 @@ Comment=Creates a blank A4 document, with a small page margin. Comment[bg]=Създаване на празен документ A4 с малко поле. Comment[ca]=Crea un document A4 en blanc amb un petit marge de pàgina. +Comment[ca@valencia]=Crea un document A4 en blanc amb un petit marge de pàgina. Comment[cs]=Vytvoří prázdný dokument A4 s malým okrajem strany. Comment[da]=Opretter et blankt A4-dokument med en lille sidemargen. Comment[de]=Erstellt ein leeres A4-Dokument mit einem schmalen Seitenrand diff -Nru calligra-2.4.0/words/templates/Wordprocessing/ColorfulA4.desktop calligra-2.4.3/words/templates/Wordprocessing/ColorfulA4.desktop --- calligra-2.4.0/words/templates/Wordprocessing/ColorfulA4.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/ColorfulA4.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Цветен документ Name[br]=Teul livet Name[ca]=Document a tot color +Name[ca@valencia]=Document a tot color Name[cs]=Barevný dokument Name[da]=Farverigt dokument Name[de]=Buntes Dokument @@ -52,6 +53,7 @@ Comment=A two-column template with stylishly colored headers and footers Comment[bg]=Шаблон с две колони със стилни цветни колонтитули Comment[ca]=Una plantilla de dues columnes amb capçaleres i peus de colors i amb estil +Comment[ca@valencia]=Una plantilla de dos columnes amb capçaleres i peus de colors i amb estil Comment[cs]=Dvousloupcová šablona se stylově vybarvenými hlavičkami a patičkami Comment[da]=En tokolonners skabelon med elegant farvet sidehoved og sidefod Comment[de]=Eine zweispaltige Vorlage mit stilvoll kolorierten Kopf- und Fußzeilen diff -Nru calligra-2.4.0/words/templates/Wordprocessing/ColorfulLetter.desktop calligra-2.4.3/words/templates/Wordprocessing/ColorfulLetter.desktop --- calligra-2.4.0/words/templates/Wordprocessing/ColorfulLetter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/ColorfulLetter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Цветен документ Name[br]=Teul livet Name[ca]=Document a tot color +Name[ca@valencia]=Document a tot color Name[cs]=Barevný dokument Name[da]=Farverigt dokument Name[de]=Buntes Dokument @@ -52,6 +53,7 @@ Comment=A two-column template with stylishly colored headers and footers Comment[bg]=Шаблон с две колони със стилни цветни колонтитули Comment[ca]=Una plantilla de dues columnes amb capçaleres i peus de colors i amb estil +Comment[ca@valencia]=Una plantilla de dos columnes amb capçaleres i peus de colors i amb estil Comment[cs]=Dvousloupcová šablona se stylově vybarvenými hlavičkami a patičkami Comment[da]=En tokolonners skabelon med elegant farvet sidehoved og sidefod Comment[de]=Eine zweispaltige Vorlage mit stilvoll kolorierten Kopf- und Fußzeilen diff -Nru calligra-2.4.0/words/templates/Wordprocessing/.directory calligra-2.4.3/words/templates/Wordprocessing/.directory --- calligra-2.4.0/words/templates/Wordprocessing/.directory 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/.directory 2012-06-26 04:21:31.000000000 +0000 @@ -2,6 +2,7 @@ Name=Blank Documents Name[bg]=Празни документи Name[ca]=Documents buits +Name[ca@valencia]=Documents buits Name[cs]=Prázdné dokumenty Name[da]=Tomme dokumenter Name[de]=Leere Dokumente @@ -19,6 +20,7 @@ Name[hi]=रिक्त दस्तावेज़ Name[hne]=खाली कागद Name[hu]=Üres dokumentumok +Name[is]=Tóm skjöl Name[it]=Documenti vuoti Name[ja]=空の文書 Name[kk]=Бос құжаттар diff -Nru calligra-2.4.0/words/templates/Wordprocessing/FaxA4.desktop calligra-2.4.3/words/templates/Wordprocessing/FaxA4.desktop --- calligra-2.4.0/words/templates/Wordprocessing/FaxA4.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/FaxA4.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Шаблон за факс Name[br]=Patrom faks Name[ca]=Plantilla per a Fax +Name[ca@valencia]=Plantilla per a Fax Name[cs]=Šablona faxu Name[cy]=Patrymlun Ffacs Name[da]=Fax-skabelon @@ -58,6 +59,7 @@ Name[zh_TW]=傳真樣板 Comment=A template to quickly create a facsimile communication Comment[ca]=Una plantilla per a crear ràpidament una comunicació per fax +Comment[ca@valencia]=Una plantilla per a crear ràpidament una comunicació per fax Comment[cs]=Šablona pro rychlé vytvoření komunikace faxem Comment[da]=En skabelon til hurtigt at oprette en faxmeddelelse Comment[de]=Eine Vorlage, um schnell ein Fax zu erstellen @@ -69,7 +71,7 @@ Comment[fi]=Pohja telefaksin nopeaa laatimista varten Comment[fr]=Un modèle pour communiquer par fax Comment[fy]=In sjabloan om fluch in faks op te stellen -Comment[gl]=Un modelo básico para criar rapidamente un fax +Comment[gl]=Un modelo básico para crear rapidamente un fax Comment[hi]=फैक्स संचार त्वरित बनाने का एक टैम्प्लेट Comment[hne]=फैक्स संचार जल्दी बनाए के एक टैम्प्लेट Comment[hu]=Sablon faxdokumentum gyors létrehozásához diff -Nru calligra-2.4.0/words/templates/Wordprocessing/FaxLetter.desktop calligra-2.4.3/words/templates/Wordprocessing/FaxLetter.desktop --- calligra-2.4.0/words/templates/Wordprocessing/FaxLetter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/FaxLetter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -6,6 +6,7 @@ Name[bg]=Шаблон за факс Name[br]=Patrom faks Name[ca]=Plantilla per a Fax +Name[ca@valencia]=Plantilla per a Fax Name[cs]=Šablona faxu Name[cy]=Patrymlun Ffacs Name[da]=Fax-skabelon @@ -58,6 +59,7 @@ Name[zh_TW]=傳真樣板 Comment=A template to quickly create a facsimile communication Comment[ca]=Una plantilla per a crear ràpidament una comunicació per fax +Comment[ca@valencia]=Una plantilla per a crear ràpidament una comunicació per fax Comment[cs]=Šablona pro rychlé vytvoření komunikace faxem Comment[da]=En skabelon til hurtigt at oprette en faxmeddelelse Comment[de]=Eine Vorlage, um schnell ein Fax zu erstellen @@ -69,7 +71,7 @@ Comment[fi]=Pohja telefaksin nopeaa laatimista varten Comment[fr]=Un modèle pour communiquer par fax Comment[fy]=In sjabloan om fluch in faks op te stellen -Comment[gl]=Un modelo básico para criar rapidamente un fax +Comment[gl]=Un modelo básico para crear rapidamente un fax Comment[hi]=फैक्स संचार त्वरित बनाने का एक टैम्प्लेट Comment[hne]=फैक्स संचार जल्दी बनाए के एक टैम्प्लेट Comment[hu]=Sablon faxdokumentum gyors létrehozásához diff -Nru calligra-2.4.0/words/templates/Wordprocessing/ProfessionalA4.desktop calligra-2.4.3/words/templates/Wordprocessing/ProfessionalA4.desktop --- calligra-2.4.0/words/templates/Wordprocessing/ProfessionalA4.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/ProfessionalA4.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Професионално писмо Name[br]=Lizher vicherel Name[ca]=Carta professional +Name[ca@valencia]=Carta professional Name[cs]=Profesionální dopis Name[da]=Professionelt brev Name[de]=Professioneller Brief @@ -51,6 +52,7 @@ Comment=Creates a blank document with wide margins for professional looking documents Comment[bg]=Създаване на празен документ с широки полета за професионално изглеждащи документи Comment[ca]=Crea un document buit amb marges amples per a documents d'aspecte professional +Comment[ca@valencia]=Crea un document buit amb marges amples per a documents d'aspecte professional Comment[cs]=Vytvoří prázdný dokument s širokými okraji pro profesionálně vypadající dokumenty Comment[da]=Laver et blankt dokument med brede margener for et professionelt udseende dokument. Comment[de]=Erstellt ein leeres Dokument mit breiten Rändern für professionell aussehende Dokumente @@ -59,7 +61,7 @@ Comment[es]=Crea un documento vacío con márgenes amplios para documentos de aspecto profesional Comment[et]=Loob dokumendi professionaalsetele dokumentidele iseloomulike laiade veeristega Comment[fa]=سندی خالی با حاشیه‌های عریض برای اسناد به نظر حرفه‌ای ایجاد می‌کند -Comment[fi]=Luo tyhjän dokumentin, jossa leveät marginaalit +Comment[fi]=Luo tyhjän asiakirjan, jossa on leveät marginaalit Comment[fr]=Crée un document vide avec de grandes marges pour une apparence professionnelle Comment[fy]=Makket in leech dokumint oan mei brede marzjes foar in profesjoneel uterlik Comment[gl]=Cría un documento en branco con marxes amplas para documentos con aspeito profisional diff -Nru calligra-2.4.0/words/templates/Wordprocessing/ProfessionalLetter.desktop calligra-2.4.3/words/templates/Wordprocessing/ProfessionalLetter.desktop --- calligra-2.4.0/words/templates/Wordprocessing/ProfessionalLetter.desktop 2012-04-06 15:44:48.000000000 +0000 +++ calligra-2.4.3/words/templates/Wordprocessing/ProfessionalLetter.desktop 2012-06-26 04:21:31.000000000 +0000 @@ -5,6 +5,7 @@ Name[bg]=Професионално писмо Name[br]=Lizher vicherel Name[ca]=Carta professional +Name[ca@valencia]=Carta professional Name[cs]=Profesionální dopis Name[da]=Professionelt brev Name[de]=Professioneller Brief @@ -51,6 +52,7 @@ Comment=Creates a blank document with wide margins for professional looking documents Comment[bg]=Създаване на празен документ с широки полета за професионално изглеждащи документи Comment[ca]=Crea un document buit amb marges amples per a documents d'aspecte professional +Comment[ca@valencia]=Crea un document buit amb marges amples per a documents d'aspecte professional Comment[cs]=Vytvoří prázdný dokument s širokými okraji pro profesionálně vypadající dokumenty Comment[da]=Laver et blankt dokument med brede margener for et professionelt udseende dokument. Comment[de]=Erstellt ein leeres Dokument mit breiten Rändern für professionell aussehende Dokumente @@ -59,7 +61,7 @@ Comment[es]=Crea un documento vacío con márgenes amplios para documentos de aspecto profesional Comment[et]=Loob dokumendi professionaalsetele dokumentidele iseloomulike laiade veeristega Comment[fa]=سندی خالی با حاشیه‌های عریض برای اسناد به نظر حرفه‌ای ایجاد می‌کند -Comment[fi]=Luo tyhjän dokumentin, jossa leveät marginaalit +Comment[fi]=Luo tyhjän asiakirjan, jossa on leveät marginaalit Comment[fr]=Crée un document vide avec de grandes marges pour une apparence professionnelle Comment[fy]=Makket in leech dokumint oan mei brede marzjes foar in profesjoneel uterlik Comment[gl]=Cría un documento en branco con marxes amplas para documentos con aspeito profisional