[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bcalligra=5D_flow/stencils/BPMN=3A_up?=
From: Yue Liu <opuspace () gmail ! com>
Date: 2011-02-16 8:51:02
Message-ID: 20110216085102.7E846A60D2 () git ! kde ! org
[Download RAW message or body]
Git commit 10ce4998e619ad4a9635cfc1ae1241b998dec602 by Yue Liu.
Committed on 16/02/2011 at 09:21.
Pushed by liu into branch 'master'.
up
I +2 -0 braindump/data/braindump.desktop
I +1 -0 braindump/data/braindump_extensions.desktop
I +1 -0 braindump/plugins/quickstates/braindumpquickstates.desktop
I +1 -0 braindump/plugins/stateshape/stateshape.desktop
I +1 -0 braindump/plugins/webshape/webshape.desktop
I +1 -0 filters/kpresenter/kpr2odf/Filterkpr2odf.desktop
I +1 -0 filters/tables/excel/export/kspread_excel_export.desktop
I +1 -0 filters/tables/html/kspread_html_import.desktop
I +1 -1 filters/words/ascii/kword_ascii_import.desktop
I +1 -0 filters/words/html-odf/html-odf_export.desktop
I +1 -1 filters/words/html/export/kword_html_export.desktop
I +1 -1 filters/words/html/import/kword_html_import.desktop
I +1 -1 filters/words/latex/export/kword_latex_export.desktop
I +1 -1 flow/src/plugins/dockers/stencilboxdocker/CollectionItemModel.cpp
I +2 -2 flow/src/plugins/dockers/stencilboxdocker/CollectionItemModel.h
I +0 -6 flow/src/plugins/dockers/stencilboxdocker/CollectionShapeFactory.cpp
I +2 -1 flow/src/plugins/dockers/stencilboxdocker/CollectionShapeFactory.h
I +27 -29 flow/src/plugins/dockers/stencilboxdocker/StencilBoxDocker.cpp
MM +8 -0 flow/stencils/BPMN/Task.desktop
I +1 -0 kpresenter/part/kpresenter.desktop
I +2 -0 kpresenter/templates/odf/curious_penguin.desktop
I +1 -0 servicetypes/calligra_application.desktop
I +0 -1 tables/data/templates/HomeFamily/VacationChecklist.desktop
I +1 -0 tables/functions/kspreadreferencemodule.desktop
I +1 -0 tables/functions/kspreadtextmodule.desktop
I +1 -0 tables/tables.desktop
I +1 -0 tables/tables_plugin.desktop
I +1 -0 tools/okularodpgenerator/libokularGenerator_odp.desktop
I +1 -0 tools/okularodpgenerator/okularApplication_odp.desktop
I +1 -0 tools/okularodpgenerator/okularOdp.desktop
http://commits.kde.org/calligra/10ce4998e619ad4a9635cfc1ae1241b998dec602
diff --cc flow/stencils/BPMN/Task.desktop
index d78f273,59a65ec..00f2c71
--- a/flow/stencils/BPMN/Task.desktop
+++ b/flow/stencils/BPMN/Task.desktop
@@@ -1,2 -1,7 +1,10 @@@
[Desktop Entry]
Name=Task
++<<<<<<< HEAD
++=======
+ Name[cs]=Úloha
+ Name[nl]=Taak
+ Name[pt_BR]=Tarefa
+ Name[uk]=Задача
+ Name[x-test]=xxTaskxx
++>>>>>>> fc144ab133d8fd038000407594e091d5aa447852
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic