ソースを参照

Merge branch 'master' into t/13

# Conflicts:
#	package.json
Maciej Gołaszewski 7 年 前
コミット
7dd8751ece

+ 21 - 0
packages/ckeditor5-table/CHANGELOG.md

@@ -1,6 +1,27 @@
 Changelog
 =========
 
+## [10.1.0](https://github.com/ckeditor/ckeditor5-table/compare/v10.0.0...v10.1.0) (2018-07-18)
+
+### Features
+
+* Implemented the table selection handle (see [ckeditor/ckeditor5-widget#40](https://github.com/ckeditor/ckeditor5-widget/issues/40)). ([47295bd](https://github.com/ckeditor/ckeditor5-table/commit/47295bd))
+* Used the switch button to toggle table headers (see [ckeditor/ckeditor5-ui#402](https://github.com/ckeditor/ckeditor5-ui/issues/402)). ([f3b7d0b](https://github.com/ckeditor/ckeditor5-table/commit/f3b7d0b))
+
+  Also:
+  * Aligned the `TableUI` to the new API of the `addListToDropdown()` helper,
+  * Updated the tests to consider the `ListItemView` as simply a container for buttons.
+
+### Bug fixes
+
+* Merge cell horizontally should not be possible on overlapped cells. Closes [#68](https://github.com/ckeditor/ckeditor5-table/issues/68). ([72b6315](https://github.com/ckeditor/ckeditor5-table/commit/72b6315))
+* The `MergeCellCommand` should check if merging cells results in an empty row and remove it. Closes [#16](https://github.com/ckeditor/ckeditor5-table/issues/16). ([a01252a](https://github.com/ckeditor/ckeditor5-table/commit/a01252a))
+
+### Other changes
+
+* Updated translations. ([1730b88](https://github.com/ckeditor/ckeditor5-table/commit/1730b88))
+
+
 ## 10.0.0 (2018-06-21)
 
 ### Features

+ 2 - 2
packages/ckeditor5-table/docs/_snippets/features/build-table-source.js

@@ -10,7 +10,7 @@ import ClassicEditor from '@ckeditor/ckeditor5-build-classic/src/ckeditor';
 import Table from '@ckeditor/ckeditor5-table/src/table';
 import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar';
 
-ClassicEditor.build.plugins.push( Table );
-ClassicEditor.build.plugins.push( TableToolbar );
+ClassicEditor.builtinPlugins.push( Table );
+ClassicEditor.builtinPlugins.push( TableToolbar );
 
 window.ClassicEditor = ClassicEditor;

+ 1 - 1
packages/ckeditor5-table/docs/features/table.md

@@ -38,7 +38,7 @@ ClassicEditor
 ```
 
 <info-box info>
-	At the moment by default the table feature is available only in the {@link builds/guides/overview#document-editor document editor build}. Read more about {@link builds/guides/development/installing-plugins installing plugins} if you want to add it to other editor builds.
+	At the moment by default the table feature is available only in the {@link builds/guides/overview#document-editor document editor build}. Read more about {@link builds/guides/integration/installing-plugins installing plugins} if you want to add it to other editor builds.
 </info-box>
 
 ## Common API

+ 1 - 1
packages/ckeditor5-table/lang/translations/cs.po

@@ -1,8 +1,8 @@
 # Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
-"Language: cs\n"
 "Language-Team: Czech (https://www.transifex.com/ckeditor/teams/11143/cs/)\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
 msgctxt "Label for the insert table toolbar button."

+ 78 - 0
packages/ckeditor5-table/lang/translations/de-ch.po

@@ -0,0 +1,78 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: German (Switzerland) (https://www.transifex.com/ckeditor/teams/11143/de_CH/)\n"
+"Language: de_CH\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Label for the insert table toolbar button."
+msgid "Insert table"
+msgstr "Tabelle einfügen"
+
+msgctxt "Label for the set/unset table header column button."
+msgid "Header column"
+msgstr "Kopfspalte"
+
+msgctxt "Label for the insert table column before the current one button."
+msgid "Insert column before"
+msgstr "Spalte links einfügen"
+
+msgctxt "Label for the insert table column after the current one button."
+msgid "Insert column after"
+msgstr "Spalte rechts einfügen"
+
+msgctxt "Label for the delete table column button."
+msgid "Delete column"
+msgstr "Spalte löschen"
+
+msgctxt "Label for the table column dropdown button."
+msgid "Column"
+msgstr "Spalte"
+
+msgctxt "Label for the set/unset table header row button."
+msgid "Header row"
+msgstr "Kopfspalte"
+
+msgctxt "Label for the insert row below button."
+msgid "Insert row below"
+msgstr "Zeile unten einfügen"
+
+msgctxt "Label for the insert row above button."
+msgid "Insert row above"
+msgstr "Zeile oben einfügen"
+
+msgctxt "Label for the delete table row button."
+msgid "Delete row"
+msgstr "Zeile löschen"
+
+msgctxt "Label for the table row dropdown button."
+msgid "Row"
+msgstr "Zeile"
+
+msgctxt "Label for the merge table cell up button."
+msgid "Merge cell up"
+msgstr "Zelle oben verbinden"
+
+msgctxt "Label for the merge table cell right button."
+msgid "Merge cell right"
+msgstr "Zele rechts verbinden"
+
+msgctxt "Label for the merge table cell down button."
+msgid "Merge cell down"
+msgstr "Zelle unten verbinden"
+
+msgctxt "Label for the merge table cell left button."
+msgid "Merge cell left"
+msgstr "Zelle links verbinden"
+
+msgctxt "Label for the split table cell vertically button."
+msgid "Split cell vertically"
+msgstr "Zelle vertikal teilen"
+
+msgctxt "Label for the split table cell horizontally button."
+msgid "Split cell horizontally"
+msgstr "Zelle horizontal teilen"
+
+msgctxt "Label for the merge table cells button."
+msgid "Merge cells"
+msgstr "Zellen verbinden"

+ 78 - 0
packages/ckeditor5-table/lang/translations/de.po

@@ -0,0 +1,78 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: German (https://www.transifex.com/ckeditor/teams/11143/de/)\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Label for the insert table toolbar button."
+msgid "Insert table"
+msgstr "Tabelle einfügen"
+
+msgctxt "Label for the set/unset table header column button."
+msgid "Header column"
+msgstr "Kopfspalte"
+
+msgctxt "Label for the insert table column before the current one button."
+msgid "Insert column before"
+msgstr "Spalte links einfügen"
+
+msgctxt "Label for the insert table column after the current one button."
+msgid "Insert column after"
+msgstr "Spalte rechts einfügen"
+
+msgctxt "Label for the delete table column button."
+msgid "Delete column"
+msgstr "Spalte löschen"
+
+msgctxt "Label for the table column dropdown button."
+msgid "Column"
+msgstr "Spalte"
+
+msgctxt "Label for the set/unset table header row button."
+msgid "Header row"
+msgstr "Kopfzeile"
+
+msgctxt "Label for the insert row below button."
+msgid "Insert row below"
+msgstr "Zeile unten einfügen"
+
+msgctxt "Label for the insert row above button."
+msgid "Insert row above"
+msgstr "Zeile oben einfügen"
+
+msgctxt "Label for the delete table row button."
+msgid "Delete row"
+msgstr "Zeile löschen"
+
+msgctxt "Label for the table row dropdown button."
+msgid "Row"
+msgstr "Zeile"
+
+msgctxt "Label for the merge table cell up button."
+msgid "Merge cell up"
+msgstr "Zelle verbinden"
+
+msgctxt "Label for the merge table cell right button."
+msgid "Merge cell right"
+msgstr "Zelle rechts verbinden"
+
+msgctxt "Label for the merge table cell down button."
+msgid "Merge cell down"
+msgstr "Zelle unten verbinden"
+
+msgctxt "Label for the merge table cell left button."
+msgid "Merge cell left"
+msgstr "Zelle links verbinden"
+
+msgctxt "Label for the split table cell vertically button."
+msgid "Split cell vertically"
+msgstr "Zelle vertikal teilen"
+
+msgctxt "Label for the split table cell horizontally button."
+msgid "Split cell horizontally"
+msgstr "Zelle horizontal teilen"
+
+msgctxt "Label for the merge table cells button."
+msgid "Merge cells"
+msgstr "Zellen verbinden"

+ 78 - 0
packages/ckeditor5-table/lang/translations/en-au.po

@@ -0,0 +1,78 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: English (Australia) (https://www.transifex.com/ckeditor/teams/11143/en_AU/)\n"
+"Language: en_AU\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Label for the insert table toolbar button."
+msgid "Insert table"
+msgstr "Insert table"
+
+msgctxt "Label for the set/unset table header column button."
+msgid "Header column"
+msgstr "Header column"
+
+msgctxt "Label for the insert table column before the current one button."
+msgid "Insert column before"
+msgstr "Insert column before"
+
+msgctxt "Label for the insert table column after the current one button."
+msgid "Insert column after"
+msgstr "Insert column after"
+
+msgctxt "Label for the delete table column button."
+msgid "Delete column"
+msgstr "Delete column"
+
+msgctxt "Label for the table column dropdown button."
+msgid "Column"
+msgstr "Column"
+
+msgctxt "Label for the set/unset table header row button."
+msgid "Header row"
+msgstr "Header row"
+
+msgctxt "Label for the insert row below button."
+msgid "Insert row below"
+msgstr "Insert row below"
+
+msgctxt "Label for the insert row above button."
+msgid "Insert row above"
+msgstr "Insert row above"
+
+msgctxt "Label for the delete table row button."
+msgid "Delete row"
+msgstr "Delete row"
+
+msgctxt "Label for the table row dropdown button."
+msgid "Row"
+msgstr "Row"
+
+msgctxt "Label for the merge table cell up button."
+msgid "Merge cell up"
+msgstr "Merge cell up"
+
+msgctxt "Label for the merge table cell right button."
+msgid "Merge cell right"
+msgstr "Merge cell right"
+
+msgctxt "Label for the merge table cell down button."
+msgid "Merge cell down"
+msgstr "Merge cell down"
+
+msgctxt "Label for the merge table cell left button."
+msgid "Merge cell left"
+msgstr "Merge cell left"
+
+msgctxt "Label for the split table cell vertically button."
+msgid "Split cell vertically"
+msgstr "Split cell vertically"
+
+msgctxt "Label for the split table cell horizontally button."
+msgid "Split cell horizontally"
+msgstr "Split cell horizontally"
+
+msgctxt "Label for the merge table cells button."
+msgid "Merge cells"
+msgstr "Merge cells"

+ 78 - 0
packages/ckeditor5-table/lang/translations/et.po

@@ -0,0 +1,78 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: Estonian (https://www.transifex.com/ckeditor/teams/11143/et/)\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Label for the insert table toolbar button."
+msgid "Insert table"
+msgstr "Sisesta tabel"
+
+msgctxt "Label for the set/unset table header column button."
+msgid "Header column"
+msgstr "Päise veerg"
+
+msgctxt "Label for the insert table column before the current one button."
+msgid "Insert column before"
+msgstr "Sisesta veerg ettepoole"
+
+msgctxt "Label for the insert table column after the current one button."
+msgid "Insert column after"
+msgstr "Sisesta veerg tahapoole"
+
+msgctxt "Label for the delete table column button."
+msgid "Delete column"
+msgstr "Kustuta veerg"
+
+msgctxt "Label for the table column dropdown button."
+msgid "Column"
+msgstr "Veerg"
+
+msgctxt "Label for the set/unset table header row button."
+msgid "Header row"
+msgstr "Päise rida"
+
+msgctxt "Label for the insert row below button."
+msgid "Insert row below"
+msgstr "Sisesta rida allapoole"
+
+msgctxt "Label for the insert row above button."
+msgid "Insert row above"
+msgstr "Sisesta rida ülespoole"
+
+msgctxt "Label for the delete table row button."
+msgid "Delete row"
+msgstr "Kustuta rida"
+
+msgctxt "Label for the table row dropdown button."
+msgid "Row"
+msgstr "Rido"
+
+msgctxt "Label for the merge table cell up button."
+msgid "Merge cell up"
+msgstr "Liida ülemise lahtriga"
+
+msgctxt "Label for the merge table cell right button."
+msgid "Merge cell right"
+msgstr "Liida paremal oleva lahtriga"
+
+msgctxt "Label for the merge table cell down button."
+msgid "Merge cell down"
+msgstr "Liida alumise lahtriga"
+
+msgctxt "Label for the merge table cell left button."
+msgid "Merge cell left"
+msgstr "Liida vasakul oleva lahtriga"
+
+msgctxt "Label for the split table cell vertically button."
+msgid "Split cell vertically"
+msgstr "Jaga lahter vertikaalselt"
+
+msgctxt "Label for the split table cell horizontally button."
+msgid "Split cell horizontally"
+msgstr "Jaga lahter horisontaalselt"
+
+msgctxt "Label for the merge table cells button."
+msgid "Merge cells"
+msgstr "Liida lahtrid"

+ 1 - 1
packages/ckeditor5-table/lang/translations/hr.po

@@ -1,8 +1,8 @@
 # Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
-"Language: hr\n"
 "Language-Team: Croatian (https://www.transifex.com/ckeditor/teams/11143/hr/)\n"
+"Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 msgctxt "Label for the insert table toolbar button."

+ 1 - 1
packages/ckeditor5-table/lang/translations/hu.po

@@ -1,8 +1,8 @@
 # Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
-"Language: hu\n"
 "Language-Team: Hungarian (https://www.transifex.com/ckeditor/teams/11143/hu/)\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "Label for the insert table toolbar button."

+ 1 - 1
packages/ckeditor5-table/lang/translations/it.po

@@ -1,8 +1,8 @@
 # Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
-"Language: it\n"
 "Language-Team: Italian (https://www.transifex.com/ckeditor/teams/11143/it/)\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "Label for the insert table toolbar button."

+ 1 - 1
packages/ckeditor5-table/lang/translations/nb.po

@@ -1,8 +1,8 @@
 # Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
-"Language: nb\n"
 "Language-Team: Norwegian Bokmål (https://www.transifex.com/ckeditor/teams/11143/nb/)\n"
+"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgctxt "Label for the insert table toolbar button."

+ 78 - 0
packages/ckeditor5-table/lang/translations/nl.po

@@ -0,0 +1,78 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: Dutch (https://www.transifex.com/ckeditor/teams/11143/nl/)\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "Label for the insert table toolbar button."
+msgid "Insert table"
+msgstr "Tabel invoegen"
+
+msgctxt "Label for the set/unset table header column button."
+msgid "Header column"
+msgstr "Titel kolom"
+
+msgctxt "Label for the insert table column before the current one button."
+msgid "Insert column before"
+msgstr "Kolom hiervoor invoegen"
+
+msgctxt "Label for the insert table column after the current one button."
+msgid "Insert column after"
+msgstr "Kolom hierna invoegen"
+
+msgctxt "Label for the delete table column button."
+msgid "Delete column"
+msgstr "Verwijder kolom"
+
+msgctxt "Label for the table column dropdown button."
+msgid "Column"
+msgstr "Kolom"
+
+msgctxt "Label for the set/unset table header row button."
+msgid "Header row"
+msgstr "Titel rij"
+
+msgctxt "Label for the insert row below button."
+msgid "Insert row below"
+msgstr "Rij hieronder invoegen"
+
+msgctxt "Label for the insert row above button."
+msgid "Insert row above"
+msgstr "Rij hierboven invoegen"
+
+msgctxt "Label for the delete table row button."
+msgid "Delete row"
+msgstr "Verwijder rij"
+
+msgctxt "Label for the table row dropdown button."
+msgid "Row"
+msgstr "Rij"
+
+msgctxt "Label for the merge table cell up button."
+msgid "Merge cell up"
+msgstr "Cel hierboven samenvoegen"
+
+msgctxt "Label for the merge table cell right button."
+msgid "Merge cell right"
+msgstr "Cel hierna samenvoegen"
+
+msgctxt "Label for the merge table cell down button."
+msgid "Merge cell down"
+msgstr "Cel hieronder samenvoegen"
+
+msgctxt "Label for the merge table cell left button."
+msgid "Merge cell left"
+msgstr "Cel hiervoor samenvoegen"
+
+msgctxt "Label for the split table cell vertically button."
+msgid "Split cell vertically"
+msgstr "Splits cel verticaal"
+
+msgctxt "Label for the split table cell horizontally button."
+msgid "Split cell horizontally"
+msgstr "Splits cel horizontaal"
+
+msgctxt "Label for the merge table cells button."
+msgid "Merge cells"
+msgstr "Cellen samenvoegen"

+ 78 - 0
packages/ckeditor5-table/lang/translations/pt-br.po

@@ -0,0 +1,78 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/ckeditor/teams/11143/pt_BR/)\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+msgctxt "Label for the insert table toolbar button."
+msgid "Insert table"
+msgstr "Inserir tabela"
+
+msgctxt "Label for the set/unset table header column button."
+msgid "Header column"
+msgstr ""
+
+msgctxt "Label for the insert table column before the current one button."
+msgid "Insert column before"
+msgstr "Inserir coluna antes"
+
+msgctxt "Label for the insert table column after the current one button."
+msgid "Insert column after"
+msgstr "Inserir coluna depois"
+
+msgctxt "Label for the delete table column button."
+msgid "Delete column"
+msgstr "Excluir coluna"
+
+msgctxt "Label for the table column dropdown button."
+msgid "Column"
+msgstr "Coluna"
+
+msgctxt "Label for the set/unset table header row button."
+msgid "Header row"
+msgstr ""
+
+msgctxt "Label for the insert row below button."
+msgid "Insert row below"
+msgstr "Inserir linha abaixo"
+
+msgctxt "Label for the insert row above button."
+msgid "Insert row above"
+msgstr "Inserir linha acima"
+
+msgctxt "Label for the delete table row button."
+msgid "Delete row"
+msgstr "Excluir linha"
+
+msgctxt "Label for the table row dropdown button."
+msgid "Row"
+msgstr "Linha"
+
+msgctxt "Label for the merge table cell up button."
+msgid "Merge cell up"
+msgstr ""
+
+msgctxt "Label for the merge table cell right button."
+msgid "Merge cell right"
+msgstr ""
+
+msgctxt "Label for the merge table cell down button."
+msgid "Merge cell down"
+msgstr ""
+
+msgctxt "Label for the merge table cell left button."
+msgid "Merge cell left"
+msgstr ""
+
+msgctxt "Label for the split table cell vertically button."
+msgid "Split cell vertically"
+msgstr ""
+
+msgctxt "Label for the split table cell horizontally button."
+msgid "Split cell horizontally"
+msgstr ""
+
+msgctxt "Label for the merge table cells button."
+msgid "Merge cells"
+msgstr "Mesclar células"

+ 1 - 1
packages/ckeditor5-table/lang/translations/tr.po

@@ -1,8 +1,8 @@
 # Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
-"Language: tr\n"
 "Language-Team: Turkish (https://www.transifex.com/ckeditor/teams/11143/tr/)\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgctxt "Label for the insert table toolbar button."

+ 1 - 1
packages/ckeditor5-table/lang/translations/uk.po

@@ -1,8 +1,8 @@
 # Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 msgid ""
 msgstr ""
-"Language: uk\n"
 "Language-Team: Ukrainian (https://www.transifex.com/ckeditor/teams/11143/uk/)\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
 msgctxt "Label for the insert table toolbar button."

+ 78 - 0
packages/ckeditor5-table/lang/translations/zh-cn.po

@@ -0,0 +1,78 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: Chinese (China) (https://www.transifex.com/ckeditor/teams/11143/zh_CN/)\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "Label for the insert table toolbar button."
+msgid "Insert table"
+msgstr "插入表格"
+
+msgctxt "Label for the set/unset table header column button."
+msgid "Header column"
+msgstr "标题列"
+
+msgctxt "Label for the insert table column before the current one button."
+msgid "Insert column before"
+msgstr "在前面插入列"
+
+msgctxt "Label for the insert table column after the current one button."
+msgid "Insert column after"
+msgstr "在后面插入列"
+
+msgctxt "Label for the delete table column button."
+msgid "Delete column"
+msgstr "删除本列"
+
+msgctxt "Label for the table column dropdown button."
+msgid "Column"
+msgstr "列"
+
+msgctxt "Label for the set/unset table header row button."
+msgid "Header row"
+msgstr "标题行"
+
+msgctxt "Label for the insert row below button."
+msgid "Insert row below"
+msgstr "在下面插入一行"
+
+msgctxt "Label for the insert row above button."
+msgid "Insert row above"
+msgstr "在上面插入一行"
+
+msgctxt "Label for the delete table row button."
+msgid "Delete row"
+msgstr "删除本行"
+
+msgctxt "Label for the table row dropdown button."
+msgid "Row"
+msgstr "行"
+
+msgctxt "Label for the merge table cell up button."
+msgid "Merge cell up"
+msgstr "向上合并单元格"
+
+msgctxt "Label for the merge table cell right button."
+msgid "Merge cell right"
+msgstr "向右合并单元格"
+
+msgctxt "Label for the merge table cell down button."
+msgid "Merge cell down"
+msgstr "向下合并单元格"
+
+msgctxt "Label for the merge table cell left button."
+msgid "Merge cell left"
+msgstr "向左合并单元格"
+
+msgctxt "Label for the split table cell vertically button."
+msgid "Split cell vertically"
+msgstr "垂直拆分单元格"
+
+msgctxt "Label for the split table cell horizontally button."
+msgid "Split cell horizontally"
+msgstr "水平分割单元格"
+
+msgctxt "Label for the merge table cells button."
+msgid "Merge cells"
+msgstr "合并单元格"

+ 8 - 8
packages/ckeditor5-table/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-table",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "Table feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -9,16 +9,16 @@
     "ckeditor5-feature"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^10.1.0",
-    "@ckeditor/ckeditor5-engine": "^10.1.0",
-    "@ckeditor/ckeditor5-ui": "^10.1.0",
-    "@ckeditor/ckeditor5-widget": "^10.1.0"
+    "@ckeditor/ckeditor5-core": "^11.0.0",
+    "@ckeditor/ckeditor5-engine": "^10.2.0",
+    "@ckeditor/ckeditor5-ui": "^11.0.0",
+    "@ckeditor/ckeditor5-widget": "^10.2.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-editor-classic": "^10.0.1",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.1",
+    "@ckeditor/ckeditor5-editor-classic": "^11.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.2",
     "@ckeditor/ckeditor5-undo": "^10.0.1",
-    "@ckeditor/ckeditor5-utils": "^10.1.0",
+    "@ckeditor/ckeditor5-utils": "^10.2.0",
     "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",

+ 3 - 3
packages/ckeditor5-table/tests/converters/downcast.js

@@ -19,14 +19,14 @@ import { formatTable, formattedViewTable, modelTable } from '../_utils/utils';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
-testUtils.createSinonSandbox();
-
 describe( 'downcast converters', () => {
 	let editor, model, doc, root, viewDocument;
 
+	testUtils.createSinonSandbox();
+
 	beforeEach( () => {
 		// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
-		sinon.stub( env, 'isEdge' ).get( () => false );
+		testUtils.sinon.stub( env, 'isEdge' ).get( () => false );
 
 		return VirtualTestEditor.create()
 			.then( newEditor => {

+ 2 - 2
packages/ckeditor5-table/tests/tableui.js

@@ -15,11 +15,11 @@ import SwitchButtonView from '@ckeditor/ckeditor5-ui/src/button/switchbuttonview
 import DropdownView from '@ckeditor/ckeditor5-ui/src/dropdown/dropdownview';
 import ListSeparatorView from '@ckeditor/ckeditor5-ui/src/list/listseparatorview';
 
-testUtils.createSinonSandbox();
-
 describe( 'TableUI', () => {
 	let editor, element;
 
+	testUtils.createSinonSandbox();
+
 	before( () => {
 		addTranslations( 'en', {} );
 		addTranslations( 'pl', {} );